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.401 by root, Mon Dec 17 06:45:53 2007 UTC

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

Diff Legend

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