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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.402 by root, Mon Dec 17 07:03:32 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.32 ();
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
34 37
35# configure various modules to our taste 38# configure various modules to our taste
36# 39#
37$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42 43
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
45 46
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER; 76our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 79our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
81 81
82our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 86our $DB_ENV;
84 87
85our %CFG; 88our %CFG;
86 89
87our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 91our $RUNTIME;
92our $NOW;
89 93
90our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
93 97
94# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 100
157 161
158The raw value load value from the last tick. 162The raw value load value from the last tick.
159 163
160=item %cf::CFG 164=item %cf::CFG
161 165
162Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 167from wherever your confdir points to.
164 168
165=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
166 170
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 172returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
171=back 181=back
172 182
173=cut 183=cut
174 184
175BEGIN { 185BEGIN {
179 $msg .= "\n" 189 $msg .= "\n"
180 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
181 191
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 193
184 utf8::encode $msg;
185 LOG llevError, $msg; 194 LOG llevError, $msg;
186 }; 195 };
187} 196}
188 197
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205)) { 214)) {
206 no strict 'refs'; 215 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 217}
209 218
210$Event::DIED = sub { 219$EV::DIED = sub {
211 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
212}; 221};
213 222
214############################################################################# 223#############################################################################
215 224
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 248 $d
240 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
241} 250}
242 251
243=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
244 253
245Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
246 255
247=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
248 257
249Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
250 259
251=cut 260=cut
252 261
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 263
255sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
257 266
258=item cf::lock_wait $string 267=item cf::lock_wait $string
259 268
260Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
261 270
264Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
267returned. 276returned.
268 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
269Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
271 283
272=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
273 285
274Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
275 287
276=cut 288=cut
277 289
278our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
279 292
280sub lock_wait($) { 293sub lock_wait($) {
281 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
282 300
283 # wait for lock, if any 301 # wait for lock, if any
284 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 304 Coro::schedule;
292 310
293 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
294 lock_wait $key; 312 lock_wait $key;
295 313
296 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
297 316
298 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
301 } 321 }
302} 322}
303 323
315 }; 335 };
316 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
317 $guard 337 $guard
318} 338}
319 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
355=item cf::get_slot $time[, $priority[, $name]]
356
357Allocate $time seconds of blocking CPU time at priority C<$priority>:
358This call blocks and returns only when you have at least C<$time> seconds
359of cpu time till the next tick. The slot is only valid till the next cede.
360
361The optional C<$name> can be used to identify the job to run. It might be
362used for statistical purposes and should identify the same time-class.
363
364Useful for short background jobs.
365
366=cut
367
368our @SLOT_QUEUE;
369our $SLOT_QUEUE;
370
371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
375 my $signal = new Coro::Signal;
376
377 while () {
378 next_job:
379 my $avail = cf::till_tick;
380 if ($avail > 0.01) {
381 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) {
383 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send;
385 Coro::cede;
386 goto next_job;
387 }
388 }
389 }
390
391 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait;
395 } else {
396 Coro::schedule;
397 }
398 }
399};
400
401sub get_slot($;$$) {
402 my ($time, $pri, $name) = @_;
403
404 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal;
406
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready;
410 $sig->wait;
411}
412
320=item cf::async { BLOCK } 413=item cf::async { BLOCK }
321 414
322Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 416C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
327 420
328BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
329 422
330=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
331 424
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 428acceptable.
336 429
337If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
343 436
344sub sync_job(&) { 437sub sync_job(&) {
345 my ($job) = @_; 438 my ($job) = @_;
346 439
347 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 441 my $time = EV::time;
349 442
350 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
352 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
353 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 449 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
356 451
357 my $busy = 1; 452 my $busy = 1;
358 my @res; 453 my @res;
359 454
360 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 457 @res = eval { $job->() };
362 warn $@ if $@; 458 warn $@ if $@;
363 undef $busy; 459 undef $busy;
364 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
365 461
366 while ($busy) { 462 while ($busy) {
367 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
368 } 467 }
468 }
369 469
370 $time = Event::time - $time; 470 $time = EV::time - $time;
371 471
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 474
375 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 505=item fork_call { }, $args
406 506
407Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
411 511
412=cut 512=cut
413 513
414sub fork_call(&@) { 514sub fork_call(&@) {
415 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
416 516
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 517 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 518 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 519 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 520
422 if (my $pid = fork) { 521 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 522 reset_signals;
436 local $SIG{__WARN__}; 523 &$cb
437 local $SIG{__DIE__}; 524 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 525
443 my @res = eval { $cb->(@args) }; 526 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 527}
461 528
462=item $value = cf::db_get $family => $key 529=item $value = cf::db_get $family => $key
463 530
464Returns a single value from the environment database. 531Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
467 534
468Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
469data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
470 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
471=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
472 561
473our $DB; 562our $DB;
474 563
475sub db_init { 564sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 565 cf::sync_job {
480 eval { 566 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 567 };
490} 568}
491 569
492sub db_get($$) { 570sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
494 572
544 if (1) { 622 if (1) {
545 $md5 = 623 $md5 =
546 join "\x00", 624 join "\x00",
547 $processversion, 625 $processversion,
548 map { 626 map {
549 Coro::cede; 627 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 629 } 0.. $#$src;
552 630
553 631
554 my $dbmd5 = db_get cache => "$id/md5"; 632 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
600 678
601In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
602C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
603Crossfire TRT). 681Deliantra).
604 682
605=over 4 683=over 4
606 684
607=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
608 686
860 "; 938 ";
861 die if $@; 939 die if $@;
862} 940}
863 941
864our $override; 942our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 943our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 944
867sub override { 945sub override {
868 $override = 1; 946 $override = 1;
869 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
870} 948}
871 949
872sub do_invoke { 950sub do_invoke {
873 my $event = shift; 951 my $event = shift;
874 my $callbacks = shift; 952 my $callbacks = shift;
875 953
876 @invoke_results = (); 954 @INVOKE_RESULTS = ();
877 955
878 local $override; 956 local $override;
879 957
880 for (@$callbacks) { 958 for (@$callbacks) {
881 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
898 976
899Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
900 978
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 979This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 980removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 982
905=back 983=back
906 984
907=cut 985=cut
908 986
909############################################################################# 987#############################################################################
910# object support 988# object support
989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
1023sub _can_merge {
1024 my ($ob1, $ob2) = @_;
1025
1026 ++$SLOW_MERGES;#d#
1027
1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
1030}
911 1031
912sub reattach { 1032sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1034 my ($obj) = @_;
915 1035
936cf::attachable->attach ( 1056cf::attachable->attach (
937 prio => -1000000, 1057 prio => -1000000,
938 on_instantiate => sub { 1058 on_instantiate => sub {
939 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
940 1060
941 $data = from_json $data; 1061 $data = decode_json $data;
942 1062
943 for (@$data) { 1063 for (@$data) {
944 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
945 1065
946 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1082sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
964 1084
965 sync_job { 1085 sync_job {
966 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
969 1090
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1095 close $fh;
975 1096
976 if (@$objs) { 1097 if (@$objs) {
977 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
978 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1103 close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
984 } 1105 }
992 } 1113 }
993 } else { 1114 } else {
994 aio_unlink $filename; 1115 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
996 } 1117 }
997 } 1118 };
998} 1119}
999 1120
1000sub object_freezer_as_string { 1121sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1002 1123
1014 or return; 1135 or return;
1015 1136
1016 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1139 or return;
1140
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1020 } 1143 }
1021 1144
1145 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1024 return ($data, $av); 1149 ($data, $av)
1025} 1150}
1026 1151
1027=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1028 1153
1029=over 4 1154=over 4
1102 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
1103 1228
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1230
1106 if (ref $msg) { 1231 if (ref $msg) {
1232 my ($type, $reply, @payload) =
1233 "ARRAY" eq ref $msg
1234 ? @$msg
1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1236
1237 my @reply;
1238
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
1112 } else { 1246 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1248 }
1115 1249
1116 cf::override; 1250 cf::override;
1206 1340
1207=head3 cf::player 1341=head3 cf::player
1208 1342
1209=over 4 1343=over 4
1210 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1211=item cf::player::find $login 1359=item cf::player::find $login
1212 1360
1213Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1214 1362
1215=cut 1363=cut
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1402
1255 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1258 } 1411 }
1259 } 1412 }
1260} 1413}
1261 1414
1271 1424
1272 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1274 1427
1275 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1276 Coro::cede; 1429 cf::cede_to_tick;
1277} 1430}
1278 1431
1279sub new($) { 1432sub new($) {
1280 my ($login) = @_; 1433 my ($login) = @_;
1281 1434
1285 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1286 1439
1287 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1288 1441
1289 $self 1442 $self
1443}
1444
1445=item $player->send_msg ($channel, $msg, $color, [extra...])
1446
1447=cut
1448
1449sub send_msg {
1450 my $ns = shift->ns
1451 or return;
1452 $ns->send_msg (@_);
1290} 1453}
1291 1454
1292=item $pl->quit_character 1455=item $pl->quit_character
1293 1456
1294Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1512 or return [];
1350 1513
1351 my @logins; 1514 my @logins;
1352 1515
1353 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1357 1525
1358 utf8::decode $login; 1526 utf8::decode $login;
1359 push @logins, $login; 1527 push @logins, $login;
1360 } 1528 }
1361 1529
1394 1562
1395Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1396 1564
1397=cut 1565=cut
1398 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1399sub expand_cfpod { 1578sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1401 1580
1402 # escape & and < 1581 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1582
1406 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1407 1586
1408 1 while 1587 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1592 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1415 $self->gender ? $2 : $1 1594 (?:
1416 }ge 1595 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1596 | < $interior >
1418 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1419 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1620 "")
1423 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1425 1632
1633 for ($xml) {
1426 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1428 1636
1429 # compress some whitespace 1637 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1434 1643
1435 $_ 1644 $xml
1436} 1645}
1646
1647no re 'eval';
1437 1648
1438sub hintmode { 1649sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1651 $_[0]{hintmode}
1441} 1652}
1442 1653
1443=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1444 1655
1445Sends an ext reply to the player. 1656Sends an ext reply to the player.
1446 1657
1447=cut 1658=cut
1448 1659
1449sub ext_reply($$%) { 1660sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1451 1662
1452 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1664}
1455 1665
1456=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1457 1667
1458Sends an ext event to the client. 1668Sends an ext event to the client.
1459 1669
1460=cut 1670=cut
1461 1671
1462sub ext_event($$%) { 1672sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1464 1674
1465 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1466} 1676}
1467 1677
1468=head3 cf::region 1678=head3 cf::region
1469 1679
1470=over 4 1680=over 4
1483 my ($path) = @_; 1693 my ($path) = @_;
1484 1694
1485 my ($match, $specificity); 1695 my ($match, $specificity);
1486 1696
1487 for my $region (list) { 1697 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1491 } 1701 }
1492 } 1702 }
1493 1703
1613 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1614 return $self; 1824 return $self;
1615 } 1825 }
1616 } 1826 }
1617 1827
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1829 ()
1620} 1830}
1621 1831
1622sub init { 1832sub init {
1623 my ($self) = @_; 1833 my ($self) = @_;
1686 1896
1687sub load_header_from($) { 1897sub load_header_from($) {
1688 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1689 1899
1690 utf8::encode $path; 1900 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1696 1909
1697 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1698 1911
1699 1 1912 1
1700} 1913}
1754sub find { 1967sub find {
1755 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1756 1969
1757 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1758 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1760 1974
1761 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1763 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1764 or return; 1980 or return;
1765 1981
1766 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1767 1983
1769 or return; 1985 or return;
1770 1986
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1774 $map->reset; 1992 $map->reset;
1775 undef $guard;
1776 return find $path; 1993 return find $path;
1777 } 1994 }
1778 1995
1779 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1780 } 1997 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1790 2007
1791 my $path = $self->{path}; 2008 my $path = $self->{path};
1792 2009
1793 { 2010 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1795 2012
2013 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2015
1798 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1799 2017
1800 $self->alloc; 2018 $self->alloc;
1801 2019
1802 $self->pre_load; 2020 $self->pre_load;
1803 Coro::cede; 2021 cf::cede_to_tick;
1804 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1806 or return; 2026 or return;
1807 2027
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1810 2030
1811 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2032 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2035 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1816 } 2039 }
1817 } 2040 }
1818 2041
1819 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1820 # now do the right thing for maps 2045 # now do the right thing for maps
1821 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2048 unless $self->difficulty;
1824 Coro::cede; 2049 cf::cede_to_tick;
1825 2050
1826 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2052 $self->decay_objects;
1828 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1829 $self->update_buttons; 2054 $self->update_buttons;
1830 Coro::cede; 2055 cf::cede_to_tick;
1831 $self->set_darkness_map; 2056 $self->set_darkness_map;
1832 Coro::cede; 2057 cf::cede_to_tick;
1833 $self->activate; 2058 $self->activate;
1834 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1835 2063
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 2065 }
1838 2066
1839 $self->post_load; 2067 $self->post_load;
1850 2078
1851 $self 2079 $self
1852} 2080}
1853 2081
1854# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1855sub load_diag { 2083sub load_neighbours {
1856 my ($map) = @_; 2084 my ($map) = @_;
1857 2085
1858 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1859 2087
1860 for (0 .. 3) { 2088 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1862 or next; 2090 or next;
1863 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1864 or next; 2092 or next;
1865 $neigh->load; 2093 $neigh->load;
1866 2094
2095 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2098 }
1870 2099
1871 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1873 or next; 2103 or next;
1874 $neigh->load; 2104 $neigh->load;
1875 } 2105 }
1876} 2106}
1877 2107
1882} 2112}
1883 2113
1884sub do_load_sync { 2114sub do_load_sync {
1885 my ($map) = @_; 2115 my ($map) = @_;
1886 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1887 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1888} 2121}
1889 2122
1890our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1892 2125
1893sub find_async { 2126sub find_async {
1894 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1895 2128
1896 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1897 2130
1898 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2133 }
1901 2134
1902 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1903 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1904 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2142 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2143 $map->load if $v;
2144 }
1909 2145
1910 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1911 } 2147 }
1912 } 2148 }
1913 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1914 }; 2150 };
1915 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1918} 2154}
1919 2155
1920sub save { 2156sub save {
1921 my ($self) = @_; 2157 my ($self) = @_;
1922 2158
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2160
1925 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1926 2162
1927 return unless $self->dirty; 2163 return unless $self->dirty;
1928 2164
1934 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1935 2171
1936 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1937 2173
1938 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1940 }; 2177 };
1941 2178
1942 if ($uniq) { 2179 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1951 my ($self) = @_; 2188 my ($self) = @_;
1952 2189
1953 # save first because save cedes 2190 # save first because save cedes
1954 $self->save; 2191 $self->save;
1955 2192
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2194
1958 return if $self->players; 2195 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1961 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2203 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2204}
1965 2205
1966sub reset_at { 2206sub reset_at {
1967 my ($self) = @_; 2207 my ($self) = @_;
1968 2208
2000 if $uniq; 2240 if $uniq;
2001 } 2241 }
2002 2242
2003 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2004 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2247 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2248
2009 $self->unlink_save; 2249 $self->unlink_save;
2010 $self->destroy; 2250 $self->destroy;
2011} 2251}
2012 2252
2013my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
2014 2254
2015sub nuke { 2255sub nuke {
2016 my ($self) = @_; 2256 my ($self) = @_;
2017 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2018 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2019 2262
2020 $self->unlink_save; 2263 $self->unlink_save;
2021 2264
2022 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2270
2028 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
2029 2273
2030 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2031} 2275}
2032 2276
2033=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
2109 2353
2110sub inv_recursive { 2354sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2112} 2356}
2113 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2114package cf; 2386package cf;
2115 2387
2116=back 2388=back
2117 2389
2118=head3 cf::object::player 2390=head3 cf::object::player
2140 2412
2141 } else { 2413 } else {
2142 my $pl = $self->contr; 2414 my $pl = $self->contr;
2143 2415
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2419
2153 } else { 2420 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2156 } 2423 }
2157 } 2424 }
2425}
2426
2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2428
2429=cut
2430
2431sub cf::object::send_msg {
2432 my $pl = shift->contr
2433 or return;
2434 $pl->send_msg (@_);
2158} 2435}
2159 2436
2160=item $player_object->may ("access") 2437=item $player_object->may ("access")
2161 2438
2162Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
2244 2521
2245 $map->load; 2522 $map->load;
2246 $map->load_diag; 2523 $map->load_neighbours;
2247 2524
2248 return unless $self->contr->active; 2525 return unless $self->contr->active;
2249 $self->activate_recursive; 2526 $self->activate_recursive;
2250 2527
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2253} 2530}
2254 2531
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2533
2257Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process.
2261 2539
2262=cut 2540=cut
2263 2541
2264our $GOTOGEN; 2542our $GOTOGEN;
2265 2543
2266sub cf::object::player::goto { 2544sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2545 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2546
2269 # do generation counting so two concurrent goto's will be executed in-order 2547 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2549
2272 $self->enter_link; 2550 $self->enter_link;
2273 2551
2274 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2275 my $map = eval { 2574 my $map = eval {
2276 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2277 2576
2278 if ($map) { 2577 if ($map) {
2279 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2281 } else { 2580 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2283 } 2582 }
2284 2583
2285 $map 2584 $map
2286 }; 2585 };
2287 2586
2292 2591
2293 if ($gen == $self->{_goto_generation}) { 2592 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2593 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
2296 } 2595 }
2596
2597 $done->() if $done;
2297 })->prio (1); 2598 })->prio (1);
2298} 2599}
2299 2600
2300=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
2301 2602
2338 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2339 } 2640 }
2340 2641
2341 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2342 2643
2343 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2344 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2346 2647
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2375 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2378 2679
2379 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2380 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2381 unless (eval { 2684 unless (eval {
2382 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2383 2686
2384 1; 2687 1;
2410 2713
2411 utf8::encode $text; 2714 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2716}
2414 2717
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2718=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2719
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2720Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2721client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2421 2724
2422=cut 2725=cut
2423 2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2424sub cf::client::send_msg { 2779sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2781
2427 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2428 2783
2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2795 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2801 }
2802
2803 $channel = $channel->{id};
2804 }
2805
2429 return unless @extra || length $msg; 2806 return unless @extra || length $msg;
2430 2807
2431 if ($self->can_msg) { 2808 if ($self->can_msg) {
2809 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF;
2812
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2813 $self->send_packet ("msg " . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2815 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826
2827 $color &= cf::NDI_COLOR_MASK;
2828
2829 utf8::encode $msg;
2830
2445 if (0 && $msg =~ /\[/) { 2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2834 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2836 $self->send_packet ("drawinfo $color $msg")
2450 } 2837 }
2451 } 2838 }
2452 } 2839 }
2453} 2840}
2454 2841
2455=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2456 2843
2457Sends an ext event to the client. 2844Sends an ext event to the client.
2458 2845
2459=cut 2846=cut
2460 2847
2461sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2463 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 }
2466} 2875}
2467 2876
2468=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2469 2878
2470Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2934 my ($ns, $buf) = @_;
2526 2935
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2937
2529 if (ref $msg) { 2938 if (ref $msg) {
2939 my ($type, $reply, @payload) =
2940 "ARRAY" eq ref $msg
2941 ? @$msg
2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2943
2944 my @reply;
2945
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2946 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2947 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2536 } else { 2953 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2955 }
2539 2956
2540 cf::override; 2957 cf::override;
2587our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2589 3006
2590$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2591 3008
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3009$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math
3011 grepstart grepwhile mapstart mapwhile
3012 sort time
3013));
2593 3014
2594# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2595 3016
2596=pod 3017=pod
2597 3018
2598The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2599 3020
2600 cf::object 3021 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3023 insert remove name archname title slaying race decrease_ob_nr
2603 3024
2604 cf::object::player 3025 cf::object::player
2605 player 3026 player
2606 3027
2607 cf::player 3028 cf::player
2612 3033
2613=cut 3034=cut
2614 3035
2615for ( 3036for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race
2617 insert remove)], 3039 decrease_ob_nr destroy)],
2618 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2621) { 3043) {
2622 no strict 'refs'; 3044 no strict 'refs';
2698# the server's init and main functions 3120# the server's init and main functions
2699 3121
2700sub load_facedata($) { 3122sub load_facedata($) {
2701 my ($path) = @_; 3123 my ($path) = @_;
2702 3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3130
2703 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2704 3132
2705 my $facedata; 3133 my $facedata;
2706 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3135 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2710 3138
2711 $facedata->{version} == 2 3139 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
3148
2714 { 3149 {
2715 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2716 3151
2717 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3158
3159 cf::cede_to_tick;
2723 } 3160 }
2724 3161
2725 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2728 or next; 3165 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3169 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3171 }
2734 Coro::cede; 3172
3173 cf::cede_to_tick;
2735 } 3174 }
2736 } 3175 }
2737 3176
2738 { 3177 {
2739 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2740 3179
2741 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3182 cf::cede_to_tick;
2744 } 3183 }
2745 3184
2746 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2747 } 3186 }
2748 3187
3188 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource};
3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198
3199 if ($info->{type} & 1) {
3200 # prepend meta info
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else {
3209 $data = $info->{data};
3210 }
3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick;
3216 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 }
3236
2749 1 3237 1
2750} 3238}
2751 3239
3240register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_;
3242
3243 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v);
3245 }
3246};
3247
2752sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2753 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
3255
3256 for (cf::region::list) {
3257 $_->{match} = qr/$_->{match}/
3258 if exists $_->{match};
3259 }
2755} 3260}
2756 3261
2757sub reload_facedata { 3262sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3263 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3264 or die "unable to load facedata\n";
2788 3293
2789sub init { 3294sub init {
2790 reload_resources; 3295 reload_resources;
2791} 3296}
2792 3297
2793sub cfg_load { 3298sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3300 or return;
2796 3301
2797 local $/; 3302 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2814sub main { 3319sub main {
2815 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2817 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818 (async { 3323 (async {
2819 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2821 }; 3327 };
2822 3328
2823 cfg_load; 3329 reload_config;
2824 db_init; 3330 db_init;
2825 load_extensions; 3331 load_extensions;
2826 3332
2827 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2828 Event::loop; 3335 EV::loop;
2829} 3336}
2830 3337
2831############################################################################# 3338#############################################################################
2832# initialisation and cleanup 3339# initialisation and cleanup
2833 3340
2834# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2835BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2844 },
2845 ); 3347 };
2846 } 3348 }
2847} 3349}
2848 3350
2849sub write_runtime { 3351sub write_runtime {
2850 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
2895 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3403 $pl->save;
2901 } 3404 }
2902 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2903 3406
2904 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
2943 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3448
2946 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
2947 3450
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2954 for (;;) { 3452 for (;;) {
2955 BDB::flush; 3453 BDB::flush;
2956 IO::AIO::flush; 3454 IO::AIO::flush;
2957 Coro::cede; 3455 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3457 warn "iterate...";
2960 } 3458 }
2961 3459
2962 ++$RELOAD; 3460 ++$RELOAD;
3021 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
3022 require cf; 3520 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3522
3025 warn "loading config and database again"; 3523 warn "loading config and database again";
3026 cf::cfg_load; 3524 cf::reload_config;
3027 3525
3028 warn "loading extensions"; 3526 warn "loading extensions";
3029 cf::load_extensions; 3527 cf::load_extensions;
3030 3528
3031 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
3051 3549
3052sub reload_perl() { 3550sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3055 3553
3056 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3063 }, 3556 do_reload_perl;
3064 ); 3557 };
3065} 3558}
3066 3559
3067register_command "reload" => sub { 3560register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3069 3562
3070 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3567 reload_perl;
3568 };
3073 } 3569 }
3074}; 3570};
3075 3571
3076unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3077 3573
3096 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3594 $signal->wait;
3099} 3595}
3100 3596
3101 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3113 return; 3601 return;
3114 } 3602 }
3115 3603
3116 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3117 3605
3118 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3119 3607
3120 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3121 for(1..10) { 3609 $NEXT_TICK += $TICK;
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125 3610
3126 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 $map->alloc; 3613 Coro::async_pool {
3129 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3130 my $t = Event::time - $t; 3615 write_runtime
3131 3616 or warn "ERROR: unable to write runtime file: $!";
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3617 };
3618 }
3142 3619
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3621 $sig->send;
3159 } 3622 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3624 $sig->send;
3162 } 3625 }
3163 3626
3164 $NOW = Event::time;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3629
3175 _post_tick; 3630 _post_tick;
3176 3631};
3177 3632$TICK_WATCHER->priority (EV::MAXPRI);
3178 },
3179);
3180 3633
3181{ 3634{
3182 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3636
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3192 3638 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare {
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3639
3208 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3646
3211 cf::sync_job { 3647 cf::sync_job {
3212 eval { 3648 eval {
3213 BDB::db_env_open 3649 BDB::db_env_open
3214 $DB_ENV, 3650 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3654 0666;
3219 3655
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3657 };
3225 3658
3226 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3660 };
3228 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
3229} 3672}
3230 3673
3231{ 3674{
3675 # configure IO::AIO
3676
3232 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io (
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3679}
3245 3680
3246my $_log_backtrace; 3681my $_log_backtrace;
3247 3682
3248sub _log_backtrace { 3683sub _log_backtrace {
3252 3687
3253 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3690 ++$_log_backtrace;
3256 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
3257 my @bt = fork_call { 3694 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines