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.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
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.32 ();
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.
346 435
347 my $busy = 1; 436 my $busy = 1;
348 my @res; 437 my @res;
349 438
350 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 441 @res = eval { $job->() };
352 warn $@ if $@; 442 warn $@ if $@;
353 undef $busy; 443 undef $busy;
354 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
355 445
390 $EXT_CORO{$coro+0} = $coro; 480 $EXT_CORO{$coro+0} = $coro;
391 481
392 $coro 482 $coro
393} 483}
394 484
395sub write_runtime { 485=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 486
398 # first touch the runtime file to show we are still running: 487Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 488process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling.
400 491
401 IO::AIO::aio_utime $runtime, undef, undef; 492=cut
402 493
403 my $guard = cf::lock_acquire "write_runtime"; 494sub fork_call(&@) {
495 my ($cb, @args) = @_;
404 496
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 497 # we seemingly have to make a local copy of the whole thing,
406 or return; 498 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious)
407 500
408 my $value = $cf::RUNTIME + 90 + 10; 501 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 502 reset_signals;
410 # 60 allows for the watchdog to kill the server. 503 &$cb
504 }, @args;
411 505
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 506 wantarray ? @res : $res[-1]
413 and return; 507}
414 508
415 # always fsync - this file is important 509=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 510
419 # touch it again to show we are up-to-date 511Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 512
422 close $fh 513=item cf::db_put $family => $key => $value
423 or return;
424 514
425 aio_rename "$runtime~", $runtime 515Stores the given C<$value> in the family. It can currently store binary
426 and return; 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 517
428 warn "runtime file written.\n"; 518=item $db = cf::db_table "name"
429 519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
541
542our $DB;
543
544sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db";
547 };
548}
549
550sub db_get($$) {
551 my $key = "$_[0]/$_[1]";
552
553 cf::sync_job {
554 BDB::db_get $DB, undef, $key, my $data;
555
556 $! ? ()
557 : $data
430 1 558 }
559}
560
561sub db_put($$$) {
562 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
564}
565
566=item cf::cache $id => [$paths...], $processversion => $process
567
568Generic caching function that returns the value of the resource $id,
569caching and regenerating as required.
570
571This function can block.
572
573=cut
574
575sub cache {
576 my ($id, $src, $processversion, $process) = @_;
577
578 my $meta =
579 join "\x00",
580 $processversion,
581 map {
582 aio_stat $_
583 and Carp::croak "$_: $!";
584
585 ($_, (stat _)[7,9])
586 } @$src;
587
588 my $dbmeta = db_get cache => "$id/meta";
589 if ($dbmeta ne $meta) {
590 # changed, we may need to process
591
592 my @data;
593 my $md5;
594
595 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_]
597 or Carp::croak "$src->[$_]: $!";
598 }
599
600 # if processing is expensive, check
601 # checksum first
602 if (1) {
603 $md5 =
604 join "\x00",
605 $processversion,
606 map {
607 cf::cede_to_tick;
608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
609 } 0.. $#$src;
610
611
612 my $dbmd5 = db_get cache => "$id/md5";
613 if ($dbmd5 eq $md5) {
614 db_put cache => "$id/meta", $meta;
615
616 return db_get cache => "$id/data";
617 }
618 }
619
620 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time;
623
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
625
626 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta;
629
630 return $data;
631 }
632
633 db_get cache => "$id/data"
431} 634}
432 635
433=item cf::datalog type => key => value, ... 636=item cf::datalog type => key => value, ...
434 637
435Log a datalog packet of the given type with the given key-value pairs. 638Log 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") 656attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 657to it. All such attachable objects support the following methods.
455 658
456In the following description, CLASS can be any of C<global>, C<object> 659In 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 660C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 661Crossfire TRT).
459 662
460=over 4 663=over 4
461 664
462=item $attachable->attach ($attachment, key => $value...) 665=item $attachable->attach ($attachment, key => $value...)
463 666
665 _attach $registry, $klass, @attach; 868 _attach $registry, $klass, @attach;
666 } 869 }
667 870
668 $obj->{$name} = \%arg; 871 $obj->{$name} = \%arg;
669 } else { 872 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 873 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 874 }
672 875
673 $obj->{_attachment}{$name} = undef; 876 $obj->{_attachment}{$name} = undef;
674} 877}
675 878
715 "; 918 ";
716 die if $@; 919 die if $@;
717} 920}
718 921
719our $override; 922our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 923our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 924
722sub override { 925sub override {
723 $override = 1; 926 $override = 1;
724 @invoke_results = (); 927 @INVOKE_RESULTS = (@_);
725} 928}
726 929
727sub do_invoke { 930sub do_invoke {
728 my $event = shift; 931 my $event = shift;
729 my $callbacks = shift; 932 my $callbacks = shift;
730 933
731 @invoke_results = (); 934 @INVOKE_RESULTS = ();
732 935
733 local $override; 936 local $override;
734 937
735 for (@$callbacks) { 938 for (@$callbacks) {
736 eval { &{$_->[1]} }; 939 eval { &{$_->[1]} };
753 956
754Generate an object-specific event with the given arguments. 957Generate an object-specific event with the given arguments.
755 958
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 959This 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 960removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 961results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 962
760=back 963=back
761 964
762=cut 965=cut
763 966
764############################################################################# 967#############################################################################
765# object support 968# object support
969#
970
971sub _can_merge {
972 my ($ob1, $ob2) = @_;
973
974 local $Storable::canonical = 1;
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977
978 $fob1 eq $fob2
979}
766 980
767sub reattach { 981sub reattach {
768 # basically do the same as instantiate, without calling instantiate 982 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 983 my ($obj) = @_;
770 984
817sub object_freezer_save { 1031sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
819 1033
820 sync_job { 1034 sync_job {
821 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
824 1039
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
847 } 1062 }
848 } else { 1063 } else {
849 aio_unlink $filename; 1064 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
851 } 1066 }
852 } 1067 };
853} 1068}
854 1069
855sub object_freezer_as_string { 1070sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
857 1072
869 or return; 1084 or return;
870 1085
871 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
873 or return; 1088 or return;
1089
874 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
875 } 1091 }
876 1092
1093 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
879 return ($data, $av); 1097 ($data, $av)
880} 1098}
1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
881 1105
882############################################################################# 1106#############################################################################
883# command handling &c 1107# command handling &c
884 1108
885=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1123}
900 1124
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1126
903Register a callbackf ro execution when the client sends an extcmd packet. 1127Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is
1130the logged-in player. Ext commands can only be processed after a player
1131has logged in successfully.
904 1132
905If the callback returns something, it is sent back as if reply was being 1133If the callback returns something, it is sent back as if reply was being
906called. 1134called.
907 1135
1136=item cf::register_exticmd $name => \&callback($ns,$packet);
1137
1138Register a callback for execution when the client sends an (asynchronous)
1139exticmd packet. Exti commands are processed by the server as soon as they
1140are received, i.e. out of order w.r.t. other commands. The first argument
1141is a client socket. Exti commands can be received anytime, even before
1142log-in.
1143
1144If the callback returns something, it is sent back as if reply was being
1145called.
1146
908=cut 1147=cut
909 1148
910sub register_extcmd { 1149sub register_extcmd {
911 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
912 1151
913 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
914} 1159}
915 1160
916cf::player->attach ( 1161cf::player->attach (
917 on_command => sub { 1162 on_command => sub {
918 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
927 cf::override; 1172 cf::override;
928 }, 1173 },
929 on_extcmd => sub { 1174 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
931 1176
932 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1178
934 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
940 } else { 1194 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1196 }
943 1197
944 cf::override; 1198 cf::override;
945 }, 1199 },
946); 1200);
947 1201
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1202sub load_extensions {
1203 cf::sync_job {
1204 my %todo;
1205
983 for my $ext (<$LIBDIR/*.ext>) { 1206 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1207 next unless -r $path;
985 eval { 1208
986 load_extension $ext; 1209 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1210 my $base = $1;
1211 my $pkg = $1;
1212 $pkg =~ s/[^[:word:]]/_/g;
1213 $pkg = "ext::$pkg";
1214
1215 open my $fh, "<:utf8", $path
1216 or die "$path: $!";
1217
1218 my $source = do { local $/; <$fh> };
1219
1220 my %ext = (
1221 path => $path,
1222 base => $base,
1223 pkg => $pkg,
1224 );
1225
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228
1229 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n"
1232 . $source
1233 . "\n};\n1";
1234
1235 $todo{$base} = \%ext;
1236 }
1237
1238 my %done;
1239 while (%todo) {
1240 my $progress;
1241
1242 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip
1245 unless exists $done{$_};
1246 }
1247
1248 warn "... loading '$k' into '$v->{pkg}'\n";
1249
1250 unless (eval $v->{source}) {
1251 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n";
1253
1254 if (exists $v->{meta}{mandatory}) {
1255 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n";
1257 exit 1;
1258 }
1259
1260 warn $msg;
1261 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
987 1 1266 }
988 } or warn "$ext not loaded: $@"; 1267
1268 skip:
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1270 unless $progress;
1271 }
989 } 1272 };
990} 1273}
991 1274
992############################################################################# 1275#############################################################################
993 1276
1277=back
1278
994=head2 CORE EXTENSIONS 1279=head2 CORE EXTENSIONS
995 1280
996Functions and methods that extend core crossfire objects. 1281Functions and methods that extend core crossfire objects.
997 1282
998=cut 1283=cut
1002use Coro::AIO; 1287use Coro::AIO;
1003 1288
1004=head3 cf::player 1289=head3 cf::player
1005 1290
1006=over 4 1291=over 4
1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1007 1306
1008=item cf::player::find $login 1307=item cf::player::find $login
1009 1308
1010Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1011 1310
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1350
1052 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1055 } 1359 }
1056 } 1360 }
1057} 1361}
1058 1362
1068 1372
1069 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1071 1375
1072 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1073 Coro::cede; 1377 cf::cede_to_tick;
1074} 1378}
1075 1379
1076sub new($) { 1380sub new($) {
1077 my ($login) = @_; 1381 my ($login) = @_;
1078 1382
1082 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1083 1387
1084 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1085 1389
1086 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1087} 1401}
1088 1402
1089=item $pl->quit_character 1403=item $pl->quit_character
1090 1404
1091Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1460 or return [];
1147 1461
1148 my @logins; 1462 my @logins;
1149 1463
1150 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1154 1473
1155 utf8::decode $login; 1474 utf8::decode $login;
1156 push @logins, $login; 1475 push @logins, $login;
1157 } 1476 }
1158 1477
1185 } 1504 }
1186 1505
1187 \@paths 1506 \@paths
1188} 1507}
1189 1508
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1510
1511Expand crossfire pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559
1190=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1191 1561
1192Sends an ext reply to the player. 1562Sends an ext reply to the player.
1193 1563
1194=cut 1564=cut
1195 1565
1196sub ext_reply($$%) { 1566sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1198 1568
1199 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1570}
1203 1571
1204=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1205 1573
1206Sends an ext event to the client. 1574Sends an ext event to the client.
1207 1575
1208=cut 1576=cut
1209 1577
1210sub ext_event($$%) { 1578sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1212 1580
1213 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1214} 1582}
1215 1583
1216=head3 cf::region 1584=head3 cf::region
1217 1585
1218=over 4 1586=over 4
1221 1589
1222package cf::region; 1590package cf::region;
1223 1591
1224=item cf::region::find_by_path $path 1592=item cf::region::find_by_path $path
1225 1593
1226Tries to decuce the probable region for a map knowing only its path. 1594Tries to decuce the likely region for a map knowing only its path.
1227 1595
1228=cut 1596=cut
1229 1597
1230sub find_by_path($) { 1598sub find_by_path($) {
1231 my ($path) = @_; 1599 my ($path) = @_;
1232 1600
1233 my ($match, $specificity); 1601 my ($match, $specificity);
1234 1602
1235 for my $region (list) { 1603 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1604 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1605 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1606 if $region->specificity > $specificity;
1239 } 1607 }
1240 } 1608 }
1241 1609
1305 my ($self, $merge) = @_; 1673 my ($self, $merge) = @_;
1306 1674
1307 # we have to keep some variables in memory intact 1675 # we have to keep some variables in memory intact
1308 local $self->{path}; 1676 local $self->{path};
1309 local $self->{load_path}; 1677 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1678
1313 $self->SUPER::thawer_merge ($merge); 1679 $self->SUPER::thawer_merge ($merge);
1314} 1680}
1315 1681
1316sub normalise { 1682sub normalise {
1363 $self->init; # pass $1 etc. 1729 $self->init; # pass $1 etc.
1364 return $self; 1730 return $self;
1365 } 1731 }
1366 } 1732 }
1367 1733
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1734 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1735 ()
1370} 1736}
1371 1737
1372sub init { 1738sub init {
1373 my ($self) = @_; 1739 my ($self) = @_;
1416 1782
1417 $_->change_map_light ($change) 1783 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1784 for grep $_->outdoor, values %cf::MAP;
1419} 1785}
1420 1786
1787sub decay_objects {
1788 my ($self) = @_;
1789
1790 return if $self->{deny_reset};
1791
1792 $self->do_decay_objects;
1793}
1794
1421sub unlink_save { 1795sub unlink_save {
1422 my ($self) = @_; 1796 my ($self) = @_;
1423 1797
1424 utf8::encode (my $save = $self->save_path); 1798 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1799 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1428 1802
1429sub load_header_from($) { 1803sub load_header_from($) {
1430 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1431 1805
1432 utf8::encode $path; 1806 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1438 1815
1439 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1440 1817
1441 1 1818 1
1442} 1819}
1481 $self->load_header_orig 1858 $self->load_header_orig
1482 or return; 1859 or return;
1483 $self->prepare_orig; 1860 $self->prepare_orig;
1484 } 1861 }
1485 1862
1863 $self->{deny_reset} = 1
1864 if $self->no_reset;
1865
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1866 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1867 unless $self->default_region;
1488 1868
1489 1 1869 1
1490} 1870}
1493sub find { 1873sub find {
1494 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1495 1875
1496 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1497 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1499 1880
1500 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1502 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1503 or return; 1886 or return;
1504 1887
1505 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1506 1889
1507 $map->load_header 1890 $map->load_header
1508 or return; 1891 or return;
1509 1892
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1513 $map->reset; 1898 $map->reset;
1514 undef $guard;
1515 return find $path; 1899 return find $path;
1516 } 1900 }
1517 1901
1518 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1519 } 1903 }
1528 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1529 1913
1530 my $path = $self->{path}; 1914 my $path = $self->{path};
1531 1915
1532 { 1916 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1534 1918
1919 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 1921
1537 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1538 1923
1539 $self->alloc; 1924 $self->alloc;
1540 1925
1541 $self->pre_load; 1926 $self->pre_load;
1542 Coro::cede; 1927 cf::cede_to_tick;
1543 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1545 or return; 1932 or return;
1546 1933
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1549 1936
1550 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 1938 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 1941 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1555 } 1945 }
1556 } 1946 }
1557 1947
1558 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1559 # now do the right thing for maps 1951 # now do the right thing for maps
1560 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 1954 unless $self->difficulty;
1563 Coro::cede; 1955 cf::cede_to_tick;
1564 1956
1565 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 1958 $self->decay_objects;
1567 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1568 $self->update_buttons; 1960 $self->update_buttons;
1569 Coro::cede; 1961 cf::cede_to_tick;
1570 $self->set_darkness_map; 1962 $self->set_darkness_map;
1571 Coro::cede; 1963 cf::cede_to_tick;
1572 $self->activate; 1964 $self->activate;
1573 } 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1574 1969
1575 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 1971 }
1577 1972
1578 $self->post_load; 1973 $self->post_load;
1582 my ($self, $ob) = @_; 1977 my ($self, $ob) = @_;
1583 1978
1584 return find "~" . $ob->name . "/" . $self->{path} 1979 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 1980 if $self->per_player;
1586 1981
1982# return find "?party/" . $ob->name . "/" . $self->{path}
1983# if $self->per_party;
1984
1587 $self 1985 $self
1588} 1986}
1589 1987
1590# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1591sub load_diag { 1989sub load_neighbours {
1592 my ($map) = @_; 1990 my ($map) = @_;
1593 1991
1594 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1595 1993
1596 for (0 .. 3) { 1994 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1598 or next; 1996 or next;
1599 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1600 or next; 1998 or next;
1601 $neigh->load; 1999 $neigh->load;
1602 2000
2001 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2004 }
1606 2005
1607 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1609 or next; 2009 or next;
1610 $neigh->load; 2010 $neigh->load;
1611 } 2011 }
1612} 2012}
1613 2013
1618} 2018}
1619 2019
1620sub do_load_sync { 2020sub do_load_sync {
1621 my ($map) = @_; 2021 my ($map) = @_;
1622 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1623 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1624} 2027}
1625 2028
1626our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1628 2031
1629sub find_async { 2032sub find_async {
1630 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1631 2034
1632 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1633 2036
1634 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2039 }
1637 2040
1638 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1639 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1640 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2048 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2049 $map->load if $v;
2050 }
1645 2051
1646 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1647 } 2053 }
1648 } 2054 }
1649 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1650 }; 2056 };
1651 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1654} 2060}
1655 2061
1656sub save { 2062sub save {
1657 my ($self) = @_; 2063 my ($self) = @_;
1658 2064
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2066
1661 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1662 2068
1663 return unless $self->dirty; 2069 return unless $self->dirty;
1664 2070
1670 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1671 2077
1672 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1673 2079
1674 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1676 }; 2083 };
1677 2084
1678 if ($uniq) { 2085 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1687 my ($self) = @_; 2094 my ($self) = @_;
1688 2095
1689 # save first because save cedes 2096 # save first because save cedes
1690 $self->save; 2097 $self->save;
1691 2098
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2100
1694 return if $self->players; 2101 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1697 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2109 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2110}
1701 2111
1702sub reset_at { 2112sub reset_at {
1703 my ($self) = @_; 2113 my ($self) = @_;
1704 2114
1705 # TODO: safety, remove and allow resettable per-player maps 2115 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2116 return 1e99 if $self->{deny_reset};
1708 2117
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2120
1722 my ($self) = @_; 2131 my ($self) = @_;
1723 2132
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2134
1726 return if $self->players; 2135 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2136
1729 warn "resetting map ", $self->path; 2137 warn "resetting map ", $self->path;
1730 2138
1731 $self->in_memory (cf::MAP_SWAPPED); 2139 $self->in_memory (cf::MAP_SWAPPED);
1732 2140
1738 if $uniq; 2146 if $uniq;
1739 } 2147 }
1740 2148
1741 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
1742 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2153 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2154
1747 $self->unlink_save; 2155 $self->unlink_save;
1748 $self->destroy; 2156 $self->destroy;
1749} 2157}
1750 2158
1751my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
1752 2160
1753sub nuke { 2161sub nuke {
1754 my ($self) = @_; 2162 my ($self) = @_;
1755 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
1756 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
1757 2168
1758 $self->unlink_save; 2169 $self->unlink_save;
1759 2170
1760 bless $self, "cf::map"; 2171 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2176
1766 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
1767 2179
1768 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2181}
2182
2183=item $maps = cf::map::tmp_maps
2184
2185Returns an arrayref with all map paths of currently instantiated and saved
2186maps. May block.
2187
2188=cut
2189
2190sub tmp_maps() {
2191 [
2192 map {
2193 utf8::decode $_;
2194 /\.map$/
2195 ? normalise $_
2196 : ()
2197 } @{ aio_readdir $TMPDIR or [] }
2198 ]
2199}
2200
2201=item $maps = cf::map::random_maps
2202
2203Returns an arrayref with all map paths of currently instantiated and saved
2204random maps. May block.
2205
2206=cut
2207
2208sub random_maps() {
2209 [
2210 map {
2211 utf8::decode $_;
2212 /\.map$/
2213 ? normalise "?random/$_"
2214 : ()
2215 } @{ aio_readdir $RANDOMDIR or [] }
2216 ]
1769} 2217}
1770 2218
1771=item cf::map::unique_maps 2219=item cf::map::unique_maps
1772 2220
1773Returns an arrayref of paths of all shared maps that have 2221Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2222instantiated unique items. May block.
1775 2223
1776=cut 2224=cut
1777 2225
1778sub unique_maps() { 2226sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2227 [
1780 or return; 2228 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2229 utf8::decode $_;
1786 next if /\.pst$/; 2230 /\.map$/
1787 next unless /^$PATH_SEP/o; 2231 ? normalise $_
1788 2232 : ()
1789 push @paths, cf::map::normalise $_; 2233 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2234 ]
1791
1792 \@paths
1793} 2235}
1794 2236
1795package cf; 2237package cf;
1796 2238
1797=back 2239=back
1815 map { $_, inv_recursive_ $_->inv } @_ 2257 map { $_, inv_recursive_ $_->inv } @_
1816} 2258}
1817 2259
1818sub inv_recursive { 2260sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2262}
2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2279 my ($uuid, $name) = ($1, $2);
2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2281 or return;
2282 $pl->ob->uuid eq $uuid
2283 or return;
2284
2285 $pl->ob
2286 } else {
2287 warn "$ref: cannot resolve object reference\n";
2288 undef
2289 }
1820} 2290}
1821 2291
1822package cf; 2292package cf;
1823 2293
1824=back 2294=back
1843 2313
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2314 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2315
1846 if ($self->{record_replies}) { 2316 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2317 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2318
1848 } else { 2319 } else {
2320 my $pl = $self->contr;
2321
2322 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2323 my $dialog = $pl->{npc_dialog};
2324 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2325
2326 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2327 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2328 $self->message ($msg, $flags);
2329 }
1851 } 2330 }
2331}
2332
2333=item $object->send_msg ($channel, $msg, $color, [extra...])
2334
2335=cut
2336
2337sub cf::object::send_msg {
2338 my $pl = shift->contr
2339 or return;
2340 $pl->send_msg (@_);
1852} 2341}
1853 2342
1854=item $player_object->may ("access") 2343=item $player_object->may ("access")
1855 2344
1856Returns wether the given player is authorized to access resource "access" 2345Returns wether the given player is authorized to access resource "access"
1935 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
1938 2427
1939 $map->load; 2428 $map->load;
1940 $map->load_diag; 2429 $map->load_neighbours;
1941 2430
1942 return unless $self->contr->active; 2431 return unless $self->contr->active;
1943 $self->activate_recursive; 2432 $self->activate_recursive;
1944 2433
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2435 $self->enter_map ($map, $x, $y);
1947} 2436}
1948 2437
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2438=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2439
1951Moves the player to the given map-path and coordinates by first freezing 2440Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2441her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2442that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2443the new (success) or old (failed) map position. In either case, $done will
2444be called at the end of this process.
1955 2445
1956=cut 2446=cut
1957 2447
1958our $GOTOGEN; 2448our $GOTOGEN;
1959 2449
1960sub cf::object::player::goto { 2450sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2451 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2452
1963 # do generation counting so two concurrent goto's will be executed in-order 2453 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2455
1966 $self->enter_link; 2456 $self->enter_link;
1967 2457
1968 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
1969 my $map = eval { 2480 my $map = eval {
1970 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
1971 2482
1972 if ($map) { 2483 if ($map) {
1973 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
1975 } else { 2486 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2488 }
1978 2489
1979 $map 2490 $map
1980 }; 2491 };
1981 2492
1986 2497
1987 if ($gen == $self->{_goto_generation}) { 2498 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2499 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2500 $self->leave_link ($map, $x, $y);
1990 } 2501 }
2502
2503 $done->() if $done;
1991 })->prio (1); 2504 })->prio (1);
1992} 2505}
1993 2506
1994=item $player_object->enter_exit ($exit_object) 2507=item $player_object->enter_exit ($exit_object)
1995 2508
2064 my $hp = $exit->stats->hp; 2577 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2578 my $sp = $exit->stats->sp;
2066 2579
2067 $self->enter_link; 2580 $self->enter_link;
2068 2581
2582 # if exit is damned, update players death & WoR home-position
2583 $self->contr->savebed ($slaying, $hp, $sp)
2584 if $exit->flag (FLAG_DAMNED);
2585
2069 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2070 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2590 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2073 2592
2074 1; 2593 1;
2100 2619
2101 utf8::encode $text; 2620 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2622}
2104 2623
2624=item $client->send_msg ($channel, $msg, $color, [extra...])
2625
2626Send a drawinfo or msg packet to the client, formatting the msg for the
2627client if neccessary. C<$type> should be a string identifying the type of
2628the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet.
2630
2631=cut
2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "infobox",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "infobox",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2652);
2653
2654sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_;
2656
2657 $msg = $self->pl->expand_cfpod ($msg);
2658
2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2660
2661 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2670 } elsif (ref $channel) {
2671 # send meta info to client, if not yet sent
2672 unless (exists $self->{channel}{$channel->{id}}) {
2673 $self->{channel}{$channel->{id}} = $channel;
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676 }
2677
2678 $channel = $channel->{id};
2679 }
2680
2681 return unless @extra || length $msg;
2682
2683 if ($self->can_msg) {
2684 # default colour, mask it out
2685 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2686 if $color & cf::NDI_DEF;
2687
2688 $self->send_packet ("msg " . $self->{json_coder}->encode (
2689 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2690 } else {
2691 if ($color >= 0) {
2692 # replace some tags by gcfclient-compatible ones
2693 for ($msg) {
2694 1 while
2695 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2696 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2697 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2698 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2699 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2700 }
2701
2702 $color &= cf::NDI_COLOR_MASK;
2703
2704 utf8::encode $msg;
2705
2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2709 } else {
2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2711 $self->send_packet ("drawinfo $color $msg")
2712 }
2713 }
2714 }
2715}
2716
2105=item $client->ext_event ($type, %msg) 2717=item $client->ext_msg ($type, @msg)
2106 2718
2107Sends an exti event to the client. 2719Sends an ext event to the client.
2108 2720
2109=cut 2721=cut
2110 2722
2111sub cf::client::ext_event($$%) { 2723sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2724 my ($self, $type, @msg) = @_;
2113 2725
2726 if ($self->extcmd == 2) {
2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2728 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2729 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 }
2732}
2733
2734=item $client->ext_reply ($msgid, @msg)
2735
2736Sends an ext reply to the client.
2737
2738=cut
2739
2740sub cf::client::ext_reply($$@) {
2741 my ($self, $id, @msg) = @_;
2742
2743 if ($self->extcmd == 2) {
2744 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2745 } elsif ($self->extcmd == 1) {
2746 #TODO: version 1, remove
2747 unshift @msg, msgtype => "reply", msgid => $id;
2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2749 }
2116} 2750}
2117 2751
2118=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
2119 2753
2120Queues a query to the client, calling the given callback with 2754Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2755the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2756C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2757
2124Queries can fail, so check the return code. Or don't, as queries will become 2758Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2759become reliable at some point in the future.
2126 2760
2127=cut 2761=cut
2128 2762
2129sub cf::client::query { 2763sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2764 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 2772 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2773 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2774
2141 $self->send_packet ($self->{query_queue}[0][0]) 2775 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2776 if @{ $self->{query_queue} } == 1;
2777
2778 1
2143} 2779}
2144 2780
2145cf::client->attach ( 2781cf::client->attach (
2782 on_connect => sub {
2783 my ($ns) = @_;
2784
2785 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2786 },
2146 on_reply => sub { 2787 on_reply => sub {
2147 my ($ns, $msg) = @_; 2788 my ($ns, $msg) = @_;
2148 2789
2149 # this weird shuffling is so that direct followup queries 2790 # this weird shuffling is so that direct followup queries
2150 # get handled first 2791 # get handled first
2162 } else { 2803 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2804 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2805 }
2165 } 2806 }
2166 }, 2807 },
2808 on_exticmd => sub {
2809 my ($ns, $buf) = @_;
2810
2811 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2812
2813 if (ref $msg) {
2814 my ($type, $reply, @payload) =
2815 "ARRAY" eq ref $msg
2816 ? @$msg
2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2818
2819 my @reply;
2820
2821 if (my $cb = $EXTICMD{$type}) {
2822 @reply = $cb->($ns, @payload);
2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2828 } else {
2829 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2830 }
2831
2832 cf::override;
2833 },
2167); 2834);
2168 2835
2169=item $client->async (\&cb) 2836=item $client->async (\&cb)
2170 2837
2171Create a new coroutine, running the specified callback. The coroutine will 2838Create a new coroutine, running the specified callback. The coroutine will
2212our $safe = new Safe "safe"; 2879our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 2880our $safe_hole = new Safe::Hole;
2214 2881
2215$SIG{FPE} = 'IGNORE'; 2882$SIG{FPE} = 'IGNORE';
2216 2883
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2884$safe->permit_only (Opcode::opset qw(
2885 :base_core :base_mem :base_orig :base_math
2886 grepstart grepwhile mapstart mapwhile
2887 sort time
2888));
2218 2889
2219# here we export the classes and methods available to script code 2890# here we export the classes and methods available to script code
2220 2891
2221=pod 2892=pod
2222 2893
2223The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2224 2895
2225 cf::object contr pay_amount pay_player map 2896 cf::object
2897 contr pay_amount pay_player map x y force_find force_add
2898 insert remove name archname title slaying race decrease_ob_nr
2899
2226 cf::object::player player 2900 cf::object::player
2227 cf::player peaceful 2901 player
2228 cf::map trigger 2902
2903 cf::player
2904 peaceful
2905
2906 cf::map
2907 trigger
2229 2908
2230=cut 2909=cut
2231 2910
2232for ( 2911for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race
2914 decrease_ob_nr)],
2234 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2237) { 2918) {
2238 no strict 'refs'; 2919 no strict 'refs';
2309=back 2990=back
2310 2991
2311=cut 2992=cut
2312 2993
2313############################################################################# 2994#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484
2485#############################################################################
2486# the server's init and main functions 2995# the server's init and main functions
2487 2996
2488sub load_facedata($) { 2997sub load_facedata($) {
2489 my ($path) = @_; 2998 my ($path) = @_;
2999
3000 # HACK to clear player env face cache, we need some signal framework
3001 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = ();
3003
3004 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3005
2491 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2492 3007
2493 my $facedata; 3008 my $facedata;
2494 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
2497 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2498 3013
2499 $facedata->{version} == 2 3014 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3015 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3016
3017 # patch in the exptable
3018 $facedata->{resource}{"res/exp_table"} = {
3019 type => FT_RSRC,
3020 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3021 };
3022 cf::cede_to_tick;
3023
2502 { 3024 {
2503 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2504 3026
2505 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3029 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3033
3034 cf::cede_to_tick;
2511 } 3035 }
2512 3036
2513 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3038 next unless $info->{smooth};
2515 my $idx = cf::face::find $face 3039 my $idx = cf::face::find $face
2516 or next; 3040 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3041 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3044 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3045 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3046 }
2522 Coro::cede; 3047
3048 cf::cede_to_tick;
2523 } 3049 }
2524 } 3050 }
2525 3051
2526 { 3052 {
2527 my $anims = $facedata->{animinfo}; 3053 my $anims = $facedata->{animinfo};
2528 3054
2529 while (my ($anim, $info) = each %$anims) { 3055 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3056 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3057 cf::cede_to_tick;
2532 } 3058 }
2533 3059
2534 cf::anim::invalidate_all; # d'oh 3060 cf::anim::invalidate_all; # d'oh
2535 } 3061 }
2536 3062
3063 {
3064 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource};
3067
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
3073
3074 if ($info->{type} & 1) {
3075 # prepend meta info
3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
3082 $data = pack "(w/a*)*", $meta, $info->{data};
3083 } else {
3084 $data = $info->{data};
3085 }
3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick;
3091 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 }
3111
2537 1 3112 1
2538} 3113}
2539 3114
3115register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_;
3117
3118 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v);
3120 }
3121};
3122
2540sub reload_regions { 3123sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
2541 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
3130
3131 for (cf::region::list) {
3132 $_->{match} = qr/$_->{match}/
3133 if exists $_->{match};
3134 }
2543} 3135}
2544 3136
2545sub reload_facedata { 3137sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3138 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3139 or die "unable to load facedata\n";
2548} 3140}
2549 3141
2550sub reload_archetypes { 3142sub reload_archetypes {
3143 load_resource_file "$DATADIR/archetypes"
3144 or die "unable to load archetypes\n";
3145 #d# NEED to laod twice to resolve forward references
3146 # this really needs to be done in an extra post-pass
3147 # (which needs to be synchronous, so solve it differently)
2551 load_resource_file "$DATADIR/archetypes" 3148 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3149 or die "unable to load archetypes\n";
2553} 3150}
2554 3151
2555sub reload_treasures { 3152sub reload_treasures {
2571 3168
2572sub init { 3169sub init {
2573 reload_resources; 3170 reload_resources;
2574} 3171}
2575 3172
2576sub cfg_load { 3173sub reload_config {
2577 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
2578 or return; 3175 or return;
2579 3176
2580 local $/; 3177 local $/;
2581 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
2597sub main { 3194sub main {
2598 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
2599 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2601 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
2602 Event::one_event; 3200 Event::one_event;
2603 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
2604 }; 3202 };
2605 3203
2606 cfg_load; 3204 reload_config;
2607 db_init; 3205 db_init;
2608 load_extensions; 3206 load_extensions;
2609 3207
2610 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
2611 Event::loop; 3209 Event::loop;
2627 }, 3225 },
2628 ); 3226 );
2629 } 3227 }
2630} 3228}
2631 3229
3230sub write_runtime {
3231 my $runtime = "$LOCALDIR/runtime";
3232
3233 # first touch the runtime file to show we are still running:
3234 # the fsync below can take a very very long time.
3235
3236 IO::AIO::aio_utime $runtime, undef, undef;
3237
3238 my $guard = cf::lock_acquire "write_runtime";
3239
3240 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3241 or return;
3242
3243 my $value = $cf::RUNTIME + 90 + 10;
3244 # 10 is the runtime save interval, for a monotonic clock
3245 # 60 allows for the watchdog to kill the server.
3246
3247 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3248 and return;
3249
3250 # always fsync - this file is important
3251 aio_fsync $fh
3252 and return;
3253
3254 # touch it again to show we are up-to-date
3255 aio_utime $fh, undef, undef;
3256
3257 close $fh
3258 or return;
3259
3260 aio_rename "$runtime~", $runtime
3261 and return;
3262
3263 warn "runtime file written.\n";
3264
3265 1
3266}
3267
2632sub emergency_save() { 3268sub emergency_save() {
2633 my $freeze_guard = cf::freeze_mainloop; 3269 my $freeze_guard = cf::freeze_mainloop;
2634 3270
2635 warn "enter emergency perl save\n"; 3271 warn "enter emergency perl save\n";
2636 3272
2711 %EXT_CORO = (); 3347 %EXT_CORO = ();
2712 3348
2713 warn "removing commands"; 3349 warn "removing commands";
2714 %COMMAND = (); 3350 %COMMAND = ();
2715 3351
2716 warn "removing ext commands"; 3352 warn "removing ext/exti commands";
2717 %EXTCMD = (); 3353 %EXTCMD = ();
3354 %EXTICMD = ();
2718 3355
2719 warn "unloading/nuking all extensions"; 3356 warn "unloading/nuking all extensions";
2720 for my $pkg (@EXTS) { 3357 for my $pkg (@EXTS) {
2721 warn "... unloading $pkg"; 3358 warn "... unloading $pkg";
2722 3359
2765 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
2766 require cf; 3403 require cf;
2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2768 3405
2769 warn "loading config and database again"; 3406 warn "loading config and database again";
2770 cf::cfg_load; 3407 cf::reload_config;
2771 3408
2772 warn "loading extensions"; 3409 warn "loading extensions";
2773 cf::load_extensions; 3410 cf::load_extensions;
2774 3411
2775 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
2811register_command "reload" => sub { 3448register_command "reload" => sub {
2812 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
2813 3450
2814 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
2815 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
2816 async { reload_perl }; 3455 reload_perl;
3456 };
2817 } 3457 }
2818}; 3458};
2819 3459
2820unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
2821 3461
2840 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait; 3482 $signal->wait;
2843} 3483}
2844 3484
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2847$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
2848 reentrant => 0, 3486 reentrant => 0,
2849 parked => 1, 3487 parked => 1,
2850 prio => 0, 3488 prio => 0,
2851 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
2859 3497
2860 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
2861 3499
2862 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
2863 3501
2864 0 && sync_job {#d#
2865 for(1..10) {
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 };
2886
2887 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
2888 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
2889 3504
2890 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2891 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
2893 write_runtime 3509 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
2895 }; 3511 };
2896 } 3512 }
2897 3513
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send; 3515 $sig->send;
2903 } 3516 }
2904 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send; 3518 $sig->send;
2915 3528
2916 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918 3531
2919 _post_tick; 3532 _post_tick;
2920
2921
2922 }, 3533 },
2923); 3534);
2924 3535
2925{ 3536{
3537 BDB::min_parallel 8;
2926 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
2927 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
2928 reentrant => 0, 3540 reentrant => 0,
2929 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
2930 poll => 'r', 3542 poll => 'r',
2931 prio => 0, 3543 prio => 0,
2932 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
2934 ); 3546 );
2935 BDB::min_parallel 8;
2936 3547
2937 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
2938 my $status; 3549 my $status;
2939 my $current = $Coro::current; 3550 my $current = $Coro::current;
2940 ( 3551 (
2949 ) 3560 )
2950 }; 3561 };
2951 3562
2952 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2954 3569
2955 cf::sync_job { 3570 cf::sync_job {
2956 eval { 3571 eval {
2957 BDB::db_env_open 3572 BDB::db_env_open
2958 $DB_ENV, 3573 $DB_ENV,
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666; 3577 0666;
2963 3578
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2965
2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2967 $DB_ENV->set_lk_detect;
2968 }; 3580 };
2969 3581
2970 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
2971 }; 3583 };
2972 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
2973} 3616}
2974 3617
2975{ 3618{
2976 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
2977 3620
2980 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
2981 reentrant => 0, 3624 reentrant => 0,
2982 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
2983 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
2984 poll => 'r', 3627 poll => 'r',
2985 prio => 6, 3628 prio => 0,
2986 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
2987 ); 3630 );
2988} 3631}
2989 3632
2990my $_log_backtrace; 3633my $_log_backtrace;
2996 3639
2997 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace; 3642 ++$_log_backtrace;
3000 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3001 my @bt = fork_call { 3646 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines