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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines