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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 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 1.86;
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 ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 43
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 45
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 47
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
74 72
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 74our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 77our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
82 79
83our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 84our $DB_ENV;
85 85
86our %CFG; 86our %CFG;
87 87
88our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 89our $RUNTIME;
90our $NOW;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
158 159
159The raw value load value from the last tick. 160The raw value load value from the last tick.
160 161
161=item %cf::CFG 162=item %cf::CFG
162 163
163Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 165from wherever your confdir points to.
165 166
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
195 210
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
212)) { 227)) {
213 no strict 'refs'; 228 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 230}
216 231
217$Event::DIED = sub { 232$EV::DIED = sub {
218 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
219}; 234};
220 235
221############################################################################# 236#############################################################################
222 237
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 261 $d
247 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
248} 263}
249 264
250=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
251 266
252Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
253 268
254=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
255 270
256Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
257 272
258=cut 273=cut
259 274
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 276
262sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
264 279
265=item cf::lock_wait $string 280=item cf::lock_wait $string
266 281
267Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
268 283
… …
271Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
274returned. 289returned.
275 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
276Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
278 296
279=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
280 298
281Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
282 300
283=cut 301=cut
284 302
285our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
286 305
287sub lock_wait($) { 306sub lock_wait($) {
288 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
289 313
290 # wait for lock, if any 314 # wait for lock, if any
291 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 317 Coro::schedule;
… …
299 323
300 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
301 lock_wait $key; 325 lock_wait $key;
302 326
303 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
304 329
305 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
308 } 334 }
309} 335}
310 336
… …
322 }; 348 };
323 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
324 $guard 350 $guard
325} 351}
326 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
327=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
328 369
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
340our @SLOT_QUEUE; 381our @SLOT_QUEUE;
341our $SLOT_QUEUE; 382our $SLOT_QUEUE;
342 383
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
345 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
346 389
347 while () { 390 while () {
348 next_job: 391 next_job:
349 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
357 } 400 }
358 } 401 }
359 } 402 }
360 403
361 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 407 $signal->wait;
365 } else { 408 } else {
366 Coro::schedule; 409 Coro::schedule;
367 } 410 }
… …
390 433
391BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
392 435
393=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
394 437
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 441acceptable.
399 442
400If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
406 449
407sub sync_job(&) { 450sub sync_job(&) {
408 my ($job) = @_; 451 my ($job) = @_;
409 452
410 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 454 my $time = EV::time;
412 455
413 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
415 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
416 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 462 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
419 464
420 my $busy = 1; 465 my $busy = 1;
421 my @res; 466 my @res;
422 467
423 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 470 @res = eval { $job->() };
425 warn $@ if $@; 471 warn $@ if $@;
426 undef $busy; 472 undef $busy;
427 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
428 474
429 while ($busy) { 475 while ($busy) {
430 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
431 } 480 }
481 }
432 482
433 $time = Event::time - $time; 483 $time = EV::time - $time;
434 484
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 487
438 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
468=item fork_call { }, $args 518=item fork_call { }, $args
469 519
470Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
474 524
475=cut 525=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 526
486sub fork_call(&@) { 527sub fork_call(&@) {
487 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
488 529
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 533
494 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 535 reset_signals;
508 local $SIG{__WARN__}; 536 &$cb
509 local $SIG{__DIE__}; 537 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 538
516 eval { 539 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 540}
529 541
530=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
531 543
532Returns a single value from the environment database. 544Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
535 547
536Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
539=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
540 574
541our $DB; 575our $DB;
542 576
543sub db_init { 577sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 578 cf::sync_job {
548 eval { 579 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 580 };
558} 581}
559 582
560sub db_get($$) { 583sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
562 585
… …
612 if (1) { 635 if (1) {
613 $md5 = 636 $md5 =
614 join "\x00", 637 join "\x00",
615 $processversion, 638 $processversion,
616 map { 639 map {
617 Coro::cede; 640 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 642 } 0.. $#$src;
620 643
621 644
622 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
… …
666attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
668 691
669In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 694Deliantra).
672 695
673=over 4 696=over 4
674 697
675=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
676 699
… …
958 } 981 }
959 982
960 0 983 0
961} 984}
962 985
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 987
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 989
967Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
968 991
… …
974 997
975=cut 998=cut
976 999
977############################################################################# 1000#############################################################################
978# object support 1001# object support
979#
980 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
981sub _can_merge { 1036sub _can_merge {
982 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
983 1038
984 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1040
988 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
989} 1043}
990 1044
991sub reattach { 1045sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1015cf::attachable->attach ( 1069cf::attachable->attach (
1016 prio => -1000000, 1070 prio => -1000000,
1017 on_instantiate => sub { 1071 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1019 1073
1020 $data = from_json $data; 1074 $data = decode_json $data;
1021 1075
1022 for (@$data) { 1076 for (@$data) {
1023 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1024 1078
1025 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1095sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1043 1097
1044 sync_job { 1098 sync_job {
1045 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1048 1103
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1108 close $fh;
1054 1109
1055 if (@$objs) { 1110 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1116 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1118 }
… …
1071 } 1126 }
1072 } else { 1127 } else {
1073 aio_unlink $filename; 1128 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1075 } 1130 }
1076 } 1131 };
1077} 1132}
1078 1133
1079sub object_freezer_as_string { 1134sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1081 1136
… …
1093 or return; 1148 or return;
1094 1149
1095 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1152 or return;
1153
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1099 } 1156 }
1100 1157
1158 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1103 return ($data, $av); 1162 ($data, $av)
1104} 1163}
1105 1164
1106=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1107 1166
1108=over 4 1167=over 4
… …
1181 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1182 1241
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1243
1185 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1191 } else { 1259 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1261 }
1194 1262
1195 cf::override; 1263 cf::override;
… …
1248 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1250 1318
1251 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1320 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1322 }
1256 1323
1257 warn $msg; 1324 warn $msg;
1258 } 1325 }
1259 1326
… …
1284use Coro::AIO; 1351use Coro::AIO;
1285 1352
1286=head3 cf::player 1353=head3 cf::player
1287 1354
1288=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1289 1370
1290=item cf::player::find $login 1371=item cf::player::find $login
1291 1372
1292Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1293 1374
… …
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1414
1334 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1337 } 1423 }
1338 } 1424 }
1339} 1425}
1340 1426
… …
1350 1436
1351 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1353 1439
1354 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1355 Coro::cede; 1441 cf::cede_to_tick;
1356} 1442}
1357 1443
1358sub new($) { 1444sub new($) {
1359 my ($login) = @_; 1445 my ($login) = @_;
1360 1446
… …
1364 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1365 1451
1366 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1367 1453
1368 $self 1454 $self
1455}
1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1369} 1465}
1370 1466
1371=item $pl->quit_character 1467=item $pl->quit_character
1372 1468
1373Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
… …
1428 or return []; 1524 or return [];
1429 1525
1430 my @logins; 1526 my @logins;
1431 1527
1432 for my $login (@$dirs) { 1528 for my $login (@$dirs) {
1529 my $path = path $login;
1530
1531 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1436 1537
1437 utf8::decode $login; 1538 utf8::decode $login;
1438 push @logins, $login; 1539 push @logins, $login;
1439 } 1540 }
1440 1541
… …
1473 1574
1474Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1475 1576
1476=cut 1577=cut
1477 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1478sub expand_cfpod { 1590sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1480 1592
1481 # escape & and < 1593 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1594
1485 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1486 1598
1487 1 while 1599 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1604 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1494 $self->gender ? $2 : $1 1606 (?:
1495 }ge 1607 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1608 | < $interior >
1497 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1498 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1632 "")
1502 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1504 1644
1645 for ($xml) {
1505 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1507 1648
1508 # compress some whitespace 1649 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1513 1655
1514 $_ 1656 $xml
1515} 1657}
1658
1659no re 'eval';
1516 1660
1517sub hintmode { 1661sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1663 $_[0]{hintmode}
1520} 1664}
1521 1665
1522=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1523 1667
1524Sends an ext reply to the player. 1668Sends an ext reply to the player.
1525 1669
1526=cut 1670=cut
1527 1671
1528sub ext_reply($$%) { 1672sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1530 1674
1531 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1676}
1534 1677
1535=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1536 1679
1537Sends an ext event to the client. 1680Sends an ext event to the client.
1538 1681
1539=cut 1682=cut
1540 1683
1541sub ext_event($$%) { 1684sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1543 1686
1544 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1545} 1688}
1546 1689
1547=head3 cf::region 1690=head3 cf::region
1548 1691
1549=over 4 1692=over 4
… …
1765 1908
1766sub load_header_from($) { 1909sub load_header_from($) {
1767 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1768 1911
1769 utf8::encode $path; 1912 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1775 1921
1776 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1777 1923
1778 1 1924 1
1779} 1925}
… …
1833sub find { 1979sub find {
1834 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1835 1981
1836 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1837 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1839 1986
1840 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1842 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1843 or return; 1992 or return;
1844 1993
1845 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1846 1995
… …
1848 or return; 1997 or return;
1849 1998
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1853 $map->reset; 2004 $map->reset;
1854 undef $guard;
1855 return find $path; 2005 return find $path;
1856 } 2006 }
1857 2007
1858 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1859 } 2009 }
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1869 2019
1870 my $path = $self->{path}; 2020 my $path = $self->{path};
1871 2021
1872 { 2022 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1874 2024
2025 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2027
1877 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1878 2029
1879 $self->alloc; 2030 $self->alloc;
1880 2031
1881 $self->pre_load; 2032 $self->pre_load;
1882 Coro::cede; 2033 cf::cede_to_tick;
1883 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1885 or return; 2038 or return;
1886 2039
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1889 2042
1890 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2044 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2047 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1895 } 2051 }
1896 } 2052 }
1897 2053
1898 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1899 # now do the right thing for maps 2057 # now do the right thing for maps
1900 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2060 unless $self->difficulty;
1903 Coro::cede; 2061 cf::cede_to_tick;
1904 2062
1905 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2064 $self->decay_objects;
1907 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1908 $self->update_buttons; 2066 $self->update_buttons;
1909 Coro::cede; 2067 cf::cede_to_tick;
1910 $self->set_darkness_map; 2068 $self->set_darkness_map;
1911 Coro::cede; 2069 cf::cede_to_tick;
1912 $self->activate; 2070 $self->activate;
1913 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1914 2075
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2077 }
1917 2078
1918 $self->post_load; 2079 $self->post_load;
… …
1929 2090
1930 $self 2091 $self
1931} 2092}
1932 2093
1933# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2095sub load_neighbours {
1935 my ($map) = @_; 2096 my ($map) = @_;
1936 2097
1937 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1938 2099
1939 for (0 .. 3) { 2100 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1941 or next; 2102 or next;
1942 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1943 or next; 2104 or next;
1944 $neigh->load; 2105 $neigh->load;
1945 2106
2107 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2110 }
1949 2111
1950 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1952 or next; 2115 or next;
1953 $neigh->load; 2116 $neigh->load;
1954 } 2117 }
1955} 2118}
1956 2119
… …
1961} 2124}
1962 2125
1963sub do_load_sync { 2126sub do_load_sync {
1964 my ($map) = @_; 2127 my ($map) = @_;
1965 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1966 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1967} 2133}
1968 2134
1969our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1971 2137
1972sub find_async { 2138sub find_async {
1973 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1974 2140
1975 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1976 2142
1977 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2145 }
1980 2146
1981 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1982 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1983 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2154 if (my $map = find $k) {
1986 $map->load; 2155 $map->load if $v;
1987 } 2156 }
1988 2157
1989 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1990 } 2159 }
1991 } 2160 }
1992 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1993 }; 2162 };
1994 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1997} 2166}
1998 2167
1999sub save { 2168sub save {
2000 my ($self) = @_; 2169 my ($self) = @_;
2001 2170
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2172
2004 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2005 2174
2006 return unless $self->dirty; 2175 return unless $self->dirty;
2007 2176
… …
2013 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2014 2183
2015 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2016 2185
2017 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2019 }; 2189 };
2020 2190
2021 if ($uniq) { 2191 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 my ($self) = @_; 2200 my ($self) = @_;
2031 2201
2032 # save first because save cedes 2202 # save first because save cedes
2033 $self->save; 2203 $self->save;
2034 2204
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2206
2037 return if $self->players; 2207 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2209 return if $self->{deny_save};
2040 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2215 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2216}
2044 2217
2045sub reset_at { 2218sub reset_at {
2046 my ($self) = @_; 2219 my ($self) = @_;
2047 2220
… …
2079 if $uniq; 2252 if $uniq;
2080 } 2253 }
2081 2254
2082 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2083 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2259 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2260
2088 $self->unlink_save; 2261 $self->unlink_save;
2089 $self->destroy; 2262 $self->destroy;
2090} 2263}
2091 2264
2092my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2093 2266
2094sub nuke { 2267sub nuke {
2095 my ($self) = @_; 2268 my ($self) = @_;
2096 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2097 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2098 2274
2099 $self->unlink_save; 2275 $self->unlink_save;
2100 2276
2101 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2282
2107 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2108 2285
2109 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2110} 2287}
2111 2288
2112=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
… …
2188 2365
2189sub inv_recursive { 2366sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2191} 2368}
2192 2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
2396}
2397
2193package cf; 2398package cf;
2194 2399
2195=back 2400=back
2196 2401
2197=head3 cf::object::player 2402=head3 cf::object::player
… …
2219 2424
2220 } else { 2425 } else {
2221 my $pl = $self->contr; 2426 my $pl = $self->contr;
2222 2427
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2431
2232 } else { 2432 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2235 } 2435 }
2236 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2237} 2447}
2238 2448
2239=item $player_object->may ("access") 2449=item $player_object->may ("access")
2240 2450
2241Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2323 2533
2324 $map->load; 2534 $map->load;
2325 $map->load_diag; 2535 $map->load_neighbours;
2326 2536
2327 return unless $self->contr->active; 2537 return unless $self->contr->active;
2328 $self->activate_recursive; 2538 $self->activate_recursive;
2329 2539
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2561
2352 $self->enter_link; 2562 $self->enter_link;
2353 2563
2354 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2355 my $map = eval { 2586 my $map = eval {
2356 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2357 2588
2358 if ($map) { 2589 if ($map) {
2359 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2361 } else { 2592 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2594 }
2364 2595
2365 $map 2596 $map
2366 }; 2597 };
2367 2598
… …
2420 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2421 } 2652 }
2422 2653
2423 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2424 2655
2425 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2426 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2428 2659
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2457 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2460 2691
2461 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2462 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2696 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2465 2698
2466 1; 2699 1;
… …
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2503 2736
2504=cut 2737=cut
2505 2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2789);
2790
2506sub cf::client::send_msg { 2791sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2793
2509 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2510 2795
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2797
2798 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2513 if (ref $channel) { 2807 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2518 } 2813 }
2519 2814
2520 $channel = $channel->{id}; 2815 $channel = $channel->{id};
2521 } 2816 }
2522 2817
2523 return unless @extra || length $msg; 2818 return unless @extra || length $msg;
2524 2819
2525 if ($self->can_msg) { 2820 if ($self->can_msg) {
2821 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF;
2824
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2825 $self->send_packet ("msg " . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2827 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838
2839 $color &= cf::NDI_COLOR_MASK;
2840
2841 utf8::encode $msg;
2842
2539 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2846 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2544 } 2849 }
2545 } 2850 }
2546 } 2851 }
2547} 2852}
2548 2853
2549=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2550 2855
2551Sends an ext event to the client. 2856Sends an ext event to the client.
2552 2857
2553=cut 2858=cut
2554 2859
2555sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2557 2862
2558 return unless $self->extcmd; 2863 if ($self->extcmd == 2) {
2559 2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 }
2869}
2870
2871=item $client->ext_reply ($msgid, @msg)
2872
2873Sends an ext reply to the client.
2874
2875=cut
2876
2877sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_;
2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2562} 2887}
2563 2888
2564=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2565 2890
2566Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2622 2947
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2949
2625 if (ref $msg) { 2950 if (ref $msg) {
2951 my ($type, $reply, @payload) =
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955
2956 my @reply;
2957
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2632 } else { 2965 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2967 }
2635 2968
2636 cf::override; 2969 cf::override;
… …
2683our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2685 3018
2686$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2687 3020
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2689 3026
2690# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2691 3028
2692=pod 3029=pod
2693 3030
2694The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2695 3032
2696 cf::object 3033 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3035 insert remove name archname title slaying race decrease_ob_nr
2699 3036
2700 cf::object::player 3037 cf::object::player
2701 player 3038 player
2702 3039
2703 cf::player 3040 cf::player
… …
2708 3045
2709=cut 3046=cut
2710 3047
2711for ( 3048for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
2713 insert remove)], 3051 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2717) { 3055) {
2718 no strict 'refs'; 3056 no strict 'refs';
… …
2794# the server's init and main functions 3132# the server's init and main functions
2795 3133
2796sub load_facedata($) { 3134sub load_facedata($) {
2797 my ($path) = @_; 3135 my ($path) = @_;
2798 3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
2799 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2800 3144
2801 my $facedata; 3145 my $facedata;
2802 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3147 or die "$path: $!";
… …
2805 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2806 3150
2807 $facedata->{version} == 2 3151 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
2810 { 3161 {
2811 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2812 3163
2813 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2815 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3171
2820 cf::cede_to_tick; 3172 cf::cede_to_tick;
2821 } 3173 }
2822 3174
2823 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2825 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2826 or next; 3179 or next;
3180
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3184 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2848 3202
2849 { 3203 {
2850 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3207
2855 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3209 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
2863 3212
2864 if ($name =~ /\.jpg$/) { 3213 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3214 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
2867 } else { 3228 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3229 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3230 }
2874 3231
2875 cf::cede_to_tick; 3232 cf::cede_to_tick;
2876 } 3233 }
2877 } 3234 }
2878 3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
2879 1 3238 1
2880} 3239}
2881 3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260
3261register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_;
3263
3264 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v);
3266 }
3267};
3268
2882sub reload_regions { 3269sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
2883 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
2885 3276
2886 for (cf::region::list) { 3277 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3278 $_->{match} = qr/$_->{match}/
… …
2923 3314
2924sub init { 3315sub init {
2925 reload_resources; 3316 reload_resources;
2926} 3317}
2927 3318
2928sub cfg_load { 3319sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3321 or return;
2931 3322
2932 local $/; 3323 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2934 3325
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3327
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2949sub main { 3340sub main {
2950 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3344 (async {
2954 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2956 }; 3348 };
2957 3349
2958 cfg_load; 3350 reload_config;
2959 db_init; 3351 db_init;
2960 load_extensions; 3352 load_extensions;
2961 3353
2962 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2963 Event::loop; 3356 EV::loop;
2964} 3357}
2965 3358
2966############################################################################# 3359#############################################################################
2967# initialisation and cleanup 3360# initialisation and cleanup
2968 3361
2969# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2970BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2979 },
2980 ); 3368 };
2981 } 3369 }
2982} 3370}
2983 3371
2984sub write_runtime { 3372sub write_runtime {
2985 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3030 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3424 $pl->save;
3036 } 3425 }
3037 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3038 3427
3039 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3078 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3469
3081 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3082 3471
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3089 for (;;) { 3473 for (;;) {
3090 BDB::flush; 3474 BDB::flush;
3091 IO::AIO::flush; 3475 IO::AIO::flush;
3092 Coro::cede; 3476 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3478 warn "iterate...";
3095 } 3479 }
3096 3480
3097 ++$RELOAD; 3481 ++$RELOAD;
… …
3156 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3157 require cf; 3541 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3543
3160 warn "loading config and database again"; 3544 warn "loading config and database again";
3161 cf::cfg_load; 3545 cf::reload_config;
3162 3546
3163 warn "loading extensions"; 3547 warn "loading extensions";
3164 cf::load_extensions; 3548 cf::load_extensions;
3165 3549
3166 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
… …
3173 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3174 3558
3175 1 3559 1
3176 } or do { 3560 } or do {
3177 warn $@; 3561 warn $@;
3178 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3563 };
3181 3564
3182 warn "reloaded"; 3565 warn "reloaded";
3183}; 3566};
3184 3567
… …
3186 3569
3187sub reload_perl() { 3570sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3190 3573
3191 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl; 3575 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3198 },
3199 ); 3577 };
3200} 3578}
3201 3579
3202register_command "reload" => sub { 3580register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3204 3582
3205 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3587 reload_perl;
3588 };
3208 } 3589 }
3209}; 3590};
3210 3591
3211unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3212 3593
… …
3231 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3614 $signal->wait;
3234} 3615}
3235 3616
3236 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3248 return; 3621 return;
3249 } 3622 }
3250 3623
3251 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3252 3625
3253 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3254 3627
3255 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3256 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 3630
3261 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3263 $map->alloc; 3633 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 3635 write_runtime
3266 3636 or warn "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3637 };
3638 }
3277 3639
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3641 $sig->send;
3294 } 3642 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3644 $sig->send;
3297 } 3645 }
3298 3646
3299 $NOW = Event::time;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3649
3310 _post_tick; 3650 _post_tick;
3311 3651};
3312 3652$TICK_WATCHER->priority (EV::MAXPRI);
3313 },
3314);
3315 3653
3316{ 3654{
3317 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3656
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3327 3658 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3660
3343 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3667
3346 cf::sync_job { 3668 cf::sync_job {
3347 eval { 3669 eval {
3348 BDB::db_env_open 3670 BDB::db_env_open
3349 $DB_ENV, 3671 $DB_ENV,
… …
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3675 0666;
3354 3676
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3678 };
3360 3679
3361 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3681 };
3363 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3364} 3693}
3365 3694
3366{ 3695{
3696 # configure IO::AIO
3697
3367 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3701}
3380 3702
3381my $_log_backtrace; 3703my $_log_backtrace;
3382 3704
3383sub _log_backtrace { 3705sub _log_backtrace {
… …
3387 3709
3388 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3712 ++$_log_backtrace;
3391 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3392 my @bt = fork_call { 3716 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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