ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
51 81
52our @EXTS = (); # list of extension package names 82our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 83our %EXTCMD = ();
84our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
56 87
57our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 89our @EVENT;
59 90
60our $CONFDIR = confdir; 91our $CONFDIR = confdir;
61our $DATADIR = datadir; 92our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
71 106
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 109our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
79 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
82 118
83our %CFG; 119our %CFG;
84 120
85our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 122our $RUNTIME;
123our $NOW;
87 124
88our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
91 128
92# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 131
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
98 140
99binmode STDOUT; 141binmode STDOUT;
100binmode STDERR; 142binmode STDERR;
101 143
102# read virtual server time, if available 144# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
107} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
108 152
109mkdir $_ 153mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 155
112our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
155 199
156The raw value load value from the last tick. 200The raw value load value from the last tick.
157 201
158=item %cf::CFG 202=item %cf::CFG
159 203
160Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 205from wherever your confdir points to.
162 206
163=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
164 208
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 210returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 211per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 212
213=item @cf::INVOKE_RESULTS
214
215This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call.
218
169=back 219=back
170 220
171=cut 221=cut
172 222
173BEGIN { 223BEGIN {
… …
177 $msg .= "\n" 227 $msg .= "\n"
178 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
179 229
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 231
182 utf8::encode $msg;
183 LOG llevError, $msg; 232 LOG llevError, $msg;
184 }; 233 };
185} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
186 250
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 261for my $pkg (qw(
198 cf::global cf::attachable 262 cf::global cf::attachable
199 cf::object cf::object::player 263 cf::object cf::object::player
200 cf::client cf::player 264 cf::client cf::player
201 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
202 cf::map cf::party cf::region 267 cf::party cf::region
203)) { 268)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 270}
207 271
208$Event::DIED = sub { 272$EV::DIED = sub {
209 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
210}; 274};
275
276#############################################################################
211 277
212=head2 UTILITY FUNCTIONS 278=head2 UTILITY FUNCTIONS
213 279
214=over 4 280=over 4
215 281
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 301 $d
236 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
237} 303}
238 304
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
242 306
243Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
244 308
245=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
246 310
247Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
248 312
313=cut
314
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316
317sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
249=item cf::lock_wait $string 334=item cf::lock_wait $string
250 335
251Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
252 337
253=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
254 339
255Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
258returned. 343returned.
259 344
345Locks are *not* recursive, locking from the same coro twice results in a
346deadlocked coro.
347
260Lock names should begin with a unique identifier (for example, cf::map::find 348Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 349uses map_find and cf::map::load uses map_load).
262 350
263=item $locked = cf::lock_active $string 351=item $locked = cf::lock_active $string
264 352
265Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
266 354
267=cut 355=cut
268 356
269our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
270 358
271sub lock_wait($) { 359sub lock_wait($) {
272 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 361}
280 362
281sub lock_acquire($) { 363sub lock_acquire($) {
282 my ($key) = @_; 364 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 365}
294 366
295sub lock_active($) { 367sub lock_active($) {
296 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 369}
300 370
301sub freeze_mainloop { 371sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
303 373
304 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 375}
376
377=item cf::periodic $interval, $cb
378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
390}
391
392=item cf::get_slot $time[, $priority[, $name]]
393
394Allocate $time seconds of blocking CPU time at priority C<$priority>:
395This call blocks and returns only when you have at least C<$time> seconds
396of cpu time till the next tick. The slot is only valid till the next cede.
397
398The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class.
400
401Useful for short background jobs.
402
403=cut
404
405our @SLOT_QUEUE;
406our $SLOT_QUEUE;
407
408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
412 my $signal = new Coro::Signal;
413
414 while () {
415 next_job:
416 my $avail = cf::till_tick;
417 if ($avail > 0.01) {
418 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) {
420 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send;
422 Coro::cede;
423 goto next_job;
424 }
425 }
426 }
427
428 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait;
432 } else {
433 Coro::schedule;
434 }
306 }; 435 }
307 $TICK_WATCHER->stop; 436};
308 $guard 437
438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
441 my ($time, $pri, $name) = @_;
442
443 $time = $TICK * .6 if $time > $TICK * .6;
444 my $sig = new Coro::Signal;
445
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready;
449 $sig->wait;
309} 450}
310 451
311=item cf::async { BLOCK } 452=item cf::async { BLOCK }
312 453
313Currently the same as Coro::async_pool, meaning you cannot use 454Currently the same as Coro::async_pool, meaning you cannot use
… …
318 459
319BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
320 461
321=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
322 463
323The design of crossfire+ requires that the main coro ($Coro::main) is 464The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 465is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
467acceptable.
326 468
327If it must be done, put the blocking parts into C<sync_job>. This will run 469If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 471server will be frozen during this time, so the block should either finish
330fast or be very important. 472fast or be very important.
… …
333 475
334sub sync_job(&) { 476sub sync_job(&) {
335 my ($job) = @_; 477 my ($job) = @_;
336 478
337 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 480 my $time = EV::time;
339 481
340 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
342 484
343 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 486
345 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
346 488
347 my $busy = 1; 489 my $busy = 1;
348 my @res; 490 my @res;
349 491
350 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 494 @res = eval { $job->() };
352 warn $@ if $@; 495 warn $@ if $@;
353 undef $busy; 496 undef $busy;
354 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
355 498
356 while ($busy) { 499 while ($busy) {
357 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
358 } 504 }
505 }
359 506
360 $time = Event::time - $time; 507 my $time = EV::time - $time;
361 508
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
366 510
367 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
368 } else { 512 } else {
369 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
370 514
… …
390 $EXT_CORO{$coro+0} = $coro; 534 $EXT_CORO{$coro+0} = $coro;
391 535
392 $coro 536 $coro
393} 537}
394 538
395sub write_runtime { 539=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 540
398 # first touch the runtime file to show we are still running: 541Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 542process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling.
400 545
401 IO::AIO::aio_utime $runtime, undef, undef; 546=cut
402 547
403 my $guard = cf::lock_acquire "write_runtime"; 548sub fork_call(&@) {
549 my ($cb, @args) = @_;
404 550
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 551 # we seemingly have to make a local copy of the whole thing,
406 or return; 552 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious)
407 554
408 my $value = $cf::RUNTIME + 90 + 10; 555 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 556 reset_signals;
410 # 60 allows for the watchdog to kill the server. 557 &$cb
558 }, @args;
411 559
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 560 wantarray ? @res : $res[-1]
413 and return; 561}
414 562
415 # always fsync - this file is important 563=item $coin = coin_from_name $name
416 aio_fsync $fh
417 and return;
418 564
419 # touch it again to show we are up-to-date 565=cut
420 aio_utime $fh, undef, undef;
421 566
422 close $fh 567our %coin_alias = (
423 or return; 568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
424 583
425 aio_rename "$runtime~", $runtime 584sub coin_from_name($) {
426 and return; 585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
588}
427 589
428 warn "runtime file written.\n"; 590=item $value = cf::db_get $family => $key
429 591
592Returns a single value from the environment database.
593
594=item cf::db_put $family => $key => $value
595
596Stores the given C<$value> in the family. It can currently store binary
597data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
598
599=item $db = cf::db_table "name"
600
601Create and/or open a new database table. The string must not be "db" and must be unique
602within each server.
603
604=cut
605
606sub db_table($) {
607 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV;
609
610 eval {
611 $db->set_flags (BDB::CHKSUM);
612
613 utf8::encode $name;
614 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
615 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
616 cf::cleanup "db_open(db): $!" if $!;
617 };
618 cf::cleanup "db_open(db): $@" if $@;
619
620 $db
621}
622
623our $DB;
624
625sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db";
628 };
629}
630
631sub db_get($$) {
632 my $key = "$_[0]/$_[1]";
633
634 cf::sync_job {
635 BDB::db_get $DB, undef, $key, my $data;
636
637 $! ? ()
638 : $data
430 1 639 }
640}
641
642sub db_put($$$) {
643 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
645}
646
647=item cf::cache $id => [$paths...], $processversion => $process
648
649Generic caching function that returns the value of the resource $id,
650caching and regenerating as required.
651
652This function can block.
653
654=cut
655
656sub cache {
657 my ($id, $src, $processversion, $process) = @_;
658
659 my $meta =
660 join "\x00",
661 $processversion,
662 map {
663 aio_stat $_
664 and Carp::croak "$_: $!";
665
666 ($_, (stat _)[7,9])
667 } @$src;
668
669 my $dbmeta = db_get cache => "$id/meta";
670 if ($dbmeta ne $meta) {
671 # changed, we may need to process
672
673 my @data;
674 my $md5;
675
676 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_]
678 or Carp::croak "$src->[$_]: $!";
679 }
680
681 # if processing is expensive, check
682 # checksum first
683 if (1) {
684 $md5 =
685 join "\x00",
686 $processversion,
687 map {
688 cf::cede_to_tick;
689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
690 } 0.. $#$src;
691
692
693 my $dbmd5 = db_get cache => "$id/md5";
694 if ($dbmd5 eq $md5) {
695 db_put cache => "$id/meta", $meta;
696
697 return db_get cache => "$id/data";
698 }
699 }
700
701 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time;
704
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
706
707 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta;
710
711 return $data;
712 }
713
714 db_get cache => "$id/data"
431} 715}
432 716
433=item cf::datalog type => key => value, ... 717=item cf::datalog type => key => value, ...
434 718
435Log a datalog packet of the given type with the given key-value pairs. 719Log a datalog packet of the given type with the given key-value pairs.
… …
447 731
448############################################################################# 732#############################################################################
449 733
450=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
451 735
452Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
455 739
456In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 742Deliantra).
459 743
460=over 4 744=over 4
461 745
462=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
463 747
… …
507=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
508 792
509Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
511 795
512Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
514 798
515These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
516 800
517=over 4 801=over 4
… …
665 _attach $registry, $klass, @attach; 949 _attach $registry, $klass, @attach;
666 } 950 }
667 951
668 $obj->{$name} = \%arg; 952 $obj->{$name} = \%arg;
669 } else { 953 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 954 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 955 }
672 956
673 $obj->{_attachment}{$name} = undef; 957 $obj->{_attachment}{$name} = undef;
674} 958}
675 959
… …
715 "; 999 ";
716 die if $@; 1000 die if $@;
717} 1001}
718 1002
719our $override; 1003our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1004our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1005
722sub override { 1006sub override {
723 $override = 1; 1007 $override = 1;
724 @invoke_results = (); 1008 @INVOKE_RESULTS = (@_);
725} 1009}
726 1010
727sub do_invoke { 1011sub do_invoke {
728 my $event = shift; 1012 my $event = shift;
729 my $callbacks = shift; 1013 my $callbacks = shift;
730 1014
731 @invoke_results = (); 1015 @INVOKE_RESULTS = ();
732 1016
733 local $override; 1017 local $override;
734 1018
735 for (@$callbacks) { 1019 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1020 eval { &{$_->[1]} };
… …
745 } 1029 }
746 1030
747 0 1031 0
748} 1032}
749 1033
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1035
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1037
754Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
755 1039
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1040This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1041removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1042results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1043
760=back 1044=back
761 1045
762=cut 1046=cut
763 1047
764############################################################################# 1048#############################################################################
765# object support 1049# object support
1050
1051sub _object_equal($$);
1052sub _object_equal($$) {
1053 my ($a, $b) = @_;
1054
1055 return 0 unless (ref $a) eq (ref $b);
1056
1057 if ("HASH" eq ref $a) {
1058 my @ka = keys %$a;
1059 my @kb = keys %$b;
1060
1061 return 0 if @ka != @kb;
1062
1063 for (0 .. $#ka) {
1064 return 0 unless $ka[$_] eq $kb[$_];
1065 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1066 }
1067
1068 } elsif ("ARRAY" eq ref $a) {
1069
1070 return 0 if @$a != @$b;
1071
1072 for (0 .. $#$a) {
1073 return 0 unless _object_equal $a->[$_], $b->[$_];
1074 }
1075
1076 } elsif ($a ne $b) {
1077 return 0;
1078 }
1079
1080 1
1081}
1082
1083our $SLOW_MERGES;#d#
1084sub _can_merge {
1085 my ($ob1, $ob2) = @_;
1086
1087 ++$SLOW_MERGES;#d#
1088
1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
1091}
766 1092
767sub reattach { 1093sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1095 my ($obj) = @_;
770 1096
1097 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1099
773 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
774 1101
775 @$registry = (); 1102 @$registry = ();
776 1103
… …
791cf::attachable->attach ( 1118cf::attachable->attach (
792 prio => -1000000, 1119 prio => -1000000,
793 on_instantiate => sub { 1120 on_instantiate => sub {
794 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
795 1122
796 $data = from_json $data; 1123 $data = decode_json $data;
797 1124
798 for (@$data) { 1125 for (@$data) {
799 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
800 1127
801 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1144sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
819 1146
820 sync_job { 1147 sync_job {
821 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
824 1152
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
829 close $fh; 1160 aio_close $fh;
830 1161
831 if (@$objs) { 1162 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
837 close $fh; 1171 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
839 } 1173 }
840 } else { 1174 } else {
841 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
842 } 1176 }
843 1177
844 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1182 } else {
846 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
847 } 1184 }
848 } else { 1185 } else {
849 aio_unlink $filename; 1186 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
851 } 1188 }
852 } 1189 };
853} 1190}
854 1191
855sub object_freezer_as_string { 1192sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
857 1194
… …
869 or return; 1206 or return;
870 1207
871 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
873 or return; 1210 or return;
1211
874 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
875 } 1214 }
876 1215
1216 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1219
879 return ($data, $av); 1220 ($data, $av)
880} 1221}
1222
1223=head2 COMMAND CALLBACKS
1224
1225=over 4
1226
1227=cut
881 1228
882############################################################################# 1229#############################################################################
883# command handling &c 1230# command handling &c
884 1231
885=item cf::register_command $name => \&callback($ob,$args); 1232=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1245 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1246}
900 1247
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1248=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1249
903Register a callbackf ro execution when the client sends an extcmd packet. 1250Register a callback for execution when the client sends an (synchronous)
1251extcmd packet. Ext commands will be processed in the order they are
1252received by the server, like other user commands. The first argument is
1253the logged-in player. Ext commands can only be processed after a player
1254has logged in successfully.
904 1255
905If the callback returns something, it is sent back as if reply was being 1256If the callback returns something, it is sent back as if reply was being
906called. 1257called.
907 1258
1259=item cf::register_exticmd $name => \&callback($ns,$packet);
1260
1261Register a callback for execution when the client sends an (asynchronous)
1262exticmd packet. Exti commands are processed by the server as soon as they
1263are received, i.e. out of order w.r.t. other commands. The first argument
1264is a client socket. Exti commands can be received anytime, even before
1265log-in.
1266
1267If the callback returns something, it is sent back as if reply was being
1268called.
1269
908=cut 1270=cut
909 1271
910sub register_extcmd { 1272sub register_extcmd {
911 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
912 1274
913 $EXTCMD{$name} = $cb; 1275 $EXTCMD{$name} = $cb;
914} 1276}
1277
1278sub register_exticmd {
1279 my ($name, $cb) = @_;
1280
1281 $EXTICMD{$name} = $cb;
1282}
1283
1284use File::Glob ();
915 1285
916cf::player->attach ( 1286cf::player->attach (
917 on_command => sub { 1287 on_command => sub {
918 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
919 1289
… …
927 cf::override; 1297 cf::override;
928 }, 1298 },
929 on_extcmd => sub { 1299 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1300 my ($pl, $buf) = @_;
931 1301
932 my $msg = eval { from_json $buf }; 1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1303
934 if (ref $msg) { 1304 if (ref $msg) {
1305 my ($type, $reply, @payload) =
1306 "ARRAY" eq ref $msg
1307 ? @$msg
1308 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1309
1310 my @reply;
1311
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1312 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1313 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1314 }
1315
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
940 } else { 1319 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1321 }
943 1322
944 cf::override; 1323 cf::override;
945 }, 1324 },
946); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
947 1339
948sub load_extensions { 1340sub load_extensions {
949 cf::sync_job { 1341 cf::sync_job {
950 my %todo; 1342 my %todo;
951 1343
… …
971 1363
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1366
975 $ext{source} = 1367 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
978 . $source 1370 . $source
979 . "\n};\n1"; 1371 . "\n};\n1";
980 1372
981 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
… …
997 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
999 1391
1000 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1393 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1003 exit 1;
1004 } 1395 }
1005 1396
1006 warn $msg; 1397 warn $msg;
1007 } 1398 }
1008 1399
… …
1018 }; 1409 };
1019} 1410}
1020 1411
1021############################################################################# 1412#############################################################################
1022 1413
1414=back
1415
1023=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1024 1417
1025Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1026 1419
1027=cut 1420=cut
1028 1421
1029package cf::player; 1422package cf::player;
1030 1423
1031use Coro::AIO; 1424use Coro::AIO;
1032 1425
1033=head3 cf::player 1426=head3 cf::player
1034 1427
1035=over 4 1428=over 4
1429
1430=item cf::player::num_playing
1431
1432Returns the official number of playing players, as per the Crossfire metaserver rules.
1433
1434=cut
1435
1436sub num_playing {
1437 scalar grep
1438 $_->ob->map
1439 && !$_->hidden
1440 && !$_->ob->flag (cf::FLAG_WIZ),
1441 cf::player::list
1442}
1036 1443
1037=item cf::player::find $login 1444=item cf::player::find $login
1038 1445
1039Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1040 1447
… …
1059 1466
1060sub exists($) { 1467sub exists($) {
1061 my ($login) = @_; 1468 my ($login) = @_;
1062 1469
1063 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1064 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1065} 1472}
1066 1473
1067sub find($) { 1474sub find($) {
1068 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1069 my $login = $_[0]; 1476 my $login = $_[0];
… …
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1483 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1484 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1485 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1487
1081 my $pl = load_pl path $login 1488 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1489 or return;
1490
1491 my $pl = cf::player::load_pl $f
1492 or return;
1493
1494 local $cf::PLAYER_LOADING{$login} = $pl;
1495 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1084 } 1497 }
1085 } 1498 }
1086} 1499}
1087 1500
… …
1096 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1097 1510
1098 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1100 1513
1514 cf::get_slot 0.01;
1515
1101 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1102 Coro::cede; 1517 cf::cede_to_tick;
1103} 1518}
1104 1519
1105sub new($) { 1520sub new($) {
1106 my ($login) = @_; 1521 my ($login) = @_;
1107 1522
… …
1113 $cf::PLAYER{$login} = $self; 1528 $cf::PLAYER{$login} = $self;
1114 1529
1115 $self 1530 $self
1116} 1531}
1117 1532
1533=item $player->send_msg ($channel, $msg, $color, [extra...])
1534
1535=cut
1536
1537sub send_msg {
1538 my $ns = shift->ns
1539 or return;
1540 $ns->send_msg (@_);
1541}
1542
1118=item $pl->quit_character 1543=item $pl->quit_character
1119 1544
1120Nukes the player without looking back. If logged in, the connection will 1545Nukes the player without looking back. If logged in, the connection will
1121be destroyed. May block for a long time. 1546be destroyed. May block for a long time.
1122 1547
… …
1126 my ($pl) = @_; 1551 my ($pl) = @_;
1127 1552
1128 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1129 1554
1130 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1131 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1132 1557
1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1134 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1135 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1136 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1137 1564
1138 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1139 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1175 or return []; 1602 or return [];
1176 1603
1177 my @logins; 1604 my @logins;
1178 1605
1179 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1607 my $path = path $login;
1608
1609 # a .pst is a dead give-away for a valid player
1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1615 }
1183 1616
1184 utf8::decode $login; 1617 utf8::decode $login;
1185 push @logins, $login; 1618 push @logins, $login;
1186 } 1619 }
1187 1620
… …
1214 } 1647 }
1215 1648
1216 \@paths 1649 \@paths
1217} 1650}
1218 1651
1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1653
1654Expand deliantra pod fragments into protocol xml.
1655
1219=item $player->ext_reply ($msgid, %msg) 1656=item $player->ext_reply ($msgid, @msg)
1220 1657
1221Sends an ext reply to the player. 1658Sends an ext reply to the player.
1222 1659
1223=cut 1660=cut
1224 1661
1225sub ext_reply($$%) { 1662sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1663 my ($self, $id, @msg) = @_;
1227 1664
1228 $msg{msgid} = $id; 1665 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1666}
1232 1667
1233=item $player->ext_event ($type, %msg) 1668=item $player->ext_msg ($type, @msg)
1234 1669
1235Sends an ext event to the client. 1670Sends an ext event to the client.
1236 1671
1237=cut 1672=cut
1238 1673
1239sub ext_event($$%) { 1674sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1675 my ($self, $type, @msg) = @_;
1241 1676
1242 $self->ns->ext_event ($type, %msg); 1677 $self->ns->ext_msg ($type, @msg);
1243} 1678}
1244 1679
1245=head3 cf::region 1680=head3 cf::region
1246 1681
1247=over 4 1682=over 4
… …
1250 1685
1251package cf::region; 1686package cf::region;
1252 1687
1253=item cf::region::find_by_path $path 1688=item cf::region::find_by_path $path
1254 1689
1255Tries to decuce the probable region for a map knowing only its path. 1690Tries to decuce the likely region for a map knowing only its path.
1256 1691
1257=cut 1692=cut
1258 1693
1259sub find_by_path($) { 1694sub find_by_path($) {
1260 my ($path) = @_; 1695 my ($path) = @_;
1261 1696
1262 my ($match, $specificity); 1697 my ($match, $specificity);
1263 1698
1264 for my $region (list) { 1699 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1700 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1701 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1702 if $region->specificity > $specificity;
1268 } 1703 }
1269 } 1704 }
1270 1705
… …
1291our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1292our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1293 1728
1294sub generate_random_map { 1729sub generate_random_map {
1295 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1296 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1297 $self->_create_random_map ( 1735 $self->_create_random_map (
1298 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1299 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1300 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1390 $self->init; # pass $1 etc. 1828 $self->init; # pass $1 etc.
1391 return $self; 1829 return $self;
1392 } 1830 }
1393 } 1831 }
1394 1832
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 1833 Carp::cluck "unable to resolve path '$path' (base '$base').";
1396 () 1834 ()
1397} 1835}
1398 1836
1399sub init { 1837sub init {
1400 my ($self) = @_; 1838 my ($self) = @_;
… …
1422 1860
1423# the temporary/swap location 1861# the temporary/swap location
1424sub save_path { 1862sub save_path {
1425 my ($self) = @_; 1863 my ($self) = @_;
1426 1864
1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1428 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1429} 1867}
1430 1868
1431# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1432sub uniq_path { 1870sub uniq_path {
1433 my ($self) = @_; 1871 my ($self) = @_;
1434 1872
1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1436 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1437}
1438
1439# and all this just because we cannot iterate over
1440# all maps in C++...
1441sub change_all_map_light {
1442 my ($change) = @_;
1443
1444 $_->change_map_light ($change)
1445 for grep $_->outdoor, values %cf::MAP;
1446} 1875}
1447 1876
1448sub decay_objects { 1877sub decay_objects {
1449 my ($self) = @_; 1878 my ($self) = @_;
1450 1879
… …
1463 1892
1464sub load_header_from($) { 1893sub load_header_from($) {
1465 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1466 1895
1467 utf8::encode $path; 1896 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1473 1905
1474 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1475 1907
1476 1 1908 1
1477} 1909}
… …
1531sub find { 1963sub find {
1532 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1533 1965
1534 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1535 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1536 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1537 1970
1538 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1539 my $guard = cf::lock_acquire "map_find:$path";
1540 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1541 or return; 1973 or return;
1542 1974
1543 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1544 1976
… …
1546 or return; 1978 or return;
1547 1979
1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1550 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1551 $map->reset; 1985 $map->reset;
1552 undef $guard;
1553 return find $path; 1986 return find $path;
1554 } 1987 }
1555 1988
1556 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1557 } 1990 }
… …
1566 local $self->{deny_reset} = 1; # loading can take a long time 1999 local $self->{deny_reset} = 1; # loading can take a long time
1567 2000
1568 my $path = $self->{path}; 2001 my $path = $self->{path};
1569 2002
1570 { 2003 {
1571 my $guard = cf::lock_acquire "map_load:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1572 2005
2006 return unless $self->valid;
1573 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1574 2008
1575 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1576 2010
1577 $self->alloc; 2011 $self->alloc;
1578 2012
1579 $self->pre_load; 2013 $self->pre_load;
1580 Coro::cede; 2014 cf::cede_to_tick;
1581 2015
2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block;
1582 $self->_load_objects ($self->{load_path}, 1) 2018 $self->_load_objects ($f)
1583 or return; 2019 or return;
1584 2020
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1586 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1587 2023
1588 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 2025 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 2026 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 2028 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 2029 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs;
2031 }
1593 } 2032 }
1594 } 2033 }
1595 2034
1596 Coro::cede; 2035 $f->resolve_delayed_derefs;
2036
2037 cf::cede_to_tick;
1597 # now do the right thing for maps 2038 # now do the right thing for maps
1598 $self->link_multipart_objects; 2039 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 2040 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 2041 unless $self->difficulty;
1601 Coro::cede; 2042 cf::cede_to_tick;
1602 2043
1603 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 2045 $self->decay_objects;
1605 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1606 $self->update_buttons; 2047 $self->update_buttons;
1607 Coro::cede; 2048 cf::cede_to_tick;
1608 $self->set_darkness_map;
1609 Coro::cede;
1610 $self->activate; 2049 $self->activate;
1611 } 2050 }
1612 2051
2052 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME);
2054
1613 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1614 } 2056 }
1615 2057
1616 $self->post_load; 2058 $self->post_load;
1617} 2059}
1618 2060
… …
1627 2069
1628 $self 2070 $self
1629} 2071}
1630 2072
1631# find and load all maps in the 3x3 area around a map 2073# find and load all maps in the 3x3 area around a map
1632sub load_diag { 2074sub load_neighbours {
1633 my ($map) = @_; 2075 my ($map) = @_;
1634 2076
1635 my @diag; # diagonal neighbours 2077 my @neigh; # diagonal neighbours
1636 2078
1637 for (0 .. 3) { 2079 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 2080 my $neigh = $map->tile_path ($_)
1639 or next; 2081 or next;
1640 $neigh = find $neigh, $map 2082 $neigh = find $neigh, $map
1641 or next; 2083 or next;
1642 $neigh->load; 2084 $neigh->load;
1643 2085
2086 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 2089 }
1647 2090
1648 for (@diag) { 2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 2093 my $neigh = find $path, $origin
1650 or next; 2094 or next;
1651 $neigh->load; 2095 $neigh->load;
1652 } 2096 }
1653} 2097}
1654 2098
… …
1659} 2103}
1660 2104
1661sub do_load_sync { 2105sub do_load_sync {
1662 my ($map) = @_; 2106 my ($map) = @_;
1663 2107
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main;
2110
1664 cf::sync_job { $map->load }; 2111 cf::sync_job { $map->load };
1665} 2112}
1666 2113
1667our %MAP_PREFETCH; 2114our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 2115our $MAP_PREFETCHER = undef;
1669 2116
1670sub find_async { 2117sub find_async {
1671 my ($path, $origin) = @_; 2118 my ($path, $origin, $load) = @_;
1672 2119
1673 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
1674 2121
1675 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1677 } 2124 }
1678 2125
1679 undef $MAP_PREFETCH{$path}; 2126 $MAP_PREFETCH{$path} |= $load;
2127
1680 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
1681 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2133 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2134 $map->load if $v;
2135 }
1686 2136
1687 delete $MAP_PREFETCH{$path}; 2137 delete $MAP_PREFETCH{$k};
1688 } 2138 }
1689 } 2139 }
1690 undef $MAP_PREFETCHER; 2140 undef $MAP_PREFETCHER;
1691 }; 2141 };
1692 $MAP_PREFETCHER->prio (6); 2142 $MAP_PREFETCHER->prio (6);
… …
1695} 2145}
1696 2146
1697sub save { 2147sub save {
1698 my ($self) = @_; 2148 my ($self) = @_;
1699 2149
1700 my $lock = cf::lock_acquire "map_data:" . $self->path; 2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
1701 2151
1702 $self->{last_save} = $cf::RUNTIME; 2152 $self->{last_save} = $cf::RUNTIME;
1703 2153
1704 return unless $self->dirty; 2154 return unless $self->dirty;
1705 2155
… …
1711 return if $self->{deny_save}; 2161 return if $self->{deny_save};
1712 2162
1713 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
1714 2164
1715 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
1716 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
1717 }; 2168 };
2169
2170 cf::get_slot 0.02;
1718 2171
1719 if ($uniq) { 2172 if ($uniq) {
1720 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1721 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1722 } else { 2175 } else {
… …
1728 my ($self) = @_; 2181 my ($self) = @_;
1729 2182
1730 # save first because save cedes 2183 # save first because save cedes
1731 $self->save; 2184 $self->save;
1732 2185
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2187
1735 return if $self->players; 2188 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
1737 return if $self->{deny_save}; 2190 return if $self->{deny_save};
1738 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
1739 $self->clear; 2196 $self->clear;
1740 $self->in_memory (cf::MAP_SWAPPED);
1741} 2197}
1742 2198
1743sub reset_at { 2199sub reset_at {
1744 my ($self) = @_; 2200 my ($self) = @_;
1745 2201
… …
1777 if $uniq; 2233 if $uniq;
1778 } 2234 }
1779 2235
1780 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
1781 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
1782 $self->clear; 2240 $self->clear;
1783
1784 $_->clear_links_to ($self) for values %cf::MAP;
1785 2241
1786 $self->unlink_save; 2242 $self->unlink_save;
1787 $self->destroy; 2243 $self->destroy;
1788} 2244}
1789 2245
1790my $nuke_counter = "aaaa"; 2246my $nuke_counter = "aaaa";
1791 2247
1792sub nuke { 2248sub nuke {
1793 my ($self) = @_; 2249 my ($self) = @_;
1794 2250
2251 {
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
1795 delete $cf::MAP{$self->path}; 2254 delete $cf::MAP{$self->path};
1796 2255
1797 $self->unlink_save; 2256 $self->unlink_save;
1798 2257
1799 bless $self, "cf::map"; 2258 bless $self, "cf::map";
1800 delete $self->{deny_reset}; 2259 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2260 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2261 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2263
1805 $cf::MAP{$self->path} = $self; 2264 $cf::MAP{$self->path} = $self;
2265 }
1806 2266
1807 $self->reset; # polite request, might not happen 2267 $self->reset; # polite request, might not happen
1808} 2268}
1809 2269
1810=item $maps = cf::map::tmp_maps 2270=item $maps = cf::map::tmp_maps
… …
1852 2312
1853sub unique_maps() { 2313sub unique_maps() {
1854 [ 2314 [
1855 map { 2315 map {
1856 utf8::decode $_; 2316 utf8::decode $_;
1857 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
1858 ? normalise $_ 2320 : normalise $_
1859 : ()
1860 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
1861 ] 2322 ]
1862} 2323}
1863 2324
1864package cf;
1865
1866=back 2325=back
1867 2326
1868=head3 cf::object 2327=head3 cf::object
1869 2328
1870=cut 2329=cut
… …
1873 2332
1874=over 4 2333=over 4
1875 2334
1876=item $ob->inv_recursive 2335=item $ob->inv_recursive
1877 2336
1878Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
1879 2339
1880=cut 2340=cut
1881 2341
1882sub inv_recursive_; 2342sub inv_recursive_;
1883sub inv_recursive_ { 2343sub inv_recursive_ {
… …
1886 2346
1887sub inv_recursive { 2347sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
1889} 2349}
1890 2350
2351=item $ref = $ob->ref
2352
2353Creates and returns a persistent reference to an object that can be stored as a string.
2354
2355=item $ob = cf::object::deref ($refstring)
2356
2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2358even if the object actually exists. May block.
2359
2360=cut
2361
2362sub deref {
2363 my ($ref) = @_;
2364
2365 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2366 my ($uuid, $name) = ($1, $2);
2367 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2368 or return;
2369 $pl->ob->uuid eq $uuid
2370 or return;
2371
2372 $pl->ob
2373 } else {
2374 warn "$ref: cannot resolve object reference\n";
2375 undef
2376 }
2377}
2378
1891package cf; 2379package cf;
1892 2380
1893=back 2381=back
1894 2382
1895=head3 cf::object::player 2383=head3 cf::object::player
… …
1901Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2389Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1902can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
1903dialogue with the given NPC character. 2391dialogue with the given NPC character.
1904 2392
1905=cut 2393=cut
2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
1906 2408
1907# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
1908# with dialog boxes. 2410# with dialog boxes.
1909#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
1910sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
… …
1912 2414
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2415 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2416
1915 if ($self->{record_replies}) { 2417 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2418 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2419
1917 } else { 2420 } else {
2421 my $pl = $self->contr;
2422
2423 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2424 my $dialog = $pl->{npc_dialog};
2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2426
2427 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2430 }
1920 } 2431 }
2432}
2433
2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2435
2436=cut
2437
2438sub cf::object::send_msg {
2439 my $pl = shift->contr
2440 or return;
2441 $pl->send_msg (@_);
1921} 2442}
1922 2443
1923=item $player_object->may ("access") 2444=item $player_object->may ("access")
1924 2445
1925Returns wether the given player is authorized to access resource "access" 2446Returns wether the given player is authorized to access resource "access"
… …
1938 2459
1939=item $player_object->enter_link 2460=item $player_object->enter_link
1940 2461
1941Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
1942 2463
1943The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
1944I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
1945 2468
1946Will never block. 2469Will never block.
1947 2470
1948=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
1949 2472
… …
2004 # use -1 or undef as default coordinates, not 0, 0 2527 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2528 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2529 if $x <=0 && $y <= 0;
2007 2530
2008 $map->load; 2531 $map->load;
2009 $map->load_diag; 2532 $map->load_neighbours;
2010 2533
2011 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2012 $self->activate_recursive; 2536 $self->activate_recursive;
2013 2537
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2016} 2540}
2017 2541
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019 2543
2020Moves the player to the given map-path and coordinates by first freezing 2544Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2547the new (success) or old (failed) map position. In either case, $done will
2548be called at the end of this process.
2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2024 2552
2025=cut 2553=cut
2026 2554
2027our $GOTOGEN; 2555our $GOTOGEN;
2028 2556
2029sub cf::object::player::goto { 2557sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2031 2559
2032 # do generation counting so two concurrent goto's will be executed in-order 2560 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2562
2035 $self->enter_link; 2563 $self->enter_link;
2036 2564
2037 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2038 my $map = eval { 2587 my $map = eval {
2039 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2040 2589
2041 if ($map) { 2590 if ($map) {
2042 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2044 } else { 2593 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2046 } 2595 }
2047 2596
2048 $map 2597 $map
2049 }; 2598 };
2050 2599
… …
2055 2604
2056 if ($gen == $self->{_goto_generation}) { 2605 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2606 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2059 } 2608 }
2609
2610 $done->() if $done;
2060 })->prio (1); 2611 })->prio (1);
2061} 2612}
2062 2613
2063=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
2064 2615
… …
2084} 2635}
2085 2636
2086sub prepare_random_map { 2637sub prepare_random_map {
2087 my ($exit) = @_; 2638 my ($exit) = @_;
2088 2639
2089 my $guard = cf::lock_acquire "exit_prepare:$exit";
2090
2091 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2092 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2093 # that depends on the exit object 2642 # that depends on the exit object
2094 2643
2095 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
… …
2097 if ($exit->map) { 2646 if ($exit->map) {
2098 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2099 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2100 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2101 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2102 } 2653 }
2103 2654
2104 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2105 2656
2106 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2107 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2108 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2109 2660
2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2111 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2112 undef $fh; 2663 undef $fh;
2113 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2114 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2115 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2116 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2117 } 2672 }
2118} 2673}
2119 2674
2120sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2121 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2122 2677
2123 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2124 2679
2125 if ($exit->slaying eq "/!") {
2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
2129 cf::sync_job { prepare_random_map $exit };
2130 }
2131
2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2133 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp;
2135
2136 $self->enter_link; 2680 $self->enter_link;
2137 2681
2138 (async { 2682 (async {
2139 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2140 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2141 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2142 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2143 1; 2706 1
2144 }) { 2707 }) {
2145 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2146 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2147 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2148 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2149 2712
2150 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
… …
2169 2732
2170 utf8::encode $text; 2733 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2735}
2173 2736
2737=item $client->send_msg ($channel, $msg, $color, [extra...])
2738
2739Send a drawinfo or msg packet to the client, formatting the msg for the
2740client if neccessary. C<$type> should be a string identifying the type of
2741the message, with C<log> being the default. If C<$color> is negative, suppress
2742the message unless the client supports the msg packet.
2743
2744=cut
2745
2746# non-persistent channels (usually the info channel)
2747our %CHANNEL = (
2748 "c/identify" => {
2749 id => "infobox",
2750 title => "Identify",
2751 reply => undef,
2752 tooltip => "Items recently identified",
2753 },
2754 "c/examine" => {
2755 id => "infobox",
2756 title => "Examine",
2757 reply => undef,
2758 tooltip => "Signs and other items you examined",
2759 },
2760 "c/book" => {
2761 id => "infobox",
2762 title => "Book",
2763 reply => undef,
2764 tooltip => "The contents of a note or book",
2765 },
2766 "c/lookat" => {
2767 id => "infobox",
2768 title => "Look",
2769 reply => undef,
2770 tooltip => "What you saw there",
2771 },
2772 "c/who" => {
2773 id => "infobox",
2774 title => "Players",
2775 reply => undef,
2776 tooltip => "Shows players who are currently online",
2777 },
2778 "c/body" => {
2779 id => "infobox",
2780 title => "Body Parts",
2781 reply => undef,
2782 tooltip => "Shows which body parts you posess and are available",
2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2820 "c/uptime" => {
2821 id => "infobox",
2822 title => "Uptime",
2823 reply => undef,
2824 tooltip => "How long the server has been running since last restart",
2825 },
2826 "c/mapinfo" => {
2827 id => "infobox",
2828 title => "Map Info",
2829 reply => undef,
2830 tooltip => "Information related to the maps",
2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2846);
2847
2848sub cf::client::send_msg {
2849 my ($self, $channel, $msg, $color, @extra) = @_;
2850
2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2853
2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2855
2856 # check predefined channels, for the benefit of C
2857 if ($CHANNEL{$channel}) {
2858 $channel = $CHANNEL{$channel};
2859
2860 $self->ext_msg (channel_info => $channel);
2861 $channel = $channel->{id};
2862
2863 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel);
2868 }
2869
2870 $channel = $channel->{id};
2871 }
2872
2873 return unless @extra || length $msg;
2874
2875 # default colour, mask it out
2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877 if $color & cf::NDI_DEF;
2878
2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 );
2883
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt);
2895}
2896
2174=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2175 2898
2176Sends an exti event to the client. 2899Sends an ext event to the client.
2177 2900
2178=cut 2901=cut
2179 2902
2180sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2182 2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2185} 2930}
2186 2931
2187=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2188 2933
2189Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2935the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2936C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 2937
2193Queries can fail, so check the return code. Or don't, as queries will become 2938Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 2939become reliable at some point in the future.
2195 2940
2196=cut 2941=cut
2197 2942
2198sub cf::client::query { 2943sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 2944 my ($self, $flags, $text, $cb) = @_;
… …
2207 utf8::encode $text; 2952 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2953 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 2954
2210 $self->send_packet ($self->{query_queue}[0][0]) 2955 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 2956 if @{ $self->{query_queue} } == 1;
2957
2958 1
2212} 2959}
2213 2960
2214cf::client->attach ( 2961cf::client->attach (
2962 on_connect => sub {
2963 my ($ns) = @_;
2964
2965 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2966 },
2215 on_reply => sub { 2967 on_reply => sub {
2216 my ($ns, $msg) = @_; 2968 my ($ns, $msg) = @_;
2217 2969
2218 # this weird shuffling is so that direct followup queries 2970 # this weird shuffling is so that direct followup queries
2219 # get handled first 2971 # get handled first
… …
2231 } else { 2983 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2984 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 2985 }
2234 } 2986 }
2235 }, 2987 },
2988 on_exticmd => sub {
2989 my ($ns, $buf) = @_;
2990
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992
2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
3001 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload);
3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 }
3011
3012 cf::override;
3013 },
2236); 3014);
2237 3015
2238=item $client->async (\&cb) 3016=item $client->async (\&cb)
2239 3017
2240Create a new coroutine, running the specified callback. The coroutine will 3018Create a new coroutine, running the specified callback. The coroutine will
… …
2281our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2283 3061
2284$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2285 3063
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2287 3069
2288# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2289 3071
2290=pod 3072=pod
2291 3073
2292The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2293 3075
2294 cf::object contr pay_amount pay_player map 3076 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split
3079 value
3080
2295 cf::object::player player 3081 cf::object::player
2296 cf::player peaceful 3082 player
2297 cf::map trigger 3083
3084 cf::player
3085 peaceful
3086
3087 cf::map
3088 trigger
2298 3089
2299=cut 3090=cut
2300 3091
2301for ( 3092for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3094 insert remove inv nrof name archname title slaying race
3095 decrease split destroy change_exp value msg lore send_msg)],
2303 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2305 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2306) { 3099) {
2307 no strict 'refs'; 3100 no strict 'refs';
2308 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2326 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2327 3120
2328 my $qcode = $code; 3121 my $qcode = $code;
2329 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2330 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2331 3126
2332 local $_; 3127 local $_;
2333 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2334 3129
2335 my $eval = 3130 my $eval =
… …
2378=back 3173=back
2379 3174
2380=cut 3175=cut
2381 3176
2382############################################################################# 3177#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553
2554#############################################################################
2555# the server's init and main functions 3178# the server's init and main functions
2556 3179
2557sub load_facedata($) { 3180sub load_facedata($) {
2558 my ($path) = @_; 3181 my ($path) = @_;
3182
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2559 3188
2560 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2561 3190
2562 my $facedata; 3191 my $facedata;
2563 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
… …
2566 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2567 3196
2568 $facedata->{version} == 2 3197 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 3199
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick;
3206
2571 { 3207 {
2572 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2573 3209
2574 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2579 Coro::cede; 3217
3218 cf::cede_to_tick;
2580 } 3219 }
2581 3220
2582 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2584 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2585 or next; 3225 or next;
3226
2586 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 3230 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 3232 }
2591 Coro::cede; 3233
3234 cf::cede_to_tick;
2592 } 3235 }
2593 } 3236 }
2594 3237
2595 { 3238 {
2596 my $anims = $facedata->{animinfo}; 3239 my $anims = $facedata->{animinfo};
2597 3240
2598 while (my ($anim, $info) = each %$anims) { 3241 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3242 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 3243 cf::cede_to_tick;
2601 } 3244 }
2602 3245
2603 cf::anim::invalidate_all; # d'oh 3246 cf::anim::invalidate_all; # d'oh
2604 } 3247 }
2605 3248
3249 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource};
3253
3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258
3259 if ($info->{type} & 1) {
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3274 } else {
3275 $RESOURCE{$name} = $info;
3276 }
3277
3278 cf::cede_to_tick;
3279 }
3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2606 1 3284 1
2607} 3285}
2608 3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306
3307register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_;
3309
3310 while (my ($k, $v) = each %$want) {
3311 $ns->fx_want ($k, $v);
3312 }
3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
2609sub reload_regions { 3325sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?)
3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3329
2610 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
3332
3333 for (cf::region::list) {
3334 $_->{match} = qr/$_->{match}/
3335 if exists $_->{match};
3336 }
2612} 3337}
2613 3338
2614sub reload_facedata { 3339sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3340 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3341 or die "unable to load facedata\n";
… …
2627} 3352}
2628 3353
2629sub reload_resources { 3354sub reload_resources {
2630 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2631 3356
3357 reload_facedata;
3358 reload_archetypes;
2632 reload_regions; 3359 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures; 3360 reload_treasures;
2637 3361
2638 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2639} 3363}
2640 3364
2641sub init { 3365sub reload_config {
2642 reload_resources;
2643}
2644
2645sub cfg_load {
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2647 or return; 3367 or return;
2648 3368
2649 local $/; 3369 local $/;
2650 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2651 3371
2652 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2653 3373
2654 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2655 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2661 }; 3381 };
2662 warn $@ if $@; 3382 warn $@ if $@;
2663 } 3383 }
2664} 3384}
2665 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
2666sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
2667 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
2668 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
2669 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2670 (async { 3423 (async {
2671 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
2672 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
2673 }; 3427 };
2674 3428
2675 cfg_load; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
2676 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
2677 load_extensions; 3447 load_extensions;
2678 3448
2679 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
2680 Event::loop; 3457 EV::loop;
2681} 3458}
2682 3459
2683############################################################################# 3460#############################################################################
2684# initialisation and cleanup 3461# initialisation and cleanup
2685 3462
2686# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
2687BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
2688 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
2689 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2690 reentrant => 0,
2691 data => WF_AUTOCANCEL,
2692 signal => $signal,
2693 prio => 0,
2694 cb => sub {
2695 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
2696 },
2697 ); 3469 };
3470 }
3471}
3472
3473sub write_runtime_sync {
3474 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time.
3476
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478
3479 my $guard = cf::lock_acquire "write_runtime";
3480
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3482 or return;
3483
3484 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server.
3487
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return;
3490
3491 # always fsync - this file is important
3492 aio_fsync $fh
3493 and return;
3494
3495 # touch it again to show we are up-to-date
3496 aio_utime $fh, undef, undef;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return;
3503
3504 warn "runtime file written.\n";
3505
2698 } 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
2699} 3557}
2700 3558
2701sub emergency_save() { 3559sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
2703 3561
2704 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
2705 3563
2706 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
2707 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
2708 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
2709 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
2710 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
2711 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
2712 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
2713 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2714 $pl->save; 3578 $pl->save;
2715 } 3579 }
2716 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
2717 3581
2718 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
2719 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
2720 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
2721 $map->valid or next; 3585 $map->valid or next;
2722 $map->save; 3586 $map->save;
2723 } 3587 }
2724 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
2725 3589
2726 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
2727 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
2728 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
2729 }; 3597 };
2730 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
2731 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
2732} 3605}
2733 3606
2734sub post_cleanup { 3607sub post_cleanup {
2735 my ($make_core) = @_; 3608 my ($make_core) = @_;
2736 3609
2737 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
2738 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
2739} 3641}
2740 3642
2741sub do_reload_perl() { 3643sub do_reload_perl() {
2742 # can/must only be called in main 3644 # can/must only be called in main
2743 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
2744 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
2745 return; 3647 return;
2746 } 3648 }
2747 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
2748 warn "reloading..."; 3655 warn "reloading...";
2749 3656
2750 warn "entering sync_job"; 3657 warn "entering sync_job";
2751 3658
2752 cf::sync_job { 3659 cf::sync_job {
2753 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
2754 cf::emergency_save; 3661 cf::emergency_save;
2755 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
2756 3663
2757 warn "syncing database to disk"; 3664 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
2759 3666
2760 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
2761 3668
2762 warn "cancelling all WF_AUTOCANCEL watchers";
2763 for (Event::all_watchers) {
2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2765 }
2766
2767 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
2768 for (;;) {
2769 BDB::flush;
2770 IO::AIO::flush;
2771 Coro::cede;
2772 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
2773 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2774 }
2775
2776 ++$RELOAD;
2777
2778 warn "cancelling all extension coros";
2779 $_->cancel for values %EXT_CORO;
2780 %EXT_CORO = ();
2781
2782 warn "removing commands";
2783 %COMMAND = ();
2784
2785 warn "removing ext commands";
2786 %EXTCMD = ();
2787
2788 warn "unloading/nuking all extensions";
2789 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg";
2791
2792 if (my $cb = $pkg->can ("unload")) {
2793 eval {
2794 $cb->($pkg);
2795 1
2796 } or warn "$pkg unloaded, but with errors: $@";
2797 } 3672 }
2798 3673
2799 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
2800 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
2801 } 3676 %EXT_CORO = ();
2802 3677
2803 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
2804 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
2805 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2806 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
2807 warn "... unloading $k"; 3687 warn "... unloading $pkg";
2808 delete $INC{$k};
2809 3688
2810 $k =~ s/\.pm$//;
2811 $k =~ s/\//::/g;
2812
2813 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
2814 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
2815 } 3698 }
2816 3699
2817 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
2818 } 3715 }
2819 3716
2820 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
2821 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2823 3720
2824 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
2825 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2827 3724
2828 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
2829 # and global variables created in xs 3726 # and global variables created in xs
2830 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
2831 3728
2832 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
2833 3730
2834 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
2835 require cf; 3732 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2837 3734
2838 warn "loading config and database again"; 3735 warn "loading config and database again";
2839 cf::cfg_load; 3736 cf::reload_config;
2840 3737
2841 warn "loading extensions"; 3738 warn "loading extensions";
2842 cf::load_extensions; 3739 cf::load_extensions;
2843 3740
3741 if ($REATTACH_ON_RELOAD) {
2844 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
2845 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
2846 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
2847 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
2848 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
2849 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
2850 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
2851 warn "leaving sync_job"; 3753 warn "leaving sync_job";
2852 3754
2853 1 3755 1
2854 } or do { 3756 } or do {
2855 warn $@; 3757 warn $@;
2856 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
2857 exit 1;
2858 }; 3759 };
2859 3760
2860 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
2861}; 3767};
2862 3768
2863our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
2864 3770
2865sub reload_perl() { 3771sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
2868 3774
2869 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
2870 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
2871 after => 0, 3777
2872 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2873 cb => sub {
2874 do_reload_perl; 3779 do_reload_perl;
2875 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
2876 }, 3781 };
2877 ); 3782 };
2878} 3783}
2879 3784
2880register_command "reload" => sub { 3785register_command "reload" => sub {
2881 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
2882 3787
2883 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
2884 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
2885 async { reload_perl }; 3792 reload_perl;
3793 };
2886 } 3794 }
2887}; 3795};
2888 3796
2889unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
2890 3798
… …
2892 3800
2893our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
2895 3803
2896sub wait_for_tick { 3804sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
2899 3806
2900 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait; 3809 $signal->wait;
2903} 3810}
2904 3811
2905sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
2908 3814
2909 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait; 3817 $signal->wait;
2912} 3818}
2913 3819
2914 my $min = 1e6;#d# 3820sub tick {
2915 my $avg = 10;
2916$TICK_WATCHER = Event->timer (
2917 reentrant => 0,
2918 parked => 1,
2919 prio => 0,
2920 at => $NEXT_TICK || $TICK,
2921 data => WF_AUTOCANCEL,
2922 cb => sub {
2923 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
2926 return; 3824 return;
2927 } 3825 }
2928 3826
2929 $NOW = $tick_start = Event::time;
2930
2931 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
2932 3828
2933 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2934 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2935 my $t = Event::time; 3831 Coro::async_pool {
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
2937 or die; 3833 write_runtime_sync
2938 3834 or warn "ERROR: unable to write runtime file: $!";
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 }; 3835 };
3836 }
2955 3837
2956 $RUNTIME += $TICK;
2957 $NEXT_TICK += $TICK;
2958
2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send; 3839 $sig->send;
2972 } 3840 }
2973 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send; 3842 $sig->send;
2975 } 3843 }
2976 3844
2977 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
2978
2979 # if we are delayed by four ticks or more, skip them all
2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2981
2982 $TICK_WATCHER->at ($NEXT_TICK);
2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987 3847
2988 _post_tick; 3848 if (0) {
2989 3849 if ($NEXT_TICK) {
2990 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
2991 }, 3854 }
2992); 3855}
2993 3856
2994{ 3857{
2995 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
2996 $BDB_POLL_WATCHER = Event->io ( 3859
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3005 3861 BDB::max_poll_reqs $TICK * 0.1;
3006 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020 3863
3021 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3023 3871
3024 cf::sync_job { 3872 cf::sync_job {
3025 eval { 3873 eval {
3026 BDB::db_env_open 3874 BDB::db_env_open
3027 $DB_ENV, 3875 $DB_ENV,
… …
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666; 3879 0666;
3032 3880
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 }; 3882 };
3038 3883
3039 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3040 }; 3885 };
3041 } 3886 }
3887
3888 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3889 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3890 };
3891 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 };
3042} 3897}
3043 3898
3044{ 3899{
3900 # configure IO::AIO
3901
3045 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
3048 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3049 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3050 reentrant => 0,
3051 data => WF_AUTOCANCEL,
3052 fd => IO::AIO::poll_fileno,
3053 poll => 'r',
3054 prio => 6,
3055 cb => \&IO::AIO::poll_cb,
3056 );
3057} 3905}
3058 3906
3059my $_log_backtrace; 3907my $_log_backtrace;
3060 3908
3061sub _log_backtrace { 3909sub _log_backtrace {
… …
3064 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3065 3913
3066 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3069 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3070 my @bt = fork_call { 3921 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3924 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!"; 3925 or die "addr2line: $!";
… …
3082 } 3933 }
3083 3934
3084 @funcs 3935 @funcs
3085 }; 3936 };
3086 3937
3087 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace; 3941 --$_log_backtrace;
3090 }; 3942 };
3091 } else { 3943 } else {
3092 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3094 } 3946 }
3095} 3947}
3096 3948
3097# load additional modules 3949# load additional modules
3098use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3099 3951
3100END { cf::emergency_save } 3952END { cf::emergency_save }
3101 3953
31021 39541
3103 3955

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines