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.385 by root, Fri Oct 12 19:13:26 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#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986}
766 987
767sub reattach { 988sub reattach {
768 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 990 my ($obj) = @_;
770 991
… …
817sub object_freezer_save { 1038sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
819 1040
820 sync_job { 1041 sync_job {
821 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
824 1046
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1051 close $fh;
830 1052
831 if (@$objs) { 1053 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1059 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
839 } 1061 }
… …
847 } 1069 }
848 } else { 1070 } else {
849 aio_unlink $filename; 1071 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
851 } 1073 }
852 } 1074 };
853} 1075}
854 1076
855sub object_freezer_as_string { 1077sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
857 1079
… …
869 or return; 1091 or return;
870 1092
871 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
873 or return; 1095 or return;
874 $av = eval { (Storable::thaw $av)->{objs} };
875 }
876 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
879 return ($data, $av); 1106 ($data, $av)
880} 1107}
1108
1109=head2 COMMAND CALLBACKS
1110
1111=over 4
1112
1113=cut
881 1114
882############################################################################# 1115#############################################################################
883# command handling &c 1116# command handling &c
884 1117
885=item cf::register_command $name => \&callback($ob,$args); 1118=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1131 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1132}
900 1133
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1134=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1135
903Register a callbackf ro execution when the client sends an extcmd packet. 1136Register a callback for execution when the client sends an (synchronous)
1137extcmd packet. Ext commands will be processed in the order they are
1138received by the server, like other user commands. The first argument is
1139the logged-in player. Ext commands can only be processed after a player
1140has logged in successfully.
904 1141
905If the callback returns something, it is sent back as if reply was being 1142If the callback returns something, it is sent back as if reply was being
906called. 1143called.
907 1144
1145=item cf::register_exticmd $name => \&callback($ns,$packet);
1146
1147Register a callback for execution when the client sends an (asynchronous)
1148exticmd packet. Exti commands are processed by the server as soon as they
1149are received, i.e. out of order w.r.t. other commands. The first argument
1150is a client socket. Exti commands can be received anytime, even before
1151log-in.
1152
1153If the callback returns something, it is sent back as if reply was being
1154called.
1155
908=cut 1156=cut
909 1157
910sub register_extcmd { 1158sub register_extcmd {
911 my ($name, $cb) = @_; 1159 my ($name, $cb) = @_;
912 1160
913 $EXTCMD{$name} = $cb; 1161 $EXTCMD{$name} = $cb;
1162}
1163
1164sub register_exticmd {
1165 my ($name, $cb) = @_;
1166
1167 $EXTICMD{$name} = $cb;
914} 1168}
915 1169
916cf::player->attach ( 1170cf::player->attach (
917 on_command => sub { 1171 on_command => sub {
918 my ($pl, $name, $params) = @_; 1172 my ($pl, $name, $params) = @_;
… …
927 cf::override; 1181 cf::override;
928 }, 1182 },
929 on_extcmd => sub { 1183 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
931 1185
932 my $msg = eval { from_json $buf }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1187
934 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
940 } else { 1203 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1205 }
943 1206
944 cf::override; 1207 cf::override;
945 }, 1208 },
946); 1209);
947 1210
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 { 1211sub load_extensions {
1212 cf::sync_job {
1213 my %todo;
1214
983 for my $ext (<$LIBDIR/*.ext>) { 1215 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1216 next unless -r $path;
985 eval { 1217
986 load_extension $ext; 1218 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1219 my $base = $1;
1220 my $pkg = $1;
1221 $pkg =~ s/[^[:word:]]/_/g;
1222 $pkg = "ext::$pkg";
1223
1224 open my $fh, "<:utf8", $path
1225 or die "$path: $!";
1226
1227 my $source = do { local $/; <$fh> };
1228
1229 my %ext = (
1230 path => $path,
1231 base => $base,
1232 pkg => $pkg,
1233 );
1234
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237
1238 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n"
1241 . $source
1242 . "\n};\n1";
1243
1244 $todo{$base} = \%ext;
1245 }
1246
1247 my %done;
1248 while (%todo) {
1249 my $progress;
1250
1251 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip
1254 unless exists $done{$_};
1255 }
1256
1257 warn "... loading '$k' into '$v->{pkg}'\n";
1258
1259 unless (eval $v->{source}) {
1260 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n";
1262
1263 if (exists $v->{meta}{mandatory}) {
1264 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n";
1266 exit 1;
1267 }
1268
1269 warn $msg;
1270 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
987 1 1275 }
988 } or warn "$ext not loaded: $@"; 1276
1277 skip:
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1279 unless $progress;
1280 }
989 } 1281 };
990} 1282}
991 1283
992############################################################################# 1284#############################################################################
993 1285
1286=back
1287
994=head2 CORE EXTENSIONS 1288=head2 CORE EXTENSIONS
995 1289
996Functions and methods that extend core crossfire objects. 1290Functions and methods that extend core crossfire objects.
997 1291
998=cut 1292=cut
… …
1002use Coro::AIO; 1296use Coro::AIO;
1003 1297
1004=head3 cf::player 1298=head3 cf::player
1005 1299
1006=over 4 1300=over 4
1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1007 1315
1008=item cf::player::find $login 1316=item cf::player::find $login
1009 1317
1010Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1011 1319
… …
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1359
1052 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1055 } 1368 }
1056 } 1369 }
1057} 1370}
1058 1371
… …
1068 1381
1069 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1071 1384
1072 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1073 Coro::cede; 1386 cf::cede_to_tick;
1074} 1387}
1075 1388
1076sub new($) { 1389sub new($) {
1077 my ($login) = @_; 1390 my ($login) = @_;
1078 1391
… …
1082 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1083 1396
1084 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1085 1398
1086 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1087} 1410}
1088 1411
1089=item $pl->quit_character 1412=item $pl->quit_character
1090 1413
1091Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
… …
1146 or return []; 1469 or return [];
1147 1470
1148 my @logins; 1471 my @logins;
1149 1472
1150 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1154 1482
1155 utf8::decode $login; 1483 utf8::decode $login;
1156 push @logins, $login; 1484 push @logins, $login;
1157 } 1485 }
1158 1486
… …
1185 } 1513 }
1186 1514
1187 \@paths 1515 \@paths
1188} 1516}
1189 1517
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1519
1520Expand crossfire pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568
1190=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1191 1570
1192Sends an ext reply to the player. 1571Sends an ext reply to the player.
1193 1572
1194=cut 1573=cut
1195 1574
1196sub ext_reply($$%) { 1575sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1198 1577
1199 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1579}
1203 1580
1204=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1205 1582
1206Sends an ext event to the client. 1583Sends an ext event to the client.
1207 1584
1208=cut 1585=cut
1209 1586
1210sub ext_event($$%) { 1587sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1212 1589
1213 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1214} 1591}
1215 1592
1216=head3 cf::region 1593=head3 cf::region
1217 1594
1218=over 4 1595=over 4
… …
1221 1598
1222package cf::region; 1599package cf::region;
1223 1600
1224=item cf::region::find_by_path $path 1601=item cf::region::find_by_path $path
1225 1602
1226Tries to decuce the probable region for a map knowing only its path. 1603Tries to decuce the likely region for a map knowing only its path.
1227 1604
1228=cut 1605=cut
1229 1606
1230sub find_by_path($) { 1607sub find_by_path($) {
1231 my ($path) = @_; 1608 my ($path) = @_;
1232 1609
1233 my ($match, $specificity); 1610 my ($match, $specificity);
1234 1611
1235 for my $region (list) { 1612 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1613 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1614 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1615 if $region->specificity > $specificity;
1239 } 1616 }
1240 } 1617 }
1241 1618
… …
1305 my ($self, $merge) = @_; 1682 my ($self, $merge) = @_;
1306 1683
1307 # we have to keep some variables in memory intact 1684 # we have to keep some variables in memory intact
1308 local $self->{path}; 1685 local $self->{path};
1309 local $self->{load_path}; 1686 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1687
1313 $self->SUPER::thawer_merge ($merge); 1688 $self->SUPER::thawer_merge ($merge);
1314} 1689}
1315 1690
1316sub normalise { 1691sub normalise {
… …
1363 $self->init; # pass $1 etc. 1738 $self->init; # pass $1 etc.
1364 return $self; 1739 return $self;
1365 } 1740 }
1366 } 1741 }
1367 1742
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1743 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1744 ()
1370} 1745}
1371 1746
1372sub init { 1747sub init {
1373 my ($self) = @_; 1748 my ($self) = @_;
… …
1416 1791
1417 $_->change_map_light ($change) 1792 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1793 for grep $_->outdoor, values %cf::MAP;
1419} 1794}
1420 1795
1796sub decay_objects {
1797 my ($self) = @_;
1798
1799 return if $self->{deny_reset};
1800
1801 $self->do_decay_objects;
1802}
1803
1421sub unlink_save { 1804sub unlink_save {
1422 my ($self) = @_; 1805 my ($self) = @_;
1423 1806
1424 utf8::encode (my $save = $self->save_path); 1807 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1808 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1428 1811
1429sub load_header_from($) { 1812sub load_header_from($) {
1430 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1431 1814
1432 utf8::encode $path; 1815 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1438 1824
1439 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1440 1826
1441 1 1827 1
1442} 1828}
… …
1481 $self->load_header_orig 1867 $self->load_header_orig
1482 or return; 1868 or return;
1483 $self->prepare_orig; 1869 $self->prepare_orig;
1484 } 1870 }
1485 1871
1872 $self->{deny_reset} = 1
1873 if $self->no_reset;
1874
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1875 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1876 unless $self->default_region;
1488 1877
1489 1 1878 1
1490} 1879}
… …
1493sub find { 1882sub find {
1494 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1495 1884
1496 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1497 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1499 1889
1500 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1502 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1503 or return; 1895 or return;
1504 1896
1505 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1506 1898
1507 $map->load_header 1899 $map->load_header
1508 or return; 1900 or return;
1509 1901
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1513 $map->reset; 1907 $map->reset;
1514 undef $guard;
1515 return find $path; 1908 return find $path;
1516 } 1909 }
1517 1910
1518 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1519 } 1912 }
… …
1528 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1529 1922
1530 my $path = $self->{path}; 1923 my $path = $self->{path};
1531 1924
1532 { 1925 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1534 1927
1928 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 1930
1537 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1538 1932
1539 $self->alloc; 1933 $self->alloc;
1540 1934
1541 $self->pre_load; 1935 $self->pre_load;
1542 Coro::cede; 1936 cf::cede_to_tick;
1543 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1545 or return; 1941 or return;
1546 1942
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1549 1945
1550 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 1947 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 1950 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1555 } 1954 }
1556 } 1955 }
1557 1956
1558 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1559 # now do the right thing for maps 1960 # now do the right thing for maps
1560 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 1963 unless $self->difficulty;
1563 Coro::cede; 1964 cf::cede_to_tick;
1564 1965
1565 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 1967 $self->decay_objects;
1567 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1568 $self->update_buttons; 1969 $self->update_buttons;
1569 Coro::cede; 1970 cf::cede_to_tick;
1570 $self->set_darkness_map; 1971 $self->set_darkness_map;
1571 Coro::cede; 1972 cf::cede_to_tick;
1572 $self->activate; 1973 $self->activate;
1573 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1574 1978
1575 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 1980 }
1577 1981
1578 $self->post_load; 1982 $self->post_load;
… …
1582 my ($self, $ob) = @_; 1986 my ($self, $ob) = @_;
1583 1987
1584 return find "~" . $ob->name . "/" . $self->{path} 1988 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 1989 if $self->per_player;
1586 1990
1991# return find "?party/" . $ob->name . "/" . $self->{path}
1992# if $self->per_party;
1993
1587 $self 1994 $self
1588} 1995}
1589 1996
1590# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1591sub load_diag { 1998sub load_neighbours {
1592 my ($map) = @_; 1999 my ($map) = @_;
1593 2000
1594 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1595 2002
1596 for (0 .. 3) { 2003 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1598 or next; 2005 or next;
1599 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1600 or next; 2007 or next;
1601 $neigh->load; 2008 $neigh->load;
1602 2009
2010 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2013 }
1606 2014
1607 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1609 or next; 2018 or next;
1610 $neigh->load; 2019 $neigh->load;
1611 } 2020 }
1612} 2021}
1613 2022
… …
1618} 2027}
1619 2028
1620sub do_load_sync { 2029sub do_load_sync {
1621 my ($map) = @_; 2030 my ($map) = @_;
1622 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1623 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1624} 2036}
1625 2037
1626our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1628 2040
1629sub find_async { 2041sub find_async {
1630 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1631 2043
1632 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1633 2045
1634 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2048 }
1637 2049
1638 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1639 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1640 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2057 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2058 $map->load if $v;
2059 }
1645 2060
1646 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1647 } 2062 }
1648 } 2063 }
1649 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1650 }; 2065 };
1651 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
… …
1654} 2069}
1655 2070
1656sub save { 2071sub save {
1657 my ($self) = @_; 2072 my ($self) = @_;
1658 2073
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2075
1661 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1662 2077
1663 return unless $self->dirty; 2078 return unless $self->dirty;
1664 2079
… …
1670 return if $self->{deny_save}; 2085 return if $self->{deny_save};
1671 2086
1672 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
1673 2088
1674 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
1676 }; 2092 };
1677 2093
1678 if ($uniq) { 2094 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1687 my ($self) = @_; 2103 my ($self) = @_;
1688 2104
1689 # save first because save cedes 2105 # save first because save cedes
1690 $self->save; 2106 $self->save;
1691 2107
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2109
1694 return if $self->players; 2110 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2112 return if $self->{deny_save};
1697 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2118 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2119}
1701 2120
1702sub reset_at { 2121sub reset_at {
1703 my ($self) = @_; 2122 my ($self) = @_;
1704 2123
1705 # TODO: safety, remove and allow resettable per-player maps 2124 # 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}; 2125 return 1e99 if $self->{deny_reset};
1708 2126
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2127 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2128 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2129
… …
1722 my ($self) = @_; 2140 my ($self) = @_;
1723 2141
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2143
1726 return if $self->players; 2144 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2145
1729 warn "resetting map ", $self->path; 2146 warn "resetting map ", $self->path;
1730 2147
1731 $self->in_memory (cf::MAP_SWAPPED); 2148 $self->in_memory (cf::MAP_SWAPPED);
1732 2149
… …
1738 if $uniq; 2155 if $uniq;
1739 } 2156 }
1740 2157
1741 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
1742 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2162 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2163
1747 $self->unlink_save; 2164 $self->unlink_save;
1748 $self->destroy; 2165 $self->destroy;
1749} 2166}
1750 2167
1751my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
1752 2169
1753sub nuke { 2170sub nuke {
1754 my ($self) = @_; 2171 my ($self) = @_;
1755 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
1756 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
1757 2177
1758 $self->unlink_save; 2178 $self->unlink_save;
1759 2179
1760 bless $self, "cf::map"; 2180 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2185
1766 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
1767 2188
1768 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2190}
2191
2192=item $maps = cf::map::tmp_maps
2193
2194Returns an arrayref with all map paths of currently instantiated and saved
2195maps. May block.
2196
2197=cut
2198
2199sub tmp_maps() {
2200 [
2201 map {
2202 utf8::decode $_;
2203 /\.map$/
2204 ? normalise $_
2205 : ()
2206 } @{ aio_readdir $TMPDIR or [] }
2207 ]
2208}
2209
2210=item $maps = cf::map::random_maps
2211
2212Returns an arrayref with all map paths of currently instantiated and saved
2213random maps. May block.
2214
2215=cut
2216
2217sub random_maps() {
2218 [
2219 map {
2220 utf8::decode $_;
2221 /\.map$/
2222 ? normalise "?random/$_"
2223 : ()
2224 } @{ aio_readdir $RANDOMDIR or [] }
2225 ]
1769} 2226}
1770 2227
1771=item cf::map::unique_maps 2228=item cf::map::unique_maps
1772 2229
1773Returns an arrayref of paths of all shared maps that have 2230Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2231instantiated unique items. May block.
1775 2232
1776=cut 2233=cut
1777 2234
1778sub unique_maps() { 2235sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2236 [
1780 or return; 2237 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2238 utf8::decode $_;
1786 next if /\.pst$/; 2239 /\.map$/
1787 next unless /^$PATH_SEP/o; 2240 ? normalise $_
1788 2241 : ()
1789 push @paths, cf::map::normalise $_; 2242 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2243 ]
1791
1792 \@paths
1793} 2244}
1794 2245
1795package cf; 2246package cf;
1796 2247
1797=back 2248=back
… …
1815 map { $_, inv_recursive_ $_->inv } @_ 2266 map { $_, inv_recursive_ $_->inv } @_
1816} 2267}
1817 2268
1818sub inv_recursive { 2269sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2271}
2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
1820} 2299}
1821 2300
1822package cf; 2301package cf;
1823 2302
1824=back 2303=back
… …
1843 2322
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2323 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2324
1846 if ($self->{record_replies}) { 2325 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2326 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2327
1848 } else { 2328 } else {
2329 my $pl = $self->contr;
2330
2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2332 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334
2335 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2338 }
1851 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
1852} 2350}
1853 2351
1854=item $player_object->may ("access") 2352=item $player_object->may ("access")
1855 2353
1856Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
… …
1935 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
1938 2436
1939 $map->load; 2437 $map->load;
1940 $map->load_diag; 2438 $map->load_neighbours;
1941 2439
1942 return unless $self->contr->active; 2440 return unless $self->contr->active;
1943 $self->activate_recursive; 2441 $self->activate_recursive;
1944 2442
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2444 $self->enter_map ($map, $x, $y);
1947} 2445}
1948 2446
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2448
1951Moves the player to the given map-path and coordinates by first freezing 2449Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2450her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2451that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2452the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process.
1955 2454
1956=cut 2455=cut
1957 2456
1958our $GOTOGEN; 2457our $GOTOGEN;
1959 2458
1960sub cf::object::player::goto { 2459sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2460 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2461
1963 # do generation counting so two concurrent goto's will be executed in-order 2462 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2464
1966 $self->enter_link; 2465 $self->enter_link;
1967 2466
1968 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
1969 my $map = eval { 2489 my $map = eval {
1970 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
1971 2491
1972 if ($map) { 2492 if ($map) {
1973 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
1975 } else { 2495 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2497 }
1978 2498
1979 $map 2499 $map
1980 }; 2500 };
1981 2501
… …
1986 2506
1987 if ($gen == $self->{_goto_generation}) { 2507 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2508 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2509 $self->leave_link ($map, $x, $y);
1990 } 2510 }
2511
2512 $done->() if $done;
1991 })->prio (1); 2513 })->prio (1);
1992} 2514}
1993 2515
1994=item $player_object->enter_exit ($exit_object) 2516=item $player_object->enter_exit ($exit_object)
1995 2517
… …
2064 my $hp = $exit->stats->hp; 2586 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2587 my $sp = $exit->stats->sp;
2066 2588
2067 $self->enter_link; 2589 $self->enter_link;
2068 2590
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2069 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2070 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2599 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2073 2601
2074 1; 2602 1;
… …
2100 2628
2101 utf8::encode $text; 2629 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2631}
2104 2632
2633=item $client->send_msg ($channel, $msg, $color, [extra...])
2634
2635Send a drawinfo or msg packet to the client, formatting the msg for the
2636client if neccessary. C<$type> should be a string identifying the type of
2637the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet.
2639
2640=cut
2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2663sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_;
2665
2666 $msg = $self->pl->expand_cfpod ($msg);
2667
2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2679 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2685 }
2686
2687 $channel = $channel->{id};
2688 }
2689
2690 return unless @extra || length $msg;
2691
2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2699 } else {
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724}
2725
2105=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2106 2727
2107Sends an exti event to the client. 2728Sends an ext event to the client.
2108 2729
2109=cut 2730=cut
2110 2731
2111sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2113 2734
2735 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2116} 2759}
2117 2760
2118=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2119 2762
2120Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2764the 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>. 2765C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2766
2124Queries can fail, so check the return code. Or don't, as queries will become 2767Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2768become reliable at some point in the future.
2126 2769
2127=cut 2770=cut
2128 2771
2129sub cf::client::query { 2772sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2773 my ($self, $flags, $text, $cb) = @_;
… …
2138 utf8::encode $text; 2781 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2782 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2783
2141 $self->send_packet ($self->{query_queue}[0][0]) 2784 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2785 if @{ $self->{query_queue} } == 1;
2786
2787 1
2143} 2788}
2144 2789
2145cf::client->attach ( 2790cf::client->attach (
2791 on_connect => sub {
2792 my ($ns) = @_;
2793
2794 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2795 },
2146 on_reply => sub { 2796 on_reply => sub {
2147 my ($ns, $msg) = @_; 2797 my ($ns, $msg) = @_;
2148 2798
2149 # this weird shuffling is so that direct followup queries 2799 # this weird shuffling is so that direct followup queries
2150 # get handled first 2800 # get handled first
… …
2162 } else { 2812 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2813 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2814 }
2165 } 2815 }
2166 }, 2816 },
2817 on_exticmd => sub {
2818 my ($ns, $buf) = @_;
2819
2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2821
2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2830 if (my $cb = $EXTICMD{$type}) {
2831 @reply = $cb->($ns, @payload);
2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2837 } else {
2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2839 }
2840
2841 cf::override;
2842 },
2167); 2843);
2168 2844
2169=item $client->async (\&cb) 2845=item $client->async (\&cb)
2170 2846
2171Create a new coroutine, running the specified callback. The coroutine will 2847Create a new coroutine, running the specified callback. The coroutine will
… …
2212our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2214 2890
2215$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2216 2892
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2218 2898
2219# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2220 2900
2221=pod 2901=pod
2222 2902
2223The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2224 2904
2225 cf::object contr pay_amount pay_player map 2905 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr
2908
2226 cf::object::player player 2909 cf::object::player
2227 cf::player peaceful 2910 player
2228 cf::map trigger 2911
2912 cf::player
2913 peaceful
2914
2915 cf::map
2916 trigger
2229 2917
2230=cut 2918=cut
2231 2919
2232for ( 2920for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2234 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2237) { 2927) {
2238 no strict 'refs'; 2928 no strict 'refs';
… …
2309=back 2999=back
2310 3000
2311=cut 3001=cut
2312 3002
2313############################################################################# 3003#############################################################################
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 3004# the server's init and main functions
2487 3005
2488sub load_facedata($) { 3006sub load_facedata($) {
2489 my ($path) = @_; 3007 my ($path) = @_;
3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3014
2491 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2492 3016
2493 my $facedata; 3017 my $facedata;
2494 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
… …
2497 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2498 3022
2499 $facedata->{version} == 2 3023 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
3032
2502 { 3033 {
2503 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2504 3035
2505 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3038 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3042
3043 cf::cede_to_tick;
2511 } 3044 }
2512 3045
2513 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3047 next unless $info->{smooth};
2515 my $idx = cf::face::find $face 3048 my $idx = cf::face::find $face
2516 or next; 3049 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3050 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3053 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3054 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3055 }
2522 Coro::cede; 3056
3057 cf::cede_to_tick;
2523 } 3058 }
2524 } 3059 }
2525 3060
2526 { 3061 {
2527 my $anims = $facedata->{animinfo}; 3062 my $anims = $facedata->{animinfo};
2528 3063
2529 while (my ($anim, $info) = each %$anims) { 3064 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3065 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3066 cf::cede_to_tick;
2532 } 3067 }
2533 3068
2534 cf::anim::invalidate_all; # d'oh 3069 cf::anim::invalidate_all; # d'oh
2535 } 3070 }
2536 3071
3072 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource};
3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082
3083 if ($info->{type} & 1) {
3084 # prepend meta info
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else {
3093 $data = $info->{data};
3094 }
3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick;
3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 }
3120
2537 1 3121 1
2538} 3122}
2539 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2540sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2541 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
3139
3140 for (cf::region::list) {
3141 $_->{match} = qr/$_->{match}/
3142 if exists $_->{match};
3143 }
2543} 3144}
2544 3145
2545sub reload_facedata { 3146sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3147 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3148 or die "unable to load facedata\n";
2548} 3149}
2549 3150
2550sub reload_archetypes { 3151sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
2551 load_resource_file "$DATADIR/archetypes" 3157 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3158 or die "unable to load archetypes\n";
2553} 3159}
2554 3160
2555sub reload_treasures { 3161sub reload_treasures {
… …
2571 3177
2572sub init { 3178sub init {
2573 reload_resources; 3179 reload_resources;
2574} 3180}
2575 3181
2576sub cfg_load { 3182sub reload_config {
2577 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2578 or return; 3184 or return;
2579 3185
2580 local $/; 3186 local $/;
2581 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
… …
2597sub main { 3203sub main {
2598 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2599 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2601 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2602 Event::one_event; 3209 Event::one_event;
2603 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2604 }; 3211 };
2605 3212
2606 cfg_load; 3213 reload_config;
2607 db_init; 3214 db_init;
2608 load_extensions; 3215 load_extensions;
2609 3216
2610 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2611 Event::loop; 3218 Event::loop;
… …
2627 }, 3234 },
2628 ); 3235 );
2629 } 3236 }
2630} 3237}
2631 3238
3239sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime";
3241
3242 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time.
3244
3245 IO::AIO::aio_utime $runtime, undef, undef;
3246
3247 my $guard = cf::lock_acquire "write_runtime";
3248
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3250 or return;
3251
3252 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server.
3255
3256 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3257 and return;
3258
3259 # always fsync - this file is important
3260 aio_fsync $fh
3261 and return;
3262
3263 # touch it again to show we are up-to-date
3264 aio_utime $fh, undef, undef;
3265
3266 close $fh
3267 or return;
3268
3269 aio_rename "$runtime~", $runtime
3270 and return;
3271
3272 warn "runtime file written.\n";
3273
3274 1
3275}
3276
2632sub emergency_save() { 3277sub emergency_save() {
2633 my $freeze_guard = cf::freeze_mainloop; 3278 my $freeze_guard = cf::freeze_mainloop;
2634 3279
2635 warn "enter emergency perl save\n"; 3280 warn "enter emergency perl save\n";
2636 3281
… …
2640 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
2641 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
2642 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
2643 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
2644 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2645 $pl->save; 3291 $pl->save;
2646 } 3292 }
2647 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
2648 3294
2649 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
2711 %EXT_CORO = (); 3357 %EXT_CORO = ();
2712 3358
2713 warn "removing commands"; 3359 warn "removing commands";
2714 %COMMAND = (); 3360 %COMMAND = ();
2715 3361
2716 warn "removing ext commands"; 3362 warn "removing ext/exti commands";
2717 %EXTCMD = (); 3363 %EXTCMD = ();
3364 %EXTICMD = ();
2718 3365
2719 warn "unloading/nuking all extensions"; 3366 warn "unloading/nuking all extensions";
2720 for my $pkg (@EXTS) { 3367 for my $pkg (@EXTS) {
2721 warn "... unloading $pkg"; 3368 warn "... unloading $pkg";
2722 3369
… …
2765 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
2766 require cf; 3413 require cf;
2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2768 3415
2769 warn "loading config and database again"; 3416 warn "loading config and database again";
2770 cf::cfg_load; 3417 cf::reload_config;
2771 3418
2772 warn "loading extensions"; 3419 warn "loading extensions";
2773 cf::load_extensions; 3420 cf::load_extensions;
2774 3421
2775 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
… …
2811register_command "reload" => sub { 3458register_command "reload" => sub {
2812 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
2813 3460
2814 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
2815 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
2816 async { reload_perl }; 3465 reload_perl;
3466 };
2817 } 3467 }
2818}; 3468};
2819 3469
2820unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
2821 3471
… …
2840 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait; 3492 $signal->wait;
2843} 3493}
2844 3494
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2847$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
2848 reentrant => 0, 3496 reentrant => 0,
2849 parked => 1, 3497 parked => 1,
2850 prio => 0, 3498 prio => 0,
2851 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
… …
2859 3507
2860 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
2861 3509
2862 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
2863 3511
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; 3512 $RUNTIME += $TICK;
2888 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
2889 3514
2890 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2891 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
2893 write_runtime 3519 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
2895 }; 3521 };
2896 } 3522 }
2897 3523
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send; 3525 $sig->send;
2903 } 3526 }
2904 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send; 3528 $sig->send;
… …
2915 3538
2916 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918 3541
2919 _post_tick; 3542 _post_tick;
2920
2921
2922 }, 3543 },
2923); 3544);
2924 3545
2925{ 3546{
3547 BDB::min_parallel 8;
2926 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
2927 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
2928 reentrant => 0, 3550 reentrant => 0,
2929 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
2930 poll => 'r', 3552 poll => 'r',
2931 prio => 0, 3553 prio => 0,
2932 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
2934 ); 3556 );
2935 BDB::min_parallel 8;
2936 3557
2937 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
2938 my $status; 3559 my $status;
2939 my $current = $Coro::current; 3560 my $current = $Coro::current;
2940 ( 3561 (
… …
2949 ) 3570 )
2950 }; 3571 };
2951 3572
2952 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2954 3579
2955 cf::sync_job { 3580 cf::sync_job {
2956 eval { 3581 eval {
2957 BDB::db_env_open 3582 BDB::db_env_open
2958 $DB_ENV, 3583 $DB_ENV,
… …
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666; 3587 0666;
2963 3588
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 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 }; 3590 };
2969 3591
2970 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
2971 }; 3593 };
2972 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
2973} 3626}
2974 3627
2975{ 3628{
2976 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
2977 3630
… …
2980 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
2981 reentrant => 0, 3634 reentrant => 0,
2982 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
2983 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
2984 poll => 'r', 3637 poll => 'r',
2985 prio => 6, 3638 prio => 0,
2986 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
2987 ); 3640 );
2988} 3641}
2989 3642
2990my $_log_backtrace; 3643my $_log_backtrace;
… …
2996 3649
2997 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace; 3652 ++$_log_backtrace;
3000 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3001 my @bt = fork_call { 3656 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

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