ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 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;
967 path => $path, 1259 path => $path,
968 base => $base, 1260 base => $base,
969 pkg => $pkg, 1261 pkg => $pkg,
970 ); 1262 );
971 1263
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1266
975 $ext{source} = 1267 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1268 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1269 . "#line 1 \"$path\"\n{\n"
978 . $source 1270 . $source
984 my %done; 1276 my %done;
985 while (%todo) { 1277 while (%todo) {
986 my $progress; 1278 my $progress;
987 1279
988 while (my ($k, $v) = each %todo) { 1280 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1281 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1282 goto skip
991 unless exists $done{$_}; 1283 unless exists $done{$_};
992 } 1284 }
993 1285
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1286 warn "... loading '$k' into '$v->{pkg}'\n";
995 1287
996 unless (eval $v->{source}) { 1288 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1289 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1290 : "$v->{base}: extension inactive.\n";
999 1291
1000 if (exists $v->{meta}{mandatory}) { 1292 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1293 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1294 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1295 exit 1;
1004 } 1296 }
1005 1297
1006 die $msg; 1298 warn $msg;
1007 } 1299 }
1008 1300
1009 $done{$k} = delete $todo{$k}; 1301 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1011 } 1304 }
1012 1305
1013 skip: 1306 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1308 unless $progress;
1017 }; 1310 };
1018} 1311}
1019 1312
1020############################################################################# 1313#############################################################################
1021 1314
1315=back
1316
1022=head2 CORE EXTENSIONS 1317=head2 CORE EXTENSIONS
1023 1318
1024Functions and methods that extend core crossfire objects. 1319Functions and methods that extend core crossfire objects.
1025 1320
1026=cut 1321=cut
1030use Coro::AIO; 1325use Coro::AIO;
1031 1326
1032=head3 cf::player 1327=head3 cf::player
1033 1328
1034=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}
1035 1344
1036=item cf::player::find $login 1345=item cf::player::find $login
1037 1346
1038Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1039 1348
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1388
1080 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1081 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;
1082 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1083 } 1397 }
1084 } 1398 }
1085} 1399}
1086 1400
1096 1410
1097 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1099 1413
1100 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1101 Coro::cede; 1415 cf::cede_to_tick;
1102} 1416}
1103 1417
1104sub new($) { 1418sub new($) {
1105 my ($login) = @_; 1419 my ($login) = @_;
1106 1420
1110 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1111 1425
1112 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1113 1427
1114 $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 (@_);
1115} 1439}
1116 1440
1117=item $pl->quit_character 1441=item $pl->quit_character
1118 1442
1119Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1174 or return []; 1498 or return [];
1175 1499
1176 my @logins; 1500 my @logins;
1177 1501
1178 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") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1182 1511
1183 utf8::decode $login; 1512 utf8::decode $login;
1184 push @logins, $login; 1513 push @logins, $login;
1185 } 1514 }
1186 1515
1213 } 1542 }
1214 1543
1215 \@paths 1544 \@paths
1216} 1545}
1217 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1218=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1219 1641
1220Sends an ext reply to the player. 1642Sends an ext reply to the player.
1221 1643
1222=cut 1644=cut
1223 1645
1224sub ext_reply($$%) { 1646sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1226 1648
1227 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1650}
1231 1651
1232=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1233 1653
1234Sends an ext event to the client. 1654Sends an ext event to the client.
1235 1655
1236=cut 1656=cut
1237 1657
1238sub ext_event($$%) { 1658sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1240 1660
1241 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1242} 1662}
1243 1663
1244=head3 cf::region 1664=head3 cf::region
1245 1665
1246=over 4 1666=over 4
1249 1669
1250package cf::region; 1670package cf::region;
1251 1671
1252=item cf::region::find_by_path $path 1672=item cf::region::find_by_path $path
1253 1673
1254Tries to decuce the probable region for a map knowing only its path. 1674Tries to decuce the likely region for a map knowing only its path.
1255 1675
1256=cut 1676=cut
1257 1677
1258sub find_by_path($) { 1678sub find_by_path($) {
1259 my ($path) = @_; 1679 my ($path) = @_;
1260 1680
1261 my ($match, $specificity); 1681 my ($match, $specificity);
1262 1682
1263 for my $region (list) { 1683 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1684 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1685 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1686 if $region->specificity > $specificity;
1267 } 1687 }
1268 } 1688 }
1269 1689
1389 $self->init; # pass $1 etc. 1809 $self->init; # pass $1 etc.
1390 return $self; 1810 return $self;
1391 } 1811 }
1392 } 1812 }
1393 1813
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1814 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1815 ()
1396} 1816}
1397 1817
1398sub init { 1818sub init {
1399 my ($self) = @_; 1819 my ($self) = @_;
1462 1882
1463sub load_header_from($) { 1883sub load_header_from($) {
1464 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1465 1885
1466 utf8::encode $path; 1886 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1472 1895
1473 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1474 1897
1475 1 1898 1
1476} 1899}
1530sub find { 1953sub find {
1531 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1532 1955
1533 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1534 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1536 1960
1537 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1539 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1540 or return; 1966 or return;
1541 1967
1542 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1543 1969
1545 or return; 1971 or return;
1546 1972
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1550 $map->reset; 1978 $map->reset;
1551 undef $guard;
1552 return find $path; 1979 return find $path;
1553 } 1980 }
1554 1981
1555 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1556 } 1983 }
1565 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1566 1993
1567 my $path = $self->{path}; 1994 my $path = $self->{path};
1568 1995
1569 { 1996 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1571 1998
1999 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 2001
1574 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1575 2003
1576 $self->alloc; 2004 $self->alloc;
1577 2005
1578 $self->pre_load; 2006 $self->pre_load;
1579 Coro::cede; 2007 cf::cede_to_tick;
1580 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1582 or return; 2012 or return;
1583 2013
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1586 2016
1587 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 2018 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 2021 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1592 } 2025 }
1593 } 2026 }
1594 2027
1595 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1596 # now do the right thing for maps 2031 # now do the right thing for maps
1597 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 2034 unless $self->difficulty;
1600 Coro::cede; 2035 cf::cede_to_tick;
1601 2036
1602 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 2038 $self->decay_objects;
1604 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1605 $self->update_buttons; 2040 $self->update_buttons;
1606 Coro::cede; 2041 cf::cede_to_tick;
1607 $self->set_darkness_map; 2042 $self->set_darkness_map;
1608 Coro::cede; 2043 cf::cede_to_tick;
1609 $self->activate; 2044 $self->activate;
1610 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1611 2049
1612 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 2051 }
1614 2052
1615 $self->post_load; 2053 $self->post_load;
1626 2064
1627 $self 2065 $self
1628} 2066}
1629 2067
1630# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1631sub load_diag { 2069sub load_neighbours {
1632 my ($map) = @_; 2070 my ($map) = @_;
1633 2071
1634 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1635 2073
1636 for (0 .. 3) { 2074 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1638 or next; 2076 or next;
1639 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1640 or next; 2078 or next;
1641 $neigh->load; 2079 $neigh->load;
1642 2080
2081 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 2084 }
1646 2085
1647 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1649 or next; 2089 or next;
1650 $neigh->load; 2090 $neigh->load;
1651 } 2091 }
1652} 2092}
1653 2093
1658} 2098}
1659 2099
1660sub do_load_sync { 2100sub do_load_sync {
1661 my ($map) = @_; 2101 my ($map) = @_;
1662 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1663 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1664} 2107}
1665 2108
1666our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1668 2111
1669sub find_async { 2112sub find_async {
1670 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1671 2114
1672 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1673 2116
1674 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2119 }
1677 2120
1678 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1679 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1680 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2128 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2129 $map->load if $v;
2130 }
1685 2131
1686 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1687 } 2133 }
1688 } 2134 }
1689 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1690 }; 2136 };
1691 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1694} 2140}
1695 2141
1696sub save { 2142sub save {
1697 my ($self) = @_; 2143 my ($self) = @_;
1698 2144
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2146
1701 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1702 2148
1703 return unless $self->dirty; 2149 return unless $self->dirty;
1704 2150
1710 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1711 2157
1712 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1713 2159
1714 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1715 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1716 }; 2163 };
1717 2164
1718 if ($uniq) { 2165 if ($uniq) {
1719 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1727 my ($self) = @_; 2174 my ($self) = @_;
1728 2175
1729 # save first because save cedes 2176 # save first because save cedes
1730 $self->save; 2177 $self->save;
1731 2178
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2180
1734 return if $self->players; 2181 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1737 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1738 $self->clear; 2189 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2190}
1741 2191
1742sub reset_at { 2192sub reset_at {
1743 my ($self) = @_; 2193 my ($self) = @_;
1744 2194
1776 if $uniq; 2226 if $uniq;
1777 } 2227 }
1778 2228
1779 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1780 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2233 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2234
1785 $self->unlink_save; 2235 $self->unlink_save;
1786 $self->destroy; 2236 $self->destroy;
1787} 2237}
1788 2238
1789my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1790 2240
1791sub nuke { 2241sub nuke {
1792 my ($self) = @_; 2242 my ($self) = @_;
1793 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1794 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1795 2248
1796 $self->unlink_save; 2249 $self->unlink_save;
1797 2250
1798 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2256
1804 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1805 2259
1806 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
1807} 2261}
1808 2262
1809=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
1885 2339
1886sub inv_recursive { 2340sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
1888} 2342}
1889 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
1890package cf; 2372package cf;
1891 2373
1892=back 2374=back
1893 2375
1894=head3 cf::object::player 2376=head3 cf::object::player
1911 2393
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2394 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2395
1914 if ($self->{record_replies}) { 2396 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2397 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2398
1916 } else { 2399 } else {
2400 my $pl = $self->contr;
2401
2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2403 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405
2406 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2409 }
1919 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
1920} 2421}
1921 2422
1922=item $player_object->may ("access") 2423=item $player_object->may ("access")
1923 2424
1924Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
2003 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2006 2507
2007 $map->load; 2508 $map->load;
2008 $map->load_diag; 2509 $map->load_neighbours;
2009 2510
2010 return unless $self->contr->active; 2511 return unless $self->contr->active;
2011 $self->activate_recursive; 2512 $self->activate_recursive;
2012 2513
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2515 $self->enter_map ($map, $x, $y);
2015} 2516}
2016 2517
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2519
2019Moves the player to the given map-path and coordinates by first freezing 2520Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2521her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2522that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2523the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process.
2023 2525
2024=cut 2526=cut
2025 2527
2026our $GOTOGEN; 2528our $GOTOGEN;
2027 2529
2028sub cf::object::player::goto { 2530sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2531 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2532
2031 # do generation counting so two concurrent goto's will be executed in-order 2533 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2535
2034 $self->enter_link; 2536 $self->enter_link;
2035 2537
2036 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2037 my $map = eval { 2560 my $map = eval {
2038 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2039 2562
2040 if ($map) { 2563 if ($map) {
2041 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2043 } else { 2566 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2045 } 2568 }
2046 2569
2047 $map 2570 $map
2048 }; 2571 };
2049 2572
2054 2577
2055 if ($gen == $self->{_goto_generation}) { 2578 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2579 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2580 $self->leave_link ($map, $x, $y);
2058 } 2581 }
2582
2583 $done->() if $done;
2059 })->prio (1); 2584 })->prio (1);
2060} 2585}
2061 2586
2062=item $player_object->enter_exit ($exit_object) 2587=item $player_object->enter_exit ($exit_object)
2063 2588
2132 my $hp = $exit->stats->hp; 2657 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2658 my $sp = $exit->stats->sp;
2134 2659
2135 $self->enter_link; 2660 $self->enter_link;
2136 2661
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2137 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2138 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2670 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2141 2672
2142 1; 2673 1;
2168 2699
2169 utf8::encode $text; 2700 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2702}
2172 2703
2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2705
2706Send a drawinfo or msg packet to the client, formatting the msg for the
2707client if neccessary. C<$type> should be a string identifying the type of
2708the message, with C<log> being the default. If C<$color> is negative, suppress
2709the message unless the client supports the msg packet.
2710
2711=cut
2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2765sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_;
2767
2768 $msg = $self->pl->expand_cfpod ($msg);
2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2792 return unless @extra || length $msg;
2793
2794 if ($self->can_msg) {
2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2801 } else {
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826}
2827
2173=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2174 2829
2175Sends an exti event to the client. 2830Sends an ext event to the client.
2176 2831
2177=cut 2832=cut
2178 2833
2179sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2181 2836
2837 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2184} 2861}
2185 2862
2186=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2187 2864
2188Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2866the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2190C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2867C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2868
2192Queries can fail, so check the return code. Or don't, as queries will become 2869Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2870become reliable at some point in the future.
2194 2871
2195=cut 2872=cut
2196 2873
2197sub cf::client::query { 2874sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2875 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2883 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2884 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2885
2209 $self->send_packet ($self->{query_queue}[0][0]) 2886 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2887 if @{ $self->{query_queue} } == 1;
2888
2889 1
2211} 2890}
2212 2891
2213cf::client->attach ( 2892cf::client->attach (
2893 on_connect => sub {
2894 my ($ns) = @_;
2895
2896 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2897 },
2214 on_reply => sub { 2898 on_reply => sub {
2215 my ($ns, $msg) = @_; 2899 my ($ns, $msg) = @_;
2216 2900
2217 # this weird shuffling is so that direct followup queries 2901 # this weird shuffling is so that direct followup queries
2218 # get handled first 2902 # get handled first
2230 } else { 2914 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2915 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2916 }
2233 } 2917 }
2234 }, 2918 },
2919 on_exticmd => sub {
2920 my ($ns, $buf) = @_;
2921
2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2923
2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2932 if (my $cb = $EXTICMD{$type}) {
2933 @reply = $cb->($ns, @payload);
2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2939 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 }
2942
2943 cf::override;
2944 },
2235); 2945);
2236 2946
2237=item $client->async (\&cb) 2947=item $client->async (\&cb)
2238 2948
2239Create a new coroutine, running the specified callback. The coroutine will 2949Create a new coroutine, running the specified callback. The coroutine will
2280our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2282 2992
2283$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2284 2994
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2286 3000
2287# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2288 3002
2289=pod 3003=pod
2290 3004
2291The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2292 3006
2293 cf::object contr pay_amount pay_player map 3007 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr
3010
2294 cf::object::player player 3011 cf::object::player
2295 cf::player peaceful 3012 player
2296 cf::map trigger 3013
3014 cf::player
3015 peaceful
3016
3017 cf::map
3018 trigger
2297 3019
2298=cut 3020=cut
2299 3021
2300for ( 3022for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2302 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2305) { 3029) {
2306 no strict 'refs'; 3030 no strict 'refs';
2377=back 3101=back
2378 3102
2379=cut 3103=cut
2380 3104
2381############################################################################# 3105#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552
2553#############################################################################
2554# the server's init and main functions 3106# the server's init and main functions
2555 3107
2556sub load_facedata($) { 3108sub load_facedata($) {
2557 my ($path) = @_; 3109 my ($path) = @_;
3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 3116
2559 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2560 3118
2561 my $facedata; 3119 my $facedata;
2562 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2565 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2566 3124
2567 $facedata->{version} == 2 3125 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
3134
2570 { 3135 {
2571 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2572 3137
2573 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3140 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 3144
3145 cf::cede_to_tick;
2579 } 3146 }
2580 3147
2581 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 3149 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 3150 my $idx = cf::face::find $face
2584 or next; 3151 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 3152 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 3155 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3156 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3157 }
2590 Coro::cede; 3158
3159 cf::cede_to_tick;
2591 } 3160 }
2592 } 3161 }
2593 3162
2594 { 3163 {
2595 my $anims = $facedata->{animinfo}; 3164 my $anims = $facedata->{animinfo};
2596 3165
2597 while (my ($anim, $info) = each %$anims) { 3166 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3167 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3168 cf::cede_to_tick;
2600 } 3169 }
2601 3170
2602 cf::anim::invalidate_all; # d'oh 3171 cf::anim::invalidate_all; # d'oh
2603 } 3172 }
2604 3173
3174 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource};
3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184
3185 if ($info->{type} & 1) {
3186 # prepend meta info
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else {
3195 $data = $info->{data};
3196 }
3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick;
3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 }
3222
2605 1 3223 1
2606} 3224}
2607 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
2608sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2609 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
3241
3242 for (cf::region::list) {
3243 $_->{match} = qr/$_->{match}/
3244 if exists $_->{match};
3245 }
2611} 3246}
2612 3247
2613sub reload_facedata { 3248sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3249 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3250 or die "unable to load facedata\n";
2616} 3251}
2617 3252
2618sub reload_archetypes { 3253sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 3259 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3260 or die "unable to load archetypes\n";
2621} 3261}
2622 3262
2623sub reload_treasures { 3263sub reload_treasures {
2639 3279
2640sub init { 3280sub init {
2641 reload_resources; 3281 reload_resources;
2642} 3282}
2643 3283
2644sub cfg_load { 3284sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3286 or return;
2647 3287
2648 local $/; 3288 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2665sub main { 3305sub main {
2666 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2667 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2669 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2670 Event::one_event; 3311 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2672 }; 3313 };
2673 3314
2674 cfg_load; 3315 reload_config;
2675 db_init; 3316 db_init;
2676 load_extensions; 3317 load_extensions;
2677 3318
2678 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2679 Event::loop; 3320 Event::loop;
2695 }, 3336 },
2696 ); 3337 );
2697 } 3338 }
2698} 3339}
2699 3340
3341sub write_runtime {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time.
3346
3347 IO::AIO::aio_utime $runtime, undef, undef;
3348
3349 my $guard = cf::lock_acquire "write_runtime";
3350
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3352 or return;
3353
3354 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server.
3357
3358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3359 and return;
3360
3361 # always fsync - this file is important
3362 aio_fsync $fh
3363 and return;
3364
3365 # touch it again to show we are up-to-date
3366 aio_utime $fh, undef, undef;
3367
3368 close $fh
3369 or return;
3370
3371 aio_rename "$runtime~", $runtime
3372 and return;
3373
3374 warn "runtime file written.\n";
3375
3376 1
3377}
3378
2700sub emergency_save() { 3379sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3380 my $freeze_guard = cf::freeze_mainloop;
2702 3381
2703 warn "enter emergency perl save\n"; 3382 warn "enter emergency perl save\n";
2704 3383
2708 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3393 $pl->save;
2714 } 3394 }
2715 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2716 3396
2717 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
2765 3445
2766 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
2767 for (;;) { 3447 for (;;) {
2768 BDB::flush; 3448 BDB::flush;
2769 IO::AIO::flush; 3449 IO::AIO::flush;
2770 Coro::cede; 3450 Coro::cede_notself;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate..."; 3452 warn "iterate...";
2773 } 3453 }
2774 3454
2775 ++$RELOAD; 3455 ++$RELOAD;
2779 %EXT_CORO = (); 3459 %EXT_CORO = ();
2780 3460
2781 warn "removing commands"; 3461 warn "removing commands";
2782 %COMMAND = (); 3462 %COMMAND = ();
2783 3463
2784 warn "removing ext commands"; 3464 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3465 %EXTCMD = ();
3466 %EXTICMD = ();
2786 3467
2787 warn "unloading/nuking all extensions"; 3468 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3469 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3470 warn "... unloading $pkg";
2790 3471
2833 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
2834 require cf; 3515 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3517
2837 warn "loading config and database again"; 3518 warn "loading config and database again";
2838 cf::cfg_load; 3519 cf::reload_config;
2839 3520
2840 warn "loading extensions"; 3521 warn "loading extensions";
2841 cf::load_extensions; 3522 cf::load_extensions;
2842 3523
2843 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
2879register_command "reload" => sub { 3560register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2881 3562
2882 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3567 reload_perl;
3568 };
2885 } 3569 }
2886}; 3570};
2887 3571
2888unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2889 3573
2908 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3594 $signal->wait;
2911} 3595}
2912 3596
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
2916 reentrant => 0, 3598 reentrant => 0,
2917 parked => 1, 3599 parked => 1,
2918 prio => 0, 3600 prio => 0,
2919 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
2927 3609
2928 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
2929 3611
2930 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
2931 3613
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2954
2955 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
2957 3616
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
2961 write_runtime 3621 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
2963 }; 3623 };
2964 } 3624 }
2965 3625
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3627 $sig->send;
2971 } 3628 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3630 $sig->send;
2983 3640
2984 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3643
2987 _post_tick; 3644 _post_tick;
2988
2989
2990 }, 3645 },
2991); 3646);
2992 3647
2993{ 3648{
3649 BDB::min_parallel 8;
2994 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
2995 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
2996 reentrant => 0, 3652 reentrant => 0,
2997 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
2998 poll => 'r', 3654 poll => 'r',
2999 prio => 0, 3655 prio => 0,
3000 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3002 ); 3658 );
3003 BDB::min_parallel 8;
3004 3659
3005 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3006 my $status; 3661 my $status;
3007 my $current = $Coro::current; 3662 my $current = $Coro::current;
3008 ( 3663 (
3017 ) 3672 )
3018 }; 3673 };
3019 3674
3020 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3681
3023 cf::sync_job { 3682 cf::sync_job {
3024 eval { 3683 eval {
3025 BDB::db_env_open 3684 BDB::db_env_open
3026 $DB_ENV, 3685 $DB_ENV,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3689 0666;
3031 3690
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3692 };
3037 3693
3038 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3695 };
3040 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3041} 3728}
3042 3729
3043{ 3730{
3044 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3045 3732
3048 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3049 reentrant => 0, 3736 reentrant => 0,
3050 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3052 poll => 'r', 3739 poll => 'r',
3053 prio => 6, 3740 prio => 0,
3054 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3055 ); 3742 );
3056} 3743}
3057 3744
3058my $_log_backtrace; 3745my $_log_backtrace;
3064 3751
3065 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3754 ++$_log_backtrace;
3068 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3069 my @bt = fork_call { 3758 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines