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.276 by root, Sun Jun 10 04:05:47 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;
945 }, 1234 },
946); 1235);
947 1236
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 { 1237sub load_extensions {
1238 cf::sync_job {
1239 my %todo;
1240
983 for my $ext (<$LIBDIR/*.ext>) { 1241 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1242 next unless -r $path;
985 eval { 1243
986 load_extension $ext; 1244 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1245 my $base = $1;
1246 my $pkg = $1;
1247 $pkg =~ s/[^[:word:]]/_/g;
1248 $pkg = "ext::$pkg";
1249
1250 open my $fh, "<:utf8", $path
1251 or die "$path: $!";
1252
1253 my $source = do { local $/; <$fh> };
1254
1255 my %ext = (
1256 path => $path,
1257 base => $base,
1258 pkg => $pkg,
1259 );
1260
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263
1264 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n"
1267 . $source
1268 . "\n};\n1";
1269
1270 $todo{$base} = \%ext;
1271 }
1272
1273 my %done;
1274 while (%todo) {
1275 my $progress;
1276
1277 while (my ($k, $v) = each %todo) {
1278 for (split /,\s*/, $v->{meta}{depends}) {
1279 goto skip
1280 unless exists $done{$_};
1281 }
1282
1283 warn "... loading '$k' into '$v->{pkg}'\n";
1284
1285 unless (eval $v->{source}) {
1286 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n";
1288
1289 if (exists $v->{meta}{mandatory}) {
1290 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n";
1292 exit 1;
1293 }
1294
1295 warn $msg;
1296 }
1297
1298 $done{$k} = delete $todo{$k};
1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
987 1 1301 }
988 } or warn "$ext not loaded: $@"; 1302
1303 skip:
1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1305 unless $progress;
1306 }
989 } 1307 };
990} 1308}
991 1309
992############################################################################# 1310#############################################################################
993 1311
1312=back
1313
994=head2 CORE EXTENSIONS 1314=head2 CORE EXTENSIONS
995 1315
996Functions and methods that extend core crossfire objects. 1316Functions and methods that extend core crossfire objects.
997 1317
998=cut 1318=cut
1002use Coro::AIO; 1322use Coro::AIO;
1003 1323
1004=head3 cf::player 1324=head3 cf::player
1005 1325
1006=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}
1007 1341
1008=item cf::player::find $login 1342=item cf::player::find $login
1009 1343
1010Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1011 1345
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1385
1052 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1053 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;
1054 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1055 } 1394 }
1056 } 1395 }
1057} 1396}
1058 1397
1068 1407
1069 aio_mkdir playerdir $pl, 0770; 1408 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1409 $pl->{last_save} = $cf::RUNTIME;
1071 1410
1072 $pl->save_pl ($path); 1411 $pl->save_pl ($path);
1073 Coro::cede; 1412 cf::cede_to_tick;
1074} 1413}
1075 1414
1076sub new($) { 1415sub new($) {
1077 my ($login) = @_; 1416 my ($login) = @_;
1078 1417
1082 $self->{deny_save} = 1; 1421 $self->{deny_save} = 1;
1083 1422
1084 $cf::PLAYER{$login} = $self; 1423 $cf::PLAYER{$login} = $self;
1085 1424
1086 $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 (@_);
1087} 1436}
1088 1437
1089=item $pl->quit_character 1438=item $pl->quit_character
1090 1439
1091Nukes the player without looking back. If logged in, the connection will 1440Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1495 or return [];
1147 1496
1148 my @logins; 1497 my @logins;
1149 1498
1150 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") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1154 1508
1155 utf8::decode $login; 1509 utf8::decode $login;
1156 push @logins, $login; 1510 push @logins, $login;
1157 } 1511 }
1158 1512
1185 } 1539 }
1186 1540
1187 \@paths 1541 \@paths
1188} 1542}
1189 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
1190=item $player->ext_reply ($msgid, %msg) 1595=item $player->ext_reply ($msgid, @msg)
1191 1596
1192Sends an ext reply to the player. 1597Sends an ext reply to the player.
1193 1598
1194=cut 1599=cut
1195 1600
1196sub ext_reply($$%) { 1601sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1602 my ($self, $id, @msg) = @_;
1198 1603
1199 $msg{msgid} = $id; 1604 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1605}
1203 1606
1204=item $player->ext_event ($type, %msg) 1607=item $player->ext_msg ($type, @msg)
1205 1608
1206Sends an ext event to the client. 1609Sends an ext event to the client.
1207 1610
1208=cut 1611=cut
1209 1612
1210sub ext_event($$%) { 1613sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1614 my ($self, $type, @msg) = @_;
1212 1615
1213 $self->ns->ext_event ($type, %msg); 1616 $self->ns->ext_msg ($type, @msg);
1214} 1617}
1215 1618
1216=head3 cf::region 1619=head3 cf::region
1217 1620
1218=over 4 1621=over 4
1221 1624
1222package cf::region; 1625package cf::region;
1223 1626
1224=item cf::region::find_by_path $path 1627=item cf::region::find_by_path $path
1225 1628
1226Tries 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.
1227 1630
1228=cut 1631=cut
1229 1632
1230sub find_by_path($) { 1633sub find_by_path($) {
1231 my ($path) = @_; 1634 my ($path) = @_;
1232 1635
1233 my ($match, $specificity); 1636 my ($match, $specificity);
1234 1637
1235 for my $region (list) { 1638 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1639 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1640 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1641 if $region->specificity > $specificity;
1239 } 1642 }
1240 } 1643 }
1241 1644
1361 $self->init; # pass $1 etc. 1764 $self->init; # pass $1 etc.
1362 return $self; 1765 return $self;
1363 } 1766 }
1364 } 1767 }
1365 1768
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1769 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1770 ()
1368} 1771}
1369 1772
1370sub init { 1773sub init {
1371 my ($self) = @_; 1774 my ($self) = @_;
1434 1837
1435sub load_header_from($) { 1838sub load_header_from($) {
1436 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1437 1840
1438 utf8::encode $path; 1841 utf8::encode $path;
1439 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1440 # or return;
1441
1442 $self->_load_header ($path)
1443 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;
1444 1850
1445 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1446 1852
1447 1 1853 1
1448} 1854}
1502sub find { 1908sub find {
1503 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1504 1910
1505 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1506 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1507 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1508 1915
1509 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1510 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
1511 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1512 or return; 1921 or return;
1513 1922
1514 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1515 1924
1517 or return; 1926 or return;
1518 1927
1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1521 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1522 $map->reset; 1933 $map->reset;
1523 undef $guard;
1524 return find $path; 1934 return find $path;
1525 } 1935 }
1526 1936
1527 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1528 } 1938 }
1537 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1538 1948
1539 my $path = $self->{path}; 1949 my $path = $self->{path};
1540 1950
1541 { 1951 {
1542 my $guard = cf::lock_acquire "map_load:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1543 1953
1954 return unless $self->valid;
1544 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1545 1956
1546 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1547 1958
1548 $self->alloc; 1959 $self->alloc;
1549 1960
1550 $self->pre_load; 1961 $self->pre_load;
1551 Coro::cede; 1962 cf::cede_to_tick;
1552 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1553 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1554 or return; 1967 or return;
1555 1968
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1558 1971
1559 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq; 1973 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1562 $self->clear_unique_items; 1976 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1564 } 1980 }
1565 } 1981 }
1566 1982
1567 Coro::cede; 1983 $f->resolve_delayed_derefs;
1984
1985 cf::cede_to_tick;
1568 # now do the right thing for maps 1986 # now do the right thing for maps
1569 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1570 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
1571 unless $self->difficulty; 1989 unless $self->difficulty;
1572 Coro::cede; 1990 cf::cede_to_tick;
1573 1991
1574 unless ($self->{deny_activate}) { 1992 unless ($self->{deny_activate}) {
1575 $self->decay_objects; 1993 $self->decay_objects;
1576 $self->fix_auto_apply; 1994 $self->fix_auto_apply;
1577 $self->update_buttons; 1995 $self->update_buttons;
1578 Coro::cede; 1996 cf::cede_to_tick;
1579 $self->set_darkness_map; 1997 $self->set_darkness_map;
1580 Coro::cede; 1998 cf::cede_to_tick;
1581 $self->activate; 1999 $self->activate;
1582 } 2000 }
2001
2002 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME);
1583 2004
1584 $self->in_memory (cf::MAP_IN_MEMORY); 2005 $self->in_memory (cf::MAP_IN_MEMORY);
1585 } 2006 }
1586 2007
1587 $self->post_load; 2008 $self->post_load;
1598 2019
1599 $self 2020 $self
1600} 2021}
1601 2022
1602# 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
1603sub load_diag { 2024sub load_neighbours {
1604 my ($map) = @_; 2025 my ($map) = @_;
1605 2026
1606 my @diag; # diagonal neighbours 2027 my @neigh; # diagonal neighbours
1607 2028
1608 for (0 .. 3) { 2029 for (0 .. 3) {
1609 my $neigh = $map->tile_path ($_) 2030 my $neigh = $map->tile_path ($_)
1610 or next; 2031 or next;
1611 $neigh = find $neigh, $map 2032 $neigh = find $neigh, $map
1612 or next; 2033 or next;
1613 $neigh->load; 2034 $neigh->load;
1614 2035
2036 push @neigh,
1615 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2037 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1616 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2038 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1617 } 2039 }
1618 2040
1619 for (@diag) { 2041 for (grep defined $_->[0], @neigh) {
2042 my ($path, $origin) = @$_;
1620 my $neigh = find @$_ 2043 my $neigh = find $path, $origin
1621 or next; 2044 or next;
1622 $neigh->load; 2045 $neigh->load;
1623 } 2046 }
1624} 2047}
1625 2048
1630} 2053}
1631 2054
1632sub do_load_sync { 2055sub do_load_sync {
1633 my ($map) = @_; 2056 my ($map) = @_;
1634 2057
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main;
2060
1635 cf::sync_job { $map->load }; 2061 cf::sync_job { $map->load };
1636} 2062}
1637 2063
1638our %MAP_PREFETCH; 2064our %MAP_PREFETCH;
1639our $MAP_PREFETCHER = undef; 2065our $MAP_PREFETCHER = undef;
1640 2066
1641sub find_async { 2067sub find_async {
1642 my ($path, $origin) = @_; 2068 my ($path, $origin, $load) = @_;
1643 2069
1644 $path = normalise $path, $origin && $origin->{path}; 2070 $path = normalise $path, $origin && $origin->{path};
1645 2071
1646 if (my $map = $cf::MAP{$path}) { 2072 if (my $map = $cf::MAP{$path}) {
1647 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1648 } 2074 }
1649 2075
1650 undef $MAP_PREFETCH{$path}; 2076 $MAP_PREFETCH{$path} |= $load;
2077
1651 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1652 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1654 my $map = find $path 2083 if (my $map = find $k) {
1655 or next;
1656 $map->load; 2084 $map->load if $v;
2085 }
1657 2086
1658 delete $MAP_PREFETCH{$path}; 2087 delete $MAP_PREFETCH{$k};
1659 } 2088 }
1660 } 2089 }
1661 undef $MAP_PREFETCHER; 2090 undef $MAP_PREFETCHER;
1662 }; 2091 };
1663 $MAP_PREFETCHER->prio (6); 2092 $MAP_PREFETCHER->prio (6);
1666} 2095}
1667 2096
1668sub save { 2097sub save {
1669 my ($self) = @_; 2098 my ($self) = @_;
1670 2099
1671 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2101
1673 $self->{last_save} = $cf::RUNTIME; 2102 $self->{last_save} = $cf::RUNTIME;
1674 2103
1675 return unless $self->dirty; 2104 return unless $self->dirty;
1676 2105
1682 return if $self->{deny_save}; 2111 return if $self->{deny_save};
1683 2112
1684 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
1685 2114
1686 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
1687 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
1688 }; 2118 };
1689 2119
1690 if ($uniq) { 2120 if ($uniq) {
1691 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1699 my ($self) = @_; 2129 my ($self) = @_;
1700 2130
1701 # save first because save cedes 2131 # save first because save cedes
1702 $self->save; 2132 $self->save;
1703 2133
1704 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1705 2135
1706 return if $self->players; 2136 return if $self->players;
1707 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
1708 return if $self->{deny_save}; 2138 return if $self->{deny_save};
1709 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2144 $self->clear;
1711 $self->in_memory (cf::MAP_SWAPPED);
1712} 2145}
1713 2146
1714sub reset_at { 2147sub reset_at {
1715 my ($self) = @_; 2148 my ($self) = @_;
1716 2149
1748 if $uniq; 2181 if $uniq;
1749 } 2182 }
1750 2183
1751 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
1752 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1753 $self->clear; 2188 $self->clear;
1754
1755 $_->clear_links_to ($self) for values %cf::MAP;
1756 2189
1757 $self->unlink_save; 2190 $self->unlink_save;
1758 $self->destroy; 2191 $self->destroy;
1759} 2192}
1760 2193
1761my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
1762 2195
1763sub nuke { 2196sub nuke {
1764 my ($self) = @_; 2197 my ($self) = @_;
1765 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
1766 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
1767 2203
1768 $self->unlink_save; 2204 $self->unlink_save;
1769 2205
1770 bless $self, "cf::map"; 2206 bless $self, "cf::map";
1771 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
1772 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
1773 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
1774 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775 2211
1776 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
1777 2214
1778 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
1779} 2216}
1780 2217
1781=item $maps = cf::map::tmp_maps 2218=item $maps = cf::map::tmp_maps
1782 2219
1783Returns an arrayref with all map paths of currently instantiated and saved 2220Returns an arrayref with all map paths of currently instantiated and saved
1784maps. 2221maps. May block.
1785 2222
1786=cut 2223=cut
1787 2224
1788sub tmp_maps() { 2225sub tmp_maps() {
1789 [ 2226 [
1790 map { 2227 map {
1791 utf8::decode $_; 2228 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o 2229 /\.map$/
1793 ? normalise $_ 2230 ? normalise $_
1794 : () 2231 : ()
1795 } @{ aio_readdir $TMPDIR or [] } 2232 } @{ aio_readdir $TMPDIR or [] }
1796 ] 2233 ]
1797} 2234}
1798 2235
2236=item $maps = cf::map::random_maps
2237
2238Returns an arrayref with all map paths of currently instantiated and saved
2239random maps. May block.
2240
2241=cut
2242
2243sub random_maps() {
2244 [
2245 map {
2246 utf8::decode $_;
2247 /\.map$/
2248 ? normalise "?random/$_"
2249 : ()
2250 } @{ aio_readdir $RANDOMDIR or [] }
2251 ]
2252}
2253
1799=item cf::map::unique_maps 2254=item cf::map::unique_maps
1800 2255
1801Returns an arrayref of paths of all shared maps that have 2256Returns an arrayref of paths of all shared maps that have
1802instantiated unique items. May block. 2257instantiated unique items. May block.
1803 2258
1805 2260
1806sub unique_maps() { 2261sub unique_maps() {
1807 [ 2262 [
1808 map { 2263 map {
1809 utf8::decode $_; 2264 utf8::decode $_;
1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o 2265 /\.map$/
1811 ? normalise $_ 2266 ? normalise $_
1812 : () 2267 : ()
1813 } @{ aio_readdir $UNIQUEDIR or [] } 2268 } @{ aio_readdir $UNIQUEDIR or [] }
1814 ] 2269 ]
1815} 2270}
1837 map { $_, inv_recursive_ $_->inv } @_ 2292 map { $_, inv_recursive_ $_->inv } @_
1838} 2293}
1839 2294
1840sub inv_recursive { 2295sub inv_recursive {
1841 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
2297}
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 }
1842} 2325}
1843 2326
1844package cf; 2327package cf;
1845 2328
1846=back 2329=back
1865 2348
1866 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2349 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1867 2350
1868 if ($self->{record_replies}) { 2351 if ($self->{record_replies}) {
1869 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2352 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2353
1870 } 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 {
1871 $msg = $npc->name . " says: $msg" if $npc; 2362 $msg = $npc->name . " says: $msg" if $npc;
1872 $self->message ($msg, $flags); 2363 $self->message ($msg, $flags);
2364 }
1873 } 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 (@_);
1874} 2376}
1875 2377
1876=item $player_object->may ("access") 2378=item $player_object->may ("access")
1877 2379
1878Returns wether the given player is authorized to access resource "access" 2380Returns wether the given player is authorized to access resource "access"
1957 # use -1 or undef as default coordinates, not 0, 0 2459 # use -1 or undef as default coordinates, not 0, 0
1958 ($x, $y) = ($map->enter_x, $map->enter_y) 2460 ($x, $y) = ($map->enter_x, $map->enter_y)
1959 if $x <=0 && $y <= 0; 2461 if $x <=0 && $y <= 0;
1960 2462
1961 $map->load; 2463 $map->load;
1962 $map->load_diag; 2464 $map->load_neighbours;
1963 2465
1964 return unless $self->contr->active; 2466 return unless $self->contr->active;
1965 $self->activate_recursive; 2467 $self->activate_recursive;
1966 2468
1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1968 $self->enter_map ($map, $x, $y); 2470 $self->enter_map ($map, $x, $y);
1969} 2471}
1970 2472
1971=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2473=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1972 2474
1973Moves 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
1974her, loading and preparing them map, calling the provided $check callback 2476her, loading and preparing them map, calling the provided $check callback
1975that 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
1976the 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.
1977 2480
1978=cut 2481=cut
1979 2482
1980our $GOTOGEN; 2483our $GOTOGEN;
1981 2484
1982sub cf::object::player::goto { 2485sub cf::object::player::goto {
1983 my ($self, $path, $x, $y, $check) = @_; 2486 my ($self, $path, $x, $y, $check, $done) = @_;
1984 2487
1985 # 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
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1987 2490
1988 $self->enter_link; 2491 $self->enter_link;
1989 2492
1990 (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
1991 my $map = eval { 2515 my $map = eval {
1992 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
1993 2517
1994 if ($map) { 2518 if ($map) {
1995 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
1996 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
1997 } else { 2521 } else {
1998 $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);
1999 } 2523 }
2000 2524
2001 $map 2525 $map
2002 }; 2526 };
2003 2527
2008 2532
2009 if ($gen == $self->{_goto_generation}) { 2533 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation}; 2534 delete $self->{_goto_generation};
2011 $self->leave_link ($map, $x, $y); 2535 $self->leave_link ($map, $x, $y);
2012 } 2536 }
2537
2538 $done->() if $done;
2013 })->prio (1); 2539 })->prio (1);
2014} 2540}
2015 2541
2016=item $player_object->enter_exit ($exit_object) 2542=item $player_object->enter_exit ($exit_object)
2017 2543
2086 my $hp = $exit->stats->hp; 2612 my $hp = $exit->stats->hp;
2087 my $sp = $exit->stats->sp; 2613 my $sp = $exit->stats->sp;
2088 2614
2089 $self->enter_link; 2615 $self->enter_link;
2090 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
2091 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2092 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2093 unless (eval { 2625 unless (eval {
2094 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2095 2627
2096 1; 2628 1;
2122 2654
2123 utf8::encode $text; 2655 utf8::encode $text;
2124 $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);
2125} 2657}
2126 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
2127=item $client->ext_event ($type, %msg) 2752=item $client->ext_msg ($type, @msg)
2128 2753
2129Sends an exti event to the client. 2754Sends an ext event to the client.
2130 2755
2131=cut 2756=cut
2132 2757
2133sub cf::client::ext_event($$%) { 2758sub cf::client::ext_msg($$@) {
2134 my ($self, $type, %msg) = @_; 2759 my ($self, $type, @msg) = @_;
2135 2760
2761 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove
2136 $msg{msgtype} = "event_$type"; 2764 push @msg, msgtype => "event_$type";
2137 $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 }
2138} 2785}
2139 2786
2140=item $success = $client->query ($flags, "text", \&cb) 2787=item $success = $client->query ($flags, "text", \&cb)
2141 2788
2142Queues a query to the client, calling the given callback with 2789Queues a query to the client, calling the given callback with
2143the 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>,
2144C<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>.
2145 2792
2146Queries 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
2147reliable at some point in the future. 2794become reliable at some point in the future.
2148 2795
2149=cut 2796=cut
2150 2797
2151sub cf::client::query { 2798sub cf::client::query {
2152 my ($self, $flags, $text, $cb) = @_; 2799 my ($self, $flags, $text, $cb) = @_;
2160 utf8::encode $text; 2807 utf8::encode $text;
2161 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2808 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2162 2809
2163 $self->send_packet ($self->{query_queue}[0][0]) 2810 $self->send_packet ($self->{query_queue}[0][0])
2164 if @{ $self->{query_queue} } == 1; 2811 if @{ $self->{query_queue} } == 1;
2812
2813 1
2165} 2814}
2166 2815
2167cf::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 },
2168 on_reply => sub { 2822 on_reply => sub {
2169 my ($ns, $msg) = @_; 2823 my ($ns, $msg) = @_;
2170 2824
2171 # this weird shuffling is so that direct followup queries 2825 # this weird shuffling is so that direct followup queries
2172 # get handled first 2826 # get handled first
2184 } else { 2838 } else {
2185 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2839 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2186 } 2840 }
2187 } 2841 }
2188 }, 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 },
2189); 2869);
2190 2870
2191=item $client->async (\&cb) 2871=item $client->async (\&cb)
2192 2872
2193Create a new coroutine, running the specified callback. The coroutine will 2873Create a new coroutine, running the specified callback. The coroutine will
2234our $safe = new Safe "safe"; 2914our $safe = new Safe "safe";
2235our $safe_hole = new Safe::Hole; 2915our $safe_hole = new Safe::Hole;
2236 2916
2237$SIG{FPE} = 'IGNORE'; 2917$SIG{FPE} = 'IGNORE';
2238 2918
2239$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));
2240 2924
2241# here we export the classes and methods available to script code 2925# here we export the classes and methods available to script code
2242 2926
2243=pod 2927=pod
2244 2928
2245The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2246 2930
2247 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
2248 cf::object::player player 2935 cf::object::player
2249 cf::player peaceful 2936 player
2250 cf::map trigger 2937
2938 cf::player
2939 peaceful
2940
2941 cf::map
2942 trigger
2251 2943
2252=cut 2944=cut
2253 2945
2254for ( 2946for (
2255 ["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)],
2256 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2257 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2258 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2259) { 2953) {
2260 no strict 'refs'; 2954 no strict 'refs';
2331=back 3025=back
2332 3026
2333=cut 3027=cut
2334 3028
2335############################################################################# 3029#############################################################################
2336
2337=head2 EXTENSION DATABASE SUPPORT
2338
2339Crossfire maintains a very simple database for extension use. It can
2340currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2341convert to/from binary).
2342
2343The parameter C<$family> should best start with the name of the extension
2344using it, it should be unique.
2345
2346=over 4
2347
2348=item $value = cf::db_get $family => $key
2349
2350Returns a single value from the database.
2351
2352=item cf::db_put $family => $key => $value
2353
2354Stores the given C<$value> in the family.
2355
2356=cut
2357
2358our $DB;
2359
2360sub db_init {
2361 unless ($DB) {
2362 $DB = BDB::db_create $DB_ENV;
2363
2364 cf::sync_job {
2365 eval {
2366 $DB->set_flags (BDB::CHKSUM);
2367
2368 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2369 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2370 cf::cleanup "db_open(db): $!" if $!;
2371 };
2372 cf::cleanup "db_open(db): $@" if $@;
2373 };
2374 }
2375}
2376
2377sub db_get($$) {
2378 my $key = "$_[0]/$_[1]";
2379
2380 cf::sync_job {
2381 BDB::db_get $DB, undef, $key, my $data;
2382
2383 $! ? ()
2384 : $data
2385 }
2386}
2387
2388sub db_put($$$) {
2389 BDB::dbreq_pri 4;
2390 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2391}
2392
2393=item cf::cache $id => [$paths...], $processversion => $process
2394
2395Generic caching function that returns the value of the resource $id,
2396caching and regenerating as required.
2397
2398This function can block.
2399
2400=cut
2401
2402sub cache {
2403 my ($id, $src, $processversion, $process) = @_;
2404
2405 my $meta =
2406 join "\x00",
2407 $processversion,
2408 map {
2409 aio_stat $_
2410 and Carp::croak "$_: $!";
2411
2412 ($_, (stat _)[7,9])
2413 } @$src;
2414
2415 my $dbmeta = db_get cache => "$id/meta";
2416 if ($dbmeta ne $meta) {
2417 # changed, we may need to process
2418
2419 my @data;
2420 my $md5;
2421
2422 for (0 .. $#$src) {
2423 0 <= aio_load $src->[$_], $data[$_]
2424 or Carp::croak "$src->[$_]: $!";
2425 }
2426
2427 # if processing is expensive, check
2428 # checksum first
2429 if (1) {
2430 $md5 =
2431 join "\x00",
2432 $processversion,
2433 map {
2434 Coro::cede;
2435 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2436 } 0.. $#$src;
2437
2438
2439 my $dbmd5 = db_get cache => "$id/md5";
2440 if ($dbmd5 eq $md5) {
2441 db_put cache => "$id/meta", $meta;
2442
2443 return db_get cache => "$id/data";
2444 }
2445 }
2446
2447 my $t1 = Time::HiRes::time;
2448 my $data = $process->(\@data);
2449 my $t2 = Time::HiRes::time;
2450
2451 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2452
2453 db_put cache => "$id/data", $data;
2454 db_put cache => "$id/md5" , $md5;
2455 db_put cache => "$id/meta", $meta;
2456
2457 return $data;
2458 }
2459
2460 db_get cache => "$id/data"
2461}
2462
2463=item fork_call { }, $args
2464
2465Executes the given code block with the given arguments in a seperate
2466process, returning the results. Everything must be serialisable with
2467Coro::Storable. May, of course, block. Note that the executed sub may
2468never block itself or use any form of Event handling.
2469
2470=cut
2471
2472sub fork_call(&@) {
2473 my ($cb, @args) = @_;
2474
2475# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2476# or die "socketpair: $!";
2477 pipe my $fh1, my $fh2
2478 or die "pipe: $!";
2479
2480 if (my $pid = fork) {
2481 close $fh2;
2482
2483 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2484 $res = Coro::Storable::thaw $res;
2485
2486 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2487
2488 die $$res unless "ARRAY" eq ref $res;
2489
2490 return wantarray ? @$res : $res->[-1];
2491 } else {
2492 reset_signals;
2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2495 eval {
2496 close $fh1;
2497
2498 my @res = eval { $cb->(@args) };
2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2500 };
2501
2502 warn $@ if $@;
2503 _exit 0;
2504 }
2505}
2506
2507#############################################################################
2508# the server's init and main functions 3030# the server's init and main functions
2509 3031
2510sub load_facedata($) { 3032sub load_facedata($) {
2511 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;
2512 3040
2513 warn "loading facedata from $path\n"; 3041 warn "loading facedata from $path\n";
2514 3042
2515 my $facedata; 3043 my $facedata;
2516 0 < aio_load $path, $facedata 3044 0 < aio_load $path, $facedata
2519 $facedata = Coro::Storable::thaw $facedata; 3047 $facedata = Coro::Storable::thaw $facedata;
2520 3048
2521 $facedata->{version} == 2 3049 $facedata->{version} == 2
2522 or cf::cleanup "$path: version mismatch, cannot proceed."; 3050 or cf::cleanup "$path: version mismatch, cannot proceed.";
2523 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
2524 { 3059 {
2525 my $faces = $facedata->{faceinfo}; 3060 my $faces = $facedata->{faceinfo};
2526 3061
2527 while (my ($face, $info) = each %$faces) { 3062 while (my ($face, $info) = each %$faces) {
2528 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3063 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2529 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3064 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap};
2530 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2531 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2532 Coro::cede; 3068
3069 cf::cede_to_tick;
2533 } 3070 }
2534 3071
2535 while (my ($face, $info) = each %$faces) { 3072 while (my ($face, $info) = each %$faces) {
2536 next unless $info->{smooth}; 3073 next unless $info->{smooth};
2537 my $idx = cf::face::find $face 3074 my $idx = cf::face::find $face
2538 or next; 3075 or next;
2539 if (my $smooth = cf::face::find $info->{smooth}) { 3076 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth;
2540 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2541 } else { 3079 } else {
2542 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3080 warn "smooth face '$info->{smooth}' not found for face '$face'";
2543 } 3081 }
2544 Coro::cede; 3082
3083 cf::cede_to_tick;
2545 } 3084 }
2546 } 3085 }
2547 3086
2548 { 3087 {
2549 my $anims = $facedata->{animinfo}; 3088 my $anims = $facedata->{animinfo};
2550 3089
2551 while (my ($anim, $info) = each %$anims) { 3090 while (my ($anim, $info) = each %$anims) {
2552 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3091 cf::anim::set $anim, $info->{frames}, $info->{facings};
2553 Coro::cede; 3092 cf::cede_to_tick;
2554 } 3093 }
2555 3094
2556 cf::anim::invalidate_all; # d'oh 3095 cf::anim::invalidate_all; # d'oh
2557 } 3096 }
2558 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
2559 1 3147 1
2560} 3148}
2561 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
2562sub 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
2563 load_resource_file "$MAPDIR/regions" 3163 load_resource_file "$MAPDIR/regions"
2564 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 }
2565} 3170}
2566 3171
2567sub reload_facedata { 3172sub reload_facedata {
2568 load_facedata "$DATADIR/facedata" 3173 load_facedata "$DATADIR/facedata"
2569 or die "unable to load facedata\n"; 3174 or die "unable to load facedata\n";
2570} 3175}
2571 3176
2572sub 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)
2573 load_resource_file "$DATADIR/archetypes" 3183 load_resource_file "$DATADIR/archetypes"
2574 or die "unable to load archetypes\n"; 3184 or die "unable to load archetypes\n";
2575} 3185}
2576 3186
2577sub reload_treasures { 3187sub reload_treasures {
2593 3203
2594sub init { 3204sub init {
2595 reload_resources; 3205 reload_resources;
2596} 3206}
2597 3207
2598sub cfg_load { 3208sub reload_config {
2599 open my $fh, "<:utf8", "$CONFDIR/config" 3209 open my $fh, "<:utf8", "$CONFDIR/config"
2600 or return; 3210 or return;
2601 3211
2602 local $/; 3212 local $/;
2603 *CFG = YAML::Syck::Load <$fh>; 3213 *CFG = YAML::Syck::Load <$fh>;
2619sub main { 3229sub main {
2620 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
2621 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
2622 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#
2623 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
2624 Event::one_event; 3235 Event::one_event;
2625 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
2626 }; 3237 };
2627 3238
2628 cfg_load; 3239 reload_config;
2629 db_init; 3240 db_init;
2630 load_extensions; 3241 load_extensions;
2631 3242
2632 $TICK_WATCHER->start; 3243 $TICK_WATCHER->start;
2633 Event::loop; 3244 Event::loop;
2649 }, 3260 },
2650 ); 3261 );
2651 } 3262 }
2652} 3263}
2653 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
2654sub emergency_save() { 3303sub emergency_save() {
2655 my $freeze_guard = cf::freeze_mainloop; 3304 my $freeze_guard = cf::freeze_mainloop;
2656 3305
2657 warn "enter emergency perl save\n"; 3306 warn "enter emergency perl save\n";
2658 3307
2662 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
2663 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
2664 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
2665 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
2666 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2667 $pl->save; 3317 $pl->save;
2668 } 3318 }
2669 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
2670 3320
2671 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
2733 %EXT_CORO = (); 3383 %EXT_CORO = ();
2734 3384
2735 warn "removing commands"; 3385 warn "removing commands";
2736 %COMMAND = (); 3386 %COMMAND = ();
2737 3387
2738 warn "removing ext commands"; 3388 warn "removing ext/exti commands";
2739 %EXTCMD = (); 3389 %EXTCMD = ();
3390 %EXTICMD = ();
2740 3391
2741 warn "unloading/nuking all extensions"; 3392 warn "unloading/nuking all extensions";
2742 for my $pkg (@EXTS) { 3393 for my $pkg (@EXTS) {
2743 warn "... unloading $pkg"; 3394 warn "... unloading $pkg";
2744 3395
2787 warn "reloading cf.pm"; 3438 warn "reloading cf.pm";
2788 require cf; 3439 require cf;
2789 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2790 3441
2791 warn "loading config and database again"; 3442 warn "loading config and database again";
2792 cf::cfg_load; 3443 cf::reload_config;
2793 3444
2794 warn "loading extensions"; 3445 warn "loading extensions";
2795 cf::load_extensions; 3446 cf::load_extensions;
2796 3447
2797 warn "reattaching attachments to objects/players"; 3448 warn "reattaching attachments to objects/players";
2833register_command "reload" => sub { 3484register_command "reload" => sub {
2834 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
2835 3486
2836 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
2837 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
2838 async { reload_perl }; 3491 reload_perl;
3492 };
2839 } 3493 }
2840}; 3494};
2841 3495
2842unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
2843 3497
2862 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
2863 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
2864 $signal->wait; 3518 $signal->wait;
2865} 3519}
2866 3520
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2869$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
2870 reentrant => 0, 3522 reentrant => 0,
2871 parked => 1, 3523 parked => 1,
2872 prio => 0, 3524 prio => 0,
2873 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
2881 3533
2882 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
2883 3535
2884 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
2885 3537
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2908
2909 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
2910 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
2911 3540
2912 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2913 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
2914 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
2915 write_runtime 3545 write_runtime
2916 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
2917 }; 3547 };
2918 } 3548 }
2919 3549
2920# my $AFTER = Event::time;
2921# warn $AFTER - $NOW;#d#
2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send; 3551 $sig->send;
2925 } 3552 }
2926 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send; 3554 $sig->send;
2937 3564
2938 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2940 3567
2941 _post_tick; 3568 _post_tick;
2942
2943
2944 }, 3569 },
2945); 3570);
2946 3571
2947{ 3572{
3573 BDB::min_parallel 8;
2948 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
2949 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
2950 reentrant => 0, 3576 reentrant => 0,
2951 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
2952 poll => 'r', 3578 poll => 'r',
2953 prio => 0, 3579 prio => 0,
2954 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
2955 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
2956 ); 3582 );
2957 BDB::min_parallel 8;
2958 3583
2959 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
2960 my $status; 3585 my $status;
2961 my $current = $Coro::current; 3586 my $current = $Coro::current;
2962 ( 3587 (
2971 ) 3596 )
2972 }; 3597 };
2973 3598
2974 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
2975 $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);
2976 3605
2977 cf::sync_job { 3606 cf::sync_job {
2978 eval { 3607 eval {
2979 BDB::db_env_open 3608 BDB::db_env_open
2980 $DB_ENV, 3609 $DB_ENV,
2982 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
2983 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2984 0666; 3613 0666;
2985 3614
2986 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2987
2988 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2989 $DB_ENV->set_lk_detect;
2990 }; 3616 };
2991 3617
2992 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
2993 }; 3619 };
2994 } 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 );
2995} 3652}
2996 3653
2997{ 3654{
2998 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
2999 3656
3002 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3003 reentrant => 0, 3660 reentrant => 0,
3004 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3005 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3006 poll => 'r', 3663 poll => 'r',
3007 prio => 6, 3664 prio => 0,
3008 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3009 ); 3666 );
3010} 3667}
3011 3668
3012my $_log_backtrace; 3669my $_log_backtrace;
3018 3675
3019 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3020 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace; 3678 ++$_log_backtrace;
3022 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3023 my @bt = fork_call { 3682 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 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 |"
3027 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines