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.277 by root, Sun Jun 10 04:24:50 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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
356 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
357 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
358 } 454 }
359 455
360 $time = Event::time - $time; 456 $time = Event::time - $time;
361 457
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
390 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
391 487
392 $coro 488 $coro
393} 489}
394 490
395sub write_runtime { 491=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 492
398 # first touch the runtime file to show we are still running: 493Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
400 497
401 IO::AIO::aio_utime $runtime, undef, undef; 498=cut
402 499
403 my $guard = cf::lock_acquire "write_runtime"; 500sub fork_call(&@) {
501 my ($cb, @args) = @_;
404 502
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 503 # we seemingly have to make a local copy of the whole thing,
406 or return; 504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
407 506
408 my $value = $cf::RUNTIME + 90 + 10; 507 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 508 reset_signals;
410 # 60 allows for the watchdog to kill the server. 509 &$cb
510 }, @args;
411 511
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 512 wantarray ? @res : $res[-1]
413 and return; 513}
414 514
415 # always fsync - this file is important 515=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 516
419 # touch it again to show we are up-to-date 517Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 518
422 close $fh 519=item cf::db_put $family => $key => $value
423 or return;
424 520
425 aio_rename "$runtime~", $runtime 521Stores the given C<$value> in the family. It can currently store binary
426 and return; 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 523
428 warn "runtime file written.\n"; 524=item $db = cf::db_table "name"
429 525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
547
548our $DB;
549
550sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db";
553 };
554}
555
556sub db_get($$) {
557 my $key = "$_[0]/$_[1]";
558
559 cf::sync_job {
560 BDB::db_get $DB, undef, $key, my $data;
561
562 $! ? ()
563 : $data
430 1 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
431} 640}
432 641
433=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
434 643
435Log a datalog packet of the given type with the given key-value pairs. 644Log 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") 662attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
455 664
456In the following description, CLASS can be any of C<global>, C<object> 665In 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 666C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 667Crossfire TRT).
459 668
460=over 4 669=over 4
461 670
462=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
463 672
665 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
666 } 875 }
667 876
668 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
669 } else { 878 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 880 }
672 881
673 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
674} 883}
675 884
715 "; 924 ";
716 die if $@; 925 die if $@;
717} 926}
718 927
719our $override; 928our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 930
722sub override { 931sub override {
723 $override = 1; 932 $override = 1;
724 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
725} 934}
726 935
727sub do_invoke { 936sub do_invoke {
728 my $event = shift; 937 my $event = shift;
729 my $callbacks = shift; 938 my $callbacks = shift;
730 939
731 @invoke_results = (); 940 @INVOKE_RESULTS = ();
732 941
733 local $override; 942 local $override;
734 943
735 for (@$callbacks) { 944 for (@$callbacks) {
736 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
753 962
754Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
755 964
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This 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 966removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 968
760=back 969=back
761 970
762=cut 971=cut
763 972
764############################################################################# 973#############################################################################
765# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
766 1017
767sub reattach { 1018sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1020 my ($obj) = @_;
770 1021
817sub object_freezer_save { 1068sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
819 1070
820 sync_job { 1071 sync_job {
821 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
824 1076
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1081 close $fh;
830 1082
831 if (@$objs) { 1083 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1089 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
839 } 1091 }
847 } 1099 }
848 } else { 1100 } else {
849 aio_unlink $filename; 1101 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
851 } 1103 }
852 } 1104 };
853} 1105}
854 1106
855sub object_freezer_as_string { 1107sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
857 1109
869 or return; 1121 or return;
870 1122
871 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
873 or return; 1125 or return;
874 $av = eval { (Storable::thaw $av)->{objs} };
875 }
876 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
879 return ($data, $av); 1136 ($data, $av)
880} 1137}
1138
1139=head2 COMMAND CALLBACKS
1140
1141=over 4
1142
1143=cut
881 1144
882############################################################################# 1145#############################################################################
883# command handling &c 1146# command handling &c
884 1147
885=item cf::register_command $name => \&callback($ob,$args); 1148=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1161 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1162}
900 1163
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1164=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1165
903Register a callbackf ro execution when the client sends an extcmd packet. 1166Register a callback for execution when the client sends an (synchronous)
1167extcmd packet. Ext commands will be processed in the order they are
1168received by the server, like other user commands. The first argument is
1169the logged-in player. Ext commands can only be processed after a player
1170has logged in successfully.
904 1171
905If the callback returns something, it is sent back as if reply was being 1172If the callback returns something, it is sent back as if reply was being
906called. 1173called.
907 1174
1175=item cf::register_exticmd $name => \&callback($ns,$packet);
1176
1177Register a callback for execution when the client sends an (asynchronous)
1178exticmd packet. Exti commands are processed by the server as soon as they
1179are received, i.e. out of order w.r.t. other commands. The first argument
1180is a client socket. Exti commands can be received anytime, even before
1181log-in.
1182
1183If the callback returns something, it is sent back as if reply was being
1184called.
1185
908=cut 1186=cut
909 1187
910sub register_extcmd { 1188sub register_extcmd {
911 my ($name, $cb) = @_; 1189 my ($name, $cb) = @_;
912 1190
913 $EXTCMD{$name} = $cb; 1191 $EXTCMD{$name} = $cb;
1192}
1193
1194sub register_exticmd {
1195 my ($name, $cb) = @_;
1196
1197 $EXTICMD{$name} = $cb;
914} 1198}
915 1199
916cf::player->attach ( 1200cf::player->attach (
917 on_command => sub { 1201 on_command => sub {
918 my ($pl, $name, $params) = @_; 1202 my ($pl, $name, $params) = @_;
927 cf::override; 1211 cf::override;
928 }, 1212 },
929 on_extcmd => sub { 1213 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
931 1215
932 my $msg = eval { from_json $buf }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1217
934 if (ref $msg) { 1218 if (ref $msg) {
1219 my ($type, $reply, @payload) =
1220 "ARRAY" eq ref $msg
1221 ? @$msg
1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1223
1224 my @reply;
1225
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
940 } else { 1233 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1235 }
943 1236
944 cf::override; 1237 cf::override;
945 }, 1238 },
946); 1239);
947 1240
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 { 1241sub load_extensions {
1242 cf::sync_job {
1243 my %todo;
1244
983 for my $ext (<$LIBDIR/*.ext>) { 1245 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1246 next unless -r $path;
985 eval { 1247
986 load_extension $ext; 1248 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1249 my $base = $1;
1250 my $pkg = $1;
1251 $pkg =~ s/[^[:word:]]/_/g;
1252 $pkg = "ext::$pkg";
1253
1254 open my $fh, "<:utf8", $path
1255 or die "$path: $!";
1256
1257 my $source = do { local $/; <$fh> };
1258
1259 my %ext = (
1260 path => $path,
1261 base => $base,
1262 pkg => $pkg,
1263 );
1264
1265 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1266 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1267
1268 $ext{source} =
1269 "package $pkg; use strict; use utf8;\n"
1270 . "#line 1 \"$path\"\n{\n"
1271 . $source
1272 . "\n};\n1";
1273
1274 $todo{$base} = \%ext;
1275 }
1276
1277 my %done;
1278 while (%todo) {
1279 my $progress;
1280
1281 while (my ($k, $v) = each %todo) {
1282 for (split /,\s*/, $v->{meta}{depends}) {
1283 goto skip
1284 unless exists $done{$_};
1285 }
1286
1287 warn "... loading '$k' into '$v->{pkg}'\n";
1288
1289 unless (eval $v->{source}) {
1290 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n";
1292
1293 if (exists $v->{meta}{mandatory}) {
1294 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n";
1296 exit 1;
1297 }
1298
1299 warn $msg;
1300 }
1301
1302 $done{$k} = delete $todo{$k};
1303 push @EXTS, $v->{pkg};
1304 $progress = 1;
987 1 1305 }
988 } or warn "$ext not loaded: $@"; 1306
1307 skip:
1308 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1309 unless $progress;
1310 }
989 } 1311 };
990} 1312}
991 1313
992############################################################################# 1314#############################################################################
993 1315
1316=back
1317
994=head2 CORE EXTENSIONS 1318=head2 CORE EXTENSIONS
995 1319
996Functions and methods that extend core crossfire objects. 1320Functions and methods that extend core crossfire objects.
997 1321
998=cut 1322=cut
1002use Coro::AIO; 1326use Coro::AIO;
1003 1327
1004=head3 cf::player 1328=head3 cf::player
1005 1329
1006=over 4 1330=over 4
1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1007 1345
1008=item cf::player::find $login 1346=item cf::player::find $login
1009 1347
1010Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1011 1349
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1389
1052 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1055 } 1398 }
1056 } 1399 }
1057} 1400}
1058 1401
1068 1411
1069 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1071 1414
1072 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1073 Coro::cede; 1416 cf::cede_to_tick;
1074} 1417}
1075 1418
1076sub new($) { 1419sub new($) {
1077 my ($login) = @_; 1420 my ($login) = @_;
1078 1421
1082 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1083 1426
1084 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1085 1428
1086 $self 1429 $self
1430}
1431
1432=item $player->send_msg ($channel, $msg, $color, [extra...])
1433
1434=cut
1435
1436sub send_msg {
1437 my $ns = shift->ns
1438 or return;
1439 $ns->send_msg (@_);
1087} 1440}
1088 1441
1089=item $pl->quit_character 1442=item $pl->quit_character
1090 1443
1091Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1499 or return [];
1147 1500
1148 my @logins; 1501 my @logins;
1149 1502
1150 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1154 1512
1155 utf8::decode $login; 1513 utf8::decode $login;
1156 push @logins, $login; 1514 push @logins, $login;
1157 } 1515 }
1158 1516
1185 } 1543 }
1186 1544
1187 \@paths 1545 \@paths
1188} 1546}
1189 1547
1548=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1549
1550Expand crossfire pod fragments into protocol xml.
1551
1552=cut
1553
1554sub expand_cfpod {
1555 ((my $self), (local $_)) = @_;
1556
1557 # escape & and <
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560
1561 # this is buggy, it needs to properly take care of nested <'s
1562
1563 1 while
1564 # replace B<>, I<>, U<> etc.
1565 s/B<([^\>]*)>/<b>$1<\/b>/
1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1569 # replace G<male|female> tags
1570 || s{G<([^>|]*)\|([^>]*)>}{
1571 $self->gender ? $2 : $1
1572 }ge
1573 # replace H<hint text>
1574 || s{H<([^\>]*)>}
1575 {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "")
1579 [$self->{hintmode}]
1580 }ge;
1581
1582 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g;
1584
1585 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines
1590
1591 $_
1592}
1593
1594sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode}
1597}
1598
1190=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1191 1600
1192Sends an ext reply to the player. 1601Sends an ext reply to the player.
1193 1602
1194=cut 1603=cut
1195 1604
1196sub ext_reply($$%) { 1605sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1198 1607
1199 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1609}
1203 1610
1204=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1205 1612
1206Sends an ext event to the client. 1613Sends an ext event to the client.
1207 1614
1208=cut 1615=cut
1209 1616
1210sub ext_event($$%) { 1617sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1212 1619
1213 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1214} 1621}
1215 1622
1216=head3 cf::region 1623=head3 cf::region
1217 1624
1218=over 4 1625=over 4
1221 1628
1222package cf::region; 1629package cf::region;
1223 1630
1224=item cf::region::find_by_path $path 1631=item cf::region::find_by_path $path
1225 1632
1226Tries to decuce the probable region for a map knowing only its path. 1633Tries to decuce the likely region for a map knowing only its path.
1227 1634
1228=cut 1635=cut
1229 1636
1230sub find_by_path($) { 1637sub find_by_path($) {
1231 my ($path) = @_; 1638 my ($path) = @_;
1232 1639
1233 my ($match, $specificity); 1640 my ($match, $specificity);
1234 1641
1235 for my $region (list) { 1642 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1643 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1644 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1645 if $region->specificity > $specificity;
1239 } 1646 }
1240 } 1647 }
1241 1648
1361 $self->init; # pass $1 etc. 1768 $self->init; # pass $1 etc.
1362 return $self; 1769 return $self;
1363 } 1770 }
1364 } 1771 }
1365 1772
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1773 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1774 ()
1368} 1775}
1369 1776
1370sub init { 1777sub init {
1371 my ($self) = @_; 1778 my ($self) = @_;
1434 1841
1435sub load_header_from($) { 1842sub load_header_from($) {
1436 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1437 1844
1438 utf8::encode $path; 1845 utf8::encode $path;
1439 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1440 # or return;
1441
1442 $self->_load_header ($path)
1443 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1444 1854
1445 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1446 1856
1447 1 1857 1
1448} 1858}
1502sub find { 1912sub find {
1503 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1504 1914
1505 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1506 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1507 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1508 1919
1509 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1510 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1511 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1512 or return; 1925 or return;
1513 1926
1514 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1515 1928
1517 or return; 1930 or return;
1518 1931
1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1521 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1522 $map->reset; 1937 $map->reset;
1523 undef $guard;
1524 return find $path; 1938 return find $path;
1525 } 1939 }
1526 1940
1527 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1528 } 1942 }
1537 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1538 1952
1539 my $path = $self->{path}; 1953 my $path = $self->{path};
1540 1954
1541 { 1955 {
1542 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1543 1957
1958 return unless $self->valid;
1544 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1545 1960
1546 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1547 1962
1548 $self->alloc; 1963 $self->alloc;
1549 1964
1550 $self->pre_load; 1965 $self->pre_load;
1551 Coro::cede; 1966 cf::cede_to_tick;
1552 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1553 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1554 or return; 1971 or return;
1555 1972
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1558 1975
1559 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq; 1977 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1562 $self->clear_unique_items; 1980 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1564 } 1984 }
1565 } 1985 }
1566 1986
1567 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1568 # now do the right thing for maps 1990 # now do the right thing for maps
1569 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1570 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1571 unless $self->difficulty; 1993 unless $self->difficulty;
1572 Coro::cede; 1994 cf::cede_to_tick;
1573 1995
1574 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1575 $self->decay_objects; 1997 $self->decay_objects;
1576 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1577 $self->update_buttons; 1999 $self->update_buttons;
1578 Coro::cede; 2000 cf::cede_to_tick;
1579 $self->set_darkness_map; 2001 $self->set_darkness_map;
1580 Coro::cede; 2002 cf::cede_to_tick;
1581 $self->activate; 2003 $self->activate;
1582 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1583 2008
1584 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1585 } 2010 }
1586 2011
1587 $self->post_load; 2012 $self->post_load;
1598 2023
1599 $self 2024 $self
1600} 2025}
1601 2026
1602# find and load all maps in the 3x3 area around a map 2027# find and load all maps in the 3x3 area around a map
1603sub load_diag { 2028sub load_neighbours {
1604 my ($map) = @_; 2029 my ($map) = @_;
1605 2030
1606 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1607 2032
1608 for (0 .. 3) { 2033 for (0 .. 3) {
1609 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1610 or next; 2035 or next;
1611 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1612 or next; 2037 or next;
1613 $neigh->load; 2038 $neigh->load;
1614 2039
2040 push @neigh,
1615 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1616 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1617 } 2043 }
1618 2044
1619 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1620 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1621 or next; 2048 or next;
1622 $neigh->load; 2049 $neigh->load;
1623 } 2050 }
1624} 2051}
1625 2052
1630} 2057}
1631 2058
1632sub do_load_sync { 2059sub do_load_sync {
1633 my ($map) = @_; 2060 my ($map) = @_;
1634 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1635 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1636} 2066}
1637 2067
1638our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1639our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1640 2070
1641sub find_async { 2071sub find_async {
1642 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1643 2073
1644 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1645 2075
1646 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1647 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1648 } 2078 }
1649 2079
1650 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1651 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1652 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1654 my $map = find $path 2087 if (my $map = find $k) {
1655 or next;
1656 $map->load; 2088 $map->load if $v;
2089 }
1657 2090
1658 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1659 } 2092 }
1660 } 2093 }
1661 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1662 }; 2095 };
1663 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
1666} 2099}
1667 2100
1668sub save { 2101sub save {
1669 my ($self) = @_; 2102 my ($self) = @_;
1670 2103
1671 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2105
1673 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1674 2107
1675 return unless $self->dirty; 2108 return unless $self->dirty;
1676 2109
1682 return if $self->{deny_save}; 2115 return if $self->{deny_save};
1683 2116
1684 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
1685 2118
1686 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
1687 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
1688 }; 2122 };
1689 2123
1690 if ($uniq) { 2124 if ($uniq) {
1691 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1699 my ($self) = @_; 2133 my ($self) = @_;
1700 2134
1701 # save first because save cedes 2135 # save first because save cedes
1702 $self->save; 2136 $self->save;
1703 2137
1704 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
1705 2139
1706 return if $self->players; 2140 return if $self->players;
1707 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
1708 return if $self->{deny_save}; 2142 return if $self->{deny_save};
1709 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2148 $self->clear;
1711 $self->in_memory (cf::MAP_SWAPPED);
1712} 2149}
1713 2150
1714sub reset_at { 2151sub reset_at {
1715 my ($self) = @_; 2152 my ($self) = @_;
1716 2153
1748 if $uniq; 2185 if $uniq;
1749 } 2186 }
1750 2187
1751 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
1752 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
1753 $self->clear; 2192 $self->clear;
1754
1755 $_->clear_links_to ($self) for values %cf::MAP;
1756 2193
1757 $self->unlink_save; 2194 $self->unlink_save;
1758 $self->destroy; 2195 $self->destroy;
1759} 2196}
1760 2197
1761my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
1762 2199
1763sub nuke { 2200sub nuke {
1764 my ($self) = @_; 2201 my ($self) = @_;
1765 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
1766 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
1767 2207
1768 $self->unlink_save; 2208 $self->unlink_save;
1769 2209
1770 bless $self, "cf::map"; 2210 bless $self, "cf::map";
1771 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
1772 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
1773 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
1774 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775 2215
1776 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
1777 2218
1778 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
1779} 2220}
1780 2221
1781=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
1857 2298
1858sub inv_recursive { 2299sub inv_recursive {
1859 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
1860} 2301}
1861 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
1862package cf; 2331package cf;
1863 2332
1864=back 2333=back
1865 2334
1866=head3 cf::object::player 2335=head3 cf::object::player
1883 2352
1884 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2353 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1885 2354
1886 if ($self->{record_replies}) { 2355 if ($self->{record_replies}) {
1887 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2356 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2357
1888 } else { 2358 } else {
2359 my $pl = $self->contr;
2360
2361 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2362 my $dialog = $pl->{npc_dialog};
2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2364
2365 } else {
1889 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
1890 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2368 }
1891 } 2369 }
2370}
2371
2372=item $object->send_msg ($channel, $msg, $color, [extra...])
2373
2374=cut
2375
2376sub cf::object::send_msg {
2377 my $pl = shift->contr
2378 or return;
2379 $pl->send_msg (@_);
1892} 2380}
1893 2381
1894=item $player_object->may ("access") 2382=item $player_object->may ("access")
1895 2383
1896Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
1975 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
1976 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
1977 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
1978 2466
1979 $map->load; 2467 $map->load;
1980 $map->load_diag; 2468 $map->load_neighbours;
1981 2469
1982 return unless $self->contr->active; 2470 return unless $self->contr->active;
1983 $self->activate_recursive; 2471 $self->activate_recursive;
1984 2472
1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1986 $self->enter_map ($map, $x, $y); 2474 $self->enter_map ($map, $x, $y);
1987} 2475}
1988 2476
1989=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2477=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1990 2478
1991Moves the player to the given map-path and coordinates by first freezing 2479Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback 2480her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on 2481that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position. 2482the new (success) or old (failed) map position. In either case, $done will
2483be called at the end of this process.
1995 2484
1996=cut 2485=cut
1997 2486
1998our $GOTOGEN; 2487our $GOTOGEN;
1999 2488
2000sub cf::object::player::goto { 2489sub cf::object::player::goto {
2001 my ($self, $path, $x, $y, $check) = @_; 2490 my ($self, $path, $x, $y, $check, $done) = @_;
2002 2491
2003 # do generation counting so two concurrent goto's will be executed in-order 2492 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2005 2494
2006 $self->enter_link; 2495 $self->enter_link;
2007 2496
2008 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2009 my $map = eval { 2519 my $map = eval {
2010 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2011 2521
2012 if ($map) { 2522 if ($map) {
2013 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2015 } else { 2525 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2017 } 2527 }
2018 2528
2019 $map 2529 $map
2020 }; 2530 };
2021 2531
2026 2536
2027 if ($gen == $self->{_goto_generation}) { 2537 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation}; 2538 delete $self->{_goto_generation};
2029 $self->leave_link ($map, $x, $y); 2539 $self->leave_link ($map, $x, $y);
2030 } 2540 }
2541
2542 $done->() if $done;
2031 })->prio (1); 2543 })->prio (1);
2032} 2544}
2033 2545
2034=item $player_object->enter_exit ($exit_object) 2546=item $player_object->enter_exit ($exit_object)
2035 2547
2104 my $hp = $exit->stats->hp; 2616 my $hp = $exit->stats->hp;
2105 my $sp = $exit->stats->sp; 2617 my $sp = $exit->stats->sp;
2106 2618
2107 $self->enter_link; 2619 $self->enter_link;
2108 2620
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2109 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2110 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2111 unless (eval { 2629 unless (eval {
2112 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2113 2631
2114 1; 2632 1;
2140 2658
2141 utf8::encode $text; 2659 utf8::encode $text;
2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2660 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2143} 2661}
2144 2662
2663=item $client->send_msg ($channel, $msg, $color, [extra...])
2664
2665Send a drawinfo or msg packet to the client, formatting the msg for the
2666client if neccessary. C<$type> should be a string identifying the type of
2667the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet.
2669
2670=cut
2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2693sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_;
2695
2696 $msg = $self->pl->expand_cfpod ($msg);
2697
2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2709 } elsif (ref $channel) {
2710 # send meta info to client, if not yet sent
2711 unless (exists $self->{channel}{$channel->{id}}) {
2712 $self->{channel}{$channel->{id}} = $channel;
2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2715 }
2716
2717 $channel = $channel->{id};
2718 }
2719
2720 return unless @extra || length $msg;
2721
2722 if ($self->can_msg) {
2723 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF;
2726
2727 $self->send_packet ("msg " . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2729 } else {
2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740
2741 $color &= cf::NDI_COLOR_MASK;
2742
2743 utf8::encode $msg;
2744
2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2748 } else {
2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2750 $self->send_packet ("drawinfo $color $msg")
2751 }
2752 }
2753 }
2754}
2755
2145=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2146 2757
2147Sends an exti event to the client. 2758Sends an ext event to the client.
2148 2759
2149=cut 2760=cut
2150 2761
2151sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2152 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2153 2764
2765 if ($self->extcmd == 2) {
2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2154 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 }
2771}
2772
2773=item $client->ext_reply ($msgid, @msg)
2774
2775Sends an ext reply to the client.
2776
2777=cut
2778
2779sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_;
2781
2782 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id;
2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2788 }
2156} 2789}
2157 2790
2158=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2159 2792
2160Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2794the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2162C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2795C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2163 2796
2164Queries can fail, so check the return code. Or don't, as queries will become 2797Queries can fail, so check the return code. Or don't, as queries will
2165reliable at some point in the future. 2798become reliable at some point in the future.
2166 2799
2167=cut 2800=cut
2168 2801
2169sub cf::client::query { 2802sub cf::client::query {
2170 my ($self, $flags, $text, $cb) = @_; 2803 my ($self, $flags, $text, $cb) = @_;
2178 utf8::encode $text; 2811 utf8::encode $text;
2179 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2812 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2180 2813
2181 $self->send_packet ($self->{query_queue}[0][0]) 2814 $self->send_packet ($self->{query_queue}[0][0])
2182 if @{ $self->{query_queue} } == 1; 2815 if @{ $self->{query_queue} } == 1;
2816
2817 1
2183} 2818}
2184 2819
2185cf::client->attach ( 2820cf::client->attach (
2821 on_connect => sub {
2822 my ($ns) = @_;
2823
2824 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2825 },
2186 on_reply => sub { 2826 on_reply => sub {
2187 my ($ns, $msg) = @_; 2827 my ($ns, $msg) = @_;
2188 2828
2189 # this weird shuffling is so that direct followup queries 2829 # this weird shuffling is so that direct followup queries
2190 # get handled first 2830 # get handled first
2202 } else { 2842 } else {
2203 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2843 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2204 } 2844 }
2205 } 2845 }
2206 }, 2846 },
2847 on_exticmd => sub {
2848 my ($ns, $buf) = @_;
2849
2850 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2851
2852 if (ref $msg) {
2853 my ($type, $reply, @payload) =
2854 "ARRAY" eq ref $msg
2855 ? @$msg
2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2857
2858 my @reply;
2859
2860 if (my $cb = $EXTICMD{$type}) {
2861 @reply = $cb->($ns, @payload);
2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2867 } else {
2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2869 }
2870
2871 cf::override;
2872 },
2207); 2873);
2208 2874
2209=item $client->async (\&cb) 2875=item $client->async (\&cb)
2210 2876
2211Create a new coroutine, running the specified callback. The coroutine will 2877Create a new coroutine, running the specified callback. The coroutine will
2252our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2253our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2254 2920
2255$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2256 2922
2257$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2923$safe->permit_only (Opcode::opset qw(
2924 :base_core :base_mem :base_orig :base_math
2925 grepstart grepwhile mapstart mapwhile
2926 sort time
2927));
2258 2928
2259# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2260 2930
2261=pod 2931=pod
2262 2932
2263The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2264 2934
2265 cf::object contr pay_amount pay_player map 2935 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr
2938
2266 cf::object::player player 2939 cf::object::player
2267 cf::player peaceful 2940 player
2268 cf::map trigger 2941
2942 cf::player
2943 peaceful
2944
2945 cf::map
2946 trigger
2269 2947
2270=cut 2948=cut
2271 2949
2272for ( 2950for (
2273 ["cf::object" => qw(contr pay_amount pay_player map)], 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race
2953 decrease_ob_nr destroy)],
2274 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2275 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2276 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2277) { 2957) {
2278 no strict 'refs'; 2958 no strict 'refs';
2349=back 3029=back
2350 3030
2351=cut 3031=cut
2352 3032
2353############################################################################# 3033#############################################################################
2354
2355=head2 EXTENSION DATABASE SUPPORT
2356
2357Crossfire maintains a very simple database for extension use. It can
2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2359convert to/from binary).
2360
2361The parameter C<$family> should best start with the name of the extension
2362using it, it should be unique.
2363
2364=over 4
2365
2366=item $value = cf::db_get $family => $key
2367
2368Returns a single value from the database.
2369
2370=item cf::db_put $family => $key => $value
2371
2372Stores the given C<$value> in the family.
2373
2374=cut
2375
2376our $DB;
2377
2378sub db_init {
2379 unless ($DB) {
2380 $DB = BDB::db_create $DB_ENV;
2381
2382 cf::sync_job {
2383 eval {
2384 $DB->set_flags (BDB::CHKSUM);
2385
2386 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2388 cf::cleanup "db_open(db): $!" if $!;
2389 };
2390 cf::cleanup "db_open(db): $@" if $@;
2391 };
2392 }
2393}
2394
2395sub db_get($$) {
2396 my $key = "$_[0]/$_[1]";
2397
2398 cf::sync_job {
2399 BDB::db_get $DB, undef, $key, my $data;
2400
2401 $! ? ()
2402 : $data
2403 }
2404}
2405
2406sub db_put($$$) {
2407 BDB::dbreq_pri 4;
2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2523}
2524
2525#############################################################################
2526# the server's init and main functions 3034# the server's init and main functions
2527 3035
2528sub load_facedata($) { 3036sub load_facedata($) {
2529 my ($path) = @_; 3037 my ($path) = @_;
3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2530 3044
2531 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2532 3046
2533 my $facedata; 3047 my $facedata;
2534 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2537 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2538 3052
2539 $facedata->{version} == 2 3053 $facedata->{version} == 2
2540 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
2541 3055
3056 # patch in the exptable
3057 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3060 };
3061 cf::cede_to_tick;
3062
2542 { 3063 {
2543 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2544 3065
2545 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2546 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3068 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap};
2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2550 Coro::cede; 3072
3073 cf::cede_to_tick;
2551 } 3074 }
2552 3075
2553 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
2554 next unless $info->{smooth}; 3077 next unless $info->{smooth};
2555 my $idx = cf::face::find $face 3078 my $idx = cf::face::find $face
2556 or next; 3079 or next;
2557 if (my $smooth = cf::face::find $info->{smooth}) { 3080 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth;
2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2559 } else { 3083 } else {
2560 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3084 warn "smooth face '$info->{smooth}' not found for face '$face'";
2561 } 3085 }
2562 Coro::cede; 3086
3087 cf::cede_to_tick;
2563 } 3088 }
2564 } 3089 }
2565 3090
2566 { 3091 {
2567 my $anims = $facedata->{animinfo}; 3092 my $anims = $facedata->{animinfo};
2568 3093
2569 while (my ($anim, $info) = each %$anims) { 3094 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3095 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede; 3096 cf::cede_to_tick;
2572 } 3097 }
2573 3098
2574 cf::anim::invalidate_all; # d'oh 3099 cf::anim::invalidate_all; # d'oh
2575 } 3100 }
2576 3101
3102 {
3103 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource};
3106
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
3112
3113 if ($info->{type} & 1) {
3114 # prepend meta info
3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
3121 $data = pack "(w/a*)*", $meta, $info->{data};
3122 } else {
3123 $data = $info->{data};
3124 }
3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick;
3130 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 }
3150
2577 1 3151 1
2578} 3152}
2579 3153
3154register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_;
3156
3157 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v);
3159 }
3160};
3161
2580sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2581 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
3169
3170 for (cf::region::list) {
3171 $_->{match} = qr/$_->{match}/
3172 if exists $_->{match};
3173 }
2583} 3174}
2584 3175
2585sub reload_facedata { 3176sub reload_facedata {
2586 load_facedata "$DATADIR/facedata" 3177 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n"; 3178 or die "unable to load facedata\n";
2588} 3179}
2589 3180
2590sub reload_archetypes { 3181sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
2591 load_resource_file "$DATADIR/archetypes" 3187 load_resource_file "$DATADIR/archetypes"
2592 or die "unable to load archetypes\n"; 3188 or die "unable to load archetypes\n";
2593} 3189}
2594 3190
2595sub reload_treasures { 3191sub reload_treasures {
2611 3207
2612sub init { 3208sub init {
2613 reload_resources; 3209 reload_resources;
2614} 3210}
2615 3211
2616sub cfg_load { 3212sub reload_config {
2617 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2618 or return; 3214 or return;
2619 3215
2620 local $/; 3216 local $/;
2621 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
2637sub main { 3233sub main {
2638 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2639 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2640 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2641 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2642 Event::one_event; 3239 Event::one_event;
2643 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2644 }; 3241 };
2645 3242
2646 cfg_load; 3243 reload_config;
2647 db_init; 3244 db_init;
2648 load_extensions; 3245 load_extensions;
2649 3246
2650 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2651 Event::loop; 3248 Event::loop;
2667 }, 3264 },
2668 ); 3265 );
2669 } 3266 }
2670} 3267}
2671 3268
3269sub write_runtime {
3270 my $runtime = "$LOCALDIR/runtime";
3271
3272 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time.
3274
3275 IO::AIO::aio_utime $runtime, undef, undef;
3276
3277 my $guard = cf::lock_acquire "write_runtime";
3278
3279 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3280 or return;
3281
3282 my $value = $cf::RUNTIME + 90 + 10;
3283 # 10 is the runtime save interval, for a monotonic clock
3284 # 60 allows for the watchdog to kill the server.
3285
3286 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3287 and return;
3288
3289 # always fsync - this file is important
3290 aio_fsync $fh
3291 and return;
3292
3293 # touch it again to show we are up-to-date
3294 aio_utime $fh, undef, undef;
3295
3296 close $fh
3297 or return;
3298
3299 aio_rename "$runtime~", $runtime
3300 and return;
3301
3302 warn "runtime file written.\n";
3303
3304 1
3305}
3306
2672sub emergency_save() { 3307sub emergency_save() {
2673 my $freeze_guard = cf::freeze_mainloop; 3308 my $freeze_guard = cf::freeze_mainloop;
2674 3309
2675 warn "enter emergency perl save\n"; 3310 warn "enter emergency perl save\n";
2676 3311
2680 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
2681 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
2682 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
2683 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
2684 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2685 $pl->save; 3321 $pl->save;
2686 } 3322 }
2687 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
2688 3324
2689 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
2737 3373
2738 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
2739 for (;;) { 3375 for (;;) {
2740 BDB::flush; 3376 BDB::flush;
2741 IO::AIO::flush; 3377 IO::AIO::flush;
2742 Coro::cede; 3378 Coro::cede_notself;
2743 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
2744 warn "iterate..."; 3380 warn "iterate...";
2745 } 3381 }
2746 3382
2747 ++$RELOAD; 3383 ++$RELOAD;
2751 %EXT_CORO = (); 3387 %EXT_CORO = ();
2752 3388
2753 warn "removing commands"; 3389 warn "removing commands";
2754 %COMMAND = (); 3390 %COMMAND = ();
2755 3391
2756 warn "removing ext commands"; 3392 warn "removing ext/exti commands";
2757 %EXTCMD = (); 3393 %EXTCMD = ();
3394 %EXTICMD = ();
2758 3395
2759 warn "unloading/nuking all extensions"; 3396 warn "unloading/nuking all extensions";
2760 for my $pkg (@EXTS) { 3397 for my $pkg (@EXTS) {
2761 warn "... unloading $pkg"; 3398 warn "... unloading $pkg";
2762 3399
2805 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
2806 require cf; 3443 require cf;
2807 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2808 3445
2809 warn "loading config and database again"; 3446 warn "loading config and database again";
2810 cf::cfg_load; 3447 cf::reload_config;
2811 3448
2812 warn "loading extensions"; 3449 warn "loading extensions";
2813 cf::load_extensions; 3450 cf::load_extensions;
2814 3451
2815 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
2851register_command "reload" => sub { 3488register_command "reload" => sub {
2852 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
2853 3490
2854 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
2855 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
2856 async { reload_perl }; 3495 reload_perl;
3496 };
2857 } 3497 }
2858}; 3498};
2859 3499
2860unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
2861 3501
2880 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
2881 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
2882 $signal->wait; 3522 $signal->wait;
2883} 3523}
2884 3524
2885 my $min = 1e6;#d#
2886 my $avg = 10;
2887$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
2888 reentrant => 0, 3526 reentrant => 0,
2889 parked => 1, 3527 parked => 1,
2890 prio => 0, 3528 prio => 0,
2891 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
2899 3537
2900 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
2901 3539
2902 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
2903 3541
2904 0 && sync_job {#d#
2905 for(1..10) {
2906 my $t = Event::time;
2907 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2908 or die;
2909
2910 $map->width (50);
2911 $map->height (50);
2912 $map->alloc;
2913 $map->_load_objects ("/tmp/x.map", 1);
2914 my $t = Event::time - $t;
2915
2916 #next unless $t < 0.0013;#d#
2917 if ($t < $min) {
2918 $min = $t;
2919 }
2920 $avg = $avg * 0.99 + $t * 0.01;
2921 }
2922 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2923 exit 0;
2924 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2925 };
2926
2927 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
2928 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
2929 3544
2930 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2931 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
2932 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
2933 write_runtime 3549 write_runtime
2934 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
2935 }; 3551 };
2936 } 3552 }
2937 3553
2938# my $AFTER = Event::time;
2939# warn $AFTER - $NOW;#d#
2940
2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2942 $sig->send; 3555 $sig->send;
2943 } 3556 }
2944 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
2945 $sig->send; 3558 $sig->send;
2955 3568
2956 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958 3571
2959 _post_tick; 3572 _post_tick;
2960
2961
2962 }, 3573 },
2963); 3574);
2964 3575
2965{ 3576{
3577 BDB::min_parallel 8;
2966 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
2967 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
2968 reentrant => 0, 3580 reentrant => 0,
2969 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
2970 poll => 'r', 3582 poll => 'r',
2971 prio => 0, 3583 prio => 0,
2972 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
2973 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
2974 ); 3586 );
2975 BDB::min_parallel 8;
2976 3587
2977 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
2978 my $status; 3589 my $status;
2979 my $current = $Coro::current; 3590 my $current = $Coro::current;
2980 ( 3591 (
2989 ) 3600 )
2990 }; 3601 };
2991 3602
2992 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
2993 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2994 3609
2995 cf::sync_job { 3610 cf::sync_job {
2996 eval { 3611 eval {
2997 BDB::db_env_open 3612 BDB::db_env_open
2998 $DB_ENV, 3613 $DB_ENV,
3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3002 0666; 3617 0666;
3003 3618
3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3005
3006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3007 $DB_ENV->set_lk_detect;
3008 }; 3620 };
3009 3621
3010 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3011 }; 3623 };
3012 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3013} 3656}
3014 3657
3015{ 3658{
3016 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3017 3660
3020 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3021 reentrant => 0, 3664 reentrant => 0,
3022 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3023 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3024 poll => 'r', 3667 poll => 'r',
3025 prio => 6, 3668 prio => 0,
3026 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3027 ); 3670 );
3028} 3671}
3029 3672
3030my $_log_backtrace; 3673my $_log_backtrace;
3036 3679
3037 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace; 3682 ++$_log_backtrace;
3040 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3041 my @bt = fork_call { 3686 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines