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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

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

Diff Legend

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