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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS 2.01 ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 42
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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
44 45
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 47
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
76our $NEXT_TICK; 78our $NEXT_TICK;
77our $NOW; 79our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
87 92
88our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
91 96
92# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99
100our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing
102our $tick_start; # for load detecting purposes
94 103
95binmode STDOUT; 104binmode STDOUT;
96binmode STDERR; 105binmode STDERR;
97 106
98# read virtual server time, if available 107# read virtual server time, if available
139 148
140=item $cf::TICK 149=item $cf::TICK
141 150
142The interval between server ticks, in seconds. 151The interval between server ticks, in seconds.
143 152
153=item $cf::LOADAVG
154
155The current CPU load on the server (alpha-smoothed), as a value between 0
156(none) and 1 (overloaded), indicating how much time is spent on processing
157objects per tick. Healthy values are < 0.5.
158
159=item $cf::LOAD
160
161The raw value load value from the last tick.
162
144=item %cf::CFG 163=item %cf::CFG
145 164
146Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
147from wherever your confdir points to. 166from wherever your confdir points to.
148 167
149=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
150 169
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 171returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 172per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
154 173
174=item @cf::INVOKE_RESULTS
175
176This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call.
179
155=back 180=back
156 181
157=cut 182=cut
158 183
159BEGIN { 184BEGIN {
163 $msg .= "\n" 188 $msg .= "\n"
164 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
165 190
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 192
168 utf8::encode $msg;
169 LOG llevError, $msg; 193 LOG llevError, $msg;
170 }; 194 };
171} 195}
172 196
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
188)) { 213)) {
189 no strict 'refs'; 214 no strict 'refs';
190 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
191} 216}
192 217
193$Event::DIED = sub { 218$EV::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
231 256
232Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
240Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
244 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
245Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
247 282
248=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
249 284
250Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
251 286
252=cut 287=cut
253 288
254our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
255 291
256sub lock_wait($) { 292sub lock_wait($) {
257 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
258 299
259 # wait for lock, if any 300 # wait for lock, if any
260 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 303 Coro::schedule;
268 309
269 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
270 lock_wait $key; 311 lock_wait $key;
271 312
272 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
273 315
274 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
277 } 320 }
278} 321}
279 322
291 }; 334 };
292 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
293 $guard 336 $guard
294} 337}
295 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
354=item cf::get_slot $time[, $priority[, $name]]
355
356Allocate $time seconds of blocking CPU time at priority C<$priority>:
357This call blocks and returns only when you have at least C<$time> seconds
358of cpu time till the next tick. The slot is only valid till the next cede.
359
360The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class.
362
363Useful for short background jobs.
364
365=cut
366
367our @SLOT_QUEUE;
368our $SLOT_QUEUE;
369
370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
374 my $signal = new Coro::Signal;
375
376 while () {
377 next_job:
378 my $avail = cf::till_tick;
379 if ($avail > 0.01) {
380 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) {
382 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send;
384 Coro::cede;
385 goto next_job;
386 }
387 }
388 }
389
390 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else {
395 Coro::schedule;
396 }
397 }
398};
399
400sub get_slot($;$$) {
401 my ($time, $pri, $name) = @_;
402
403 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal;
405
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready;
409 $sig->wait;
410}
411
296=item cf::async { BLOCK } 412=item cf::async { BLOCK }
297 413
298Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 415C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
303 419
304BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
305 421
306=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
307 423
308The design of crossfire+ requires that the main coro ($Coro::main) is 424The design of Deliantra requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 425is always able to handle events or runnable, as Deliantra is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
427acceptable.
311 428
312If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 431server will be frozen during this time, so the block should either finish
315fast or be very important. 432fast or be very important.
318 435
319sub sync_job(&) { 436sub sync_job(&) {
320 my ($job) = @_; 437 my ($job) = @_;
321 438
322 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
440 my $time = EV::time;
441
323 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
325 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
326 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 448 # (but this is cancel-safe)
328 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
329 450
330 my $busy = 1; 451 my $busy = 1;
331 my @res; 452 my @res;
332 453
333 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
334 @res = eval { $job->() }; 456 @res = eval { $job->() };
335 warn $@ if $@; 457 warn $@ if $@;
336 undef $busy; 458 undef $busy;
337 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
338 460
339 while ($busy) { 461 while ($busy) {
340 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
341 } 466 }
467 }
468
469 $time = EV::time - $time;
470
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load
342 475
343 wantarray ? @res : $res[0] 476 wantarray ? @res : $res[0]
344 } else { 477 } else {
345 # we are in another coroutine, how wonderful, everything just works 478 # we are in another coroutine, how wonderful, everything just works
346 479
366 $EXT_CORO{$coro+0} = $coro; 499 $EXT_CORO{$coro+0} = $coro;
367 500
368 $coro 501 $coro
369} 502}
370 503
371sub write_runtime { 504=item fork_call { }, $args
372 my $runtime = "$LOCALDIR/runtime";
373 505
374 # first touch the runtime file to show we are still running: 506Executes the given code block with the given arguments in a seperate
375 # the fsync below can take a very very long time. 507process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling.
376 510
377 warn "touching runtime...\n";#d# 511=cut
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 512
379 utime undef, undef, $fh; 513sub fork_call(&@) {
514 my ($cb, @args) = @_;
515
516 # we seemingly have to make a local copy of the whole thing,
517 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious)
519
520 my @res = Coro::Util::fork_eval {
521 reset_signals;
522 &$cb
523 }, @args;
524
525 wantarray ? @res : $res[-1]
526}
527
528=item $value = cf::db_get $family => $key
529
530Returns a single value from the environment database.
531
532=item cf::db_put $family => $key => $value
533
534Stores the given C<$value> in the family. It can currently store binary
535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
380 } 555 };
556 cf::cleanup "db_open(db): $@" if $@;
381 557
382 my $guard = cf::lock_acquire "write_runtime"; 558 $db
559}
383 560
384 warn "starting to write runtime...\n";#d# 561our $DB;
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return;
387 562
388 my $value = $cf::RUNTIME + 90 + 10; 563sub db_init {
389 # 10 is the runtime save interval, for a monotonic clock 564 cf::sync_job {
390 # 60 allows for the watchdog to kill the server. 565 $DB ||= db_table "db";
566 };
567}
391 568
392 (aio_write $fh, 0, (length $value), $value, 0) <= 0 569sub db_get($$) {
393 and return; 570 my $key = "$_[0]/$_[1]";
394 571
395 # always fsync - this file is important 572 cf::sync_job {
396 aio_fsync $fh 573 BDB::db_get $DB, undef, $key, my $data;
397 and return;
398 574
399 # touch it again to show we are up-to-date 575 $! ? ()
400 utime undef, undef, $fh; 576 : $data
401
402 close $fh
403 or return;
404
405 aio_rename "$runtime~", $runtime
406 and return;
407
408 warn "... done writing runtime.\n";#d#
409
410 1 577 }
578}
579
580sub db_put($$$) {
581 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
583}
584
585=item cf::cache $id => [$paths...], $processversion => $process
586
587Generic caching function that returns the value of the resource $id,
588caching and regenerating as required.
589
590This function can block.
591
592=cut
593
594sub cache {
595 my ($id, $src, $processversion, $process) = @_;
596
597 my $meta =
598 join "\x00",
599 $processversion,
600 map {
601 aio_stat $_
602 and Carp::croak "$_: $!";
603
604 ($_, (stat _)[7,9])
605 } @$src;
606
607 my $dbmeta = db_get cache => "$id/meta";
608 if ($dbmeta ne $meta) {
609 # changed, we may need to process
610
611 my @data;
612 my $md5;
613
614 for (0 .. $#$src) {
615 0 <= aio_load $src->[$_], $data[$_]
616 or Carp::croak "$src->[$_]: $!";
617 }
618
619 # if processing is expensive, check
620 # checksum first
621 if (1) {
622 $md5 =
623 join "\x00",
624 $processversion,
625 map {
626 cf::cede_to_tick;
627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
628 } 0.. $#$src;
629
630
631 my $dbmd5 = db_get cache => "$id/md5";
632 if ($dbmd5 eq $md5) {
633 db_put cache => "$id/meta", $meta;
634
635 return db_get cache => "$id/data";
636 }
637 }
638
639 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time;
642
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
644
645 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta;
648
649 return $data;
650 }
651
652 db_get cache => "$id/data"
411} 653}
412 654
413=item cf::datalog type => key => value, ... 655=item cf::datalog type => key => value, ...
414 656
415Log a datalog packet of the given type with the given key-value pairs. 657Log a datalog packet of the given type with the given key-value pairs.
433attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
434to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
435 677
436In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
437C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
438crossfire+). 680Deliantra).
439 681
440=over 4 682=over 4
441 683
442=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
443 685
606 $registry = $CB_TYPE[$object_type] ||= []; 848 $registry = $CB_TYPE[$object_type] ||= [];
607 849
608 } elsif ($type eq "subtype") { 850 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 851 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 852 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 853 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 854
613 } elsif ($type eq "package") { 855 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 856 my $pkg = shift @arg;
615 857
616 while (my ($name, $id) = each %cb_id) { 858 while (my ($name, $id) = each %cb_id) {
645 _attach $registry, $klass, @attach; 887 _attach $registry, $klass, @attach;
646 } 888 }
647 889
648 $obj->{$name} = \%arg; 890 $obj->{$name} = \%arg;
649 } else { 891 } else {
650 warn "object uses attachment '$name' that is not available, postponing.\n"; 892 warn "object uses attachment '$name' which is not available, postponing.\n";
651 } 893 }
652 894
653 $obj->{_attachment}{$name} = undef; 895 $obj->{_attachment}{$name} = undef;
654} 896}
655 897
657 if (ref $_[0]) { 899 if (ref $_[0]) {
658 _object_attach @_; 900 _object_attach @_;
659 } else { 901 } else {
660 _attach shift->_attach_registry, @_; 902 _attach shift->_attach_registry, @_;
661 } 903 }
904 _recalc_want;
662}; 905};
663 906
664# all those should be optimised 907# all those should be optimised
665sub cf::attachable::detach { 908sub cf::attachable::detach {
666 my ($obj, $name) = @_; 909 my ($obj, $name) = @_;
669 delete $obj->{_attachment}{$name}; 912 delete $obj->{_attachment}{$name};
670 reattach ($obj); 913 reattach ($obj);
671 } else { 914 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 915 Carp::croak "cannot, currently, detach class attachments";
673 } 916 }
917 _recalc_want;
674}; 918};
675 919
676sub cf::attachable::attached { 920sub cf::attachable::attached {
677 my ($obj, $name) = @_; 921 my ($obj, $name) = @_;
678 922
693 "; 937 ";
694 die if $@; 938 die if $@;
695} 939}
696 940
697our $override; 941our $override;
698our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 942our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
699 943
700sub override { 944sub override {
701 $override = 1; 945 $override = 1;
702 @invoke_results = (); 946 @INVOKE_RESULTS = (@_);
703} 947}
704 948
705sub do_invoke { 949sub do_invoke {
706 my $event = shift; 950 my $event = shift;
707 my $callbacks = shift; 951 my $callbacks = shift;
708 952
709 @invoke_results = (); 953 @INVOKE_RESULTS = ();
710 954
711 local $override; 955 local $override;
712 956
713 for (@$callbacks) { 957 for (@$callbacks) {
714 eval { &{$_->[1]} }; 958 eval { &{$_->[1]} };
731 975
732Generate an object-specific event with the given arguments. 976Generate an object-specific event with the given arguments.
733 977
734This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 978This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
735removed in future versions), and there is no public API to access override 979removed in future versions), and there is no public API to access override
736results (if you must, access C<@cf::invoke_results> directly). 980results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737 981
738=back 982=back
739 983
740=cut 984=cut
741 985
742############################################################################# 986#############################################################################
743# object support 987# object support
988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
1022sub _can_merge {
1023 my ($ob1, $ob2) = @_;
1024
1025 ++$SLOW_MERGES;#d#
1026
1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
1029}
744 1030
745sub reattach { 1031sub reattach {
746 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
747 my ($obj) = @_; 1033 my ($obj) = @_;
748 1034
769cf::attachable->attach ( 1055cf::attachable->attach (
770 prio => -1000000, 1056 prio => -1000000,
771 on_instantiate => sub { 1057 on_instantiate => sub {
772 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
773 1059
774 $data = from_json $data; 1060 $data = decode_json $data;
775 1061
776 for (@$data) { 1062 for (@$data) {
777 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
778 1064
779 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
795sub object_freezer_save { 1081sub object_freezer_save {
796 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
797 1083
798 sync_job { 1084 sync_job {
799 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
800 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
801 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
802 1089
803 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
804 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
805 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
806 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
807 close $fh; 1094 close $fh;
808 1095
809 if (@$objs) { 1096 if (@$objs) {
810 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
811 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
812 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
813 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
814 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
815 close $fh; 1102 close $fh;
816 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
817 } 1104 }
825 } 1112 }
826 } else { 1113 } else {
827 aio_unlink $filename; 1114 aio_unlink $filename;
828 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
829 } 1116 }
830 } 1117 };
831} 1118}
832 1119
833sub object_freezer_as_string { 1120sub object_freezer_as_string {
834 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
835 1122
847 or return; 1134 or return;
848 1135
849 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
850 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
851 or return; 1138 or return;
1139
852 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
853 } 1142 }
854 1143
1144 utf8::decode (my $decname = $filename);
855 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 1146 $decname, length $data, scalar @{$av || []};
1147
857 return ($data, $av); 1148 ($data, $av)
858} 1149}
1150
1151=head2 COMMAND CALLBACKS
1152
1153=over 4
1154
1155=cut
859 1156
860############################################################################# 1157#############################################################################
861# command handling &c 1158# command handling &c
862 1159
863=item cf::register_command $name => \&callback($ob,$args); 1160=item cf::register_command $name => \&callback($ob,$args);
876 push @{ $COMMAND{$name} }, [$caller, $cb]; 1173 push @{ $COMMAND{$name} }, [$caller, $cb];
877} 1174}
878 1175
879=item cf::register_extcmd $name => \&callback($pl,$packet); 1176=item cf::register_extcmd $name => \&callback($pl,$packet);
880 1177
881Register a callbackf ro execution when the client sends an extcmd packet. 1178Register a callback for execution when the client sends an (synchronous)
1179extcmd packet. Ext commands will be processed in the order they are
1180received by the server, like other user commands. The first argument is
1181the logged-in player. Ext commands can only be processed after a player
1182has logged in successfully.
882 1183
883If the callback returns something, it is sent back as if reply was being 1184If the callback returns something, it is sent back as if reply was being
884called. 1185called.
885 1186
1187=item cf::register_exticmd $name => \&callback($ns,$packet);
1188
1189Register a callback for execution when the client sends an (asynchronous)
1190exticmd packet. Exti commands are processed by the server as soon as they
1191are received, i.e. out of order w.r.t. other commands. The first argument
1192is a client socket. Exti commands can be received anytime, even before
1193log-in.
1194
1195If the callback returns something, it is sent back as if reply was being
1196called.
1197
886=cut 1198=cut
887 1199
888sub register_extcmd { 1200sub register_extcmd {
889 my ($name, $cb) = @_; 1201 my ($name, $cb) = @_;
890 1202
891 $EXTCMD{$name} = $cb; 1203 $EXTCMD{$name} = $cb;
1204}
1205
1206sub register_exticmd {
1207 my ($name, $cb) = @_;
1208
1209 $EXTICMD{$name} = $cb;
892} 1210}
893 1211
894cf::player->attach ( 1212cf::player->attach (
895 on_command => sub { 1213 on_command => sub {
896 my ($pl, $name, $params) = @_; 1214 my ($pl, $name, $params) = @_;
905 cf::override; 1223 cf::override;
906 }, 1224 },
907 on_extcmd => sub { 1225 on_extcmd => sub {
908 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
909 1227
910 my $msg = eval { from_json $buf }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911 1229
912 if (ref $msg) { 1230 if (ref $msg) {
1231 my ($type, $reply, @payload) =
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235
1236 my @reply;
1237
913 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
914 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
915 $pl->ext_reply ($msg->{msgid}, %reply);
916 }
917 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
918 } else { 1245 } else {
919 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920 } 1247 }
921 1248
922 cf::override; 1249 cf::override;
923 }, 1250 },
924); 1251);
925 1252
926sub load_extension {
927 my ($path) = @_;
928
929 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
930 my $base = $1;
931 my $pkg = $1;
932 $pkg =~ s/[^[:word:]]/_/g;
933 $pkg = "ext::$pkg";
934
935 warn "... loading '$path' into '$pkg'\n";
936
937 open my $fh, "<:utf8", $path
938 or die "$path: $!";
939
940 my $source =
941 "package $pkg; use strict; use utf8;\n"
942 . "#line 1 \"$path\"\n{\n"
943 . (do { local $/; <$fh> })
944 . "\n};\n1";
945
946 unless (eval $source) {
947 my $msg = $@ ? "$path: $@\n"
948 : "extension disabled.\n";
949 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950 warn $@;
951 warn "mandatory extension failed to load, exiting.\n";
952 exit 1;
953 }
954 die $@;
955 }
956
957 push @EXTS, $pkg;
958}
959
960sub load_extensions { 1253sub load_extensions {
1254 cf::sync_job {
1255 my %todo;
1256
961 for my $ext (<$LIBDIR/*.ext>) { 1257 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 1258 next unless -r $path;
963 eval { 1259
964 load_extension $ext; 1260 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1261 my $base = $1;
1262 my $pkg = $1;
1263 $pkg =~ s/[^[:word:]]/_/g;
1264 $pkg = "ext::$pkg";
1265
1266 open my $fh, "<:utf8", $path
1267 or die "$path: $!";
1268
1269 my $source = do { local $/; <$fh> };
1270
1271 my %ext = (
1272 path => $path,
1273 base => $base,
1274 pkg => $pkg,
1275 );
1276
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279
1280 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n"
1283 . $source
1284 . "\n};\n1";
1285
1286 $todo{$base} = \%ext;
1287 }
1288
1289 my %done;
1290 while (%todo) {
1291 my $progress;
1292
1293 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip
1296 unless exists $done{$_};
1297 }
1298
1299 warn "... loading '$k' into '$v->{pkg}'\n";
1300
1301 unless (eval $v->{source}) {
1302 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n";
1304
1305 if (exists $v->{meta}{mandatory}) {
1306 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n";
1308 exit 1;
1309 }
1310
1311 warn $msg;
1312 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
965 1 1317 }
966 } or warn "$ext not loaded: $@"; 1318
1319 skip:
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1321 unless $progress;
1322 }
967 } 1323 };
968} 1324}
969 1325
970############################################################################# 1326#############################################################################
971 1327
1328=back
1329
972=head2 CORE EXTENSIONS 1330=head2 CORE EXTENSIONS
973 1331
974Functions and methods that extend core crossfire objects. 1332Functions and methods that extend core crossfire objects.
975 1333
976=cut 1334=cut
980use Coro::AIO; 1338use Coro::AIO;
981 1339
982=head3 cf::player 1340=head3 cf::player
983 1341
984=over 4 1342=over 4
1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
985 1357
986=item cf::player::find $login 1358=item cf::player::find $login
987 1359
988Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
989 1361
1025 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1026 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1027 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1028 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1029 1401
1030 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1031 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1032 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1033 } 1410 }
1034 } 1411 }
1035} 1412}
1036 1413
1046 1423
1047 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1048 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1049 1426
1050 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1051 Coro::cede; 1428 cf::cede_to_tick;
1052} 1429}
1053 1430
1054sub new($) { 1431sub new($) {
1055 my ($login) = @_; 1432 my ($login) = @_;
1056 1433
1060 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1061 1438
1062 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1063 1440
1064 $self 1441 $self
1442}
1443
1444=item $player->send_msg ($channel, $msg, $color, [extra...])
1445
1446=cut
1447
1448sub send_msg {
1449 my $ns = shift->ns
1450 or return;
1451 $ns->send_msg (@_);
1065} 1452}
1066 1453
1067=item $pl->quit_character 1454=item $pl->quit_character
1068 1455
1069Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1124 or return []; 1511 or return [];
1125 1512
1126 my @logins; 1513 my @logins;
1127 1514
1128 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1129 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1130 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1131 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1132 1524
1133 utf8::decode $login; 1525 utf8::decode $login;
1134 push @logins, $login; 1526 push @logins, $login;
1135 } 1527 }
1136 1528
1163 } 1555 }
1164 1556
1165 \@paths 1557 \@paths
1166} 1558}
1167 1559
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1561
1562Expand crossfire pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652
1168=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1169 1654
1170Sends an ext reply to the player. 1655Sends an ext reply to the player.
1171 1656
1172=cut 1657=cut
1173 1658
1174sub ext_reply($$%) { 1659sub ext_reply($$@) {
1175 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1176 1661
1177 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1178
1179 $self->send ("ext " . cf::to_json \%msg);
1180} 1663}
1181 1664
1182=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1183 1666
1184Sends an ext event to the client. 1667Sends an ext event to the client.
1185 1668
1186=cut 1669=cut
1187 1670
1188sub ext_event($$%) { 1671sub ext_msg($$@) {
1189 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1190 1673
1191 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1192} 1675}
1193 1676
1194=head3 cf::region 1677=head3 cf::region
1195 1678
1196=over 4 1679=over 4
1199 1682
1200package cf::region; 1683package cf::region;
1201 1684
1202=item cf::region::find_by_path $path 1685=item cf::region::find_by_path $path
1203 1686
1204Tries to decuce the probable region for a map knowing only its path. 1687Tries to decuce the likely region for a map knowing only its path.
1205 1688
1206=cut 1689=cut
1207 1690
1208sub find_by_path($) { 1691sub find_by_path($) {
1209 my ($path) = @_; 1692 my ($path) = @_;
1210 1693
1211 my ($match, $specificity); 1694 my ($match, $specificity);
1212 1695
1213 for my $region (list) { 1696 for my $region (list) {
1214 if ($region->match && $path =~ $region->match) { 1697 if ($region->{match} && $path =~ $region->{match}) {
1215 ($match, $specificity) = ($region, $region->specificity) 1698 ($match, $specificity) = ($region, $region->specificity)
1216 if $region->specificity > $specificity; 1699 if $region->specificity > $specificity;
1217 } 1700 }
1218 } 1701 }
1219 1702
1283 my ($self, $merge) = @_; 1766 my ($self, $merge) = @_;
1284 1767
1285 # we have to keep some variables in memory intact 1768 # we have to keep some variables in memory intact
1286 local $self->{path}; 1769 local $self->{path};
1287 local $self->{load_path}; 1770 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1771
1291 $self->SUPER::thawer_merge ($merge); 1772 $self->SUPER::thawer_merge ($merge);
1292} 1773}
1293 1774
1294sub normalise { 1775sub normalise {
1341 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1342 return $self; 1823 return $self;
1343 } 1824 }
1344 } 1825 }
1345 1826
1346 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1347 () 1828 ()
1348} 1829}
1349 1830
1350sub init { 1831sub init {
1351 my ($self) = @_; 1832 my ($self) = @_;
1394 1875
1395 $_->change_map_light ($change) 1876 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1877 for grep $_->outdoor, values %cf::MAP;
1397} 1878}
1398 1879
1880sub decay_objects {
1881 my ($self) = @_;
1882
1883 return if $self->{deny_reset};
1884
1885 $self->do_decay_objects;
1886}
1887
1399sub unlink_save { 1888sub unlink_save {
1400 my ($self) = @_; 1889 my ($self) = @_;
1401 1890
1402 utf8::encode (my $save = $self->save_path); 1891 utf8::encode (my $save = $self->save_path);
1403 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1892 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1406 1895
1407sub load_header_from($) { 1896sub load_header_from($) {
1408 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1409 1898
1410 utf8::encode $path; 1899 utf8::encode $path;
1411 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1412 # or return;
1413
1414 $self->_load_header ($path)
1415 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1416 1908
1417 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1418 1910
1419 1 1911 1
1420} 1912}
1459 $self->load_header_orig 1951 $self->load_header_orig
1460 or return; 1952 or return;
1461 $self->prepare_orig; 1953 $self->prepare_orig;
1462 } 1954 }
1463 1955
1956 $self->{deny_reset} = 1
1957 if $self->no_reset;
1958
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1959 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1960 unless $self->default_region;
1466 1961
1467 1 1962 1
1468} 1963}
1471sub find { 1966sub find {
1472 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1473 1968
1474 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1475 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1476 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1477 1973
1478 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1479 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1480 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1481 or return; 1979 or return;
1482 1980
1483 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1484 1982
1485 $map->load_header 1983 $map->load_header
1486 or return; 1984 or return;
1487 1985
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1491 $map->reset; 1991 $map->reset;
1492 undef $guard;
1493 return find $path; 1992 return find $path;
1494 } 1993 }
1495 1994
1496 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1497 } 1996 }
1506 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1507 2006
1508 my $path = $self->{path}; 2007 my $path = $self->{path};
1509 2008
1510 { 2009 {
1511 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1512 2011
2012 return unless $self->valid;
1513 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1514 2014
1515 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1516 2016
1517 $self->alloc; 2017 $self->alloc;
1518 2018
1519 $self->pre_load; 2019 $self->pre_load;
1520 Coro::cede; 2020 cf::cede_to_tick;
1521 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1522 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1523 or return; 2025 or return;
1524 2026
1525 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1526 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1527 2029
1528 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1529 utf8::encode $uniq; 2031 utf8::encode $uniq;
1530 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1531 $self->clear_unique_items; 2034 $self->clear_unique_items;
1532 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1533 } 2038 }
1534 } 2039 }
1535 2040
1536 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1537 # now do the right thing for maps 2044 # now do the right thing for maps
1538 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1539 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1540 unless $self->difficulty; 2047 unless $self->difficulty;
1541 Coro::cede; 2048 cf::cede_to_tick;
1542 2049
1543 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1544 $self->decay_objects; 2051 $self->decay_objects;
1545 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1546 $self->update_buttons; 2053 $self->update_buttons;
1547 Coro::cede; 2054 cf::cede_to_tick;
1548 $self->set_darkness_map; 2055 $self->set_darkness_map;
1549 Coro::cede; 2056 cf::cede_to_tick;
1550 $self->activate; 2057 $self->activate;
1551 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1552 2062
1553 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1554 } 2064 }
1555 2065
1556 $self->post_load; 2066 $self->post_load;
1560 my ($self, $ob) = @_; 2070 my ($self, $ob) = @_;
1561 2071
1562 return find "~" . $ob->name . "/" . $self->{path} 2072 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 2073 if $self->per_player;
1564 2074
2075# return find "?party/" . $ob->name . "/" . $self->{path}
2076# if $self->per_party;
2077
1565 $self 2078 $self
1566} 2079}
1567 2080
1568# find and load all maps in the 3x3 area around a map 2081# find and load all maps in the 3x3 area around a map
1569sub load_diag { 2082sub load_neighbours {
1570 my ($map) = @_; 2083 my ($map) = @_;
1571 2084
1572 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1573 2086
1574 for (0 .. 3) { 2087 for (0 .. 3) {
1575 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1576 or next; 2089 or next;
1577 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1578 or next; 2091 or next;
1579 $neigh->load; 2092 $neigh->load;
1580 2093
2094 push @neigh,
1581 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1582 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1583 } 2097 }
1584 2098
1585 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1586 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1587 or next; 2102 or next;
1588 $neigh->load; 2103 $neigh->load;
1589 } 2104 }
1590} 2105}
1591 2106
1596} 2111}
1597 2112
1598sub do_load_sync { 2113sub do_load_sync {
1599 my ($map) = @_; 2114 my ($map) = @_;
1600 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1601 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1602} 2120}
1603 2121
1604our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1605our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1606 2124
1607sub find_async { 2125sub find_async {
1608 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1609 2127
1610 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1611 2129
1612 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1613 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1614 } 2132 }
1615 2133
1616 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1617 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1618 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1619 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1620 my $map = find $path 2141 if (my $map = find $k) {
1621 or next;
1622 $map->load; 2142 $map->load if $v;
2143 }
1623 2144
1624 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1625 } 2146 }
1626 } 2147 }
1627 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1628 }; 2149 };
1629 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1632} 2153}
1633 2154
1634sub save { 2155sub save {
1635 my ($self) = @_; 2156 my ($self) = @_;
1636 2157
1637 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2159
1639 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1640 2161
1641 return unless $self->dirty; 2162 return unless $self->dirty;
1642 2163
1648 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1649 2170
1650 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1651 2172
1652 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1653 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1654 }; 2176 };
1655 2177
1656 if ($uniq) { 2178 if ($uniq) {
1657 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1665 my ($self) = @_; 2187 my ($self) = @_;
1666 2188
1667 # save first because save cedes 2189 # save first because save cedes
1668 $self->save; 2190 $self->save;
1669 2191
1670 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1671 2193
1672 return if $self->players; 2194 return if $self->players;
1673 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1674 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1675 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1676 $self->clear; 2202 $self->clear;
1677 $self->in_memory (cf::MAP_SWAPPED);
1678} 2203}
1679 2204
1680sub reset_at { 2205sub reset_at {
1681 my ($self) = @_; 2206 my ($self) = @_;
1682 2207
1683 # TODO: safety, remove and allow resettable per-player maps 2208 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 2209 return 1e99 if $self->{deny_reset};
1686 2210
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689 2213
1700 my ($self) = @_; 2224 my ($self) = @_;
1701 2225
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 2227
1704 return if $self->players; 2228 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 2229
1707 warn "resetting map ", $self->path;#d# 2230 warn "resetting map ", $self->path;
1708 2231
1709 $self->in_memory (cf::MAP_SWAPPED); 2232 $self->in_memory (cf::MAP_SWAPPED);
1710 2233
1711 # need to save uniques path 2234 # need to save uniques path
1712 unless ($self->{deny_save}) { 2235 unless ($self->{deny_save}) {
1716 if $uniq; 2239 if $uniq;
1717 } 2240 }
1718 2241
1719 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
1720 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
1721 $self->clear; 2246 $self->clear;
1722
1723 $_->clear_links_to ($self) for values %cf::MAP;
1724 2247
1725 $self->unlink_save; 2248 $self->unlink_save;
1726 $self->destroy; 2249 $self->destroy;
1727} 2250}
1728 2251
1729my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
1730 2253
1731sub nuke { 2254sub nuke {
1732 my ($self) = @_; 2255 my ($self) = @_;
1733 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
1734 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
1735 2261
1736 $self->unlink_save; 2262 $self->unlink_save;
1737 2263
1738 bless $self, "cf::map"; 2264 bless $self, "cf::map";
1739 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
1740 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
1741 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
1742 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1743 2269
1744 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
1745 2272
1746 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2274}
2275
2276=item $maps = cf::map::tmp_maps
2277
2278Returns an arrayref with all map paths of currently instantiated and saved
2279maps. May block.
2280
2281=cut
2282
2283sub tmp_maps() {
2284 [
2285 map {
2286 utf8::decode $_;
2287 /\.map$/
2288 ? normalise $_
2289 : ()
2290 } @{ aio_readdir $TMPDIR or [] }
2291 ]
2292}
2293
2294=item $maps = cf::map::random_maps
2295
2296Returns an arrayref with all map paths of currently instantiated and saved
2297random maps. May block.
2298
2299=cut
2300
2301sub random_maps() {
2302 [
2303 map {
2304 utf8::decode $_;
2305 /\.map$/
2306 ? normalise "?random/$_"
2307 : ()
2308 } @{ aio_readdir $RANDOMDIR or [] }
2309 ]
1747} 2310}
1748 2311
1749=item cf::map::unique_maps 2312=item cf::map::unique_maps
1750 2313
1751Returns an arrayref of paths of all shared maps that have 2314Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 2315instantiated unique items. May block.
1753 2316
1754=cut 2317=cut
1755 2318
1756sub unique_maps() { 2319sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 2320 [
1758 or return; 2321 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 2322 utf8::decode $_;
1764 next if /\.pst$/; 2323 /\.map$/
1765 next unless /^$PATH_SEP/o; 2324 ? normalise $_
1766 2325 : ()
1767 push @paths, cf::map::normalise $_; 2326 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 2327 ]
1769
1770 \@paths
1771} 2328}
1772 2329
1773package cf; 2330package cf;
1774 2331
1775=back 2332=back
1793 map { $_, inv_recursive_ $_->inv } @_ 2350 map { $_, inv_recursive_ $_->inv } @_
1794} 2351}
1795 2352
1796sub inv_recursive { 2353sub inv_recursive {
1797 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2355}
2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
1798} 2383}
1799 2384
1800package cf; 2385package cf;
1801 2386
1802=back 2387=back
1821 2406
1822 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2407 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823 2408
1824 if ($self->{record_replies}) { 2409 if ($self->{record_replies}) {
1825 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2410 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2411
1826 } else { 2412 } else {
2413 my $pl = $self->contr;
2414
2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2416 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418
2419 } else {
1827 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
1828 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2422 }
1829 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
1830} 2434}
1831 2435
1832=item $player_object->may ("access") 2436=item $player_object->may ("access")
1833 2437
1834Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
1881 $self->deactivate_recursive; 2485 $self->deactivate_recursive;
1882 2486
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2487 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 2488
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 2490 if $self->map && $self->map->{path} ne "{link}";
1887 2491
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2492 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 2493}
1890 2494
1891sub cf::object::player::leave_link { 2495sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 2496 my ($self, $map, $x, $y) = @_;
2497
2498 return unless $self->contr->active;
1893 2499
1894 my $link_pos = delete $self->{_link_pos}; 2500 my $link_pos = delete $self->{_link_pos};
1895 2501
1896 unless ($map) { 2502 unless ($map) {
1897 # restore original map position 2503 # restore original map position
1911 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
1912 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
1913 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
1914 2520
1915 $map->load; 2521 $map->load;
1916 $map->load_diag; 2522 $map->load_neighbours;
1917 2523
1918 return unless $self->contr->active; 2524 return unless $self->contr->active;
1919 $self->activate_recursive; 2525 $self->activate_recursive;
1920 2526
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
1923} 2529}
1924 2530
1925cf::player->attach ( 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926 on_logout => sub {
1927 my ($pl) = @_;
1928 2532
1929 # abort map switching before logout 2533Moves the player to the given map-path and coordinates by first freezing
1930 if ($pl->ob->{_link_pos}) { 2534her, loading and preparing them map, calling the provided $check callback
1931 cf::sync_job { 2535that has to return the map if sucecssful, and then unfreezes the player on
1932 $pl->ob->leave_link 2536the new (success) or old (failed) map position. In either case, $done will
1933 }; 2537be called at the end of this process.
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938 2538
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y)
1958
1959=cut 2539=cut
2540
2541our $GOTOGEN;
1960 2542
1961sub cf::object::player::goto { 2543sub cf::object::player::goto {
1962 my ($self, $path, $x, $y) = @_; 2544 my ($self, $path, $x, $y, $check, $done) = @_;
2545
2546 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963 2548
1964 $self->enter_link; 2549 $self->enter_link;
1965 2550
1966 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
1967 my $map = eval { 2573 my $map = eval {
1968 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2575
2576 if ($map) {
1969 $map = $map->customise_for ($self) if $map; 2577 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map;
2579 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 }
2582
1970 $map 2583 $map
2584 };
2585
2586 if ($@) {
2587 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2588 LOG llevError | logBacktrace, Carp::longmess $@;
1971 } or 2589 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2590
2591 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2593 $self->leave_link ($map, $x, $y);
2594 }
2595
2596 $done->() if $done;
1975 })->prio (1); 2597 })->prio (1);
1976} 2598}
1977 2599
1978=item $player_object->enter_exit ($exit_object) 2600=item $player_object->enter_exit ($exit_object)
1979 2601
2016 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2017 } 2639 }
2018 2640
2019 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2020 2642
2021 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2022 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2023 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2024 2646
2025 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2026 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2048 my $hp = $exit->stats->hp; 2670 my $hp = $exit->stats->hp;
2049 my $sp = $exit->stats->sp; 2671 my $sp = $exit->stats->sp;
2050 2672
2051 $self->enter_link; 2673 $self->enter_link;
2052 2674
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2053 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2054 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2055 unless (eval { 2683 unless (eval {
2056 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2057 2685
2058 1; 2686 1;
2084 2712
2085 utf8::encode $text; 2713 utf8::encode $text;
2086 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087} 2715}
2088 2716
2717=item $client->send_msg ($channel, $msg, $color, [extra...])
2718
2719Send a drawinfo or msg packet to the client, formatting the msg for the
2720client if neccessary. C<$type> should be a string identifying the type of
2721the message, with C<log> being the default. If C<$color> is negative, suppress
2722the message unless the client supports the msg packet.
2723
2724=cut
2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2778sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_;
2780
2781 $msg = $self->pl->expand_cfpod ($msg);
2782
2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2794 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800 }
2801
2802 $channel = $channel->{id};
2803 }
2804
2805 return unless @extra || length $msg;
2806
2807 if ($self->can_msg) {
2808 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF;
2811
2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2814 } else {
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825
2826 $color &= cf::NDI_COLOR_MASK;
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839}
2840
2089=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2090 2842
2091Sends an exti event to the client. 2843Sends an ext event to the client.
2092 2844
2093=cut 2845=cut
2094 2846
2095sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2096 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2097 2849
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2098 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2099 $self->send_packet ("ext " . cf::to_json \%msg); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2100} 2874}
2101 2875
2102=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2103 2877
2104Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2105the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2879the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2106C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2880C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107 2881
2108Queries can fail, so check the return code. Or don't, as queries will become 2882Queries can fail, so check the return code. Or don't, as queries will
2109reliable at some point in the future. 2883become reliable at some point in the future.
2110 2884
2111=cut 2885=cut
2112 2886
2113sub cf::client::query { 2887sub cf::client::query {
2114 my ($self, $flags, $text, $cb) = @_; 2888 my ($self, $flags, $text, $cb) = @_;
2122 utf8::encode $text; 2896 utf8::encode $text;
2123 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2897 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124 2898
2125 $self->send_packet ($self->{query_queue}[0][0]) 2899 $self->send_packet ($self->{query_queue}[0][0])
2126 if @{ $self->{query_queue} } == 1; 2900 if @{ $self->{query_queue} } == 1;
2901
2902 1
2127} 2903}
2128 2904
2129cf::client->attach ( 2905cf::client->attach (
2906 on_connect => sub {
2907 my ($ns) = @_;
2908
2909 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2910 },
2130 on_reply => sub { 2911 on_reply => sub {
2131 my ($ns, $msg) = @_; 2912 my ($ns, $msg) = @_;
2132 2913
2133 # this weird shuffling is so that direct followup queries 2914 # this weird shuffling is so that direct followup queries
2134 # get handled first 2915 # get handled first
2146 } else { 2927 } else {
2147 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2928 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148 } 2929 }
2149 } 2930 }
2150 }, 2931 },
2932 on_exticmd => sub {
2933 my ($ns, $buf) = @_;
2934
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936
2937 if (ref $msg) {
2938 my ($type, $reply, @payload) =
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942
2943 my @reply;
2944
2945 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload);
2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2952 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 }
2955
2956 cf::override;
2957 },
2151); 2958);
2152 2959
2153=item $client->async (\&cb) 2960=item $client->async (\&cb)
2154 2961
2155Create a new coroutine, running the specified callback. The coroutine will 2962Create a new coroutine, running the specified callback. The coroutine will
2196our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2197our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2198 3005
2199$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2200 3007
2201$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3008$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math
3010 grepstart grepwhile mapstart mapwhile
3011 sort time
3012));
2202 3013
2203# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2204 3015
2205=pod 3016=pod
2206 3017
2207The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2208 3019
2209 cf::object contr pay_amount pay_player map 3020 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr
3023
2210 cf::object::player player 3024 cf::object::player
2211 cf::player peaceful 3025 player
2212 cf::map trigger 3026
3027 cf::player
3028 peaceful
3029
3030 cf::map
3031 trigger
2213 3032
2214=cut 3033=cut
2215 3034
2216for ( 3035for (
2217 ["cf::object" => qw(contr pay_amount pay_player map)], 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race
3038 decrease_ob_nr destroy)],
2218 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2219 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2220 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2221) { 3042) {
2222 no strict 'refs'; 3043 no strict 'refs';
2293=back 3114=back
2294 3115
2295=cut 3116=cut
2296 3117
2297############################################################################# 3118#############################################################################
2298
2299=head2 EXTENSION DATABASE SUPPORT
2300
2301Crossfire maintains a very simple database for extension use. It can
2302currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2303convert to/from binary).
2304
2305The parameter C<$family> should best start with the name of the extension
2306using it, it should be unique.
2307
2308=over 4
2309
2310=item $value = cf::db_get $family => $key
2311
2312Returns a single value from the database.
2313
2314=item cf::db_put $family => $key => $value
2315
2316Stores the given C<$value> in the family.
2317
2318=cut
2319
2320our $DB;
2321
2322sub db_init {
2323 unless ($DB) {
2324 $DB = BDB::db_create $DB_ENV;
2325
2326 cf::sync_job {
2327 eval {
2328 $DB->set_flags (BDB::CHKSUM);
2329
2330 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2331 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2332 cf::cleanup "db_open(db): $!" if $!;
2333 };
2334 cf::cleanup "db_open(db): $@" if $@;
2335 };
2336 }
2337}
2338
2339sub db_get($$) {
2340 my $key = "$_[0]/$_[1]";
2341
2342 cf::sync_job {
2343 BDB::db_get $DB, undef, $key, my $data;
2344
2345 $! ? ()
2346 : $data
2347 }
2348}
2349
2350sub db_put($$$) {
2351 BDB::dbreq_pri 4;
2352 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2353}
2354
2355=item cf::cache $id => [$paths...], $processversion => $process
2356
2357Generic caching function that returns the value of the resource $id,
2358caching and regenerating as required.
2359
2360This function can block.
2361
2362=cut
2363
2364sub cache {
2365 my ($id, $src, $processversion, $process) = @_;
2366
2367 my $meta =
2368 join "\x00",
2369 $processversion,
2370 map {
2371 aio_stat $_
2372 and Carp::croak "$_: $!";
2373
2374 ($_, (stat _)[7,9])
2375 } @$src;
2376
2377 my $dbmeta = db_get cache => "$id/meta";
2378 if ($dbmeta ne $meta) {
2379 # changed, we may need to process
2380
2381 my @data;
2382 my $md5;
2383
2384 for (0 .. $#$src) {
2385 0 <= aio_load $src->[$_], $data[$_]
2386 or Carp::croak "$src->[$_]: $!";
2387 }
2388
2389 # if processing is expensive, check
2390 # checksum first
2391 if (1) {
2392 $md5 =
2393 join "\x00",
2394 $processversion,
2395 map {
2396 Coro::cede;
2397 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2398 } 0.. $#$src;
2399
2400
2401 my $dbmd5 = db_get cache => "$id/md5";
2402 if ($dbmd5 eq $md5) {
2403 db_put cache => "$id/meta", $meta;
2404
2405 return db_get cache => "$id/data";
2406 }
2407 }
2408
2409 my $t1 = Time::HiRes::time;
2410 my $data = $process->(\@data);
2411 my $t2 = Time::HiRes::time;
2412
2413 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415 db_put cache => "$id/data", $data;
2416 db_put cache => "$id/md5" , $md5;
2417 db_put cache => "$id/meta", $meta;
2418
2419 return $data;
2420 }
2421
2422 db_get cache => "$id/data"
2423}
2424
2425=item fork_call { }, $args
2426
2427Executes the given code block with the given arguments in a seperate
2428process, returning the results. Everything must be serialisable with
2429Coro::Storable. May, of course, block. Note that the executed sub may
2430never block itself or use any form of Event handling.
2431
2432=cut
2433
2434sub fork_call(&@) {
2435 my ($cb, @args) = @_;
2436
2437# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438# or die "socketpair: $!";
2439 pipe my $fh1, my $fh2
2440 or die "pipe: $!";
2441
2442 if (my $pid = fork) {
2443 close $fh2;
2444
2445 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446 $res = Coro::Storable::thaw $res;
2447
2448 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450 die $$res unless "ARRAY" eq ref $res;
2451
2452 return wantarray ? @$res : $res->[-1];
2453 } else {
2454 reset_signals;
2455 local $SIG{__WARN__};
2456 local $SIG{__DIE__};
2457 eval {
2458 close $fh1;
2459
2460 my @res = eval { $cb->(@args) };
2461 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462 };
2463
2464 warn $@ if $@;
2465 _exit 0;
2466 }
2467}
2468
2469
2470
2471#############################################################################
2472# the server's init and main functions 3119# the server's init and main functions
2473 3120
2474sub load_facedata($) { 3121sub load_facedata($) {
2475 my ($path) = @_; 3122 my ($path) = @_;
3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2476 3129
2477 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2478 3131
2479 my $facedata; 3132 my $facedata;
2480 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2483 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2484 3137
2485 $facedata->{version} == 2 3138 $facedata->{version} == 2
2486 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
2487 3140
3141 # patch in the exptable
3142 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3145 };
3146 cf::cede_to_tick;
3147
2488 { 3148 {
2489 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2490 3150
2491 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3153 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap};
2494 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2495 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2496 Coro::cede; 3157
3158 cf::cede_to_tick;
2497 } 3159 }
2498 3160
2499 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2500 next unless $info->{smooth}; 3162 next unless $info->{smooth};
2501 my $idx = cf::face::find $face 3163 my $idx = cf::face::find $face
2502 or next; 3164 or next;
2503 if (my $smooth = cf::face::find $info->{smooth}) { 3165 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth;
2504 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505 } else { 3168 } else {
2506 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3169 warn "smooth face '$info->{smooth}' not found for face '$face'";
2507 } 3170 }
2508 Coro::cede; 3171
3172 cf::cede_to_tick;
2509 } 3173 }
2510 } 3174 }
2511 3175
2512 { 3176 {
2513 my $anims = $facedata->{animinfo}; 3177 my $anims = $facedata->{animinfo};
2514 3178
2515 while (my ($anim, $info) = each %$anims) { 3179 while (my ($anim, $info) = each %$anims) {
2516 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3180 cf::anim::set $anim, $info->{frames}, $info->{facings};
2517 Coro::cede; 3181 cf::cede_to_tick;
2518 } 3182 }
2519 3183
2520 cf::anim::invalidate_all; # d'oh 3184 cf::anim::invalidate_all; # d'oh
2521 } 3185 }
2522 3186
3187 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource};
3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197
3198 if ($info->{type} & 1) {
3199 # prepend meta info
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else {
3208 $data = $info->{data};
3209 }
3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick;
3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 }
3235
2523 1 3236 1
2524} 3237}
2525 3238
3239register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_;
3241
3242 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v);
3244 }
3245};
3246
2526sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2527 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
3254
3255 for (cf::region::list) {
3256 $_->{match} = qr/$_->{match}/
3257 if exists $_->{match};
3258 }
2529} 3259}
2530 3260
2531sub reload_facedata { 3261sub reload_facedata {
2532 load_facedata "$DATADIR/facedata" 3262 load_facedata "$DATADIR/facedata"
2533 or die "unable to load facedata\n"; 3263 or die "unable to load facedata\n";
2534} 3264}
2535 3265
2536sub reload_archetypes { 3266sub reload_archetypes {
2537 load_resource_file "$DATADIR/archetypes" 3267 load_resource_file "$DATADIR/archetypes"
2538 or die "unable to load archetypes\n"; 3268 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
2539} 3274}
2540 3275
2541sub reload_treasures { 3276sub reload_treasures {
2542 load_resource_file "$DATADIR/treasures" 3277 load_resource_file "$DATADIR/treasures"
2543 or die "unable to load treasurelists\n"; 3278 or die "unable to load treasurelists\n";
2546sub reload_resources { 3281sub reload_resources {
2547 warn "reloading resource files...\n"; 3282 warn "reloading resource files...\n";
2548 3283
2549 reload_regions; 3284 reload_regions;
2550 reload_facedata; 3285 reload_facedata;
3286 #reload_archetypes;#d#
2551 reload_archetypes; 3287 reload_archetypes;
2552 reload_treasures; 3288 reload_treasures;
2553 3289
2554 warn "finished reloading resource files\n"; 3290 warn "finished reloading resource files\n";
2555} 3291}
2556 3292
2557sub init { 3293sub init {
2558 reload_resources; 3294 reload_resources;
2559} 3295}
2560 3296
2561sub cfg_load { 3297sub reload_config {
2562 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2563 or return; 3299 or return;
2564 3300
2565 local $/; 3301 local $/;
2566 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2582sub main { 3318sub main {
2583 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2584 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2585 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2586 (async { 3322 (async {
2587 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2588 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2589 }; 3326 };
2590 3327
2591 cfg_load; 3328 reload_config;
2592 db_init; 3329 db_init;
2593 load_extensions; 3330 load_extensions;
2594 3331
2595 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2596 Event::loop; 3334 EV::loop;
2597} 3335}
2598 3336
2599############################################################################# 3337#############################################################################
2600# initialisation and cleanup 3338# initialisation and cleanup
2601 3339
2602# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2603BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2604 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2605 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2608 signal => $signal,
2609 prio => 0,
2610 cb => sub {
2611 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2612 },
2613 ); 3346 };
3347 }
3348}
3349
3350sub write_runtime {
3351 my $runtime = "$LOCALDIR/runtime";
3352
3353 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time.
3355
3356 IO::AIO::aio_utime $runtime, undef, undef;
3357
3358 my $guard = cf::lock_acquire "write_runtime";
3359
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3361 or return;
3362
3363 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server.
3366
3367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3368 and return;
3369
3370 # always fsync - this file is important
3371 aio_fsync $fh
3372 and return;
3373
3374 # touch it again to show we are up-to-date
3375 aio_utime $fh, undef, undef;
3376
3377 close $fh
3378 or return;
3379
3380 aio_rename "$runtime~", $runtime
3381 and return;
3382
3383 warn "runtime file written.\n";
3384
2614 } 3385 1
2615} 3386}
2616 3387
2617sub emergency_save() { 3388sub emergency_save() {
2618 my $freeze_guard = cf::freeze_mainloop; 3389 my $freeze_guard = cf::freeze_mainloop;
2619 3390
2625 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
2626 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
2627 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
2628 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
2629 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2630 $pl->save; 3402 $pl->save;
2631 } 3403 }
2632 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
2633 3405
2634 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
2673 warn "syncing database to disk"; 3445 warn "syncing database to disk";
2674 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
2675 3447
2676 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
2677 3449
2678 warn "cancelling all WF_AUTOCANCEL watchers";
2679 for (Event::all_watchers) {
2680 $_->cancel if $_->data & WF_AUTOCANCEL;
2681 }
2682
2683 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
2684 for (;;) { 3451 for (;;) {
2685 BDB::flush; 3452 BDB::flush;
2686 IO::AIO::flush; 3453 IO::AIO::flush;
2687 Coro::cede; 3454 Coro::cede_notself;
2688 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
2689 warn "iterate..."; 3456 warn "iterate...";
2690 } 3457 }
2691 3458
2692 ++$RELOAD; 3459 ++$RELOAD;
2696 %EXT_CORO = (); 3463 %EXT_CORO = ();
2697 3464
2698 warn "removing commands"; 3465 warn "removing commands";
2699 %COMMAND = (); 3466 %COMMAND = ();
2700 3467
2701 warn "removing ext commands"; 3468 warn "removing ext/exti commands";
2702 %EXTCMD = (); 3469 %EXTCMD = ();
3470 %EXTICMD = ();
2703 3471
2704 warn "unloading/nuking all extensions"; 3472 warn "unloading/nuking all extensions";
2705 for my $pkg (@EXTS) { 3473 for my $pkg (@EXTS) {
2706 warn "... unloading $pkg"; 3474 warn "... unloading $pkg";
2707 3475
2750 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
2751 require cf; 3519 require cf;
2752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2753 3521
2754 warn "loading config and database again"; 3522 warn "loading config and database again";
2755 cf::cfg_load; 3523 cf::reload_config;
2756 3524
2757 warn "loading extensions"; 3525 warn "loading extensions";
2758 cf::load_extensions; 3526 cf::load_extensions;
2759 3527
2760 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
2780 3548
2781sub reload_perl() { 3549sub reload_perl() {
2782 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
2783 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
2784 3552
2785 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2786 reentrant => 0,
2787 after => 0,
2788 data => WF_AUTOCANCEL,
2789 cb => sub {
2790 do_reload_perl;
2791 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
2792 }, 3555 do_reload_perl;
2793 ); 3556 };
2794} 3557}
2795 3558
2796register_command "reload" => sub { 3559register_command "reload" => sub {
2797 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
2798 3561
2799 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
2800 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
2801 async { reload_perl }; 3566 reload_perl;
3567 };
2802 } 3568 }
2803}; 3569};
2804 3570
2805unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
2806 3572
2825 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 3593 $signal->wait;
2828} 3594}
2829 3595
2830$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2831 reentrant => 0,
2832 parked => 1,
2833 prio => 0,
2834 at => $NEXT_TICK || $TICK,
2835 data => WF_AUTOCANCEL,
2836 cb => sub {
2837 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
2840 return; 3600 return;
2841 } 3601 }
2842 3602
2843 $NOW = Event::time; 3603 $NOW = $tick_start = EV::now;
2844 3604
2845 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
2846 3606
2847 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
2849 3609
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2851 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
2852 Coro::async_pool { 3612 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver";
2853 write_runtime 3614 write_runtime
2854 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
2855 };
2856 } 3616 };
3617 }
2857 3618
2858# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d#
2860
2861 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2863
2864 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start;
2866
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2868 $sig->send; 3620 $sig->send;
2869 } 3621 }
2870 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send; 3623 $sig->send;
2872 } 3624 }
2873 3625
3626 $LOAD = ($NOW - $tick_start) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628
2874 _post_tick; 3629 _post_tick;
2875 }, 3630};
2876); 3631$TICK_WATCHER->priority (EV::MAXPRI);
2877 3632
2878{ 3633{
3634 BDB::min_parallel 8;
2879 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
2880 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
2881 reentrant => 0,
2882 fd => BDB::poll_fileno,
2883 poll => 'r',
2884 prio => 0,
2885 data => WF_AUTOCANCEL,
2886 cb => \&BDB::poll_cb,
2887 );
2888 BDB::min_parallel 8;
2889 3637
2890 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
2891 my $status; 3639 my $status;
2892 my $current = $Coro::current; 3640 my $current = $Coro::current;
2893 ( 3641 (
2902 ) 3650 )
2903 }; 3651 };
2904 3652
2905 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
2906 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2907 3659
2908 cf::sync_job { 3660 cf::sync_job {
2909 eval { 3661 eval {
2910 BDB::db_env_open 3662 BDB::db_env_open
2911 $DB_ENV, 3663 $DB_ENV,
2913 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2914 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2915 0666; 3667 0666;
2916 3668
2917 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2918
2919 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2920 $DB_ENV->set_lk_detect;
2921 }; 3670 };
2922 3671
2923 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
2924 }; 3673 };
2925 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
2926} 3685}
2927 3686
2928{ 3687{
2929 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
2930 3689
2931 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
2932 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
2933 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
2934 reentrant => 0,
2935 data => WF_AUTOCANCEL,
2936 fd => IO::AIO::poll_fileno,
2937 poll => 'r',
2938 prio => 6,
2939 cb => \&IO::AIO::poll_cb,
2940 );
2941} 3693}
2942 3694
2943my $_log_backtrace; 3695my $_log_backtrace;
2944 3696
2945sub _log_backtrace { 3697sub _log_backtrace {
2949 3701
2950 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
2951 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
2952 ++$_log_backtrace; 3704 ++$_log_backtrace;
2953 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
2954 my @bt = fork_call { 3708 my @bt = fork_call {
2955 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
2956 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2957 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2958 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines