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.389 by root, Sat Oct 20 04:39:57 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::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;
1126
874 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
875 } 1129 }
876 1130
1131 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
879 return ($data, $av); 1135 ($data, $av)
880} 1136}
1137
1138=head2 COMMAND CALLBACKS
1139
1140=over 4
1141
1142=cut
881 1143
882############################################################################# 1144#############################################################################
883# command handling &c 1145# command handling &c
884 1146
885=item cf::register_command $name => \&callback($ob,$args); 1147=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1161}
900 1162
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1164
903Register a callbackf ro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
904 1170
905If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
906called. 1172called.
907 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
908=cut 1185=cut
909 1186
910sub register_extcmd { 1187sub register_extcmd {
911 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
912 1189
913 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
914} 1197}
915 1198
916cf::player->attach ( 1199cf::player->attach (
917 on_command => sub { 1200 on_command => sub {
918 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
927 cf::override; 1210 cf::override;
928 }, 1211 },
929 on_extcmd => sub { 1212 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
931 1214
932 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1216
934 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
940 } else { 1232 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1234 }
943 1235
944 cf::override; 1236 cf::override;
945 }, 1237 },
946); 1238);
947 1239
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 { 1240sub load_extensions {
1241 cf::sync_job {
1242 my %todo;
1243
983 for my $ext (<$LIBDIR/*.ext>) { 1244 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1245 next unless -r $path;
985 eval { 1246
986 load_extension $ext; 1247 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1248 my $base = $1;
1249 my $pkg = $1;
1250 $pkg =~ s/[^[:word:]]/_/g;
1251 $pkg = "ext::$pkg";
1252
1253 open my $fh, "<:utf8", $path
1254 or die "$path: $!";
1255
1256 my $source = do { local $/; <$fh> };
1257
1258 my %ext = (
1259 path => $path,
1260 base => $base,
1261 pkg => $pkg,
1262 );
1263
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266
1267 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n"
1270 . $source
1271 . "\n};\n1";
1272
1273 $todo{$base} = \%ext;
1274 }
1275
1276 my %done;
1277 while (%todo) {
1278 my $progress;
1279
1280 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip
1283 unless exists $done{$_};
1284 }
1285
1286 warn "... loading '$k' into '$v->{pkg}'\n";
1287
1288 unless (eval $v->{source}) {
1289 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n";
1291
1292 if (exists $v->{meta}{mandatory}) {
1293 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n";
1295 exit 1;
1296 }
1297
1298 warn $msg;
1299 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
987 1 1304 }
988 } or warn "$ext not loaded: $@"; 1305
1306 skip:
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1308 unless $progress;
1309 }
989 } 1310 };
990} 1311}
991 1312
992############################################################################# 1313#############################################################################
993 1314
1315=back
1316
994=head2 CORE EXTENSIONS 1317=head2 CORE EXTENSIONS
995 1318
996Functions and methods that extend core crossfire objects. 1319Functions and methods that extend core crossfire objects.
997 1320
998=cut 1321=cut
1002use Coro::AIO; 1325use Coro::AIO;
1003 1326
1004=head3 cf::player 1327=head3 cf::player
1005 1328
1006=over 4 1329=over 4
1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1007 1344
1008=item cf::player::find $login 1345=item cf::player::find $login
1009 1346
1010Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1011 1348
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1388
1052 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1055 } 1397 }
1056 } 1398 }
1057} 1399}
1058 1400
1068 1410
1069 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1071 1413
1072 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1073 Coro::cede; 1415 cf::cede_to_tick;
1074} 1416}
1075 1417
1076sub new($) { 1418sub new($) {
1077 my ($login) = @_; 1419 my ($login) = @_;
1078 1420
1082 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1083 1425
1084 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1085 1427
1086 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1087} 1439}
1088 1440
1089=item $pl->quit_character 1441=item $pl->quit_character
1090 1442
1091Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1498 or return [];
1147 1499
1148 my @logins; 1500 my @logins;
1149 1501
1150 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1154 1511
1155 utf8::decode $login; 1512 utf8::decode $login;
1156 push @logins, $login; 1513 push @logins, $login;
1157 } 1514 }
1158 1515
1185 } 1542 }
1186 1543
1187 \@paths 1544 \@paths
1188} 1545}
1189 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597
1190=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1191 1599
1192Sends an ext reply to the player. 1600Sends an ext reply to the player.
1193 1601
1194=cut 1602=cut
1195 1603
1196sub ext_reply($$%) { 1604sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1198 1606
1199 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1608}
1203 1609
1204=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1205 1611
1206Sends an ext event to the client. 1612Sends an ext event to the client.
1207 1613
1208=cut 1614=cut
1209 1615
1210sub ext_event($$%) { 1616sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1212 1618
1213 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1214} 1620}
1215 1621
1216=head3 cf::region 1622=head3 cf::region
1217 1623
1218=over 4 1624=over 4
1221 1627
1222package cf::region; 1628package cf::region;
1223 1629
1224=item cf::region::find_by_path $path 1630=item cf::region::find_by_path $path
1225 1631
1226Tries to decuce the probable region for a map knowing only its path. 1632Tries to decuce the likely region for a map knowing only its path.
1227 1633
1228=cut 1634=cut
1229 1635
1230sub find_by_path($) { 1636sub find_by_path($) {
1231 my ($path) = @_; 1637 my ($path) = @_;
1232 1638
1233 my ($match, $specificity); 1639 my ($match, $specificity);
1234 1640
1235 for my $region (list) { 1641 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1642 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1643 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1644 if $region->specificity > $specificity;
1239 } 1645 }
1240 } 1646 }
1241 1647
1361 $self->init; # pass $1 etc. 1767 $self->init; # pass $1 etc.
1362 return $self; 1768 return $self;
1363 } 1769 }
1364 } 1770 }
1365 1771
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1772 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1773 ()
1368} 1774}
1369 1775
1370sub init { 1776sub init {
1371 my ($self) = @_; 1777 my ($self) = @_;
1434 1840
1435sub load_header_from($) { 1841sub load_header_from($) {
1436 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1437 1843
1438 utf8::encode $path; 1844 utf8::encode $path;
1439 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1440 # or return;
1441
1442 $self->_load_header ($path)
1443 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1444 1853
1445 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1446 1855
1447 1 1856 1
1448} 1857}
1502sub find { 1911sub find {
1503 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1504 1913
1505 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1506 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1507 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1508 1918
1509 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1510 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1511 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1512 or return; 1924 or return;
1513 1925
1514 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1515 1927
1517 or return; 1929 or return;
1518 1930
1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1521 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1522 $map->reset; 1936 $map->reset;
1523 undef $guard;
1524 return find $path; 1937 return find $path;
1525 } 1938 }
1526 1939
1527 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1528 } 1941 }
1537 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1538 1951
1539 my $path = $self->{path}; 1952 my $path = $self->{path};
1540 1953
1541 { 1954 {
1542 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1543 1956
1957 return unless $self->valid;
1544 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1545 1959
1546 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1547 1961
1548 $self->alloc; 1962 $self->alloc;
1549 1963
1550 $self->pre_load; 1964 $self->pre_load;
1551 Coro::cede; 1965 cf::cede_to_tick;
1552 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1553 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1554 or return; 1970 or return;
1555 1971
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1558 1974
1559 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq; 1976 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1562 $self->clear_unique_items; 1979 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1564 } 1983 }
1565 } 1984 }
1566 1985
1567 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1568 # now do the right thing for maps 1989 # now do the right thing for maps
1569 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1570 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1571 unless $self->difficulty; 1992 unless $self->difficulty;
1572 Coro::cede; 1993 cf::cede_to_tick;
1573 1994
1574 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1575 $self->decay_objects; 1996 $self->decay_objects;
1576 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1577 $self->update_buttons; 1998 $self->update_buttons;
1578 Coro::cede; 1999 cf::cede_to_tick;
1579 $self->set_darkness_map; 2000 $self->set_darkness_map;
1580 Coro::cede; 2001 cf::cede_to_tick;
1581 $self->activate; 2002 $self->activate;
1582 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1583 2007
1584 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1585 } 2009 }
1586 2010
1587 $self->post_load; 2011 $self->post_load;
1598 2022
1599 $self 2023 $self
1600} 2024}
1601 2025
1602# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1603sub load_diag { 2027sub load_neighbours {
1604 my ($map) = @_; 2028 my ($map) = @_;
1605 2029
1606 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1607 2031
1608 for (0 .. 3) { 2032 for (0 .. 3) {
1609 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1610 or next; 2034 or next;
1611 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1612 or next; 2036 or next;
1613 $neigh->load; 2037 $neigh->load;
1614 2038
2039 push @neigh,
1615 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1616 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1617 } 2042 }
1618 2043
1619 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1620 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1621 or next; 2047 or next;
1622 $neigh->load; 2048 $neigh->load;
1623 } 2049 }
1624} 2050}
1625 2051
1630} 2056}
1631 2057
1632sub do_load_sync { 2058sub do_load_sync {
1633 my ($map) = @_; 2059 my ($map) = @_;
1634 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1635 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1636} 2065}
1637 2066
1638our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1639our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1640 2069
1641sub find_async { 2070sub find_async {
1642 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1643 2072
1644 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1645 2074
1646 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1647 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1648 } 2077 }
1649 2078
1650 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1651 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1652 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1654 my $map = find $path 2086 if (my $map = find $k) {
1655 or next;
1656 $map->load; 2087 $map->load if $v;
2088 }
1657 2089
1658 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1659 } 2091 }
1660 } 2092 }
1661 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1662 }; 2094 };
1663 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
1666} 2098}
1667 2099
1668sub save { 2100sub save {
1669 my ($self) = @_; 2101 my ($self) = @_;
1670 2102
1671 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2104
1673 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1674 2106
1675 return unless $self->dirty; 2107 return unless $self->dirty;
1676 2108
1682 return if $self->{deny_save}; 2114 return if $self->{deny_save};
1683 2115
1684 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
1685 2117
1686 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
1687 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
1688 }; 2121 };
1689 2122
1690 if ($uniq) { 2123 if ($uniq) {
1691 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1699 my ($self) = @_; 2132 my ($self) = @_;
1700 2133
1701 # save first because save cedes 2134 # save first because save cedes
1702 $self->save; 2135 $self->save;
1703 2136
1704 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
1705 2138
1706 return if $self->players; 2139 return if $self->players;
1707 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
1708 return if $self->{deny_save}; 2141 return if $self->{deny_save};
1709 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2147 $self->clear;
1711 $self->in_memory (cf::MAP_SWAPPED);
1712} 2148}
1713 2149
1714sub reset_at { 2150sub reset_at {
1715 my ($self) = @_; 2151 my ($self) = @_;
1716 2152
1748 if $uniq; 2184 if $uniq;
1749 } 2185 }
1750 2186
1751 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
1752 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
1753 $self->clear; 2191 $self->clear;
1754
1755 $_->clear_links_to ($self) for values %cf::MAP;
1756 2192
1757 $self->unlink_save; 2193 $self->unlink_save;
1758 $self->destroy; 2194 $self->destroy;
1759} 2195}
1760 2196
1761my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
1762 2198
1763sub nuke { 2199sub nuke {
1764 my ($self) = @_; 2200 my ($self) = @_;
1765 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
1766 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
1767 2206
1768 $self->unlink_save; 2207 $self->unlink_save;
1769 2208
1770 bless $self, "cf::map"; 2209 bless $self, "cf::map";
1771 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
1772 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
1773 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
1774 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775 2214
1776 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
1777 2217
1778 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
1779} 2219}
1780 2220
1781=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
1857 2297
1858sub inv_recursive { 2298sub inv_recursive {
1859 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
1860} 2300}
1861 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
1862package cf; 2330package cf;
1863 2331
1864=back 2332=back
1865 2333
1866=head3 cf::object::player 2334=head3 cf::object::player
1883 2351
1884 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2352 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1885 2353
1886 if ($self->{record_replies}) { 2354 if ($self->{record_replies}) {
1887 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2355 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2356
1888 } else { 2357 } else {
2358 my $pl = $self->contr;
2359
2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2361 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363
2364 } else {
1889 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
1890 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2367 }
1891 } 2368 }
2369}
2370
2371=item $object->send_msg ($channel, $msg, $color, [extra...])
2372
2373=cut
2374
2375sub cf::object::send_msg {
2376 my $pl = shift->contr
2377 or return;
2378 $pl->send_msg (@_);
1892} 2379}
1893 2380
1894=item $player_object->may ("access") 2381=item $player_object->may ("access")
1895 2382
1896Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
1975 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
1976 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
1977 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
1978 2465
1979 $map->load; 2466 $map->load;
1980 $map->load_diag; 2467 $map->load_neighbours;
1981 2468
1982 return unless $self->contr->active; 2469 return unless $self->contr->active;
1983 $self->activate_recursive; 2470 $self->activate_recursive;
1984 2471
1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1986 $self->enter_map ($map, $x, $y); 2473 $self->enter_map ($map, $x, $y);
1987} 2474}
1988 2475
1989=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1990 2477
1991Moves the player to the given map-path and coordinates by first freezing 2478Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback 2479her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on 2480that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position. 2481the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process.
1995 2483
1996=cut 2484=cut
1997 2485
1998our $GOTOGEN; 2486our $GOTOGEN;
1999 2487
2000sub cf::object::player::goto { 2488sub cf::object::player::goto {
2001 my ($self, $path, $x, $y, $check) = @_; 2489 my ($self, $path, $x, $y, $check, $done) = @_;
2002 2490
2003 # do generation counting so two concurrent goto's will be executed in-order 2491 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2005 2493
2006 $self->enter_link; 2494 $self->enter_link;
2007 2495
2008 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2009 my $map = eval { 2518 my $map = eval {
2010 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2011 2520
2012 if ($map) { 2521 if ($map) {
2013 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2015 } else { 2524 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2017 } 2526 }
2018 2527
2019 $map 2528 $map
2020 }; 2529 };
2021 2530
2026 2535
2027 if ($gen == $self->{_goto_generation}) { 2536 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation}; 2537 delete $self->{_goto_generation};
2029 $self->leave_link ($map, $x, $y); 2538 $self->leave_link ($map, $x, $y);
2030 } 2539 }
2540
2541 $done->() if $done;
2031 })->prio (1); 2542 })->prio (1);
2032} 2543}
2033 2544
2034=item $player_object->enter_exit ($exit_object) 2545=item $player_object->enter_exit ($exit_object)
2035 2546
2104 my $hp = $exit->stats->hp; 2615 my $hp = $exit->stats->hp;
2105 my $sp = $exit->stats->sp; 2616 my $sp = $exit->stats->sp;
2106 2617
2107 $self->enter_link; 2618 $self->enter_link;
2108 2619
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2109 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2110 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2111 unless (eval { 2628 unless (eval {
2112 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2113 2630
2114 1; 2631 1;
2140 2657
2141 utf8::encode $text; 2658 utf8::encode $text;
2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2143} 2660}
2144 2661
2662=item $client->send_msg ($channel, $msg, $color, [extra...])
2663
2664Send a drawinfo or msg packet to the client, formatting the msg for the
2665client if neccessary. C<$type> should be a string identifying the type of
2666the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet.
2668
2669=cut
2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696);
2697
2698sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_;
2700
2701 $msg = $self->pl->expand_cfpod ($msg);
2702
2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704
2705 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2714 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2720 }
2721
2722 $channel = $channel->{id};
2723 }
2724
2725 return unless @extra || length $msg;
2726
2727 if ($self->can_msg) {
2728 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF;
2731
2732 $self->send_packet ("msg " . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2734 } else {
2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745
2746 $color &= cf::NDI_COLOR_MASK;
2747
2748 utf8::encode $msg;
2749
2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2753 } else {
2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2755 $self->send_packet ("drawinfo $color $msg")
2756 }
2757 }
2758 }
2759}
2760
2145=item $client->ext_event ($type, %msg) 2761=item $client->ext_msg ($type, @msg)
2146 2762
2147Sends an exti event to the client. 2763Sends an ext event to the client.
2148 2764
2149=cut 2765=cut
2150 2766
2151sub cf::client::ext_event($$%) { 2767sub cf::client::ext_msg($$@) {
2152 my ($self, $type, %msg) = @_; 2768 my ($self, $type, @msg) = @_;
2153 2769
2770 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove
2154 $msg{msgtype} = "event_$type"; 2773 push @msg, msgtype => "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg); 2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 }
2776}
2777
2778=item $client->ext_reply ($msgid, @msg)
2779
2780Sends an ext reply to the client.
2781
2782=cut
2783
2784sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_;
2786
2787 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 }
2156} 2794}
2157 2795
2158=item $success = $client->query ($flags, "text", \&cb) 2796=item $success = $client->query ($flags, "text", \&cb)
2159 2797
2160Queues a query to the client, calling the given callback with 2798Queues a query to the client, calling the given callback with
2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2799the 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>. 2800C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2163 2801
2164Queries can fail, so check the return code. Or don't, as queries will become 2802Queries can fail, so check the return code. Or don't, as queries will
2165reliable at some point in the future. 2803become reliable at some point in the future.
2166 2804
2167=cut 2805=cut
2168 2806
2169sub cf::client::query { 2807sub cf::client::query {
2170 my ($self, $flags, $text, $cb) = @_; 2808 my ($self, $flags, $text, $cb) = @_;
2178 utf8::encode $text; 2816 utf8::encode $text;
2179 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2817 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2180 2818
2181 $self->send_packet ($self->{query_queue}[0][0]) 2819 $self->send_packet ($self->{query_queue}[0][0])
2182 if @{ $self->{query_queue} } == 1; 2820 if @{ $self->{query_queue} } == 1;
2821
2822 1
2183} 2823}
2184 2824
2185cf::client->attach ( 2825cf::client->attach (
2826 on_connect => sub {
2827 my ($ns) = @_;
2828
2829 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2830 },
2186 on_reply => sub { 2831 on_reply => sub {
2187 my ($ns, $msg) = @_; 2832 my ($ns, $msg) = @_;
2188 2833
2189 # this weird shuffling is so that direct followup queries 2834 # this weird shuffling is so that direct followup queries
2190 # get handled first 2835 # get handled first
2202 } else { 2847 } else {
2203 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2848 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2204 } 2849 }
2205 } 2850 }
2206 }, 2851 },
2852 on_exticmd => sub {
2853 my ($ns, $buf) = @_;
2854
2855 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2856
2857 if (ref $msg) {
2858 my ($type, $reply, @payload) =
2859 "ARRAY" eq ref $msg
2860 ? @$msg
2861 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2862
2863 my @reply;
2864
2865 if (my $cb = $EXTICMD{$type}) {
2866 @reply = $cb->($ns, @payload);
2867 }
2868
2869 $ns->ext_reply ($reply, @reply)
2870 if $reply;
2871
2872 } else {
2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2874 }
2875
2876 cf::override;
2877 },
2207); 2878);
2208 2879
2209=item $client->async (\&cb) 2880=item $client->async (\&cb)
2210 2881
2211Create a new coroutine, running the specified callback. The coroutine will 2882Create a new coroutine, running the specified callback. The coroutine will
2252our $safe = new Safe "safe"; 2923our $safe = new Safe "safe";
2253our $safe_hole = new Safe::Hole; 2924our $safe_hole = new Safe::Hole;
2254 2925
2255$SIG{FPE} = 'IGNORE'; 2926$SIG{FPE} = 'IGNORE';
2256 2927
2257$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2928$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math
2930 grepstart grepwhile mapstart mapwhile
2931 sort time
2932));
2258 2933
2259# here we export the classes and methods available to script code 2934# here we export the classes and methods available to script code
2260 2935
2261=pod 2936=pod
2262 2937
2263The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2264 2939
2265 cf::object contr pay_amount pay_player map 2940 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr
2943
2266 cf::object::player player 2944 cf::object::player
2267 cf::player peaceful 2945 player
2268 cf::map trigger 2946
2947 cf::player
2948 peaceful
2949
2950 cf::map
2951 trigger
2269 2952
2270=cut 2953=cut
2271 2954
2272for ( 2955for (
2273 ["cf::object" => qw(contr pay_amount pay_player map)], 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race
2958 decrease_ob_nr destroy)],
2274 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2275 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2276 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2277) { 2962) {
2278 no strict 'refs'; 2963 no strict 'refs';
2349=back 3034=back
2350 3035
2351=cut 3036=cut
2352 3037
2353############################################################################# 3038#############################################################################
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 3039# the server's init and main functions
2527 3040
2528sub load_facedata($) { 3041sub load_facedata($) {
2529 my ($path) = @_; 3042 my ($path) = @_;
3043
3044 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = ();
3047
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2530 3049
2531 warn "loading facedata from $path\n"; 3050 warn "loading facedata from $path\n";
2532 3051
2533 my $facedata; 3052 my $facedata;
2534 0 < aio_load $path, $facedata 3053 0 < aio_load $path, $facedata
2537 $facedata = Coro::Storable::thaw $facedata; 3056 $facedata = Coro::Storable::thaw $facedata;
2538 3057
2539 $facedata->{version} == 2 3058 $facedata->{version} == 2
2540 or cf::cleanup "$path: version mismatch, cannot proceed."; 3059 or cf::cleanup "$path: version mismatch, cannot proceed.";
2541 3060
3061 # patch in the exptable
3062 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3065 };
3066 cf::cede_to_tick;
3067
2542 { 3068 {
2543 my $faces = $facedata->{faceinfo}; 3069 my $faces = $facedata->{faceinfo};
2544 3070
2545 while (my ($face, $info) = each %$faces) { 3071 while (my ($face, $info) = each %$faces) {
2546 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3072 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3073 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap};
2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2550 Coro::cede; 3077
3078 cf::cede_to_tick;
2551 } 3079 }
2552 3080
2553 while (my ($face, $info) = each %$faces) { 3081 while (my ($face, $info) = each %$faces) {
2554 next unless $info->{smooth}; 3082 next unless $info->{smooth};
2555 my $idx = cf::face::find $face 3083 my $idx = cf::face::find $face
2556 or next; 3084 or next;
2557 if (my $smooth = cf::face::find $info->{smooth}) { 3085 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth;
2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2559 } else { 3088 } else {
2560 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3089 warn "smooth face '$info->{smooth}' not found for face '$face'";
2561 } 3090 }
2562 Coro::cede; 3091
3092 cf::cede_to_tick;
2563 } 3093 }
2564 } 3094 }
2565 3095
2566 { 3096 {
2567 my $anims = $facedata->{animinfo}; 3097 my $anims = $facedata->{animinfo};
2568 3098
2569 while (my ($anim, $info) = each %$anims) { 3099 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3100 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede; 3101 cf::cede_to_tick;
2572 } 3102 }
2573 3103
2574 cf::anim::invalidate_all; # d'oh 3104 cf::anim::invalidate_all; # d'oh
2575 } 3105 }
2576 3106
3107 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource};
3111
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117
3118 if ($info->{type} & 1) {
3119 # prepend meta info
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else {
3128 $data = $info->{data};
3129 }
3130
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick;
3135 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 }
3155
2577 1 3156 1
2578} 3157}
2579 3158
3159register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_;
3161
3162 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v);
3164 }
3165};
3166
2580sub reload_regions { 3167sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = ();
3171
2581 load_resource_file "$MAPDIR/regions" 3172 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n"; 3173 or die "unable to load regions file\n";
3174
3175 for (cf::region::list) {
3176 $_->{match} = qr/$_->{match}/
3177 if exists $_->{match};
3178 }
2583} 3179}
2584 3180
2585sub reload_facedata { 3181sub reload_facedata {
2586 load_facedata "$DATADIR/facedata" 3182 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n"; 3183 or die "unable to load facedata\n";
2588} 3184}
2589 3185
2590sub reload_archetypes { 3186sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
2591 load_resource_file "$DATADIR/archetypes" 3192 load_resource_file "$DATADIR/archetypes"
2592 or die "unable to load archetypes\n"; 3193 or die "unable to load archetypes\n";
2593} 3194}
2594 3195
2595sub reload_treasures { 3196sub reload_treasures {
2611 3212
2612sub init { 3213sub init {
2613 reload_resources; 3214 reload_resources;
2614} 3215}
2615 3216
2616sub cfg_load { 3217sub reload_config {
2617 open my $fh, "<:utf8", "$CONFDIR/config" 3218 open my $fh, "<:utf8", "$CONFDIR/config"
2618 or return; 3219 or return;
2619 3220
2620 local $/; 3221 local $/;
2621 *CFG = YAML::Syck::Load <$fh>; 3222 *CFG = YAML::Syck::Load <$fh>;
2637sub main { 3238sub main {
2638 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
2639 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
2640 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2641 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
2642 Event::one_event; 3244 Event::one_event;
2643 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
2644 }; 3246 };
2645 3247
2646 cfg_load; 3248 reload_config;
2647 db_init; 3249 db_init;
2648 load_extensions; 3250 load_extensions;
2649 3251
2650 $TICK_WATCHER->start; 3252 $TICK_WATCHER->start;
2651 Event::loop; 3253 Event::loop;
2667 }, 3269 },
2668 ); 3270 );
2669 } 3271 }
2670} 3272}
2671 3273
3274sub write_runtime {
3275 my $runtime = "$LOCALDIR/runtime";
3276
3277 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time.
3279
3280 IO::AIO::aio_utime $runtime, undef, undef;
3281
3282 my $guard = cf::lock_acquire "write_runtime";
3283
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3285 or return;
3286
3287 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server.
3290
3291 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3292 and return;
3293
3294 # always fsync - this file is important
3295 aio_fsync $fh
3296 and return;
3297
3298 # touch it again to show we are up-to-date
3299 aio_utime $fh, undef, undef;
3300
3301 close $fh
3302 or return;
3303
3304 aio_rename "$runtime~", $runtime
3305 and return;
3306
3307 warn "runtime file written.\n";
3308
3309 1
3310}
3311
2672sub emergency_save() { 3312sub emergency_save() {
2673 my $freeze_guard = cf::freeze_mainloop; 3313 my $freeze_guard = cf::freeze_mainloop;
2674 3314
2675 warn "enter emergency perl save\n"; 3315 warn "enter emergency perl save\n";
2676 3316
2680 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
2681 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
2682 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
2683 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
2684 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2685 $pl->save; 3326 $pl->save;
2686 } 3327 }
2687 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
2688 3329
2689 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
2737 3378
2738 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
2739 for (;;) { 3380 for (;;) {
2740 BDB::flush; 3381 BDB::flush;
2741 IO::AIO::flush; 3382 IO::AIO::flush;
2742 Coro::cede; 3383 Coro::cede_notself;
2743 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
2744 warn "iterate..."; 3385 warn "iterate...";
2745 } 3386 }
2746 3387
2747 ++$RELOAD; 3388 ++$RELOAD;
2751 %EXT_CORO = (); 3392 %EXT_CORO = ();
2752 3393
2753 warn "removing commands"; 3394 warn "removing commands";
2754 %COMMAND = (); 3395 %COMMAND = ();
2755 3396
2756 warn "removing ext commands"; 3397 warn "removing ext/exti commands";
2757 %EXTCMD = (); 3398 %EXTCMD = ();
3399 %EXTICMD = ();
2758 3400
2759 warn "unloading/nuking all extensions"; 3401 warn "unloading/nuking all extensions";
2760 for my $pkg (@EXTS) { 3402 for my $pkg (@EXTS) {
2761 warn "... unloading $pkg"; 3403 warn "... unloading $pkg";
2762 3404
2805 warn "reloading cf.pm"; 3447 warn "reloading cf.pm";
2806 require cf; 3448 require cf;
2807 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2808 3450
2809 warn "loading config and database again"; 3451 warn "loading config and database again";
2810 cf::cfg_load; 3452 cf::reload_config;
2811 3453
2812 warn "loading extensions"; 3454 warn "loading extensions";
2813 cf::load_extensions; 3455 cf::load_extensions;
2814 3456
2815 warn "reattaching attachments to objects/players"; 3457 warn "reattaching attachments to objects/players";
2851register_command "reload" => sub { 3493register_command "reload" => sub {
2852 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
2853 3495
2854 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
2855 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
2856 async { reload_perl }; 3500 reload_perl;
3501 };
2857 } 3502 }
2858}; 3503};
2859 3504
2860unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
2861 3506
2880 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
2881 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
2882 $signal->wait; 3527 $signal->wait;
2883} 3528}
2884 3529
2885 my $min = 1e6;#d#
2886 my $avg = 10;
2887$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
2888 reentrant => 0, 3531 reentrant => 0,
2889 parked => 1, 3532 parked => 1,
2890 prio => 0, 3533 prio => 0,
2891 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
2899 3542
2900 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
2901 3544
2902 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
2903 3546
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; 3547 $RUNTIME += $TICK;
2928 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
2929 3549
2930 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2931 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
2932 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
2933 write_runtime 3554 write_runtime
2934 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
2935 }; 3556 };
2936 } 3557 }
2937 3558
2938# my $AFTER = Event::time;
2939# warn $AFTER - $NOW;#d#
2940
2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2942 $sig->send; 3560 $sig->send;
2943 } 3561 }
2944 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
2945 $sig->send; 3563 $sig->send;
2955 3573
2956 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958 3576
2959 _post_tick; 3577 _post_tick;
2960
2961
2962 }, 3578 },
2963); 3579);
2964 3580
2965{ 3581{
3582 BDB::min_parallel 8;
2966 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
2967 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
2968 reentrant => 0, 3585 reentrant => 0,
2969 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
2970 poll => 'r', 3587 poll => 'r',
2971 prio => 0, 3588 prio => 0,
2972 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
2973 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
2974 ); 3591 );
2975 BDB::min_parallel 8;
2976 3592
2977 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
2978 my $status; 3594 my $status;
2979 my $current = $Coro::current; 3595 my $current = $Coro::current;
2980 ( 3596 (
2989 ) 3605 )
2990 }; 3606 };
2991 3607
2992 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
2993 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2994 3614
2995 cf::sync_job { 3615 cf::sync_job {
2996 eval { 3616 eval {
2997 BDB::db_env_open 3617 BDB::db_env_open
2998 $DB_ENV, 3618 $DB_ENV,
3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3002 0666; 3622 0666;
3003 3623
3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 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 }; 3625 };
3009 3626
3010 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3011 }; 3628 };
3012 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3013} 3661}
3014 3662
3015{ 3663{
3016 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3017 3665
3020 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3021 reentrant => 0, 3669 reentrant => 0,
3022 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3023 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3024 poll => 'r', 3672 poll => 'r',
3025 prio => 6, 3673 prio => 0,
3026 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3027 ); 3675 );
3028} 3676}
3029 3677
3030my $_log_backtrace; 3678my $_log_backtrace;
3036 3684
3037 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace; 3687 ++$_log_backtrace;
3040 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3041 my @bt = fork_call { 3691 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines