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.386 by root, Mon Oct 15 17:50:27 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
… …
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
… …
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
… …
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
206} 218}
207 219
208$Event::DIED = sub { 220$Event::DIED = sub {
209 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
210}; 222};
223
224#############################################################################
211 225
212=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
213 227
214=over 4 228=over 4
215 229
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 249 $d
236 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
237} 251}
238 252
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
242 254
243Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
244 256
245=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
246 258
247Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
248 267
249=item cf::lock_wait $string 268=item cf::lock_wait $string
250 269
251Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
252 271
… …
255Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
258returned. 277returned.
259 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
260Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
262 284
263=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
264 286
265Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
266 288
267=cut 289=cut
268 290
269our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
270 293
271sub lock_wait($) { 294sub lock_wait($) {
272 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
273 301
274 # wait for lock, if any 302 # wait for lock, if any
275 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 305 Coro::schedule;
… …
283 311
284 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
285 lock_wait $key; 313 lock_wait $key;
286 314
287 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
288 317
289 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
292 } 322 }
293} 323}
294 324
… …
306 }; 336 };
307 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
308 $guard 338 $guard
309} 339}
310 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
311=item cf::async { BLOCK } 399=item cf::async { BLOCK }
312 400
313Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
318 406
319BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
320 408
321=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
322 410
323The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
326 415
327If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
330fast or be very important. 419fast or be very important.
… …
338 my $time = Event::time; 427 my $time = Event::time;
339 428
340 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
342 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
343 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 435 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
346 437
347 my $busy = 1; 438 my $busy = 1;
348 my @res; 439 my @res;
349 440
350 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 443 @res = eval { $job->() };
352 warn $@ if $@; 444 warn $@ if $@;
353 undef $busy; 445 undef $busy;
354 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
355 447
… …
390 $EXT_CORO{$coro+0} = $coro; 482 $EXT_CORO{$coro+0} = $coro;
391 483
392 $coro 484 $coro
393} 485}
394 486
395sub write_runtime { 487=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 488
398 # first touch the runtime file to show we are still running: 489Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 490process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling.
400 493
401 IO::AIO::aio_utime $runtime, undef, undef; 494=cut
402 495
403 my $guard = cf::lock_acquire "write_runtime"; 496sub fork_call(&@) {
497 my ($cb, @args) = @_;
404 498
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 499 # we seemingly have to make a local copy of the whole thing,
406 or return; 500 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious)
407 502
408 my $value = $cf::RUNTIME + 90 + 10; 503 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 504 reset_signals;
410 # 60 allows for the watchdog to kill the server. 505 &$cb
506 }, @args;
411 507
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 508 wantarray ? @res : $res[-1]
413 and return; 509}
414 510
415 # always fsync - this file is important 511=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 512
419 # touch it again to show we are up-to-date 513Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 514
422 close $fh 515=item cf::db_put $family => $key => $value
423 or return;
424 516
425 aio_rename "$runtime~", $runtime 517Stores the given C<$value> in the family. It can currently store binary
426 and return; 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 519
428 warn "runtime file written.\n"; 520=item $db = cf::db_table "name"
429 521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
543
544our $DB;
545
546sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db";
549 };
550}
551
552sub db_get($$) {
553 my $key = "$_[0]/$_[1]";
554
555 cf::sync_job {
556 BDB::db_get $DB, undef, $key, my $data;
557
558 $! ? ()
559 : $data
430 1 560 }
561}
562
563sub db_put($$$) {
564 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
566}
567
568=item cf::cache $id => [$paths...], $processversion => $process
569
570Generic caching function that returns the value of the resource $id,
571caching and regenerating as required.
572
573This function can block.
574
575=cut
576
577sub cache {
578 my ($id, $src, $processversion, $process) = @_;
579
580 my $meta =
581 join "\x00",
582 $processversion,
583 map {
584 aio_stat $_
585 and Carp::croak "$_: $!";
586
587 ($_, (stat _)[7,9])
588 } @$src;
589
590 my $dbmeta = db_get cache => "$id/meta";
591 if ($dbmeta ne $meta) {
592 # changed, we may need to process
593
594 my @data;
595 my $md5;
596
597 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_]
599 or Carp::croak "$src->[$_]: $!";
600 }
601
602 # if processing is expensive, check
603 # checksum first
604 if (1) {
605 $md5 =
606 join "\x00",
607 $processversion,
608 map {
609 cf::cede_to_tick;
610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
611 } 0.. $#$src;
612
613
614 my $dbmd5 = db_get cache => "$id/md5";
615 if ($dbmd5 eq $md5) {
616 db_put cache => "$id/meta", $meta;
617
618 return db_get cache => "$id/data";
619 }
620 }
621
622 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time;
625
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
627
628 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta;
631
632 return $data;
633 }
634
635 db_get cache => "$id/data"
431} 636}
432 637
433=item cf::datalog type => key => value, ... 638=item cf::datalog type => key => value, ...
434 639
435Log a datalog packet of the given type with the given key-value pairs. 640Log a datalog packet of the given type with the given key-value pairs.
… …
453attach callbacks/event handlers (a collection of which is called an "attachment") 658attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 659to it. All such attachable objects support the following methods.
455 660
456In the following description, CLASS can be any of C<global>, C<object> 661In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 662C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 663Crossfire TRT).
459 664
460=over 4 665=over 4
461 666
462=item $attachable->attach ($attachment, key => $value...) 667=item $attachable->attach ($attachment, key => $value...)
463 668
… …
665 _attach $registry, $klass, @attach; 870 _attach $registry, $klass, @attach;
666 } 871 }
667 872
668 $obj->{$name} = \%arg; 873 $obj->{$name} = \%arg;
669 } else { 874 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 875 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 876 }
672 877
673 $obj->{_attachment}{$name} = undef; 878 $obj->{_attachment}{$name} = undef;
674} 879}
675 880
… …
715 "; 920 ";
716 die if $@; 921 die if $@;
717} 922}
718 923
719our $override; 924our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 926
722sub override { 927sub override {
723 $override = 1; 928 $override = 1;
724 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
725} 930}
726 931
727sub do_invoke { 932sub do_invoke {
728 my $event = shift; 933 my $event = shift;
729 my $callbacks = shift; 934 my $callbacks = shift;
730 935
731 @invoke_results = (); 936 @INVOKE_RESULTS = ();
732 937
733 local $override; 938 local $override;
734 939
735 for (@$callbacks) { 940 for (@$callbacks) {
736 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
… …
753 958
754Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
755 960
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 964
760=back 965=back
761 966
762=cut 967=cut
763 968
764############################################################################# 969#############################################################################
765# object support 970# object support
971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
1005sub _can_merge {
1006 my ($ob1, $ob2) = @_;
1007
1008 ++$SLOW_MERGES;#d#
1009
1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
1012}
766 1013
767sub reattach { 1014sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1016 my ($obj) = @_;
770 1017
… …
817sub object_freezer_save { 1064sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
819 1066
820 sync_job { 1067 sync_job {
821 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
824 1072
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1077 close $fh;
830 1078
831 if (@$objs) { 1079 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1085 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
839 } 1087 }
… …
847 } 1095 }
848 } else { 1096 } else {
849 aio_unlink $filename; 1097 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
851 } 1099 }
852 } 1100 };
853} 1101}
854 1102
855sub object_freezer_as_string { 1103sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
857 1105
… …
869 or return; 1117 or return;
870 1118
871 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
873 or return; 1121 or return;
874 $av = eval { (Storable::thaw $av)->{objs} };
875 }
876 1122
1123 my $st = eval { Coro::Storable::thaw $av }
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1126 }
1127
1128 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1131
879 return ($data, $av); 1132 ($data, $av)
880} 1133}
1134
1135=head2 COMMAND CALLBACKS
1136
1137=over 4
1138
1139=cut
881 1140
882############################################################################# 1141#############################################################################
883# command handling &c 1142# command handling &c
884 1143
885=item cf::register_command $name => \&callback($ob,$args); 1144=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1157 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1158}
900 1159
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1160=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1161
903Register a callbackf ro execution when the client sends an extcmd packet. 1162Register a callback for execution when the client sends an (synchronous)
1163extcmd packet. Ext commands will be processed in the order they are
1164received by the server, like other user commands. The first argument is
1165the logged-in player. Ext commands can only be processed after a player
1166has logged in successfully.
904 1167
905If the callback returns something, it is sent back as if reply was being 1168If the callback returns something, it is sent back as if reply was being
906called. 1169called.
907 1170
1171=item cf::register_exticmd $name => \&callback($ns,$packet);
1172
1173Register a callback for execution when the client sends an (asynchronous)
1174exticmd packet. Exti commands are processed by the server as soon as they
1175are received, i.e. out of order w.r.t. other commands. The first argument
1176is a client socket. Exti commands can be received anytime, even before
1177log-in.
1178
1179If the callback returns something, it is sent back as if reply was being
1180called.
1181
908=cut 1182=cut
909 1183
910sub register_extcmd { 1184sub register_extcmd {
911 my ($name, $cb) = @_; 1185 my ($name, $cb) = @_;
912 1186
913 $EXTCMD{$name} = $cb; 1187 $EXTCMD{$name} = $cb;
1188}
1189
1190sub register_exticmd {
1191 my ($name, $cb) = @_;
1192
1193 $EXTICMD{$name} = $cb;
914} 1194}
915 1195
916cf::player->attach ( 1196cf::player->attach (
917 on_command => sub { 1197 on_command => sub {
918 my ($pl, $name, $params) = @_; 1198 my ($pl, $name, $params) = @_;
… …
927 cf::override; 1207 cf::override;
928 }, 1208 },
929 on_extcmd => sub { 1209 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1210 my ($pl, $buf) = @_;
931 1211
932 my $msg = eval { from_json $buf }; 1212 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1213
934 if (ref $msg) { 1214 if (ref $msg) {
1215 my ($type, $reply, @payload) =
1216 "ARRAY" eq ref $msg
1217 ? @$msg
1218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1219
1220 my @reply;
1221
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1222 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1223 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1224 }
1225
1226 $pl->ext_reply ($reply, @reply)
1227 if $reply;
1228
940 } else { 1229 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1231 }
943 1232
944 cf::override; 1233 cf::override;
945 }, 1234 },
946); 1235);
947 1236
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1237sub load_extensions {
1238 cf::sync_job {
1239 my %todo;
1240
983 for my $ext (<$LIBDIR/*.ext>) { 1241 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1242 next unless -r $path;
985 eval { 1243
986 load_extension $ext; 1244 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1245 my $base = $1;
1246 my $pkg = $1;
1247 $pkg =~ s/[^[:word:]]/_/g;
1248 $pkg = "ext::$pkg";
1249
1250 open my $fh, "<:utf8", $path
1251 or die "$path: $!";
1252
1253 my $source = do { local $/; <$fh> };
1254
1255 my %ext = (
1256 path => $path,
1257 base => $base,
1258 pkg => $pkg,
1259 );
1260
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263
1264 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n"
1267 . $source
1268 . "\n};\n1";
1269
1270 $todo{$base} = \%ext;
1271 }
1272
1273 my %done;
1274 while (%todo) {
1275 my $progress;
1276
1277 while (my ($k, $v) = each %todo) {
1278 for (split /,\s*/, $v->{meta}{depends}) {
1279 goto skip
1280 unless exists $done{$_};
1281 }
1282
1283 warn "... loading '$k' into '$v->{pkg}'\n";
1284
1285 unless (eval $v->{source}) {
1286 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n";
1288
1289 if (exists $v->{meta}{mandatory}) {
1290 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n";
1292 exit 1;
1293 }
1294
1295 warn $msg;
1296 }
1297
1298 $done{$k} = delete $todo{$k};
1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
987 1 1301 }
988 } or warn "$ext not loaded: $@"; 1302
1303 skip:
1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1305 unless $progress;
1306 }
989 } 1307 };
990} 1308}
991 1309
992############################################################################# 1310#############################################################################
993 1311
1312=back
1313
994=head2 CORE EXTENSIONS 1314=head2 CORE EXTENSIONS
995 1315
996Functions and methods that extend core crossfire objects. 1316Functions and methods that extend core crossfire objects.
997 1317
998=cut 1318=cut
… …
1002use Coro::AIO; 1322use Coro::AIO;
1003 1323
1004=head3 cf::player 1324=head3 cf::player
1005 1325
1006=over 4 1326=over 4
1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1007 1341
1008=item cf::player::find $login 1342=item cf::player::find $login
1009 1343
1010Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1011 1345
… …
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1385
1052 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1387 or return;
1388
1389 my $pl = cf::player::load_pl $f
1390 or return;
1391 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1055 } 1394 }
1056 } 1395 }
1057} 1396}
1058 1397
… …
1068 1407
1069 aio_mkdir playerdir $pl, 0770; 1408 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1409 $pl->{last_save} = $cf::RUNTIME;
1071 1410
1072 $pl->save_pl ($path); 1411 $pl->save_pl ($path);
1073 Coro::cede; 1412 cf::cede_to_tick;
1074} 1413}
1075 1414
1076sub new($) { 1415sub new($) {
1077 my ($login) = @_; 1416 my ($login) = @_;
1078 1417
… …
1082 $self->{deny_save} = 1; 1421 $self->{deny_save} = 1;
1083 1422
1084 $cf::PLAYER{$login} = $self; 1423 $cf::PLAYER{$login} = $self;
1085 1424
1086 $self 1425 $self
1426}
1427
1428=item $player->send_msg ($channel, $msg, $color, [extra...])
1429
1430=cut
1431
1432sub send_msg {
1433 my $ns = shift->ns
1434 or return;
1435 $ns->send_msg (@_);
1087} 1436}
1088 1437
1089=item $pl->quit_character 1438=item $pl->quit_character
1090 1439
1091Nukes the player without looking back. If logged in, the connection will 1440Nukes the player without looking back. If logged in, the connection will
… …
1146 or return []; 1495 or return [];
1147 1496
1148 my @logins; 1497 my @logins;
1149 1498
1150 for my $login (@$dirs) { 1499 for my $login (@$dirs) {
1500 my $path = path $login;
1501
1502 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1154 1508
1155 utf8::decode $login; 1509 utf8::decode $login;
1156 push @logins, $login; 1510 push @logins, $login;
1157 } 1511 }
1158 1512
… …
1185 } 1539 }
1186 1540
1187 \@paths 1541 \@paths
1188} 1542}
1189 1543
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1545
1546Expand crossfire pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594
1190=item $player->ext_reply ($msgid, %msg) 1595=item $player->ext_reply ($msgid, @msg)
1191 1596
1192Sends an ext reply to the player. 1597Sends an ext reply to the player.
1193 1598
1194=cut 1599=cut
1195 1600
1196sub ext_reply($$%) { 1601sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1602 my ($self, $id, @msg) = @_;
1198 1603
1199 $msg{msgid} = $id; 1604 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1605}
1203 1606
1204=item $player->ext_event ($type, %msg) 1607=item $player->ext_msg ($type, @msg)
1205 1608
1206Sends an ext event to the client. 1609Sends an ext event to the client.
1207 1610
1208=cut 1611=cut
1209 1612
1210sub ext_event($$%) { 1613sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1614 my ($self, $type, @msg) = @_;
1212 1615
1213 $self->ns->ext_event ($type, %msg); 1616 $self->ns->ext_msg ($type, @msg);
1214} 1617}
1215 1618
1216=head3 cf::region 1619=head3 cf::region
1217 1620
1218=over 4 1621=over 4
… …
1221 1624
1222package cf::region; 1625package cf::region;
1223 1626
1224=item cf::region::find_by_path $path 1627=item cf::region::find_by_path $path
1225 1628
1226Tries to decuce the probable region for a map knowing only its path. 1629Tries to decuce the likely region for a map knowing only its path.
1227 1630
1228=cut 1631=cut
1229 1632
1230sub find_by_path($) { 1633sub find_by_path($) {
1231 my ($path) = @_; 1634 my ($path) = @_;
1232 1635
1233 my ($match, $specificity); 1636 my ($match, $specificity);
1234 1637
1235 for my $region (list) { 1638 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1639 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1640 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1641 if $region->specificity > $specificity;
1239 } 1642 }
1240 } 1643 }
1241 1644
… …
1305 my ($self, $merge) = @_; 1708 my ($self, $merge) = @_;
1306 1709
1307 # we have to keep some variables in memory intact 1710 # we have to keep some variables in memory intact
1308 local $self->{path}; 1711 local $self->{path};
1309 local $self->{load_path}; 1712 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1713
1313 $self->SUPER::thawer_merge ($merge); 1714 $self->SUPER::thawer_merge ($merge);
1314} 1715}
1315 1716
1316sub normalise { 1717sub normalise {
… …
1363 $self->init; # pass $1 etc. 1764 $self->init; # pass $1 etc.
1364 return $self; 1765 return $self;
1365 } 1766 }
1366 } 1767 }
1367 1768
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1769 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1770 ()
1370} 1771}
1371 1772
1372sub init { 1773sub init {
1373 my ($self) = @_; 1774 my ($self) = @_;
… …
1416 1817
1417 $_->change_map_light ($change) 1818 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1819 for grep $_->outdoor, values %cf::MAP;
1419} 1820}
1420 1821
1822sub decay_objects {
1823 my ($self) = @_;
1824
1825 return if $self->{deny_reset};
1826
1827 $self->do_decay_objects;
1828}
1829
1421sub unlink_save { 1830sub unlink_save {
1422 my ($self) = @_; 1831 my ($self) = @_;
1423 1832
1424 utf8::encode (my $save = $self->save_path); 1833 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1834 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1428 1837
1429sub load_header_from($) { 1838sub load_header_from($) {
1430 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1431 1840
1432 utf8::encode $path; 1841 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1843 or return;
1844
1845 $self->_load_header ($f)
1846 or return;
1847
1848 local $MAP_LOADING{$self->{path}} = $self;
1849 $f->resolve_delayed_derefs;
1438 1850
1439 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1440 1852
1441 1 1853 1
1442} 1854}
… …
1481 $self->load_header_orig 1893 $self->load_header_orig
1482 or return; 1894 or return;
1483 $self->prepare_orig; 1895 $self->prepare_orig;
1484 } 1896 }
1485 1897
1898 $self->{deny_reset} = 1
1899 if $self->no_reset;
1900
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1901 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1902 unless $self->default_region;
1488 1903
1489 1 1904 1
1490} 1905}
… …
1493sub find { 1908sub find {
1494 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1495 1910
1496 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1497 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1499 1915
1500 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1502 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1503 or return; 1921 or return;
1504 1922
1505 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1506 1924
1507 $map->load_header 1925 $map->load_header
1508 or return; 1926 or return;
1509 1927
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1513 $map->reset; 1933 $map->reset;
1514 undef $guard;
1515 return find $path; 1934 return find $path;
1516 } 1935 }
1517 1936
1518 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1519 } 1938 }
… …
1528 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1529 1948
1530 my $path = $self->{path}; 1949 my $path = $self->{path};
1531 1950
1532 { 1951 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1534 1953
1954 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 1956
1537 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1538 1958
1539 $self->alloc; 1959 $self->alloc;
1540 1960
1541 $self->pre_load; 1961 $self->pre_load;
1542 Coro::cede; 1962 cf::cede_to_tick;
1543 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1545 or return; 1967 or return;
1546 1968
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1549 1971
1550 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 1973 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 1976 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1555 } 1980 }
1556 } 1981 }
1557 1982
1558 Coro::cede; 1983 $f->resolve_delayed_derefs;
1984
1985 cf::cede_to_tick;
1559 # now do the right thing for maps 1986 # now do the right thing for maps
1560 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 1989 unless $self->difficulty;
1563 Coro::cede; 1990 cf::cede_to_tick;
1564 1991
1565 unless ($self->{deny_activate}) { 1992 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 1993 $self->decay_objects;
1567 $self->fix_auto_apply; 1994 $self->fix_auto_apply;
1568 $self->update_buttons; 1995 $self->update_buttons;
1569 Coro::cede; 1996 cf::cede_to_tick;
1570 $self->set_darkness_map; 1997 $self->set_darkness_map;
1571 Coro::cede; 1998 cf::cede_to_tick;
1572 $self->activate; 1999 $self->activate;
1573 } 2000 }
2001
2002 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME);
1574 2004
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2005 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 2006 }
1577 2007
1578 $self->post_load; 2008 $self->post_load;
… …
1582 my ($self, $ob) = @_; 2012 my ($self, $ob) = @_;
1583 2013
1584 return find "~" . $ob->name . "/" . $self->{path} 2014 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2015 if $self->per_player;
1586 2016
2017# return find "?party/" . $ob->name . "/" . $self->{path}
2018# if $self->per_party;
2019
1587 $self 2020 $self
1588} 2021}
1589 2022
1590# find and load all maps in the 3x3 area around a map 2023# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2024sub load_neighbours {
1592 my ($map) = @_; 2025 my ($map) = @_;
1593 2026
1594 my @diag; # diagonal neighbours 2027 my @neigh; # diagonal neighbours
1595 2028
1596 for (0 .. 3) { 2029 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2030 my $neigh = $map->tile_path ($_)
1598 or next; 2031 or next;
1599 $neigh = find $neigh, $map 2032 $neigh = find $neigh, $map
1600 or next; 2033 or next;
1601 $neigh->load; 2034 $neigh->load;
1602 2035
2036 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2037 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2038 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2039 }
1606 2040
1607 for (@diag) { 2041 for (grep defined $_->[0], @neigh) {
2042 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2043 my $neigh = find $path, $origin
1609 or next; 2044 or next;
1610 $neigh->load; 2045 $neigh->load;
1611 } 2046 }
1612} 2047}
1613 2048
… …
1618} 2053}
1619 2054
1620sub do_load_sync { 2055sub do_load_sync {
1621 my ($map) = @_; 2056 my ($map) = @_;
1622 2057
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main;
2060
1623 cf::sync_job { $map->load }; 2061 cf::sync_job { $map->load };
1624} 2062}
1625 2063
1626our %MAP_PREFETCH; 2064our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2065our $MAP_PREFETCHER = undef;
1628 2066
1629sub find_async { 2067sub find_async {
1630 my ($path, $origin) = @_; 2068 my ($path, $origin, $load) = @_;
1631 2069
1632 $path = normalise $path, $origin && $origin->{path}; 2070 $path = normalise $path, $origin && $origin->{path};
1633 2071
1634 if (my $map = $cf::MAP{$path}) { 2072 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2074 }
1637 2075
1638 undef $MAP_PREFETCH{$path}; 2076 $MAP_PREFETCH{$path} |= $load;
2077
1639 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1640 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2083 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2084 $map->load if $v;
2085 }
1645 2086
1646 delete $MAP_PREFETCH{$path}; 2087 delete $MAP_PREFETCH{$k};
1647 } 2088 }
1648 } 2089 }
1649 undef $MAP_PREFETCHER; 2090 undef $MAP_PREFETCHER;
1650 }; 2091 };
1651 $MAP_PREFETCHER->prio (6); 2092 $MAP_PREFETCHER->prio (6);
… …
1654} 2095}
1655 2096
1656sub save { 2097sub save {
1657 my ($self) = @_; 2098 my ($self) = @_;
1658 2099
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2101
1661 $self->{last_save} = $cf::RUNTIME; 2102 $self->{last_save} = $cf::RUNTIME;
1662 2103
1663 return unless $self->dirty; 2104 return unless $self->dirty;
1664 2105
… …
1670 return if $self->{deny_save}; 2111 return if $self->{deny_save};
1671 2112
1672 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
1673 2114
1674 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
1676 }; 2118 };
1677 2119
1678 if ($uniq) { 2120 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1687 my ($self) = @_; 2129 my ($self) = @_;
1688 2130
1689 # save first because save cedes 2131 # save first because save cedes
1690 $self->save; 2132 $self->save;
1691 2133
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2135
1694 return if $self->players; 2136 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2138 return if $self->{deny_save};
1697 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2144 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2145}
1701 2146
1702sub reset_at { 2147sub reset_at {
1703 my ($self) = @_; 2148 my ($self) = @_;
1704 2149
1705 # TODO: safety, remove and allow resettable per-player maps 2150 # 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}; 2151 return 1e99 if $self->{deny_reset};
1708 2152
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2153 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2154 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2155
… …
1722 my ($self) = @_; 2166 my ($self) = @_;
1723 2167
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2168 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2169
1726 return if $self->players; 2170 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2171
1729 warn "resetting map ", $self->path; 2172 warn "resetting map ", $self->path;
1730 2173
1731 $self->in_memory (cf::MAP_SWAPPED); 2174 $self->in_memory (cf::MAP_SWAPPED);
1732 2175
… …
1738 if $uniq; 2181 if $uniq;
1739 } 2182 }
1740 2183
1741 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
1742 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2188 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2189
1747 $self->unlink_save; 2190 $self->unlink_save;
1748 $self->destroy; 2191 $self->destroy;
1749} 2192}
1750 2193
1751my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
1752 2195
1753sub nuke { 2196sub nuke {
1754 my ($self) = @_; 2197 my ($self) = @_;
1755 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
1756 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
1757 2203
1758 $self->unlink_save; 2204 $self->unlink_save;
1759 2205
1760 bless $self, "cf::map"; 2206 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2211
1766 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
1767 2214
1768 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
2216}
2217
2218=item $maps = cf::map::tmp_maps
2219
2220Returns an arrayref with all map paths of currently instantiated and saved
2221maps. May block.
2222
2223=cut
2224
2225sub tmp_maps() {
2226 [
2227 map {
2228 utf8::decode $_;
2229 /\.map$/
2230 ? normalise $_
2231 : ()
2232 } @{ aio_readdir $TMPDIR or [] }
2233 ]
2234}
2235
2236=item $maps = cf::map::random_maps
2237
2238Returns an arrayref with all map paths of currently instantiated and saved
2239random maps. May block.
2240
2241=cut
2242
2243sub random_maps() {
2244 [
2245 map {
2246 utf8::decode $_;
2247 /\.map$/
2248 ? normalise "?random/$_"
2249 : ()
2250 } @{ aio_readdir $RANDOMDIR or [] }
2251 ]
1769} 2252}
1770 2253
1771=item cf::map::unique_maps 2254=item cf::map::unique_maps
1772 2255
1773Returns an arrayref of paths of all shared maps that have 2256Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2257instantiated unique items. May block.
1775 2258
1776=cut 2259=cut
1777 2260
1778sub unique_maps() { 2261sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2262 [
1780 or return; 2263 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2264 utf8::decode $_;
1786 next if /\.pst$/; 2265 /\.map$/
1787 next unless /^$PATH_SEP/o; 2266 ? normalise $_
1788 2267 : ()
1789 push @paths, cf::map::normalise $_; 2268 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2269 ]
1791
1792 \@paths
1793} 2270}
1794 2271
1795package cf; 2272package cf;
1796 2273
1797=back 2274=back
… …
1815 map { $_, inv_recursive_ $_->inv } @_ 2292 map { $_, inv_recursive_ $_->inv } @_
1816} 2293}
1817 2294
1818sub inv_recursive { 2295sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
2297}
2298
2299=item $ref = $ob->ref
2300
2301creates and returns a persistent reference to an objetc that can be stored as a string.
2302
2303=item $ob = cf::object::deref ($refstring)
2304
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block.
2307
2308=cut
2309
2310sub deref {
2311 my ($ref) = @_;
2312
2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2314 my ($uuid, $name) = ($1, $2);
2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2316 or return;
2317 $pl->ob->uuid eq $uuid
2318 or return;
2319
2320 $pl->ob
2321 } else {
2322 warn "$ref: cannot resolve object reference\n";
2323 undef
2324 }
1820} 2325}
1821 2326
1822package cf; 2327package cf;
1823 2328
1824=back 2329=back
… …
1843 2348
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2349 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2350
1846 if ($self->{record_replies}) { 2351 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2352 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2353
1848 } else { 2354 } else {
2355 my $pl = $self->contr;
2356
2357 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2358 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360
2361 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2362 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2363 $self->message ($msg, $flags);
2364 }
1851 } 2365 }
2366}
2367
2368=item $object->send_msg ($channel, $msg, $color, [extra...])
2369
2370=cut
2371
2372sub cf::object::send_msg {
2373 my $pl = shift->contr
2374 or return;
2375 $pl->send_msg (@_);
1852} 2376}
1853 2377
1854=item $player_object->may ("access") 2378=item $player_object->may ("access")
1855 2379
1856Returns wether the given player is authorized to access resource "access" 2380Returns wether the given player is authorized to access resource "access"
… …
1935 # use -1 or undef as default coordinates, not 0, 0 2459 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2460 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2461 if $x <=0 && $y <= 0;
1938 2462
1939 $map->load; 2463 $map->load;
1940 $map->load_diag; 2464 $map->load_neighbours;
1941 2465
1942 return unless $self->contr->active; 2466 return unless $self->contr->active;
1943 $self->activate_recursive; 2467 $self->activate_recursive;
1944 2468
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2470 $self->enter_map ($map, $x, $y);
1947} 2471}
1948 2472
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2473=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2474
1951Moves the player to the given map-path and coordinates by first freezing 2475Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2476her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2477that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2478the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process.
1955 2480
1956=cut 2481=cut
1957 2482
1958our $GOTOGEN; 2483our $GOTOGEN;
1959 2484
1960sub cf::object::player::goto { 2485sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2486 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2487
1963 # do generation counting so two concurrent goto's will be executed in-order 2488 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2490
1966 $self->enter_link; 2491 $self->enter_link;
1967 2492
1968 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
1969 my $map = eval { 2515 my $map = eval {
1970 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
1971 2517
1972 if ($map) { 2518 if ($map) {
1973 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
1975 } else { 2521 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2523 }
1978 2524
1979 $map 2525 $map
1980 }; 2526 };
1981 2527
… …
1986 2532
1987 if ($gen == $self->{_goto_generation}) { 2533 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2534 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2535 $self->leave_link ($map, $x, $y);
1990 } 2536 }
2537
2538 $done->() if $done;
1991 })->prio (1); 2539 })->prio (1);
1992} 2540}
1993 2541
1994=item $player_object->enter_exit ($exit_object) 2542=item $player_object->enter_exit ($exit_object)
1995 2543
… …
2064 my $hp = $exit->stats->hp; 2612 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2613 my $sp = $exit->stats->sp;
2066 2614
2067 $self->enter_link; 2615 $self->enter_link;
2068 2616
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2069 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2070 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2625 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2073 2627
2074 1; 2628 1;
… …
2100 2654
2101 utf8::encode $text; 2655 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2656 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2657}
2104 2658
2659=item $client->send_msg ($channel, $msg, $color, [extra...])
2660
2661Send a drawinfo or msg packet to the client, formatting the msg for the
2662client if neccessary. C<$type> should be a string identifying the type of
2663the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet.
2665
2666=cut
2667
2668our %CHANNEL = (
2669 "c/identify" => {
2670 id => "infobox",
2671 title => "Identify",
2672 reply => undef,
2673 tooltip => "Items recently identified",
2674 },
2675 "c/examine" => {
2676 id => "infobox",
2677 title => "Examine",
2678 reply => undef,
2679 tooltip => "Signs and other items you examined",
2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2687);
2688
2689sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_;
2691
2692 $msg = $self->pl->expand_cfpod ($msg);
2693
2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695
2696 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2705 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711 }
2712
2713 $channel = $channel->{id};
2714 }
2715
2716 return unless @extra || length $msg;
2717
2718 if ($self->can_msg) {
2719 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF;
2722
2723 $self->send_packet ("msg " . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2725 } else {
2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736
2737 $color &= cf::NDI_COLOR_MASK;
2738
2739 utf8::encode $msg;
2740
2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2744 } else {
2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2746 $self->send_packet ("drawinfo $color $msg")
2747 }
2748 }
2749 }
2750}
2751
2105=item $client->ext_event ($type, %msg) 2752=item $client->ext_msg ($type, @msg)
2106 2753
2107Sends an exti event to the client. 2754Sends an ext event to the client.
2108 2755
2109=cut 2756=cut
2110 2757
2111sub cf::client::ext_event($$%) { 2758sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2759 my ($self, $type, @msg) = @_;
2113 2760
2761 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2764 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 }
2767}
2768
2769=item $client->ext_reply ($msgid, @msg)
2770
2771Sends an ext reply to the client.
2772
2773=cut
2774
2775sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_;
2777
2778 if ($self->extcmd == 2) {
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 }
2116} 2785}
2117 2786
2118=item $success = $client->query ($flags, "text", \&cb) 2787=item $success = $client->query ($flags, "text", \&cb)
2119 2788
2120Queues a query to the client, calling the given callback with 2789Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2790the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2791C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2792
2124Queries can fail, so check the return code. Or don't, as queries will become 2793Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2794become reliable at some point in the future.
2126 2795
2127=cut 2796=cut
2128 2797
2129sub cf::client::query { 2798sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2799 my ($self, $flags, $text, $cb) = @_;
… …
2138 utf8::encode $text; 2807 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2808 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2809
2141 $self->send_packet ($self->{query_queue}[0][0]) 2810 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2811 if @{ $self->{query_queue} } == 1;
2812
2813 1
2143} 2814}
2144 2815
2145cf::client->attach ( 2816cf::client->attach (
2817 on_connect => sub {
2818 my ($ns) = @_;
2819
2820 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2821 },
2146 on_reply => sub { 2822 on_reply => sub {
2147 my ($ns, $msg) = @_; 2823 my ($ns, $msg) = @_;
2148 2824
2149 # this weird shuffling is so that direct followup queries 2825 # this weird shuffling is so that direct followup queries
2150 # get handled first 2826 # get handled first
… …
2162 } else { 2838 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2839 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2840 }
2165 } 2841 }
2166 }, 2842 },
2843 on_exticmd => sub {
2844 my ($ns, $buf) = @_;
2845
2846 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2847
2848 if (ref $msg) {
2849 my ($type, $reply, @payload) =
2850 "ARRAY" eq ref $msg
2851 ? @$msg
2852 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2853
2854 my @reply;
2855
2856 if (my $cb = $EXTICMD{$type}) {
2857 @reply = $cb->($ns, @payload);
2858 }
2859
2860 $ns->ext_reply ($reply, @reply)
2861 if $reply;
2862
2863 } else {
2864 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2865 }
2866
2867 cf::override;
2868 },
2167); 2869);
2168 2870
2169=item $client->async (\&cb) 2871=item $client->async (\&cb)
2170 2872
2171Create a new coroutine, running the specified callback. The coroutine will 2873Create a new coroutine, running the specified callback. The coroutine will
… …
2212our $safe = new Safe "safe"; 2914our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 2915our $safe_hole = new Safe::Hole;
2214 2916
2215$SIG{FPE} = 'IGNORE'; 2917$SIG{FPE} = 'IGNORE';
2216 2918
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2919$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math
2921 grepstart grepwhile mapstart mapwhile
2922 sort time
2923));
2218 2924
2219# here we export the classes and methods available to script code 2925# here we export the classes and methods available to script code
2220 2926
2221=pod 2927=pod
2222 2928
2223The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2224 2930
2225 cf::object contr pay_amount pay_player map 2931 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr
2934
2226 cf::object::player player 2935 cf::object::player
2227 cf::player peaceful 2936 player
2228 cf::map trigger 2937
2938 cf::player
2939 peaceful
2940
2941 cf::map
2942 trigger
2229 2943
2230=cut 2944=cut
2231 2945
2232for ( 2946for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race
2949 decrease_ob_nr destroy)],
2234 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2237) { 2953) {
2238 no strict 'refs'; 2954 no strict 'refs';
… …
2309=back 3025=back
2310 3026
2311=cut 3027=cut
2312 3028
2313############################################################################# 3029#############################################################################
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 3030# the server's init and main functions
2487 3031
2488sub load_facedata($) { 3032sub load_facedata($) {
2489 my ($path) = @_; 3033 my ($path) = @_;
3034
3035 # HACK to clear player env face cache, we need some signal framework
3036 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = ();
3038
3039 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3040
2491 warn "loading facedata from $path\n"; 3041 warn "loading facedata from $path\n";
2492 3042
2493 my $facedata; 3043 my $facedata;
2494 0 < aio_load $path, $facedata 3044 0 < aio_load $path, $facedata
… …
2497 $facedata = Coro::Storable::thaw $facedata; 3047 $facedata = Coro::Storable::thaw $facedata;
2498 3048
2499 $facedata->{version} == 2 3049 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3050 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3051
3052 # patch in the exptable
3053 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC,
3055 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3056 };
3057 cf::cede_to_tick;
3058
2502 { 3059 {
2503 my $faces = $facedata->{faceinfo}; 3060 my $faces = $facedata->{faceinfo};
2504 3061
2505 while (my ($face, $info) = each %$faces) { 3062 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3063 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3064 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3068
3069 cf::cede_to_tick;
2511 } 3070 }
2512 3071
2513 while (my ($face, $info) = each %$faces) { 3072 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3073 next unless $info->{smooth};
2515 my $idx = cf::face::find $face 3074 my $idx = cf::face::find $face
2516 or next; 3075 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3076 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3079 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3080 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3081 }
2522 Coro::cede; 3082
3083 cf::cede_to_tick;
2523 } 3084 }
2524 } 3085 }
2525 3086
2526 { 3087 {
2527 my $anims = $facedata->{animinfo}; 3088 my $anims = $facedata->{animinfo};
2528 3089
2529 while (my ($anim, $info) = each %$anims) { 3090 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3091 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3092 cf::cede_to_tick;
2532 } 3093 }
2533 3094
2534 cf::anim::invalidate_all; # d'oh 3095 cf::anim::invalidate_all; # d'oh
2535 } 3096 }
2536 3097
3098 {
3099 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource};
3102
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
3108
3109 if ($info->{type} & 1) {
3110 # prepend meta info
3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
3118 } else {
3119 $data = $info->{data};
3120 }
3121
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick;
3126 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 }
3146
2537 1 3147 1
2538} 3148}
2539 3149
3150register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_;
3152
3153 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v);
3155 }
3156};
3157
2540sub reload_regions { 3158sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = ();
3162
2541 load_resource_file "$MAPDIR/regions" 3163 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3164 or die "unable to load regions file\n";
3165
3166 for (cf::region::list) {
3167 $_->{match} = qr/$_->{match}/
3168 if exists $_->{match};
3169 }
2543} 3170}
2544 3171
2545sub reload_facedata { 3172sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3173 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3174 or die "unable to load facedata\n";
2548} 3175}
2549 3176
2550sub reload_archetypes { 3177sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
2551 load_resource_file "$DATADIR/archetypes" 3183 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3184 or die "unable to load archetypes\n";
2553} 3185}
2554 3186
2555sub reload_treasures { 3187sub reload_treasures {
… …
2571 3203
2572sub init { 3204sub init {
2573 reload_resources; 3205 reload_resources;
2574} 3206}
2575 3207
2576sub cfg_load { 3208sub reload_config {
2577 open my $fh, "<:utf8", "$CONFDIR/config" 3209 open my $fh, "<:utf8", "$CONFDIR/config"
2578 or return; 3210 or return;
2579 3211
2580 local $/; 3212 local $/;
2581 *CFG = YAML::Syck::Load <$fh>; 3213 *CFG = YAML::Syck::Load <$fh>;
… …
2597sub main { 3229sub main {
2598 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
2599 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2601 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
2602 Event::one_event; 3235 Event::one_event;
2603 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
2604 }; 3237 };
2605 3238
2606 cfg_load; 3239 reload_config;
2607 db_init; 3240 db_init;
2608 load_extensions; 3241 load_extensions;
2609 3242
2610 $TICK_WATCHER->start; 3243 $TICK_WATCHER->start;
2611 Event::loop; 3244 Event::loop;
… …
2627 }, 3260 },
2628 ); 3261 );
2629 } 3262 }
2630} 3263}
2631 3264
3265sub write_runtime {
3266 my $runtime = "$LOCALDIR/runtime";
3267
3268 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time.
3270
3271 IO::AIO::aio_utime $runtime, undef, undef;
3272
3273 my $guard = cf::lock_acquire "write_runtime";
3274
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3276 or return;
3277
3278 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server.
3281
3282 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3283 and return;
3284
3285 # always fsync - this file is important
3286 aio_fsync $fh
3287 and return;
3288
3289 # touch it again to show we are up-to-date
3290 aio_utime $fh, undef, undef;
3291
3292 close $fh
3293 or return;
3294
3295 aio_rename "$runtime~", $runtime
3296 and return;
3297
3298 warn "runtime file written.\n";
3299
3300 1
3301}
3302
2632sub emergency_save() { 3303sub emergency_save() {
2633 my $freeze_guard = cf::freeze_mainloop; 3304 my $freeze_guard = cf::freeze_mainloop;
2634 3305
2635 warn "enter emergency perl save\n"; 3306 warn "enter emergency perl save\n";
2636 3307
… …
2640 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
2641 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
2642 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
2643 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
2644 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2645 $pl->save; 3317 $pl->save;
2646 } 3318 }
2647 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
2648 3320
2649 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
2711 %EXT_CORO = (); 3383 %EXT_CORO = ();
2712 3384
2713 warn "removing commands"; 3385 warn "removing commands";
2714 %COMMAND = (); 3386 %COMMAND = ();
2715 3387
2716 warn "removing ext commands"; 3388 warn "removing ext/exti commands";
2717 %EXTCMD = (); 3389 %EXTCMD = ();
3390 %EXTICMD = ();
2718 3391
2719 warn "unloading/nuking all extensions"; 3392 warn "unloading/nuking all extensions";
2720 for my $pkg (@EXTS) { 3393 for my $pkg (@EXTS) {
2721 warn "... unloading $pkg"; 3394 warn "... unloading $pkg";
2722 3395
… …
2765 warn "reloading cf.pm"; 3438 warn "reloading cf.pm";
2766 require cf; 3439 require cf;
2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2768 3441
2769 warn "loading config and database again"; 3442 warn "loading config and database again";
2770 cf::cfg_load; 3443 cf::reload_config;
2771 3444
2772 warn "loading extensions"; 3445 warn "loading extensions";
2773 cf::load_extensions; 3446 cf::load_extensions;
2774 3447
2775 warn "reattaching attachments to objects/players"; 3448 warn "reattaching attachments to objects/players";
… …
2811register_command "reload" => sub { 3484register_command "reload" => sub {
2812 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
2813 3486
2814 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
2815 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
2816 async { reload_perl }; 3491 reload_perl;
3492 };
2817 } 3493 }
2818}; 3494};
2819 3495
2820unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
2821 3497
… …
2840 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait; 3518 $signal->wait;
2843} 3519}
2844 3520
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2847$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
2848 reentrant => 0, 3522 reentrant => 0,
2849 parked => 1, 3523 parked => 1,
2850 prio => 0, 3524 prio => 0,
2851 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
2859 3533
2860 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
2861 3535
2862 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
2863 3537
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; 3538 $RUNTIME += $TICK;
2888 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
2889 3540
2890 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2891 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
2893 write_runtime 3545 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
2895 }; 3547 };
2896 } 3548 }
2897 3549
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send; 3551 $sig->send;
2903 } 3552 }
2904 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send; 3554 $sig->send;
… …
2915 3564
2916 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918 3567
2919 _post_tick; 3568 _post_tick;
2920
2921
2922 }, 3569 },
2923); 3570);
2924 3571
2925{ 3572{
3573 BDB::min_parallel 8;
2926 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
2927 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
2928 reentrant => 0, 3576 reentrant => 0,
2929 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
2930 poll => 'r', 3578 poll => 'r',
2931 prio => 0, 3579 prio => 0,
2932 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
2934 ); 3582 );
2935 BDB::min_parallel 8;
2936 3583
2937 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
2938 my $status; 3585 my $status;
2939 my $current = $Coro::current; 3586 my $current = $Coro::current;
2940 ( 3587 (
… …
2949 ) 3596 )
2950 }; 3597 };
2951 3598
2952 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2954 3605
2955 cf::sync_job { 3606 cf::sync_job {
2956 eval { 3607 eval {
2957 BDB::db_env_open 3608 BDB::db_env_open
2958 $DB_ENV, 3609 $DB_ENV,
… …
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666; 3613 0666;
2963 3614
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 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 }; 3616 };
2969 3617
2970 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
2971 }; 3619 };
2972 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
2973} 3652}
2974 3653
2975{ 3654{
2976 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
2977 3656
… …
2980 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
2981 reentrant => 0, 3660 reentrant => 0,
2982 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
2983 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
2984 poll => 'r', 3663 poll => 'r',
2985 prio => 6, 3664 prio => 0,
2986 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
2987 ); 3666 );
2988} 3667}
2989 3668
2990my $_log_backtrace; 3669my $_log_backtrace;
… …
2996 3675
2997 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace; 3678 ++$_log_backtrace;
3000 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3001 my @bt = fork_call { 3682 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines