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.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use 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::Event;
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 ();
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
… …
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
… …
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
… …
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
… …
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
206} 218}
207 219
208$Event::DIED = sub { 220$Event::DIED = sub {
209 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
210}; 222};
223
224#############################################################################
211 225
212=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
213 227
214=over 4 228=over 4
215 229
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 249 $d
236 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
237} 251}
238 252
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
242 254
243Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
244 256
245=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
246 258
247Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
248 267
249=item cf::lock_wait $string 268=item cf::lock_wait $string
250 269
251Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
252 271
… …
255Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
258returned. 277returned.
259 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
260Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
262 284
263=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
264 286
265Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
266 288
267=cut 289=cut
268 290
269our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
270 293
271sub lock_wait($) { 294sub lock_wait($) {
272 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
273 301
274 # wait for lock, if any 302 # wait for lock, if any
275 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 305 Coro::schedule;
… …
283 311
284 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
285 lock_wait $key; 313 lock_wait $key;
286 314
287 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
288 317
289 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
292 } 322 }
293} 323}
294 324
… …
306 }; 336 };
307 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
308 $guard 338 $guard
309} 339}
310 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
311=item cf::async { BLOCK } 399=item cf::async { BLOCK }
312 400
313Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
318 406
319BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
320 408
321=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
322 410
323The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
326 415
327If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
330fast or be very important. 419fast or be very important.
… …
338 my $time = Event::time; 427 my $time = Event::time;
339 428
340 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
342 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
343 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 435 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
346 437
347 my $busy = 1; 438 my $busy = 1;
348 my @res; 439 my @res;
349 440
350 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 443 @res = eval { $job->() };
352 warn $@ if $@; 444 warn $@ if $@;
353 undef $busy; 445 undef $busy;
354 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
355 447
… …
390 $EXT_CORO{$coro+0} = $coro; 482 $EXT_CORO{$coro+0} = $coro;
391 483
392 $coro 484 $coro
393} 485}
394 486
395sub write_runtime { 487=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 488
398 # first touch the runtime file to show we are still running: 489Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 490process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling.
400 493
401 IO::AIO::aio_utime $runtime, undef, undef; 494=cut
402 495
403 my $guard = cf::lock_acquire "write_runtime"; 496sub fork_call(&@) {
497 my ($cb, @args) = @_;
404 498
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 499 # we seemingly have to make a local copy of the whole thing,
406 or return; 500 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious)
407 502
408 my $value = $cf::RUNTIME + 90 + 10; 503 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 504 reset_signals;
410 # 60 allows for the watchdog to kill the server. 505 &$cb
506 }, @args;
411 507
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 508 wantarray ? @res : $res[-1]
413 and return; 509}
414 510
415 # always fsync - this file is important 511=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 512
419 # touch it again to show we are up-to-date 513Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 514
422 close $fh 515=item cf::db_put $family => $key => $value
423 or return;
424 516
425 aio_rename "$runtime~", $runtime 517Stores the given C<$value> in the family. It can currently store binary
426 and return; 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 519
428 warn "runtime file written.\n"; 520=item $db = cf::db_table "name"
429 521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
543
544our $DB;
545
546sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db";
549 };
550}
551
552sub db_get($$) {
553 my $key = "$_[0]/$_[1]";
554
555 cf::sync_job {
556 BDB::db_get $DB, undef, $key, my $data;
557
558 $! ? ()
559 : $data
430 1 560 }
561}
562
563sub db_put($$$) {
564 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
566}
567
568=item cf::cache $id => [$paths...], $processversion => $process
569
570Generic caching function that returns the value of the resource $id,
571caching and regenerating as required.
572
573This function can block.
574
575=cut
576
577sub cache {
578 my ($id, $src, $processversion, $process) = @_;
579
580 my $meta =
581 join "\x00",
582 $processversion,
583 map {
584 aio_stat $_
585 and Carp::croak "$_: $!";
586
587 ($_, (stat _)[7,9])
588 } @$src;
589
590 my $dbmeta = db_get cache => "$id/meta";
591 if ($dbmeta ne $meta) {
592 # changed, we may need to process
593
594 my @data;
595 my $md5;
596
597 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_]
599 or Carp::croak "$src->[$_]: $!";
600 }
601
602 # if processing is expensive, check
603 # checksum first
604 if (1) {
605 $md5 =
606 join "\x00",
607 $processversion,
608 map {
609 cf::cede_to_tick;
610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
611 } 0.. $#$src;
612
613
614 my $dbmd5 = db_get cache => "$id/md5";
615 if ($dbmd5 eq $md5) {
616 db_put cache => "$id/meta", $meta;
617
618 return db_get cache => "$id/data";
619 }
620 }
621
622 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time;
625
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
627
628 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta;
631
632 return $data;
633 }
634
635 db_get cache => "$id/data"
431} 636}
432 637
433=item cf::datalog type => key => value, ... 638=item cf::datalog type => key => value, ...
434 639
435Log a datalog packet of the given type with the given key-value pairs. 640Log a datalog packet of the given type with the given key-value pairs.
… …
453attach callbacks/event handlers (a collection of which is called an "attachment") 658attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 659to it. All such attachable objects support the following methods.
455 660
456In the following description, CLASS can be any of C<global>, C<object> 661In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 662C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 663Crossfire TRT).
459 664
460=over 4 665=over 4
461 666
462=item $attachable->attach ($attachment, key => $value...) 667=item $attachable->attach ($attachment, key => $value...)
463 668
… …
665 _attach $registry, $klass, @attach; 870 _attach $registry, $klass, @attach;
666 } 871 }
667 872
668 $obj->{$name} = \%arg; 873 $obj->{$name} = \%arg;
669 } else { 874 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 875 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 876 }
672 877
673 $obj->{_attachment}{$name} = undef; 878 $obj->{_attachment}{$name} = undef;
674} 879}
675 880
… …
715 "; 920 ";
716 die if $@; 921 die if $@;
717} 922}
718 923
719our $override; 924our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 926
722sub override { 927sub override {
723 $override = 1; 928 $override = 1;
724 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
725} 930}
726 931
727sub do_invoke { 932sub do_invoke {
728 my $event = shift; 933 my $event = shift;
729 my $callbacks = shift; 934 my $callbacks = shift;
730 935
731 @invoke_results = (); 936 @INVOKE_RESULTS = ();
732 937
733 local $override; 938 local $override;
734 939
735 for (@$callbacks) { 940 for (@$callbacks) {
736 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
… …
753 958
754Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
755 960
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 964
760=back 965=back
761 966
762=cut 967=cut
763 968
764############################################################################# 969#############################################################################
765# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986}
766 987
767sub reattach { 988sub reattach {
768 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 990 my ($obj) = @_;
770 991
… …
817sub object_freezer_save { 1038sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
819 1040
820 sync_job { 1041 sync_job {
821 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
824 1046
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1051 close $fh;
830 1052
831 if (@$objs) { 1053 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1059 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
839 } 1061 }
… …
847 } 1069 }
848 } else { 1070 } else {
849 aio_unlink $filename; 1071 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
851 } 1073 }
852 } 1074 };
853} 1075}
854 1076
855sub object_freezer_as_string { 1077sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
857 1079
… …
869 or return; 1091 or return;
870 1092
871 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
873 or return; 1095 or return;
874 $av = eval { (Storable::thaw $av)->{objs} };
875 }
876 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
879 return ($data, $av); 1106 ($data, $av)
880} 1107}
1108
1109=head2 COMMAND CALLBACKS
1110
1111=over 4
1112
1113=cut
881 1114
882############################################################################# 1115#############################################################################
883# command handling &c 1116# command handling &c
884 1117
885=item cf::register_command $name => \&callback($ob,$args); 1118=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1131 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1132}
900 1133
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1134=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1135
903Register a callbackf ro execution when the client sends an extcmd packet. 1136Register a callback for execution when the client sends an (synchronous)
1137extcmd packet. Ext commands will be processed in the order they are
1138received by the server, like other user commands. The first argument is
1139the logged-in player. Ext commands can only be processed after a player
1140has logged in successfully.
904 1141
905If the callback returns something, it is sent back as if reply was being 1142If the callback returns something, it is sent back as if reply was being
906called. 1143called.
907 1144
1145=item cf::register_exticmd $name => \&callback($ns,$packet);
1146
1147Register a callback for execution when the client sends an (asynchronous)
1148exticmd packet. Exti commands are processed by the server as soon as they
1149are received, i.e. out of order w.r.t. other commands. The first argument
1150is a client socket. Exti commands can be received anytime, even before
1151log-in.
1152
1153If the callback returns something, it is sent back as if reply was being
1154called.
1155
908=cut 1156=cut
909 1157
910sub register_extcmd { 1158sub register_extcmd {
911 my ($name, $cb) = @_; 1159 my ($name, $cb) = @_;
912 1160
913 $EXTCMD{$name} = $cb; 1161 $EXTCMD{$name} = $cb;
1162}
1163
1164sub register_exticmd {
1165 my ($name, $cb) = @_;
1166
1167 $EXTICMD{$name} = $cb;
914} 1168}
915 1169
916cf::player->attach ( 1170cf::player->attach (
917 on_command => sub { 1171 on_command => sub {
918 my ($pl, $name, $params) = @_; 1172 my ($pl, $name, $params) = @_;
… …
927 cf::override; 1181 cf::override;
928 }, 1182 },
929 on_extcmd => sub { 1183 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
931 1185
932 my $msg = eval { from_json $buf }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1187
934 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
940 } else { 1203 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1205 }
943 1206
944 cf::override; 1207 cf::override;
… …
967 path => $path, 1230 path => $path,
968 base => $base, 1231 base => $base,
969 pkg => $pkg, 1232 pkg => $pkg,
970 ); 1233 );
971 1234
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1237
975 $ext{source} = 1238 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1239 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1240 . "#line 1 \"$path\"\n{\n"
978 . $source 1241 . $source
… …
984 my %done; 1247 my %done;
985 while (%todo) { 1248 while (%todo) {
986 my $progress; 1249 my $progress;
987 1250
988 while (my ($k, $v) = each %todo) { 1251 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1252 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1253 goto skip
991 unless exists $done{$_}; 1254 unless exists $done{$_};
992 } 1255 }
993 1256
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1257 warn "... loading '$k' into '$v->{pkg}'\n";
995 1258
996 unless (eval $v->{source}) { 1259 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1260 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1261 : "$v->{base}: extension inactive.\n";
999 1262
1000 if (exists $v->{meta}{mandatory}) { 1263 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1264 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1265 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1266 exit 1;
1004 } 1267 }
1005 1268
1006 die $msg; 1269 warn $msg;
1007 } 1270 }
1008 1271
1009 $done{$k} = delete $todo{$k}; 1272 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
1011 } 1275 }
1012 1276
1013 skip: 1277 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1279 unless $progress;
… …
1017 }; 1281 };
1018} 1282}
1019 1283
1020############################################################################# 1284#############################################################################
1021 1285
1286=back
1287
1022=head2 CORE EXTENSIONS 1288=head2 CORE EXTENSIONS
1023 1289
1024Functions and methods that extend core crossfire objects. 1290Functions and methods that extend core crossfire objects.
1025 1291
1026=cut 1292=cut
… …
1030use Coro::AIO; 1296use Coro::AIO;
1031 1297
1032=head3 cf::player 1298=head3 cf::player
1033 1299
1034=over 4 1300=over 4
1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1035 1315
1036=item cf::player::find $login 1316=item cf::player::find $login
1037 1317
1038Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1039 1319
… …
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1359
1080 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1081 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1082 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1083 } 1368 }
1084 } 1369 }
1085} 1370}
1086 1371
… …
1096 1381
1097 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1099 1384
1100 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1101 Coro::cede; 1386 cf::cede_to_tick;
1102} 1387}
1103 1388
1104sub new($) { 1389sub new($) {
1105 my ($login) = @_; 1390 my ($login) = @_;
1106 1391
… …
1110 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1111 1396
1112 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1113 1398
1114 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1115} 1410}
1116 1411
1117=item $pl->quit_character 1412=item $pl->quit_character
1118 1413
1119Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
… …
1174 or return []; 1469 or return [];
1175 1470
1176 my @logins; 1471 my @logins;
1177 1472
1178 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1182 1482
1183 utf8::decode $login; 1483 utf8::decode $login;
1184 push @logins, $login; 1484 push @logins, $login;
1185 } 1485 }
1186 1486
… …
1213 } 1513 }
1214 1514
1215 \@paths 1515 \@paths
1216} 1516}
1217 1517
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1519
1520Expand crossfire pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568
1218=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1219 1570
1220Sends an ext reply to the player. 1571Sends an ext reply to the player.
1221 1572
1222=cut 1573=cut
1223 1574
1224sub ext_reply($$%) { 1575sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1226 1577
1227 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1579}
1231 1580
1232=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1233 1582
1234Sends an ext event to the client. 1583Sends an ext event to the client.
1235 1584
1236=cut 1585=cut
1237 1586
1238sub ext_event($$%) { 1587sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1240 1589
1241 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1242} 1591}
1243 1592
1244=head3 cf::region 1593=head3 cf::region
1245 1594
1246=over 4 1595=over 4
… …
1249 1598
1250package cf::region; 1599package cf::region;
1251 1600
1252=item cf::region::find_by_path $path 1601=item cf::region::find_by_path $path
1253 1602
1254Tries to decuce the probable region for a map knowing only its path. 1603Tries to decuce the likely region for a map knowing only its path.
1255 1604
1256=cut 1605=cut
1257 1606
1258sub find_by_path($) { 1607sub find_by_path($) {
1259 my ($path) = @_; 1608 my ($path) = @_;
1260 1609
1261 my ($match, $specificity); 1610 my ($match, $specificity);
1262 1611
1263 for my $region (list) { 1612 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1613 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1614 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1615 if $region->specificity > $specificity;
1267 } 1616 }
1268 } 1617 }
1269 1618
… …
1389 $self->init; # pass $1 etc. 1738 $self->init; # pass $1 etc.
1390 return $self; 1739 return $self;
1391 } 1740 }
1392 } 1741 }
1393 1742
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1743 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1744 ()
1396} 1745}
1397 1746
1398sub init { 1747sub init {
1399 my ($self) = @_; 1748 my ($self) = @_;
… …
1462 1811
1463sub load_header_from($) { 1812sub load_header_from($) {
1464 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1465 1814
1466 utf8::encode $path; 1815 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1472 1824
1473 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1474 1826
1475 1 1827 1
1476} 1828}
… …
1530sub find { 1882sub find {
1531 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1532 1884
1533 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1534 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1536 1889
1537 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1539 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1540 or return; 1895 or return;
1541 1896
1542 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1543 1898
… …
1545 or return; 1900 or return;
1546 1901
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1550 $map->reset; 1907 $map->reset;
1551 undef $guard;
1552 return find $path; 1908 return find $path;
1553 } 1909 }
1554 1910
1555 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1556 } 1912 }
… …
1565 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1566 1922
1567 my $path = $self->{path}; 1923 my $path = $self->{path};
1568 1924
1569 { 1925 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1571 1927
1928 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 1930
1574 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1575 1932
1576 $self->alloc; 1933 $self->alloc;
1577 1934
1578 $self->pre_load; 1935 $self->pre_load;
1579 Coro::cede; 1936 cf::cede_to_tick;
1580 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1582 or return; 1941 or return;
1583 1942
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1586 1945
1587 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 1947 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 1950 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1592 } 1954 }
1593 } 1955 }
1594 1956
1595 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1596 # now do the right thing for maps 1960 # now do the right thing for maps
1597 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 1963 unless $self->difficulty;
1600 Coro::cede; 1964 cf::cede_to_tick;
1601 1965
1602 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 1967 $self->decay_objects;
1604 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1605 $self->update_buttons; 1969 $self->update_buttons;
1606 Coro::cede; 1970 cf::cede_to_tick;
1607 $self->set_darkness_map; 1971 $self->set_darkness_map;
1608 Coro::cede; 1972 cf::cede_to_tick;
1609 $self->activate; 1973 $self->activate;
1610 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1611 1978
1612 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 1980 }
1614 1981
1615 $self->post_load; 1982 $self->post_load;
… …
1626 1993
1627 $self 1994 $self
1628} 1995}
1629 1996
1630# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1631sub load_diag { 1998sub load_neighbours {
1632 my ($map) = @_; 1999 my ($map) = @_;
1633 2000
1634 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1635 2002
1636 for (0 .. 3) { 2003 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1638 or next; 2005 or next;
1639 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1640 or next; 2007 or next;
1641 $neigh->load; 2008 $neigh->load;
1642 2009
2010 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 2013 }
1646 2014
1647 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1649 or next; 2018 or next;
1650 $neigh->load; 2019 $neigh->load;
1651 } 2020 }
1652} 2021}
1653 2022
… …
1658} 2027}
1659 2028
1660sub do_load_sync { 2029sub do_load_sync {
1661 my ($map) = @_; 2030 my ($map) = @_;
1662 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1663 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1664} 2036}
1665 2037
1666our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1668 2040
1669sub find_async { 2041sub find_async {
1670 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1671 2043
1672 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1673 2045
1674 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2048 }
1677 2049
1678 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1679 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1680 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2057 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2058 $map->load if $v;
2059 }
1685 2060
1686 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1687 } 2062 }
1688 } 2063 }
1689 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1690 }; 2065 };
1691 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
… …
1694} 2069}
1695 2070
1696sub save { 2071sub save {
1697 my ($self) = @_; 2072 my ($self) = @_;
1698 2073
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2075
1701 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1702 2077
1703 return unless $self->dirty; 2078 return unless $self->dirty;
1704 2079
… …
1710 return if $self->{deny_save}; 2085 return if $self->{deny_save};
1711 2086
1712 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
1713 2088
1714 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
1715 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
1716 }; 2092 };
1717 2093
1718 if ($uniq) { 2094 if ($uniq) {
1719 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1727 my ($self) = @_; 2103 my ($self) = @_;
1728 2104
1729 # save first because save cedes 2105 # save first because save cedes
1730 $self->save; 2106 $self->save;
1731 2107
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2109
1734 return if $self->players; 2110 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2112 return if $self->{deny_save};
1737 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
1738 $self->clear; 2118 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2119}
1741 2120
1742sub reset_at { 2121sub reset_at {
1743 my ($self) = @_; 2122 my ($self) = @_;
1744 2123
… …
1776 if $uniq; 2155 if $uniq;
1777 } 2156 }
1778 2157
1779 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
1780 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2162 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2163
1785 $self->unlink_save; 2164 $self->unlink_save;
1786 $self->destroy; 2165 $self->destroy;
1787} 2166}
1788 2167
1789my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
1790 2169
1791sub nuke { 2170sub nuke {
1792 my ($self) = @_; 2171 my ($self) = @_;
1793 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
1794 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
1795 2177
1796 $self->unlink_save; 2178 $self->unlink_save;
1797 2179
1798 bless $self, "cf::map"; 2180 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2185
1804 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
1805 2188
1806 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
1807} 2190}
1808 2191
1809=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
… …
1885 2268
1886sub inv_recursive { 2269sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
1888} 2271}
1889 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
1890package cf; 2301package cf;
1891 2302
1892=back 2303=back
1893 2304
1894=head3 cf::object::player 2305=head3 cf::object::player
… …
1911 2322
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2323 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2324
1914 if ($self->{record_replies}) { 2325 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2326 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2327
1916 } else { 2328 } else {
2329 my $pl = $self->contr;
2330
2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2332 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334
2335 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2338 }
1919 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
1920} 2350}
1921 2351
1922=item $player_object->may ("access") 2352=item $player_object->may ("access")
1923 2353
1924Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
… …
2003 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
2006 2436
2007 $map->load; 2437 $map->load;
2008 $map->load_diag; 2438 $map->load_neighbours;
2009 2439
2010 return unless $self->contr->active; 2440 return unless $self->contr->active;
2011 $self->activate_recursive; 2441 $self->activate_recursive;
2012 2442
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2444 $self->enter_map ($map, $x, $y);
2015} 2445}
2016 2446
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2448
2019Moves the player to the given map-path and coordinates by first freezing 2449Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2450her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2451that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2452the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process.
2023 2454
2024=cut 2455=cut
2025 2456
2026our $GOTOGEN; 2457our $GOTOGEN;
2027 2458
2028sub cf::object::player::goto { 2459sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2460 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2461
2031 # do generation counting so two concurrent goto's will be executed in-order 2462 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2464
2034 $self->enter_link; 2465 $self->enter_link;
2035 2466
2036 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2037 my $map = eval { 2489 my $map = eval {
2038 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2039 2491
2040 if ($map) { 2492 if ($map) {
2041 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2043 } else { 2495 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2045 } 2497 }
2046 2498
2047 $map 2499 $map
2048 }; 2500 };
2049 2501
… …
2054 2506
2055 if ($gen == $self->{_goto_generation}) { 2507 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2508 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2509 $self->leave_link ($map, $x, $y);
2058 } 2510 }
2511
2512 $done->() if $done;
2059 })->prio (1); 2513 })->prio (1);
2060} 2514}
2061 2515
2062=item $player_object->enter_exit ($exit_object) 2516=item $player_object->enter_exit ($exit_object)
2063 2517
… …
2132 my $hp = $exit->stats->hp; 2586 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2587 my $sp = $exit->stats->sp;
2134 2588
2135 $self->enter_link; 2589 $self->enter_link;
2136 2590
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2137 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2138 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2599 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2141 2601
2142 1; 2602 1;
… …
2168 2628
2169 utf8::encode $text; 2629 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2631}
2172 2632
2633=item $client->send_msg ($channel, $msg, $color, [extra...])
2634
2635Send a drawinfo or msg packet to the client, formatting the msg for the
2636client if neccessary. C<$type> should be a string identifying the type of
2637the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet.
2639
2640=cut
2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2663sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_;
2665
2666 $msg = $self->pl->expand_cfpod ($msg);
2667
2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2679 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2685 }
2686
2687 $channel = $channel->{id};
2688 }
2689
2690 return unless @extra || length $msg;
2691
2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2699 } else {
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724}
2725
2173=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2174 2727
2175Sends an exti event to the client. 2728Sends an ext event to the client.
2176 2729
2177=cut 2730=cut
2178 2731
2179sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2181 2734
2735 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2184} 2759}
2185 2760
2186=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2187 2762
2188Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2764the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2190C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2765C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2766
2192Queries can fail, so check the return code. Or don't, as queries will become 2767Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2768become reliable at some point in the future.
2194 2769
2195=cut 2770=cut
2196 2771
2197sub cf::client::query { 2772sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2773 my ($self, $flags, $text, $cb) = @_;
… …
2206 utf8::encode $text; 2781 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2782 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2783
2209 $self->send_packet ($self->{query_queue}[0][0]) 2784 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2785 if @{ $self->{query_queue} } == 1;
2786
2787 1
2211} 2788}
2212 2789
2213cf::client->attach ( 2790cf::client->attach (
2791 on_connect => sub {
2792 my ($ns) = @_;
2793
2794 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2795 },
2214 on_reply => sub { 2796 on_reply => sub {
2215 my ($ns, $msg) = @_; 2797 my ($ns, $msg) = @_;
2216 2798
2217 # this weird shuffling is so that direct followup queries 2799 # this weird shuffling is so that direct followup queries
2218 # get handled first 2800 # get handled first
… …
2230 } else { 2812 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2813 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2814 }
2233 } 2815 }
2234 }, 2816 },
2817 on_exticmd => sub {
2818 my ($ns, $buf) = @_;
2819
2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2821
2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2830 if (my $cb = $EXTICMD{$type}) {
2831 @reply = $cb->($ns, @payload);
2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2837 } else {
2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2839 }
2840
2841 cf::override;
2842 },
2235); 2843);
2236 2844
2237=item $client->async (\&cb) 2845=item $client->async (\&cb)
2238 2846
2239Create a new coroutine, running the specified callback. The coroutine will 2847Create a new coroutine, running the specified callback. The coroutine will
… …
2280our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2282 2890
2283$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2284 2892
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2286 2898
2287# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2288 2900
2289=pod 2901=pod
2290 2902
2291The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2292 2904
2293 cf::object contr pay_amount pay_player map 2905 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr
2908
2294 cf::object::player player 2909 cf::object::player
2295 cf::player peaceful 2910 player
2296 cf::map trigger 2911
2912 cf::player
2913 peaceful
2914
2915 cf::map
2916 trigger
2297 2917
2298=cut 2918=cut
2299 2919
2300for ( 2920for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2302 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2305) { 2927) {
2306 no strict 'refs'; 2928 no strict 'refs';
… …
2377=back 2999=back
2378 3000
2379=cut 3001=cut
2380 3002
2381############################################################################# 3003#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552
2553#############################################################################
2554# the server's init and main functions 3004# the server's init and main functions
2555 3005
2556sub load_facedata($) { 3006sub load_facedata($) {
2557 my ($path) = @_; 3007 my ($path) = @_;
3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 3014
2559 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2560 3016
2561 my $facedata; 3017 my $facedata;
2562 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
… …
2565 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2566 3022
2567 $facedata->{version} == 2 3023 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
3032
2570 { 3033 {
2571 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2572 3035
2573 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3038 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 3042
3043 cf::cede_to_tick;
2579 } 3044 }
2580 3045
2581 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 3047 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 3048 my $idx = cf::face::find $face
2584 or next; 3049 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 3050 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 3053 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3054 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3055 }
2590 Coro::cede; 3056
3057 cf::cede_to_tick;
2591 } 3058 }
2592 } 3059 }
2593 3060
2594 { 3061 {
2595 my $anims = $facedata->{animinfo}; 3062 my $anims = $facedata->{animinfo};
2596 3063
2597 while (my ($anim, $info) = each %$anims) { 3064 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3065 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3066 cf::cede_to_tick;
2600 } 3067 }
2601 3068
2602 cf::anim::invalidate_all; # d'oh 3069 cf::anim::invalidate_all; # d'oh
2603 } 3070 }
2604 3071
3072 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource};
3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082
3083 if ($info->{type} & 1) {
3084 # prepend meta info
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else {
3093 $data = $info->{data};
3094 }
3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick;
3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 }
3120
2605 1 3121 1
2606} 3122}
2607 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2608sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2609 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
3139
3140 for (cf::region::list) {
3141 $_->{match} = qr/$_->{match}/
3142 if exists $_->{match};
3143 }
2611} 3144}
2612 3145
2613sub reload_facedata { 3146sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3147 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3148 or die "unable to load facedata\n";
2616} 3149}
2617 3150
2618sub reload_archetypes { 3151sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 3157 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3158 or die "unable to load archetypes\n";
2621} 3159}
2622 3160
2623sub reload_treasures { 3161sub reload_treasures {
… …
2639 3177
2640sub init { 3178sub init {
2641 reload_resources; 3179 reload_resources;
2642} 3180}
2643 3181
2644sub cfg_load { 3182sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3184 or return;
2647 3185
2648 local $/; 3186 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
… …
2665sub main { 3203sub main {
2666 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2667 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2669 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2670 Event::one_event; 3209 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2672 }; 3211 };
2673 3212
2674 cfg_load; 3213 reload_config;
2675 db_init; 3214 db_init;
2676 load_extensions; 3215 load_extensions;
2677 3216
2678 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2679 Event::loop; 3218 Event::loop;
… …
2695 }, 3234 },
2696 ); 3235 );
2697 } 3236 }
2698} 3237}
2699 3238
3239sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime";
3241
3242 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time.
3244
3245 IO::AIO::aio_utime $runtime, undef, undef;
3246
3247 my $guard = cf::lock_acquire "write_runtime";
3248
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3250 or return;
3251
3252 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server.
3255
3256 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3257 and return;
3258
3259 # always fsync - this file is important
3260 aio_fsync $fh
3261 and return;
3262
3263 # touch it again to show we are up-to-date
3264 aio_utime $fh, undef, undef;
3265
3266 close $fh
3267 or return;
3268
3269 aio_rename "$runtime~", $runtime
3270 and return;
3271
3272 warn "runtime file written.\n";
3273
3274 1
3275}
3276
2700sub emergency_save() { 3277sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3278 my $freeze_guard = cf::freeze_mainloop;
2702 3279
2703 warn "enter emergency perl save\n"; 3280 warn "enter emergency perl save\n";
2704 3281
… …
2708 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3291 $pl->save;
2714 } 3292 }
2715 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
2716 3294
2717 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
2779 %EXT_CORO = (); 3357 %EXT_CORO = ();
2780 3358
2781 warn "removing commands"; 3359 warn "removing commands";
2782 %COMMAND = (); 3360 %COMMAND = ();
2783 3361
2784 warn "removing ext commands"; 3362 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3363 %EXTCMD = ();
3364 %EXTICMD = ();
2786 3365
2787 warn "unloading/nuking all extensions"; 3366 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3367 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3368 warn "... unloading $pkg";
2790 3369
… …
2833 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
2834 require cf; 3413 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3415
2837 warn "loading config and database again"; 3416 warn "loading config and database again";
2838 cf::cfg_load; 3417 cf::reload_config;
2839 3418
2840 warn "loading extensions"; 3419 warn "loading extensions";
2841 cf::load_extensions; 3420 cf::load_extensions;
2842 3421
2843 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
… …
2879register_command "reload" => sub { 3458register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
2881 3460
2882 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3465 reload_perl;
3466 };
2885 } 3467 }
2886}; 3468};
2887 3469
2888unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
2889 3471
… …
2908 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3492 $signal->wait;
2911} 3493}
2912 3494
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
2916 reentrant => 0, 3496 reentrant => 0,
2917 parked => 1, 3497 parked => 1,
2918 prio => 0, 3498 prio => 0,
2919 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
… …
2927 3507
2928 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
2929 3509
2930 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
2931 3511
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2954
2955 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
2957 3514
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
2961 write_runtime 3519 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
2963 }; 3521 };
2964 } 3522 }
2965 3523
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3525 $sig->send;
2971 } 3526 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3528 $sig->send;
… …
2983 3538
2984 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3541
2987 _post_tick; 3542 _post_tick;
2988
2989
2990 }, 3543 },
2991); 3544);
2992 3545
2993{ 3546{
3547 BDB::min_parallel 8;
2994 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
2995 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
2996 reentrant => 0, 3550 reentrant => 0,
2997 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
2998 poll => 'r', 3552 poll => 'r',
2999 prio => 0, 3553 prio => 0,
3000 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3002 ); 3556 );
3003 BDB::min_parallel 8;
3004 3557
3005 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3006 my $status; 3559 my $status;
3007 my $current = $Coro::current; 3560 my $current = $Coro::current;
3008 ( 3561 (
… …
3017 ) 3570 )
3018 }; 3571 };
3019 3572
3020 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3579
3023 cf::sync_job { 3580 cf::sync_job {
3024 eval { 3581 eval {
3025 BDB::db_env_open 3582 BDB::db_env_open
3026 $DB_ENV, 3583 $DB_ENV,
… …
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3587 0666;
3031 3588
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3590 };
3037 3591
3038 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3593 };
3040 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3041} 3626}
3042 3627
3043{ 3628{
3044 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3045 3630
… …
3048 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3049 reentrant => 0, 3634 reentrant => 0,
3050 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3052 poll => 'r', 3637 poll => 'r',
3053 prio => 6, 3638 prio => 0,
3054 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3055 ); 3640 );
3056} 3641}
3057 3642
3058my $_log_backtrace; 3643my $_log_backtrace;
… …
3064 3649
3065 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3652 ++$_log_backtrace;
3068 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3069 my @bt = fork_call { 3656 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

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