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.386 by root, Mon Oct 15 17:50:27 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
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
1005sub _can_merge {
1006 my ($ob1, $ob2) = @_;
1007
1008 ++$SLOW_MERGES;#d#
1009
1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
1012}
766 1013
767sub reattach { 1014sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1016 my ($obj) = @_;
770 1017
817sub object_freezer_save { 1064sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
819 1066
820 sync_job { 1067 sync_job {
821 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
824 1072
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1077 close $fh;
830 1078
831 if (@$objs) { 1079 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1085 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
839 } 1087 }
847 } 1095 }
848 } else { 1096 } else {
849 aio_unlink $filename; 1097 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
851 } 1099 }
852 } 1100 };
853} 1101}
854 1102
855sub object_freezer_as_string { 1103sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
857 1105
869 or return; 1117 or return;
870 1118
871 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
873 or return; 1121 or return;
874 $av = eval { (Storable::thaw $av)->{objs} };
875 }
876 1122
1123 my $st = eval { Coro::Storable::thaw $av }
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1126 }
1127
1128 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1131
879 return ($data, $av); 1132 ($data, $av)
880} 1133}
1134
1135=head2 COMMAND CALLBACKS
1136
1137=over 4
1138
1139=cut
881 1140
882############################################################################# 1141#############################################################################
883# command handling &c 1142# command handling &c
884 1143
885=item cf::register_command $name => \&callback($ob,$args); 1144=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1157 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1158}
900 1159
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1160=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1161
903Register a callbackf ro execution when the client sends an extcmd packet. 1162Register a callback for execution when the client sends an (synchronous)
1163extcmd packet. Ext commands will be processed in the order they are
1164received by the server, like other user commands. The first argument is
1165the logged-in player. Ext commands can only be processed after a player
1166has logged in successfully.
904 1167
905If the callback returns something, it is sent back as if reply was being 1168If the callback returns something, it is sent back as if reply was being
906called. 1169called.
907 1170
1171=item cf::register_exticmd $name => \&callback($ns,$packet);
1172
1173Register a callback for execution when the client sends an (asynchronous)
1174exticmd packet. Exti commands are processed by the server as soon as they
1175are received, i.e. out of order w.r.t. other commands. The first argument
1176is a client socket. Exti commands can be received anytime, even before
1177log-in.
1178
1179If the callback returns something, it is sent back as if reply was being
1180called.
1181
908=cut 1182=cut
909 1183
910sub register_extcmd { 1184sub register_extcmd {
911 my ($name, $cb) = @_; 1185 my ($name, $cb) = @_;
912 1186
913 $EXTCMD{$name} = $cb; 1187 $EXTCMD{$name} = $cb;
1188}
1189
1190sub register_exticmd {
1191 my ($name, $cb) = @_;
1192
1193 $EXTICMD{$name} = $cb;
914} 1194}
915 1195
916cf::player->attach ( 1196cf::player->attach (
917 on_command => sub { 1197 on_command => sub {
918 my ($pl, $name, $params) = @_; 1198 my ($pl, $name, $params) = @_;
927 cf::override; 1207 cf::override;
928 }, 1208 },
929 on_extcmd => sub { 1209 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1210 my ($pl, $buf) = @_;
931 1211
932 my $msg = eval { from_json $buf }; 1212 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1213
934 if (ref $msg) { 1214 if (ref $msg) {
1215 my ($type, $reply, @payload) =
1216 "ARRAY" eq ref $msg
1217 ? @$msg
1218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1219
1220 my @reply;
1221
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1222 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1223 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1224 }
1225
1226 $pl->ext_reply ($reply, @reply)
1227 if $reply;
1228
940 } else { 1229 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1231 }
943 1232
944 cf::override; 1233 cf::override;
967 path => $path, 1256 path => $path,
968 base => $base, 1257 base => $base,
969 pkg => $pkg, 1258 pkg => $pkg,
970 ); 1259 );
971 1260
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1263
975 $ext{source} = 1264 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1265 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1266 . "#line 1 \"$path\"\n{\n"
978 . $source 1267 . $source
984 my %done; 1273 my %done;
985 while (%todo) { 1274 while (%todo) {
986 my $progress; 1275 my $progress;
987 1276
988 while (my ($k, $v) = each %todo) { 1277 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1278 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1279 goto skip
991 unless exists $done{$_}; 1280 unless exists $done{$_};
992 } 1281 }
993 1282
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1283 warn "... loading '$k' into '$v->{pkg}'\n";
995 1284
996 unless (eval $v->{source}) { 1285 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1286 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1287 : "$v->{base}: extension inactive.\n";
999 1288
1000 if (exists $v->{meta}{mandatory}) { 1289 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1290 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1291 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1292 exit 1;
1004 } 1293 }
1005 1294
1006 die $msg; 1295 warn $msg;
1007 } 1296 }
1008 1297
1009 $done{$k} = delete $todo{$k}; 1298 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
1011 } 1301 }
1012 1302
1013 skip: 1303 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1305 unless $progress;
1017 }; 1307 };
1018} 1308}
1019 1309
1020############################################################################# 1310#############################################################################
1021 1311
1312=back
1313
1022=head2 CORE EXTENSIONS 1314=head2 CORE EXTENSIONS
1023 1315
1024Functions and methods that extend core crossfire objects. 1316Functions and methods that extend core crossfire objects.
1025 1317
1026=cut 1318=cut
1030use Coro::AIO; 1322use Coro::AIO;
1031 1323
1032=head3 cf::player 1324=head3 cf::player
1033 1325
1034=over 4 1326=over 4
1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1035 1341
1036=item cf::player::find $login 1342=item cf::player::find $login
1037 1343
1038Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1039 1345
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1385
1080 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1081 or return; 1387 or return;
1388
1389 my $pl = cf::player::load_pl $f
1390 or return;
1391 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs;
1082 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1083 } 1394 }
1084 } 1395 }
1085} 1396}
1086 1397
1096 1407
1097 aio_mkdir playerdir $pl, 0770; 1408 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1409 $pl->{last_save} = $cf::RUNTIME;
1099 1410
1100 $pl->save_pl ($path); 1411 $pl->save_pl ($path);
1101 Coro::cede; 1412 cf::cede_to_tick;
1102} 1413}
1103 1414
1104sub new($) { 1415sub new($) {
1105 my ($login) = @_; 1416 my ($login) = @_;
1106 1417
1110 $self->{deny_save} = 1; 1421 $self->{deny_save} = 1;
1111 1422
1112 $cf::PLAYER{$login} = $self; 1423 $cf::PLAYER{$login} = $self;
1113 1424
1114 $self 1425 $self
1426}
1427
1428=item $player->send_msg ($channel, $msg, $color, [extra...])
1429
1430=cut
1431
1432sub send_msg {
1433 my $ns = shift->ns
1434 or return;
1435 $ns->send_msg (@_);
1115} 1436}
1116 1437
1117=item $pl->quit_character 1438=item $pl->quit_character
1118 1439
1119Nukes the player without looking back. If logged in, the connection will 1440Nukes the player without looking back. If logged in, the connection will
1174 or return []; 1495 or return [];
1175 1496
1176 my @logins; 1497 my @logins;
1177 1498
1178 for my $login (@$dirs) { 1499 for my $login (@$dirs) {
1500 my $path = path $login;
1501
1502 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1182 1508
1183 utf8::decode $login; 1509 utf8::decode $login;
1184 push @logins, $login; 1510 push @logins, $login;
1185 } 1511 }
1186 1512
1213 } 1539 }
1214 1540
1215 \@paths 1541 \@paths
1216} 1542}
1217 1543
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1545
1546Expand crossfire pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594
1218=item $player->ext_reply ($msgid, %msg) 1595=item $player->ext_reply ($msgid, @msg)
1219 1596
1220Sends an ext reply to the player. 1597Sends an ext reply to the player.
1221 1598
1222=cut 1599=cut
1223 1600
1224sub ext_reply($$%) { 1601sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1602 my ($self, $id, @msg) = @_;
1226 1603
1227 $msg{msgid} = $id; 1604 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1605}
1231 1606
1232=item $player->ext_event ($type, %msg) 1607=item $player->ext_msg ($type, @msg)
1233 1608
1234Sends an ext event to the client. 1609Sends an ext event to the client.
1235 1610
1236=cut 1611=cut
1237 1612
1238sub ext_event($$%) { 1613sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1614 my ($self, $type, @msg) = @_;
1240 1615
1241 $self->ns->ext_event ($type, %msg); 1616 $self->ns->ext_msg ($type, @msg);
1242} 1617}
1243 1618
1244=head3 cf::region 1619=head3 cf::region
1245 1620
1246=over 4 1621=over 4
1249 1624
1250package cf::region; 1625package cf::region;
1251 1626
1252=item cf::region::find_by_path $path 1627=item cf::region::find_by_path $path
1253 1628
1254Tries to decuce the probable region for a map knowing only its path. 1629Tries to decuce the likely region for a map knowing only its path.
1255 1630
1256=cut 1631=cut
1257 1632
1258sub find_by_path($) { 1633sub find_by_path($) {
1259 my ($path) = @_; 1634 my ($path) = @_;
1260 1635
1261 my ($match, $specificity); 1636 my ($match, $specificity);
1262 1637
1263 for my $region (list) { 1638 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1639 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1640 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1641 if $region->specificity > $specificity;
1267 } 1642 }
1268 } 1643 }
1269 1644
1389 $self->init; # pass $1 etc. 1764 $self->init; # pass $1 etc.
1390 return $self; 1765 return $self;
1391 } 1766 }
1392 } 1767 }
1393 1768
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1769 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1770 ()
1396} 1771}
1397 1772
1398sub init { 1773sub init {
1399 my ($self) = @_; 1774 my ($self) = @_;
1462 1837
1463sub load_header_from($) { 1838sub load_header_from($) {
1464 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1465 1840
1466 utf8::encode $path; 1841 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1843 or return;
1844
1845 $self->_load_header ($f)
1846 or return;
1847
1848 local $MAP_LOADING{$self->{path}} = $self;
1849 $f->resolve_delayed_derefs;
1472 1850
1473 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1474 1852
1475 1 1853 1
1476} 1854}
1530sub find { 1908sub find {
1531 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1532 1910
1533 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1534 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1536 1915
1537 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1539 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1540 or return; 1921 or return;
1541 1922
1542 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1543 1924
1545 or return; 1926 or return;
1546 1927
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1550 $map->reset; 1933 $map->reset;
1551 undef $guard;
1552 return find $path; 1934 return find $path;
1553 } 1935 }
1554 1936
1555 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1556 } 1938 }
1565 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1566 1948
1567 my $path = $self->{path}; 1949 my $path = $self->{path};
1568 1950
1569 { 1951 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1571 1953
1954 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 1956
1574 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1575 1958
1576 $self->alloc; 1959 $self->alloc;
1577 1960
1578 $self->pre_load; 1961 $self->pre_load;
1579 Coro::cede; 1962 cf::cede_to_tick;
1580 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1582 or return; 1967 or return;
1583 1968
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1586 1971
1587 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 1973 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 1976 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1592 } 1980 }
1593 } 1981 }
1594 1982
1595 Coro::cede; 1983 $f->resolve_delayed_derefs;
1984
1985 cf::cede_to_tick;
1596 # now do the right thing for maps 1986 # now do the right thing for maps
1597 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 1989 unless $self->difficulty;
1600 Coro::cede; 1990 cf::cede_to_tick;
1601 1991
1602 unless ($self->{deny_activate}) { 1992 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 1993 $self->decay_objects;
1604 $self->fix_auto_apply; 1994 $self->fix_auto_apply;
1605 $self->update_buttons; 1995 $self->update_buttons;
1606 Coro::cede; 1996 cf::cede_to_tick;
1607 $self->set_darkness_map; 1997 $self->set_darkness_map;
1608 Coro::cede; 1998 cf::cede_to_tick;
1609 $self->activate; 1999 $self->activate;
1610 } 2000 }
2001
2002 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME);
1611 2004
1612 $self->in_memory (cf::MAP_IN_MEMORY); 2005 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 2006 }
1614 2007
1615 $self->post_load; 2008 $self->post_load;
1626 2019
1627 $self 2020 $self
1628} 2021}
1629 2022
1630# find and load all maps in the 3x3 area around a map 2023# find and load all maps in the 3x3 area around a map
1631sub load_diag { 2024sub load_neighbours {
1632 my ($map) = @_; 2025 my ($map) = @_;
1633 2026
1634 my @diag; # diagonal neighbours 2027 my @neigh; # diagonal neighbours
1635 2028
1636 for (0 .. 3) { 2029 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 2030 my $neigh = $map->tile_path ($_)
1638 or next; 2031 or next;
1639 $neigh = find $neigh, $map 2032 $neigh = find $neigh, $map
1640 or next; 2033 or next;
1641 $neigh->load; 2034 $neigh->load;
1642 2035
2036 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2037 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2038 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 2039 }
1646 2040
1647 for (@diag) { 2041 for (grep defined $_->[0], @neigh) {
2042 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 2043 my $neigh = find $path, $origin
1649 or next; 2044 or next;
1650 $neigh->load; 2045 $neigh->load;
1651 } 2046 }
1652} 2047}
1653 2048
1658} 2053}
1659 2054
1660sub do_load_sync { 2055sub do_load_sync {
1661 my ($map) = @_; 2056 my ($map) = @_;
1662 2057
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main;
2060
1663 cf::sync_job { $map->load }; 2061 cf::sync_job { $map->load };
1664} 2062}
1665 2063
1666our %MAP_PREFETCH; 2064our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2065our $MAP_PREFETCHER = undef;
1668 2066
1669sub find_async { 2067sub find_async {
1670 my ($path, $origin) = @_; 2068 my ($path, $origin, $load) = @_;
1671 2069
1672 $path = normalise $path, $origin && $origin->{path}; 2070 $path = normalise $path, $origin && $origin->{path};
1673 2071
1674 if (my $map = $cf::MAP{$path}) { 2072 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2074 }
1677 2075
1678 undef $MAP_PREFETCH{$path}; 2076 $MAP_PREFETCH{$path} |= $load;
2077
1679 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1680 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2083 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2084 $map->load if $v;
2085 }
1685 2086
1686 delete $MAP_PREFETCH{$path}; 2087 delete $MAP_PREFETCH{$k};
1687 } 2088 }
1688 } 2089 }
1689 undef $MAP_PREFETCHER; 2090 undef $MAP_PREFETCHER;
1690 }; 2091 };
1691 $MAP_PREFETCHER->prio (6); 2092 $MAP_PREFETCHER->prio (6);
1694} 2095}
1695 2096
1696sub save { 2097sub save {
1697 my ($self) = @_; 2098 my ($self) = @_;
1698 2099
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2101
1701 $self->{last_save} = $cf::RUNTIME; 2102 $self->{last_save} = $cf::RUNTIME;
1702 2103
1703 return unless $self->dirty; 2104 return unless $self->dirty;
1704 2105
1710 return if $self->{deny_save}; 2111 return if $self->{deny_save};
1711 2112
1712 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
1713 2114
1714 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
1715 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
1716 }; 2118 };
1717 2119
1718 if ($uniq) { 2120 if ($uniq) {
1719 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1727 my ($self) = @_; 2129 my ($self) = @_;
1728 2130
1729 # save first because save cedes 2131 # save first because save cedes
1730 $self->save; 2132 $self->save;
1731 2133
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2135
1734 return if $self->players; 2136 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2138 return if $self->{deny_save};
1737 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
1738 $self->clear; 2144 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2145}
1741 2146
1742sub reset_at { 2147sub reset_at {
1743 my ($self) = @_; 2148 my ($self) = @_;
1744 2149
1776 if $uniq; 2181 if $uniq;
1777 } 2182 }
1778 2183
1779 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
1780 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2188 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2189
1785 $self->unlink_save; 2190 $self->unlink_save;
1786 $self->destroy; 2191 $self->destroy;
1787} 2192}
1788 2193
1789my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
1790 2195
1791sub nuke { 2196sub nuke {
1792 my ($self) = @_; 2197 my ($self) = @_;
1793 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
1794 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
1795 2203
1796 $self->unlink_save; 2204 $self->unlink_save;
1797 2205
1798 bless $self, "cf::map"; 2206 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2211
1804 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
1805 2214
1806 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
1807} 2216}
1808 2217
1809=item $maps = cf::map::tmp_maps 2218=item $maps = cf::map::tmp_maps
1885 2294
1886sub inv_recursive { 2295sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
1888} 2297}
1889 2298
2299=item $ref = $ob->ref
2300
2301creates and returns a persistent reference to an objetc that can be stored as a string.
2302
2303=item $ob = cf::object::deref ($refstring)
2304
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block.
2307
2308=cut
2309
2310sub deref {
2311 my ($ref) = @_;
2312
2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2314 my ($uuid, $name) = ($1, $2);
2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2316 or return;
2317 $pl->ob->uuid eq $uuid
2318 or return;
2319
2320 $pl->ob
2321 } else {
2322 warn "$ref: cannot resolve object reference\n";
2323 undef
2324 }
2325}
2326
1890package cf; 2327package cf;
1891 2328
1892=back 2329=back
1893 2330
1894=head3 cf::object::player 2331=head3 cf::object::player
1911 2348
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2349 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2350
1914 if ($self->{record_replies}) { 2351 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2352 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2353
1916 } else { 2354 } else {
2355 my $pl = $self->contr;
2356
2357 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2358 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360
2361 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2362 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2363 $self->message ($msg, $flags);
2364 }
1919 } 2365 }
2366}
2367
2368=item $object->send_msg ($channel, $msg, $color, [extra...])
2369
2370=cut
2371
2372sub cf::object::send_msg {
2373 my $pl = shift->contr
2374 or return;
2375 $pl->send_msg (@_);
1920} 2376}
1921 2377
1922=item $player_object->may ("access") 2378=item $player_object->may ("access")
1923 2379
1924Returns wether the given player is authorized to access resource "access" 2380Returns wether the given player is authorized to access resource "access"
2003 # use -1 or undef as default coordinates, not 0, 0 2459 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2460 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2461 if $x <=0 && $y <= 0;
2006 2462
2007 $map->load; 2463 $map->load;
2008 $map->load_diag; 2464 $map->load_neighbours;
2009 2465
2010 return unless $self->contr->active; 2466 return unless $self->contr->active;
2011 $self->activate_recursive; 2467 $self->activate_recursive;
2012 2468
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2470 $self->enter_map ($map, $x, $y);
2015} 2471}
2016 2472
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2473=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2474
2019Moves the player to the given map-path and coordinates by first freezing 2475Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2476her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2477that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2478the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process.
2023 2480
2024=cut 2481=cut
2025 2482
2026our $GOTOGEN; 2483our $GOTOGEN;
2027 2484
2028sub cf::object::player::goto { 2485sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2486 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2487
2031 # do generation counting so two concurrent goto's will be executed in-order 2488 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2490
2034 $self->enter_link; 2491 $self->enter_link;
2035 2492
2036 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2037 my $map = eval { 2515 my $map = eval {
2038 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2039 2517
2040 if ($map) { 2518 if ($map) {
2041 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2043 } else { 2521 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2045 } 2523 }
2046 2524
2047 $map 2525 $map
2048 }; 2526 };
2049 2527
2054 2532
2055 if ($gen == $self->{_goto_generation}) { 2533 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2534 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2535 $self->leave_link ($map, $x, $y);
2058 } 2536 }
2537
2538 $done->() if $done;
2059 })->prio (1); 2539 })->prio (1);
2060} 2540}
2061 2541
2062=item $player_object->enter_exit ($exit_object) 2542=item $player_object->enter_exit ($exit_object)
2063 2543
2132 my $hp = $exit->stats->hp; 2612 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2613 my $sp = $exit->stats->sp;
2134 2614
2135 $self->enter_link; 2615 $self->enter_link;
2136 2616
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2137 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2138 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2625 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2141 2627
2142 1; 2628 1;
2168 2654
2169 utf8::encode $text; 2655 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2656 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2657}
2172 2658
2659=item $client->send_msg ($channel, $msg, $color, [extra...])
2660
2661Send a drawinfo or msg packet to the client, formatting the msg for the
2662client if neccessary. C<$type> should be a string identifying the type of
2663the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet.
2665
2666=cut
2667
2668our %CHANNEL = (
2669 "c/identify" => {
2670 id => "infobox",
2671 title => "Identify",
2672 reply => undef,
2673 tooltip => "Items recently identified",
2674 },
2675 "c/examine" => {
2676 id => "infobox",
2677 title => "Examine",
2678 reply => undef,
2679 tooltip => "Signs and other items you examined",
2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2687);
2688
2689sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_;
2691
2692 $msg = $self->pl->expand_cfpod ($msg);
2693
2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695
2696 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2705 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711 }
2712
2713 $channel = $channel->{id};
2714 }
2715
2716 return unless @extra || length $msg;
2717
2718 if ($self->can_msg) {
2719 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF;
2722
2723 $self->send_packet ("msg " . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2725 } else {
2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736
2737 $color &= cf::NDI_COLOR_MASK;
2738
2739 utf8::encode $msg;
2740
2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2744 } else {
2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2746 $self->send_packet ("drawinfo $color $msg")
2747 }
2748 }
2749 }
2750}
2751
2173=item $client->ext_event ($type, %msg) 2752=item $client->ext_msg ($type, @msg)
2174 2753
2175Sends an exti event to the client. 2754Sends an ext event to the client.
2176 2755
2177=cut 2756=cut
2178 2757
2179sub cf::client::ext_event($$%) { 2758sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2759 my ($self, $type, @msg) = @_;
2181 2760
2761 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2764 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 }
2767}
2768
2769=item $client->ext_reply ($msgid, @msg)
2770
2771Sends an ext reply to the client.
2772
2773=cut
2774
2775sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_;
2777
2778 if ($self->extcmd == 2) {
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 }
2184} 2785}
2185 2786
2186=item $success = $client->query ($flags, "text", \&cb) 2787=item $success = $client->query ($flags, "text", \&cb)
2187 2788
2188Queues a query to the client, calling the given callback with 2789Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2790the 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>. 2791C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2792
2192Queries can fail, so check the return code. Or don't, as queries will become 2793Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2794become reliable at some point in the future.
2194 2795
2195=cut 2796=cut
2196 2797
2197sub cf::client::query { 2798sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2799 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2807 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2808 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2809
2209 $self->send_packet ($self->{query_queue}[0][0]) 2810 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2811 if @{ $self->{query_queue} } == 1;
2812
2813 1
2211} 2814}
2212 2815
2213cf::client->attach ( 2816cf::client->attach (
2817 on_connect => sub {
2818 my ($ns) = @_;
2819
2820 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2821 },
2214 on_reply => sub { 2822 on_reply => sub {
2215 my ($ns, $msg) = @_; 2823 my ($ns, $msg) = @_;
2216 2824
2217 # this weird shuffling is so that direct followup queries 2825 # this weird shuffling is so that direct followup queries
2218 # get handled first 2826 # get handled first
2230 } else { 2838 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2839 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2840 }
2233 } 2841 }
2234 }, 2842 },
2843 on_exticmd => sub {
2844 my ($ns, $buf) = @_;
2845
2846 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2847
2848 if (ref $msg) {
2849 my ($type, $reply, @payload) =
2850 "ARRAY" eq ref $msg
2851 ? @$msg
2852 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2853
2854 my @reply;
2855
2856 if (my $cb = $EXTICMD{$type}) {
2857 @reply = $cb->($ns, @payload);
2858 }
2859
2860 $ns->ext_reply ($reply, @reply)
2861 if $reply;
2862
2863 } else {
2864 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2865 }
2866
2867 cf::override;
2868 },
2235); 2869);
2236 2870
2237=item $client->async (\&cb) 2871=item $client->async (\&cb)
2238 2872
2239Create a new coroutine, running the specified callback. The coroutine will 2873Create a new coroutine, running the specified callback. The coroutine will
2280our $safe = new Safe "safe"; 2914our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2915our $safe_hole = new Safe::Hole;
2282 2916
2283$SIG{FPE} = 'IGNORE'; 2917$SIG{FPE} = 'IGNORE';
2284 2918
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2919$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math
2921 grepstart grepwhile mapstart mapwhile
2922 sort time
2923));
2286 2924
2287# here we export the classes and methods available to script code 2925# here we export the classes and methods available to script code
2288 2926
2289=pod 2927=pod
2290 2928
2291The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2292 2930
2293 cf::object contr pay_amount pay_player map 2931 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr
2934
2294 cf::object::player player 2935 cf::object::player
2295 cf::player peaceful 2936 player
2296 cf::map trigger 2937
2938 cf::player
2939 peaceful
2940
2941 cf::map
2942 trigger
2297 2943
2298=cut 2944=cut
2299 2945
2300for ( 2946for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race
2949 decrease_ob_nr destroy)],
2302 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2305) { 2953) {
2306 no strict 'refs'; 2954 no strict 'refs';
2377=back 3025=back
2378 3026
2379=cut 3027=cut
2380 3028
2381############################################################################# 3029#############################################################################
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 3030# the server's init and main functions
2555 3031
2556sub load_facedata($) { 3032sub load_facedata($) {
2557 my ($path) = @_; 3033 my ($path) = @_;
3034
3035 # HACK to clear player env face cache, we need some signal framework
3036 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = ();
3038
3039 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 3040
2559 warn "loading facedata from $path\n"; 3041 warn "loading facedata from $path\n";
2560 3042
2561 my $facedata; 3043 my $facedata;
2562 0 < aio_load $path, $facedata 3044 0 < aio_load $path, $facedata
2565 $facedata = Coro::Storable::thaw $facedata; 3047 $facedata = Coro::Storable::thaw $facedata;
2566 3048
2567 $facedata->{version} == 2 3049 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 3050 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 3051
3052 # patch in the exptable
3053 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC,
3055 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3056 };
3057 cf::cede_to_tick;
3058
2570 { 3059 {
2571 my $faces = $facedata->{faceinfo}; 3060 my $faces = $facedata->{faceinfo};
2572 3061
2573 while (my ($face, $info) = each %$faces) { 3062 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3063 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3064 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 3068
3069 cf::cede_to_tick;
2579 } 3070 }
2580 3071
2581 while (my ($face, $info) = each %$faces) { 3072 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 3073 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 3074 my $idx = cf::face::find $face
2584 or next; 3075 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 3076 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 3079 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3080 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3081 }
2590 Coro::cede; 3082
3083 cf::cede_to_tick;
2591 } 3084 }
2592 } 3085 }
2593 3086
2594 { 3087 {
2595 my $anims = $facedata->{animinfo}; 3088 my $anims = $facedata->{animinfo};
2596 3089
2597 while (my ($anim, $info) = each %$anims) { 3090 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3091 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3092 cf::cede_to_tick;
2600 } 3093 }
2601 3094
2602 cf::anim::invalidate_all; # d'oh 3095 cf::anim::invalidate_all; # d'oh
2603 } 3096 }
2604 3097
3098 {
3099 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource};
3102
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
3108
3109 if ($info->{type} & 1) {
3110 # prepend meta info
3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
3118 } else {
3119 $data = $info->{data};
3120 }
3121
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick;
3126 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 }
3146
2605 1 3147 1
2606} 3148}
2607 3149
3150register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_;
3152
3153 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v);
3155 }
3156};
3157
2608sub reload_regions { 3158sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = ();
3162
2609 load_resource_file "$MAPDIR/regions" 3163 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3164 or die "unable to load regions file\n";
3165
3166 for (cf::region::list) {
3167 $_->{match} = qr/$_->{match}/
3168 if exists $_->{match};
3169 }
2611} 3170}
2612 3171
2613sub reload_facedata { 3172sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3173 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3174 or die "unable to load facedata\n";
2616} 3175}
2617 3176
2618sub reload_archetypes { 3177sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 3183 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3184 or die "unable to load archetypes\n";
2621} 3185}
2622 3186
2623sub reload_treasures { 3187sub reload_treasures {
2639 3203
2640sub init { 3204sub init {
2641 reload_resources; 3205 reload_resources;
2642} 3206}
2643 3207
2644sub cfg_load { 3208sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3209 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3210 or return;
2647 3211
2648 local $/; 3212 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3213 *CFG = YAML::Syck::Load <$fh>;
2665sub main { 3229sub main {
2666 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
2667 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
2668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2669 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
2670 Event::one_event; 3235 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
2672 }; 3237 };
2673 3238
2674 cfg_load; 3239 reload_config;
2675 db_init; 3240 db_init;
2676 load_extensions; 3241 load_extensions;
2677 3242
2678 $TICK_WATCHER->start; 3243 $TICK_WATCHER->start;
2679 Event::loop; 3244 Event::loop;
2695 }, 3260 },
2696 ); 3261 );
2697 } 3262 }
2698} 3263}
2699 3264
3265sub write_runtime {
3266 my $runtime = "$LOCALDIR/runtime";
3267
3268 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time.
3270
3271 IO::AIO::aio_utime $runtime, undef, undef;
3272
3273 my $guard = cf::lock_acquire "write_runtime";
3274
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3276 or return;
3277
3278 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server.
3281
3282 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3283 and return;
3284
3285 # always fsync - this file is important
3286 aio_fsync $fh
3287 and return;
3288
3289 # touch it again to show we are up-to-date
3290 aio_utime $fh, undef, undef;
3291
3292 close $fh
3293 or return;
3294
3295 aio_rename "$runtime~", $runtime
3296 and return;
3297
3298 warn "runtime file written.\n";
3299
3300 1
3301}
3302
2700sub emergency_save() { 3303sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3304 my $freeze_guard = cf::freeze_mainloop;
2702 3305
2703 warn "enter emergency perl save\n"; 3306 warn "enter emergency perl save\n";
2704 3307
2708 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3317 $pl->save;
2714 } 3318 }
2715 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
2716 3320
2717 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
2779 %EXT_CORO = (); 3383 %EXT_CORO = ();
2780 3384
2781 warn "removing commands"; 3385 warn "removing commands";
2782 %COMMAND = (); 3386 %COMMAND = ();
2783 3387
2784 warn "removing ext commands"; 3388 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3389 %EXTCMD = ();
3390 %EXTICMD = ();
2786 3391
2787 warn "unloading/nuking all extensions"; 3392 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3393 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3394 warn "... unloading $pkg";
2790 3395
2833 warn "reloading cf.pm"; 3438 warn "reloading cf.pm";
2834 require cf; 3439 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3441
2837 warn "loading config and database again"; 3442 warn "loading config and database again";
2838 cf::cfg_load; 3443 cf::reload_config;
2839 3444
2840 warn "loading extensions"; 3445 warn "loading extensions";
2841 cf::load_extensions; 3446 cf::load_extensions;
2842 3447
2843 warn "reattaching attachments to objects/players"; 3448 warn "reattaching attachments to objects/players";
2879register_command "reload" => sub { 3484register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
2881 3486
2882 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3491 reload_perl;
3492 };
2885 } 3493 }
2886}; 3494};
2887 3495
2888unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
2889 3497
2908 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3518 $signal->wait;
2911} 3519}
2912 3520
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
2916 reentrant => 0, 3522 reentrant => 0,
2917 parked => 1, 3523 parked => 1,
2918 prio => 0, 3524 prio => 0,
2919 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
2927 3533
2928 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
2929 3535
2930 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
2931 3537
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; 3538 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
2957 3540
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
2961 write_runtime 3545 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
2963 }; 3547 };
2964 } 3548 }
2965 3549
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3551 $sig->send;
2971 } 3552 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3554 $sig->send;
2983 3564
2984 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3567
2987 _post_tick; 3568 _post_tick;
2988
2989
2990 }, 3569 },
2991); 3570);
2992 3571
2993{ 3572{
3573 BDB::min_parallel 8;
2994 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
2995 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
2996 reentrant => 0, 3576 reentrant => 0,
2997 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
2998 poll => 'r', 3578 poll => 'r',
2999 prio => 0, 3579 prio => 0,
3000 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3002 ); 3582 );
3003 BDB::min_parallel 8;
3004 3583
3005 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3006 my $status; 3585 my $status;
3007 my $current = $Coro::current; 3586 my $current = $Coro::current;
3008 ( 3587 (
3017 ) 3596 )
3018 }; 3597 };
3019 3598
3020 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3605
3023 cf::sync_job { 3606 cf::sync_job {
3024 eval { 3607 eval {
3025 BDB::db_env_open 3608 BDB::db_env_open
3026 $DB_ENV, 3609 $DB_ENV,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3613 0666;
3031 3614
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 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 }; 3616 };
3037 3617
3038 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3619 };
3040 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3041} 3652}
3042 3653
3043{ 3654{
3044 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3045 3656
3048 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3049 reentrant => 0, 3660 reentrant => 0,
3050 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3052 poll => 'r', 3663 poll => 'r',
3053 prio => 6, 3664 prio => 0,
3054 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3055 ); 3666 );
3056} 3667}
3057 3668
3058my $_log_backtrace; 3669my $_log_backtrace;
3064 3675
3065 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3678 ++$_log_backtrace;
3068 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3069 my @bt = fork_call { 3682 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines