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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines