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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 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
368=item cf::get_slot $time[, $priority[, $name]]
369
370Allocate $time seconds of blocking CPU time at priority C<$priority>:
371This call blocks and returns only when you have at least C<$time> seconds
372of cpu time till the next tick. The slot is only valid till the next cede.
373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
377Useful for short background jobs.
378
379=cut
380
381our @SLOT_QUEUE;
382our $SLOT_QUEUE;
383
384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
388 my $signal = new Coro::Signal;
389
390 while () {
391 next_job:
392 my $avail = cf::till_tick;
393 if ($avail > 0.01) {
394 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) {
396 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send;
398 Coro::cede;
399 goto next_job;
400 }
401 }
402 }
403
404 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else {
409 Coro::schedule;
410 }
411 }
412};
413
414sub get_slot($;$$) {
415 my ($time, $pri, $name) = @_;
416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready;
423 $sig->wait;
424}
425
327=item cf::async { BLOCK } 426=item cf::async { BLOCK }
328 427
329Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 429C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
… …
334 433
335BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
336 435
337=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
338 437
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 441acceptable.
343 442
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
350 449
351sub sync_job(&) { 450sub sync_job(&) {
352 my ($job) = @_; 451 my ($job) = @_;
353 452
354 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 454 my $time = EV::time;
356 455
357 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
359 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
360 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 462 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
363 464
364 my $busy = 1; 465 my $busy = 1;
365 my @res; 466 my @res;
366 467
367 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 470 @res = eval { $job->() };
369 warn $@ if $@; 471 warn $@ if $@;
370 undef $busy; 472 undef $busy;
371 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
372 474
373 while ($busy) { 475 while ($busy) {
374 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
375 } 480 }
481 }
376 482
377 $time = Event::time - $time; 483 $time = EV::time - $time;
378 484
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381 487
382 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
412=item fork_call { }, $args 518=item fork_call { }, $args
413 519
414Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
418 524
419=cut 525=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 526
430sub fork_call(&@) { 527sub fork_call(&@) {
431 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
432 529
433# 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,
434# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 533
438 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 535 reset_signals;
452 local $SIG{__WARN__}; 536 &$cb
453 local $SIG{__DIE__}; 537 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 538
460 eval { 539 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 540}
473 541
474=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
475 543
476Returns a single value from the environment database. 544Returns a single value from the environment database.
… …
478=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
479 547
480Stores 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
481data 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).
482 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
483=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}
484 574
485our $DB; 575our $DB;
486 576
487sub db_init { 577sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 578 cf::sync_job {
492 eval { 579 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 580 };
502} 581}
503 582
504sub db_get($$) { 583sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
506 585
… …
556 if (1) { 635 if (1) {
557 $md5 = 636 $md5 =
558 join "\x00", 637 join "\x00",
559 $processversion, 638 $processversion,
560 map { 639 map {
561 Coro::cede; 640 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 642 } 0.. $#$src;
564 643
565 644
566 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
… …
610attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
612 691
613In 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>
614C<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
615Crossfire TRT). 694Deliantra).
616 695
617=over 4 696=over 4
618 697
619=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
620 699
… …
902 } 981 }
903 982
904 0 983 0
905} 984}
906 985
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 987
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 989
911Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
912 991
… …
918 997
919=cut 998=cut
920 999
921############################################################################# 1000#############################################################################
922# object support 1001# object support
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#
1036sub _can_merge {
1037 my ($ob1, $ob2) = @_;
1038
1039 ++$SLOW_MERGES;#d#
1040
1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
1043}
923 1044
924sub reattach { 1045sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1047 my ($obj) = @_;
927 1048
… …
948cf::attachable->attach ( 1069cf::attachable->attach (
949 prio => -1000000, 1070 prio => -1000000,
950 on_instantiate => sub { 1071 on_instantiate => sub {
951 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
952 1073
953 $data = from_json $data; 1074 $data = decode_json $data;
954 1075
955 for (@$data) { 1076 for (@$data) {
956 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
957 1078
958 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
974sub object_freezer_save { 1095sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
976 1097
977 sync_job { 1098 sync_job {
978 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
981 1103
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1108 close $fh;
987 1109
988 if (@$objs) { 1110 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1116 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
996 } 1118 }
… …
1004 } 1126 }
1005 } else { 1127 } else {
1006 aio_unlink $filename; 1128 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1008 } 1130 }
1009 } 1131 };
1010} 1132}
1011 1133
1012sub object_freezer_as_string { 1134sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1014 1136
… …
1026 or return; 1148 or return;
1027 1149
1028 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1152 or return;
1153
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1032 } 1156 }
1033 1157
1158 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1036 return ($data, $av); 1162 ($data, $av)
1037} 1163}
1038 1164
1039=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1040 1166
1041=over 4 1167=over 4
… …
1114 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1115 1241
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1243
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1124 } else { 1259 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1261 }
1127 1262
1128 cf::override; 1263 cf::override;
… …
1181 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1183 1318
1184 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1320 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1322 }
1189 1323
1190 warn $msg; 1324 warn $msg;
1191 } 1325 }
1192 1326
… …
1217use Coro::AIO; 1351use Coro::AIO;
1218 1352
1219=head3 cf::player 1353=head3 cf::player
1220 1354
1221=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}
1222 1370
1223=item cf::player::find $login 1371=item cf::player::find $login
1224 1372
1225Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1226 1374
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1414
1267 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1270 } 1423 }
1271 } 1424 }
1272} 1425}
1273 1426
… …
1283 1436
1284 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1286 1439
1287 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1288 Coro::cede; 1441 cf::cede_to_tick;
1289} 1442}
1290 1443
1291sub new($) { 1444sub new($) {
1292 my ($login) = @_; 1445 my ($login) = @_;
1293 1446
… …
1297 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1298 1451
1299 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1300 1453
1301 $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 (@_);
1302} 1465}
1303 1466
1304=item $pl->quit_character 1467=item $pl->quit_character
1305 1468
1306Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1524 or return [];
1362 1525
1363 my @logins; 1526 my @logins;
1364 1527
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1369 1537
1370 utf8::decode $login; 1538 utf8::decode $login;
1371 push @logins, $login; 1539 push @logins, $login;
1372 } 1540 }
1373 1541
… …
1406 1574
1407Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1408 1576
1409=cut 1577=cut
1410 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
1411sub expand_cfpod { 1590sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1413 1592
1414 # escape & and < 1593 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1594
1418 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1419 1598
1420 1 while 1599 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1604 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1427 $self->gender ? $2 : $1 1606 (?:
1428 }ge 1607 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1608 | < $interior >
1430 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1431 { 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") {
1432 ("<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>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1632 "")
1435 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1437 1644
1645 for ($xml) {
1438 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1440 1648
1441 # compress some whitespace 1649 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1446 1655
1447 $_ 1656 $xml
1448} 1657}
1658
1659no re 'eval';
1449 1660
1450sub hintmode { 1661sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1663 $_[0]{hintmode}
1453} 1664}
1454 1665
1455=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1456 1667
1457Sends an ext reply to the player. 1668Sends an ext reply to the player.
1458 1669
1459=cut 1670=cut
1460 1671
1461sub ext_reply($$%) { 1672sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1463 1674
1464 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1676}
1467 1677
1468=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1469 1679
1470Sends an ext event to the client. 1680Sends an ext event to the client.
1471 1681
1472=cut 1682=cut
1473 1683
1474sub ext_event($$%) { 1684sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1476 1686
1477 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1478} 1688}
1479 1689
1480=head3 cf::region 1690=head3 cf::region
1481 1691
1482=over 4 1692=over 4
… …
1698 1908
1699sub load_header_from($) { 1909sub load_header_from($) {
1700 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1701 1911
1702 utf8::encode $path; 1912 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1921
1709 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1710 1923
1711 1 1924 1
1712} 1925}
… …
1766sub find { 1979sub find {
1767 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1768 1981
1769 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1770 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1772 1986
1773 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1774 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
1775 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1776 or return; 1992 or return;
1777 1993
1778 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1779 1995
… …
1781 or return; 1997 or return;
1782 1998
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1786 $map->reset; 2004 $map->reset;
1787 undef $guard;
1788 return find $path; 2005 return find $path;
1789 } 2006 }
1790 2007
1791 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1792 } 2009 }
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1802 2019
1803 my $path = $self->{path}; 2020 my $path = $self->{path};
1804 2021
1805 { 2022 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1807 2024
2025 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2027
1810 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1811 2029
1812 $self->alloc; 2030 $self->alloc;
1813 2031
1814 $self->pre_load; 2032 $self->pre_load;
1815 Coro::cede; 2033 cf::cede_to_tick;
1816 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1818 or return; 2038 or return;
1819 2039
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1822 2042
1823 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2044 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2047 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1828 } 2051 }
1829 } 2052 }
1830 2053
1831 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1832 # now do the right thing for maps 2057 # now do the right thing for maps
1833 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2060 unless $self->difficulty;
1836 Coro::cede; 2061 cf::cede_to_tick;
1837 2062
1838 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2064 $self->decay_objects;
1840 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1841 $self->update_buttons; 2066 $self->update_buttons;
1842 Coro::cede; 2067 cf::cede_to_tick;
1843 $self->set_darkness_map; 2068 $self->set_darkness_map;
1844 Coro::cede; 2069 cf::cede_to_tick;
1845 $self->activate; 2070 $self->activate;
1846 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1847 2075
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2077 }
1850 2078
1851 $self->post_load; 2079 $self->post_load;
… …
1862 2090
1863 $self 2091 $self
1864} 2092}
1865 2093
1866# 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
1867sub load_diag { 2095sub load_neighbours {
1868 my ($map) = @_; 2096 my ($map) = @_;
1869 2097
1870 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1871 2099
1872 for (0 .. 3) { 2100 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1874 or next; 2102 or next;
1875 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1876 or next; 2104 or next;
1877 $neigh->load; 2105 $neigh->load;
1878 2106
2107 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2110 }
1882 2111
1883 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1885 or next; 2115 or next;
1886 $neigh->load; 2116 $neigh->load;
1887 } 2117 }
1888} 2118}
1889 2119
… …
1894} 2124}
1895 2125
1896sub do_load_sync { 2126sub do_load_sync {
1897 my ($map) = @_; 2127 my ($map) = @_;
1898 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1899 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1900} 2133}
1901 2134
1902our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1904 2137
1905sub find_async { 2138sub find_async {
1906 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1907 2140
1908 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1909 2142
1910 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2145 }
1913 2146
1914 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1915 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1916 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2154 if (my $map = find $k) {
1919 $map->load; 2155 $map->load if $v;
1920 } 2156 }
1921 2157
1922 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1923 } 2159 }
1924 } 2160 }
1925 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1926 }; 2162 };
1927 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1930} 2166}
1931 2167
1932sub save { 2168sub save {
1933 my ($self) = @_; 2169 my ($self) = @_;
1934 2170
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2172
1937 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1938 2174
1939 return unless $self->dirty; 2175 return unless $self->dirty;
1940 2176
… …
1946 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1947 2183
1948 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1949 2185
1950 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1952 }; 2189 };
1953 2190
1954 if ($uniq) { 2191 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1963 my ($self) = @_; 2200 my ($self) = @_;
1964 2201
1965 # save first because save cedes 2202 # save first because save cedes
1966 $self->save; 2203 $self->save;
1967 2204
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2206
1970 return if $self->players; 2207 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1973 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2215 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2216}
1977 2217
1978sub reset_at { 2218sub reset_at {
1979 my ($self) = @_; 2219 my ($self) = @_;
1980 2220
… …
2012 if $uniq; 2252 if $uniq;
2013 } 2253 }
2014 2254
2015 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2016 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2259 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2260
2021 $self->unlink_save; 2261 $self->unlink_save;
2022 $self->destroy; 2262 $self->destroy;
2023} 2263}
2024 2264
2025my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2026 2266
2027sub nuke { 2267sub nuke {
2028 my ($self) = @_; 2268 my ($self) = @_;
2029 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2030 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2031 2274
2032 $self->unlink_save; 2275 $self->unlink_save;
2033 2276
2034 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2282
2040 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2041 2285
2042 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2043} 2287}
2044 2288
2045=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
… …
2121 2365
2122sub inv_recursive { 2366sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2124} 2368}
2125 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
2126package cf; 2398package cf;
2127 2399
2128=back 2400=back
2129 2401
2130=head3 cf::object::player 2402=head3 cf::object::player
… …
2152 2424
2153 } else { 2425 } else {
2154 my $pl = $self->contr; 2426 my $pl = $self->contr;
2155 2427
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2431
2165 } else { 2432 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2168 } 2435 }
2169 } 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 (@_);
2170} 2447}
2171 2448
2172=item $player_object->may ("access") 2449=item $player_object->may ("access")
2173 2450
2174Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2256 2533
2257 $map->load; 2534 $map->load;
2258 $map->load_diag; 2535 $map->load_neighbours;
2259 2536
2260 return unless $self->contr->active; 2537 return unless $self->contr->active;
2261 $self->activate_recursive; 2538 $self->activate_recursive;
2262 2539
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2561
2285 $self->enter_link; 2562 $self->enter_link;
2286 2563
2287 (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
2288 my $map = eval { 2586 my $map = eval {
2289 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2290 2588
2291 if ($map) { 2589 if ($map) {
2292 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2294 } else { 2592 } else {
2295 $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);
2296 } 2594 }
2297 2595
2298 $map 2596 $map
2299 }; 2597 };
2300 2598
… …
2353 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2354 } 2652 }
2355 2653
2356 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2357 2655
2358 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2359 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2361 2659
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2390 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2393 2691
2394 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2395 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2696 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2398 2698
2399 1; 2699 1;
… …
2434the 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
2435the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2436 2736
2437=cut 2737=cut
2438 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
2439sub cf::client::send_msg { 2791sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2793
2442 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2443 2795
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 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
2448 if (ref $channel) { 2807 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2453 } 2813 }
2454 2814
2455 $channel = $channel->{id}; 2815 $channel = $channel->{id};
2456 } 2816 }
2457 2817
2818 return unless @extra || length $msg;
2819
2458 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
2459 $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]));
2460 } else { 2827 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 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
2472 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2846 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2477 } 2849 }
2478 } 2850 }
2479 } 2851 }
2480} 2852}
2481 2853
2482=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2483 2855
2484Sends an ext event to the client. 2856Sends an ext event to the client.
2485 2857
2486=cut 2858=cut
2487 2859
2488sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2490 2862
2491 return unless $self->extcmd; 2863 if ($self->extcmd == 2) {
2492 2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2887}
2496 2888
2497=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2498 2890
2499Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2555 2947
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2949
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2565 } else { 2965 } else {
2566 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";
2567 } 2967 }
2568 2968
2569 cf::override; 2969 cf::override;
… …
2616our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2618 3018
2619$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2620 3020
2621$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));
2622 3026
2623# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2624 3028
2625=pod 3029=pod
2626 3030
2627The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2628 3032
2629 cf::object 3033 cf::object
2630 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
2631 insert remove 3035 insert remove name archname title slaying race decrease_ob_nr
2632 3036
2633 cf::object::player 3037 cf::object::player
2634 player 3038 player
2635 3039
2636 cf::player 3040 cf::player
… …
2641 3045
2642=cut 3046=cut
2643 3047
2644for ( 3048for (
2645 ["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
2646 insert remove)], 3051 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2650) { 3055) {
2651 no strict 'refs'; 3056 no strict 'refs';
… …
2727# the server's init and main functions 3132# the server's init and main functions
2728 3133
2729sub load_facedata($) { 3134sub load_facedata($) {
2730 my ($path) = @_; 3135 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2733 3144
2734 my $facedata; 3145 my $facedata;
2735 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3147 or die "$path: $!";
… …
2738 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2739 3150
2740 $facedata->{version} == 2 3151 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 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
2743 { 3161 {
2744 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2745 3163
2746 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2748 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3171
2753 cf::cede_to_tick; 3172 cf::cede_to_tick;
2754 } 3173 }
2755 3174
2756 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2758 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2759 or next; 3179 or next;
3180
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3184 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2781 3202
2782 { 3203 {
2783 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3207
2788 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3209 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
2796 3212
2797 if ($name =~ /\.jpg$/) { 3213 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3214 # prepend meta info
2799 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};
2800 } else { 3228 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3229 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3230 }
2807 3231
2808 cf::cede_to_tick; 3232 cf::cede_to_tick;
2809 } 3233 }
2810 } 3234 }
2811 3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
2812 1 3238 1
2813} 3239}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
2818 3276
2819 for (cf::region::list) { 3277 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3278 $_->{match} = qr/$_->{match}/
… …
2856 3314
2857sub init { 3315sub init {
2858 reload_resources; 3316 reload_resources;
2859} 3317}
2860 3318
2861sub cfg_load { 3319sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3321 or return;
2864 3322
2865 local $/; 3323 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2867 3325
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3327
2870 $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};
2871 $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};
… …
2882sub main { 3340sub main {
2883 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2885 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#
2886 (async { 3344 (async {
2887 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2889 }; 3348 };
2890 3349
2891 cfg_load; 3350 reload_config;
2892 db_init; 3351 db_init;
2893 load_extensions; 3352 load_extensions;
2894 3353
2895 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2896 Event::loop; 3356 EV::loop;
2897} 3357}
2898 3358
2899############################################################################# 3359#############################################################################
2900# initialisation and cleanup 3360# initialisation and cleanup
2901 3361
2902# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2903BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2912 },
2913 ); 3368 };
2914 } 3369 }
2915} 3370}
2916 3371
2917sub write_runtime { 3372sub write_runtime {
2918 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
2963 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3424 $pl->save;
2969 } 3425 }
2970 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2971 3427
2972 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3011 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3469
3014 # 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
3015 3471
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3022 for (;;) { 3473 for (;;) {
3023 BDB::flush; 3474 BDB::flush;
3024 IO::AIO::flush; 3475 IO::AIO::flush;
3025 Coro::cede; 3476 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3478 warn "iterate...";
3028 } 3479 }
3029 3480
3030 ++$RELOAD; 3481 ++$RELOAD;
… …
3089 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3090 require cf; 3541 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3543
3093 warn "loading config and database again"; 3544 warn "loading config and database again";
3094 cf::cfg_load; 3545 cf::reload_config;
3095 3546
3096 warn "loading extensions"; 3547 warn "loading extensions";
3097 cf::load_extensions; 3548 cf::load_extensions;
3098 3549
3099 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
… …
3106 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3107 3558
3108 1 3559 1
3109 } or do { 3560 } or do {
3110 warn $@; 3561 warn $@;
3111 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3563 };
3114 3564
3115 warn "reloaded"; 3565 warn "reloaded";
3116}; 3566};
3117 3567
… …
3119 3569
3120sub reload_perl() { 3570sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3123 3573
3124 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3575 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3131 },
3132 ); 3577 };
3133} 3578}
3134 3579
3135register_command "reload" => sub { 3580register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3137 3582
3138 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3587 reload_perl;
3588 };
3141 } 3589 }
3142}; 3590};
3143 3591
3144unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3145 3593
… …
3164 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3614 $signal->wait;
3167} 3615}
3168 3616
3169 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3179 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"
3180 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3181 return; 3621 return;
3182 } 3622 }
3183 3623
3184 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3185 3625
3186 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3187 3627
3188 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3189 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193 3630
3194 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3195 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3196 $map->alloc; 3633 Coro::async_pool {
3197 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3198 my $t = Event::time - $t; 3635 write_runtime
3199 3636 or warn "ERROR: unable to write runtime file: $!";
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3637 };
3638 }
3210 3639
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3641 $sig->send;
3227 } 3642 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3644 $sig->send;
3230 } 3645 }
3231 3646
3232 $NOW = Event::time;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3649
3243 _post_tick; 3650 _post_tick;
3244 3651};
3245 3652$TICK_WATCHER->priority (EV::MAXPRI);
3246 },
3247);
3248 3653
3249{ 3654{
3250 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3656
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3260 3658 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3660
3276 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3277 $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);
3278 3667
3279 cf::sync_job { 3668 cf::sync_job {
3280 eval { 3669 eval {
3281 BDB::db_env_open 3670 BDB::db_env_open
3282 $DB_ENV, 3671 $DB_ENV,
… …
3284 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
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3675 0666;
3287 3676
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3678 };
3293 3679
3294 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3681 };
3296 } 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 };
3297} 3693}
3298 3694
3299{ 3695{
3696 # configure IO::AIO
3697
3300 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3701}
3313 3702
3314my $_log_backtrace; 3703my $_log_backtrace;
3315 3704
3316sub _log_backtrace { 3705sub _log_backtrace {
… …
3320 3709
3321 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3712 ++$_log_backtrace;
3324 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3325 my @bt = fork_call { 3716 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 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 |"
3329 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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