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.275 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
206} 218}
207 219
208$Event::DIED = sub { 220$Event::DIED = sub {
209 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
210}; 222};
223
224#############################################################################
211 225
212=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
213 227
214=over 4 228=over 4
215 229
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 249 $d
236 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
237} 251}
238 252
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
242 254
243Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
244 256
245=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
246 258
247Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
248 267
249=item cf::lock_wait $string 268=item cf::lock_wait $string
250 269
251Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
252 271
255Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
258returned. 277returned.
259 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
260Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
262 284
263=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
264 286
265Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
266 288
267=cut 289=cut
268 290
269our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
270 293
271sub lock_wait($) { 294sub lock_wait($) {
272 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
273 301
274 # wait for lock, if any 302 # wait for lock, if any
275 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 305 Coro::schedule;
283 311
284 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
285 lock_wait $key; 313 lock_wait $key;
286 314
287 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
288 317
289 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
292 } 322 }
293} 323}
294 324
306 }; 336 };
307 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
308 $guard 338 $guard
309} 339}
310 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
311=item cf::async { BLOCK } 399=item cf::async { BLOCK }
312 400
313Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
318 406
319BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
320 408
321=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
322 410
323The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
326 415
327If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
330fast or be very important. 419fast or be very important.
338 my $time = Event::time; 427 my $time = Event::time;
339 428
340 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
342 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
343 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 435 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
346 437
347 my $busy = 1; 438 my $busy = 1;
348 my @res; 439 my @res;
349 440
350 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 443 @res = eval { $job->() };
352 warn $@ if $@; 444 warn $@ if $@;
353 undef $busy; 445 undef $busy;
354 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
355 447
356 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
357 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
358 } 454 }
359 455
360 $time = Event::time - $time; 456 $time = Event::time - $time;
361 457
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
390 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
391 487
392 $coro 488 $coro
393} 489}
394 490
395sub write_runtime { 491=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 492
398 # first touch the runtime file to show we are still running: 493Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
400 497
401 IO::AIO::aio_utime $runtime, undef, undef; 498=cut
402 499
403 my $guard = cf::lock_acquire "write_runtime"; 500sub fork_call(&@) {
501 my ($cb, @args) = @_;
404 502
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 503 # we seemingly have to make a local copy of the whole thing,
406 or return; 504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
407 506
408 my $value = $cf::RUNTIME + 90 + 10; 507 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 508 reset_signals;
410 # 60 allows for the watchdog to kill the server. 509 &$cb
510 }, @args;
411 511
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 512 wantarray ? @res : $res[-1]
413 and return; 513}
414 514
415 # always fsync - this file is important 515=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 516
419 # touch it again to show we are up-to-date 517Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 518
422 close $fh 519=item cf::db_put $family => $key => $value
423 or return;
424 520
425 aio_rename "$runtime~", $runtime 521Stores the given C<$value> in the family. It can currently store binary
426 and return; 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 523
428 warn "runtime file written.\n"; 524=item $db = cf::db_table "name"
429 525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
547
548our $DB;
549
550sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db";
553 };
554}
555
556sub db_get($$) {
557 my $key = "$_[0]/$_[1]";
558
559 cf::sync_job {
560 BDB::db_get $DB, undef, $key, my $data;
561
562 $! ? ()
563 : $data
430 1 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
431} 640}
432 641
433=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
434 643
435Log a datalog packet of the given type with the given key-value pairs. 644Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
455 664
456In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 667Crossfire TRT).
459 668
460=over 4 669=over 4
461 670
462=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
463 672
665 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
666 } 875 }
667 876
668 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
669 } else { 878 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 880 }
672 881
673 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
674} 883}
675 884
715 "; 924 ";
716 die if $@; 925 die if $@;
717} 926}
718 927
719our $override; 928our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 930
722sub override { 931sub override {
723 $override = 1; 932 $override = 1;
724 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
725} 934}
726 935
727sub do_invoke { 936sub do_invoke {
728 my $event = shift; 937 my $event = shift;
729 my $callbacks = shift; 938 my $callbacks = shift;
730 939
731 @invoke_results = (); 940 @INVOKE_RESULTS = ();
732 941
733 local $override; 942 local $override;
734 943
735 for (@$callbacks) { 944 for (@$callbacks) {
736 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
753 962
754Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
755 964
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 968
760=back 969=back
761 970
762=cut 971=cut
763 972
764############################################################################# 973#############################################################################
765# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
766 1017
767sub reattach { 1018sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1020 my ($obj) = @_;
770 1021
817sub object_freezer_save { 1068sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
819 1070
820 sync_job { 1071 sync_job {
821 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
824 1076
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1081 close $fh;
830 1082
831 if (@$objs) { 1083 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1089 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
839 } 1091 }
847 } 1099 }
848 } else { 1100 } else {
849 aio_unlink $filename; 1101 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
851 } 1103 }
852 } 1104 };
853} 1105}
854 1106
855sub object_freezer_as_string { 1107sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
857 1109
869 or return; 1121 or return;
870 1122
871 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
873 or return; 1125 or return;
1126
874 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
875 } 1129 }
876 1130
1131 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
879 return ($data, $av); 1135 ($data, $av)
880} 1136}
1137
1138=head2 COMMAND CALLBACKS
1139
1140=over 4
1141
1142=cut
881 1143
882############################################################################# 1144#############################################################################
883# command handling &c 1145# command handling &c
884 1146
885=item cf::register_command $name => \&callback($ob,$args); 1147=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1161}
900 1162
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1164
903Register a callbackf ro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
904 1170
905If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
906called. 1172called.
907 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
908=cut 1185=cut
909 1186
910sub register_extcmd { 1187sub register_extcmd {
911 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
912 1189
913 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
914} 1197}
915 1198
916cf::player->attach ( 1199cf::player->attach (
917 on_command => sub { 1200 on_command => sub {
918 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
927 cf::override; 1210 cf::override;
928 }, 1211 },
929 on_extcmd => sub { 1212 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
931 1214
932 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1216
934 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
940 } else { 1232 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1234 }
943 1235
944 cf::override; 1236 cf::override;
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
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1190=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1191 1641
1192Sends an ext reply to the player. 1642Sends an ext reply to the player.
1193 1643
1194=cut 1644=cut
1195 1645
1196sub ext_reply($$%) { 1646sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1198 1648
1199 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1650}
1203 1651
1204=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1205 1653
1206Sends an ext event to the client. 1654Sends an ext event to the client.
1207 1655
1208=cut 1656=cut
1209 1657
1210sub ext_event($$%) { 1658sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1212 1660
1213 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1214} 1662}
1215 1663
1216=head3 cf::region 1664=head3 cf::region
1217 1665
1218=over 4 1666=over 4
1221 1669
1222package cf::region; 1670package cf::region;
1223 1671
1224=item cf::region::find_by_path $path 1672=item cf::region::find_by_path $path
1225 1673
1226Tries to decuce the probable region for a map knowing only its path. 1674Tries to decuce the likely region for a map knowing only its path.
1227 1675
1228=cut 1676=cut
1229 1677
1230sub find_by_path($) { 1678sub find_by_path($) {
1231 my ($path) = @_; 1679 my ($path) = @_;
1232 1680
1233 my ($match, $specificity); 1681 my ($match, $specificity);
1234 1682
1235 for my $region (list) { 1683 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1684 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1685 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1686 if $region->specificity > $specificity;
1239 } 1687 }
1240 } 1688 }
1241 1689
1361 $self->init; # pass $1 etc. 1809 $self->init; # pass $1 etc.
1362 return $self; 1810 return $self;
1363 } 1811 }
1364 } 1812 }
1365 1813
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1814 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1815 ()
1368} 1816}
1369 1817
1370sub init { 1818sub init {
1371 my ($self) = @_; 1819 my ($self) = @_;
1434 1882
1435sub load_header_from($) { 1883sub load_header_from($) {
1436 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1437 1885
1438 utf8::encode $path; 1886 utf8::encode $path;
1439 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1440 # or return;
1441
1442 $self->_load_header ($path)
1443 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1444 1895
1445 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1446 1897
1447 1 1898 1
1448} 1899}
1502sub find { 1953sub find {
1503 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1504 1955
1505 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1506 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1507 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1508 1960
1509 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1510 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1511 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1512 or return; 1966 or return;
1513 1967
1514 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1515 1969
1517 or return; 1971 or return;
1518 1972
1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1521 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1522 $map->reset; 1978 $map->reset;
1523 undef $guard;
1524 return find $path; 1979 return find $path;
1525 } 1980 }
1526 1981
1527 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1528 } 1983 }
1537 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1538 1993
1539 my $path = $self->{path}; 1994 my $path = $self->{path};
1540 1995
1541 { 1996 {
1542 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1543 1998
1999 return unless $self->valid;
1544 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1545 2001
1546 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1547 2003
1548 $self->alloc; 2004 $self->alloc;
1549 2005
1550 $self->pre_load; 2006 $self->pre_load;
1551 Coro::cede; 2007 cf::cede_to_tick;
1552 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1553 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1554 or return; 2012 or return;
1555 2013
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1558 2016
1559 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq; 2018 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1562 $self->clear_unique_items; 2021 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1564 } 2025 }
1565 } 2026 }
1566 2027
1567 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1568 # now do the right thing for maps 2031 # now do the right thing for maps
1569 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1570 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1571 unless $self->difficulty; 2034 unless $self->difficulty;
1572 Coro::cede; 2035 cf::cede_to_tick;
1573 2036
1574 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1575 $self->decay_objects; 2038 $self->decay_objects;
1576 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1577 $self->update_buttons; 2040 $self->update_buttons;
1578 Coro::cede; 2041 cf::cede_to_tick;
1579 $self->set_darkness_map; 2042 $self->set_darkness_map;
1580 Coro::cede; 2043 cf::cede_to_tick;
1581 $self->activate; 2044 $self->activate;
1582 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1583 2049
1584 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1585 } 2051 }
1586 2052
1587 $self->post_load; 2053 $self->post_load;
1598 2064
1599 $self 2065 $self
1600} 2066}
1601 2067
1602# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1603sub load_diag { 2069sub load_neighbours {
1604 my ($map) = @_; 2070 my ($map) = @_;
1605 2071
1606 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1607 2073
1608 for (0 .. 3) { 2074 for (0 .. 3) {
1609 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1610 or next; 2076 or next;
1611 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1612 or next; 2078 or next;
1613 $neigh->load; 2079 $neigh->load;
1614 2080
2081 push @neigh,
1615 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1616 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1617 } 2084 }
1618 2085
1619 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1620 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1621 or next; 2089 or next;
1622 $neigh->load; 2090 $neigh->load;
1623 } 2091 }
1624} 2092}
1625 2093
1630} 2098}
1631 2099
1632sub do_load_sync { 2100sub do_load_sync {
1633 my ($map) = @_; 2101 my ($map) = @_;
1634 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1635 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1636} 2107}
1637 2108
1638our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1639our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1640 2111
1641sub find_async { 2112sub find_async {
1642 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1643 2114
1644 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1645 2116
1646 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1647 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1648 } 2119 }
1649 2120
1650 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1651 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1652 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1654 my $map = find $path 2128 if (my $map = find $k) {
1655 or next;
1656 $map->load; 2129 $map->load if $v;
2130 }
1657 2131
1658 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1659 } 2133 }
1660 } 2134 }
1661 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1662 }; 2136 };
1663 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1666} 2140}
1667 2141
1668sub save { 2142sub save {
1669 my ($self) = @_; 2143 my ($self) = @_;
1670 2144
1671 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2146
1673 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1674 2148
1675 return unless $self->dirty; 2149 return unless $self->dirty;
1676 2150
1682 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1683 2157
1684 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1685 2159
1686 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1687 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1688 }; 2163 };
1689 2164
1690 if ($uniq) { 2165 if ($uniq) {
1691 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1699 my ($self) = @_; 2174 my ($self) = @_;
1700 2175
1701 # save first because save cedes 2176 # save first because save cedes
1702 $self->save; 2177 $self->save;
1703 2178
1704 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1705 2180
1706 return if $self->players; 2181 return if $self->players;
1707 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1708 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1709 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2189 $self->clear;
1711 $self->in_memory (cf::MAP_SWAPPED);
1712} 2190}
1713 2191
1714sub reset_at { 2192sub reset_at {
1715 my ($self) = @_; 2193 my ($self) = @_;
1716 2194
1748 if $uniq; 2226 if $uniq;
1749 } 2227 }
1750 2228
1751 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1752 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1753 $self->clear; 2233 $self->clear;
1754
1755 $_->clear_links_to ($self) for values %cf::MAP;
1756 2234
1757 $self->unlink_save; 2235 $self->unlink_save;
1758 $self->destroy; 2236 $self->destroy;
1759} 2237}
1760 2238
1761my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1762 2240
1763sub nuke { 2241sub nuke {
1764 my ($self) = @_; 2242 my ($self) = @_;
1765 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1766 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1767 2248
1768 $self->unlink_save; 2249 $self->unlink_save;
1769 2250
1770 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1771 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1772 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1773 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1774 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775 2256
1776 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1777 2259
1778 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2261}
2262
2263=item $maps = cf::map::tmp_maps
2264
2265Returns an arrayref with all map paths of currently instantiated and saved
2266maps. May block.
2267
2268=cut
2269
2270sub tmp_maps() {
2271 [
2272 map {
2273 utf8::decode $_;
2274 /\.map$/
2275 ? normalise $_
2276 : ()
2277 } @{ aio_readdir $TMPDIR or [] }
2278 ]
2279}
2280
2281=item $maps = cf::map::random_maps
2282
2283Returns an arrayref with all map paths of currently instantiated and saved
2284random maps. May block.
2285
2286=cut
2287
2288sub random_maps() {
2289 [
2290 map {
2291 utf8::decode $_;
2292 /\.map$/
2293 ? normalise "?random/$_"
2294 : ()
2295 } @{ aio_readdir $RANDOMDIR or [] }
2296 ]
1779} 2297}
1780 2298
1781=item cf::map::unique_maps 2299=item cf::map::unique_maps
1782 2300
1783Returns an arrayref of paths of all shared maps that have 2301Returns an arrayref of paths of all shared maps that have
1784instantiated unique items. May block. 2302instantiated unique items. May block.
1785 2303
1786=cut 2304=cut
1787 2305
1788sub unique_maps() { 2306sub unique_maps() {
1789 my $files = aio_readdir $UNIQUEDIR 2307 [
1790 or return; 2308 map {
1791
1792 my @paths;
1793
1794 for (@$files) {
1795 utf8::decode $_; 2309 utf8::decode $_;
1796 next if /\.pst$/; 2310 /\.map$/
1797 next unless /^$PATH_SEP/o; 2311 ? normalise $_
1798 2312 : ()
1799 push @paths, cf::map::normalise $_; 2313 } @{ aio_readdir $UNIQUEDIR or [] }
1800 } 2314 ]
1801
1802 \@paths
1803} 2315}
1804 2316
1805package cf; 2317package cf;
1806 2318
1807=back 2319=back
1825 map { $_, inv_recursive_ $_->inv } @_ 2337 map { $_, inv_recursive_ $_->inv } @_
1826} 2338}
1827 2339
1828sub inv_recursive { 2340sub inv_recursive {
1829 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2342}
2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
1830} 2370}
1831 2371
1832package cf; 2372package cf;
1833 2373
1834=back 2374=back
1853 2393
1854 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2394 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1855 2395
1856 if ($self->{record_replies}) { 2396 if ($self->{record_replies}) {
1857 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2397 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2398
1858 } else { 2399 } else {
2400 my $pl = $self->contr;
2401
2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2403 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405
2406 } else {
1859 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
1860 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2409 }
1861 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
1862} 2421}
1863 2422
1864=item $player_object->may ("access") 2423=item $player_object->may ("access")
1865 2424
1866Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
1945 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
1946 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
1947 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
1948 2507
1949 $map->load; 2508 $map->load;
1950 $map->load_diag; 2509 $map->load_neighbours;
1951 2510
1952 return unless $self->contr->active; 2511 return unless $self->contr->active;
1953 $self->activate_recursive; 2512 $self->activate_recursive;
1954 2513
1955 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1956 $self->enter_map ($map, $x, $y); 2515 $self->enter_map ($map, $x, $y);
1957} 2516}
1958 2517
1959=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1960 2519
1961Moves the player to the given map-path and coordinates by first freezing 2520Moves the player to the given map-path and coordinates by first freezing
1962her, loading and preparing them map, calling the provided $check callback 2521her, loading and preparing them map, calling the provided $check callback
1963that has to return the map if sucecssful, and then unfreezes the player on 2522that has to return the map if sucecssful, and then unfreezes the player on
1964the new (success) or old (failed) map position. 2523the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process.
1965 2525
1966=cut 2526=cut
1967 2527
1968our $GOTOGEN; 2528our $GOTOGEN;
1969 2529
1970sub cf::object::player::goto { 2530sub cf::object::player::goto {
1971 my ($self, $path, $x, $y, $check) = @_; 2531 my ($self, $path, $x, $y, $check, $done) = @_;
1972 2532
1973 # do generation counting so two concurrent goto's will be executed in-order 2533 # do generation counting so two concurrent goto's will be executed in-order
1974 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1975 2535
1976 $self->enter_link; 2536 $self->enter_link;
1977 2537
1978 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
1979 my $map = eval { 2560 my $map = eval {
1980 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
1981 2562
1982 if ($map) { 2563 if ($map) {
1983 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
1984 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
1985 } else { 2566 } else {
1986 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1987 } 2568 }
1988 2569
1989 $map 2570 $map
1990 }; 2571 };
1991 2572
1996 2577
1997 if ($gen == $self->{_goto_generation}) { 2578 if ($gen == $self->{_goto_generation}) {
1998 delete $self->{_goto_generation}; 2579 delete $self->{_goto_generation};
1999 $self->leave_link ($map, $x, $y); 2580 $self->leave_link ($map, $x, $y);
2000 } 2581 }
2582
2583 $done->() if $done;
2001 })->prio (1); 2584 })->prio (1);
2002} 2585}
2003 2586
2004=item $player_object->enter_exit ($exit_object) 2587=item $player_object->enter_exit ($exit_object)
2005 2588
2074 my $hp = $exit->stats->hp; 2657 my $hp = $exit->stats->hp;
2075 my $sp = $exit->stats->sp; 2658 my $sp = $exit->stats->sp;
2076 2659
2077 $self->enter_link; 2660 $self->enter_link;
2078 2661
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2079 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2080 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2081 unless (eval { 2670 unless (eval {
2082 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2083 2672
2084 1; 2673 1;
2110 2699
2111 utf8::encode $text; 2700 utf8::encode $text;
2112 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2113} 2702}
2114 2703
2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2705
2706Send a drawinfo or msg packet to the client, formatting the msg for the
2707client if neccessary. C<$type> should be a string identifying the type of
2708the message, with C<log> being the default. If C<$color> is negative, suppress
2709the message unless the client supports the msg packet.
2710
2711=cut
2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2765sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_;
2767
2768 $msg = $self->pl->expand_cfpod ($msg);
2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2792 return unless @extra || length $msg;
2793
2794 if ($self->can_msg) {
2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2801 } else {
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826}
2827
2115=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2116 2829
2117Sends an exti event to the client. 2830Sends an ext event to the client.
2118 2831
2119=cut 2832=cut
2120 2833
2121sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2122 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2123 2836
2837 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2124 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2125 $self->send_packet ("ext " . cf::to_json \%msg); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2126} 2861}
2127 2862
2128=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2129 2864
2130Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2131the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2866the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2132C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2867C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2133 2868
2134Queries can fail, so check the return code. Or don't, as queries will become 2869Queries can fail, so check the return code. Or don't, as queries will
2135reliable at some point in the future. 2870become reliable at some point in the future.
2136 2871
2137=cut 2872=cut
2138 2873
2139sub cf::client::query { 2874sub cf::client::query {
2140 my ($self, $flags, $text, $cb) = @_; 2875 my ($self, $flags, $text, $cb) = @_;
2148 utf8::encode $text; 2883 utf8::encode $text;
2149 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2884 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2150 2885
2151 $self->send_packet ($self->{query_queue}[0][0]) 2886 $self->send_packet ($self->{query_queue}[0][0])
2152 if @{ $self->{query_queue} } == 1; 2887 if @{ $self->{query_queue} } == 1;
2888
2889 1
2153} 2890}
2154 2891
2155cf::client->attach ( 2892cf::client->attach (
2893 on_connect => sub {
2894 my ($ns) = @_;
2895
2896 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2897 },
2156 on_reply => sub { 2898 on_reply => sub {
2157 my ($ns, $msg) = @_; 2899 my ($ns, $msg) = @_;
2158 2900
2159 # this weird shuffling is so that direct followup queries 2901 # this weird shuffling is so that direct followup queries
2160 # get handled first 2902 # get handled first
2172 } else { 2914 } else {
2173 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2915 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2174 } 2916 }
2175 } 2917 }
2176 }, 2918 },
2919 on_exticmd => sub {
2920 my ($ns, $buf) = @_;
2921
2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2923
2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2932 if (my $cb = $EXTICMD{$type}) {
2933 @reply = $cb->($ns, @payload);
2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2939 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 }
2942
2943 cf::override;
2944 },
2177); 2945);
2178 2946
2179=item $client->async (\&cb) 2947=item $client->async (\&cb)
2180 2948
2181Create a new coroutine, running the specified callback. The coroutine will 2949Create a new coroutine, running the specified callback. The coroutine will
2222our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2223our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2224 2992
2225$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2226 2994
2227$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2228 3000
2229# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2230 3002
2231=pod 3003=pod
2232 3004
2233The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2234 3006
2235 cf::object contr pay_amount pay_player map 3007 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr
3010
2236 cf::object::player player 3011 cf::object::player
2237 cf::player peaceful 3012 player
2238 cf::map trigger 3013
3014 cf::player
3015 peaceful
3016
3017 cf::map
3018 trigger
2239 3019
2240=cut 3020=cut
2241 3021
2242for ( 3022for (
2243 ["cf::object" => qw(contr pay_amount pay_player map)], 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2244 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2245 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2246 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2247) { 3029) {
2248 no strict 'refs'; 3030 no strict 'refs';
2319=back 3101=back
2320 3102
2321=cut 3103=cut
2322 3104
2323############################################################################# 3105#############################################################################
2324
2325=head2 EXTENSION DATABASE SUPPORT
2326
2327Crossfire maintains a very simple database for extension use. It can
2328currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2329convert to/from binary).
2330
2331The parameter C<$family> should best start with the name of the extension
2332using it, it should be unique.
2333
2334=over 4
2335
2336=item $value = cf::db_get $family => $key
2337
2338Returns a single value from the database.
2339
2340=item cf::db_put $family => $key => $value
2341
2342Stores the given C<$value> in the family.
2343
2344=cut
2345
2346our $DB;
2347
2348sub db_init {
2349 unless ($DB) {
2350 $DB = BDB::db_create $DB_ENV;
2351
2352 cf::sync_job {
2353 eval {
2354 $DB->set_flags (BDB::CHKSUM);
2355
2356 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2357 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2358 cf::cleanup "db_open(db): $!" if $!;
2359 };
2360 cf::cleanup "db_open(db): $@" if $@;
2361 };
2362 }
2363}
2364
2365sub db_get($$) {
2366 my $key = "$_[0]/$_[1]";
2367
2368 cf::sync_job {
2369 BDB::db_get $DB, undef, $key, my $data;
2370
2371 $! ? ()
2372 : $data
2373 }
2374}
2375
2376sub db_put($$$) {
2377 BDB::dbreq_pri 4;
2378 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2379}
2380
2381=item cf::cache $id => [$paths...], $processversion => $process
2382
2383Generic caching function that returns the value of the resource $id,
2384caching and regenerating as required.
2385
2386This function can block.
2387
2388=cut
2389
2390sub cache {
2391 my ($id, $src, $processversion, $process) = @_;
2392
2393 my $meta =
2394 join "\x00",
2395 $processversion,
2396 map {
2397 aio_stat $_
2398 and Carp::croak "$_: $!";
2399
2400 ($_, (stat _)[7,9])
2401 } @$src;
2402
2403 my $dbmeta = db_get cache => "$id/meta";
2404 if ($dbmeta ne $meta) {
2405 # changed, we may need to process
2406
2407 my @data;
2408 my $md5;
2409
2410 for (0 .. $#$src) {
2411 0 <= aio_load $src->[$_], $data[$_]
2412 or Carp::croak "$src->[$_]: $!";
2413 }
2414
2415 # if processing is expensive, check
2416 # checksum first
2417 if (1) {
2418 $md5 =
2419 join "\x00",
2420 $processversion,
2421 map {
2422 Coro::cede;
2423 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2424 } 0.. $#$src;
2425
2426
2427 my $dbmd5 = db_get cache => "$id/md5";
2428 if ($dbmd5 eq $md5) {
2429 db_put cache => "$id/meta", $meta;
2430
2431 return db_get cache => "$id/data";
2432 }
2433 }
2434
2435 my $t1 = Time::HiRes::time;
2436 my $data = $process->(\@data);
2437 my $t2 = Time::HiRes::time;
2438
2439 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2440
2441 db_put cache => "$id/data", $data;
2442 db_put cache => "$id/md5" , $md5;
2443 db_put cache => "$id/meta", $meta;
2444
2445 return $data;
2446 }
2447
2448 db_get cache => "$id/data"
2449}
2450
2451=item fork_call { }, $args
2452
2453Executes the given code block with the given arguments in a seperate
2454process, returning the results. Everything must be serialisable with
2455Coro::Storable. May, of course, block. Note that the executed sub may
2456never block itself or use any form of Event handling.
2457
2458=cut
2459
2460sub fork_call(&@) {
2461 my ($cb, @args) = @_;
2462
2463# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2464# or die "socketpair: $!";
2465 pipe my $fh1, my $fh2
2466 or die "pipe: $!";
2467
2468 if (my $pid = fork) {
2469 close $fh2;
2470
2471 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2472 $res = Coro::Storable::thaw $res;
2473
2474 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2475
2476 die $$res unless "ARRAY" eq ref $res;
2477
2478 return wantarray ? @$res : $res->[-1];
2479 } else {
2480 reset_signals;
2481 local $SIG{__WARN__};
2482 local $SIG{__DIE__};
2483 eval {
2484 close $fh1;
2485
2486 my @res = eval { $cb->(@args) };
2487 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2488 };
2489
2490 warn $@ if $@;
2491 _exit 0;
2492 }
2493}
2494
2495#############################################################################
2496# the server's init and main functions 3106# the server's init and main functions
2497 3107
2498sub load_facedata($) { 3108sub load_facedata($) {
2499 my ($path) = @_; 3109 my ($path) = @_;
3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2500 3116
2501 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2502 3118
2503 my $facedata; 3119 my $facedata;
2504 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2507 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2508 3124
2509 $facedata->{version} == 2 3125 $facedata->{version} == 2
2510 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
2511 3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
3134
2512 { 3135 {
2513 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2514 3137
2515 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2516 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2517 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3140 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap};
2518 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2519 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2520 Coro::cede; 3144
3145 cf::cede_to_tick;
2521 } 3146 }
2522 3147
2523 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2524 next unless $info->{smooth}; 3149 next unless $info->{smooth};
2525 my $idx = cf::face::find $face 3150 my $idx = cf::face::find $face
2526 or next; 3151 or next;
2527 if (my $smooth = cf::face::find $info->{smooth}) { 3152 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth;
2528 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2529 } else { 3155 } else {
2530 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3156 warn "smooth face '$info->{smooth}' not found for face '$face'";
2531 } 3157 }
2532 Coro::cede; 3158
3159 cf::cede_to_tick;
2533 } 3160 }
2534 } 3161 }
2535 3162
2536 { 3163 {
2537 my $anims = $facedata->{animinfo}; 3164 my $anims = $facedata->{animinfo};
2538 3165
2539 while (my ($anim, $info) = each %$anims) { 3166 while (my ($anim, $info) = each %$anims) {
2540 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3167 cf::anim::set $anim, $info->{frames}, $info->{facings};
2541 Coro::cede; 3168 cf::cede_to_tick;
2542 } 3169 }
2543 3170
2544 cf::anim::invalidate_all; # d'oh 3171 cf::anim::invalidate_all; # d'oh
2545 } 3172 }
2546 3173
3174 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource};
3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184
3185 if ($info->{type} & 1) {
3186 # prepend meta info
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else {
3195 $data = $info->{data};
3196 }
3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick;
3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 }
3222
2547 1 3223 1
2548} 3224}
2549 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
2550sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2551 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2552 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
3241
3242 for (cf::region::list) {
3243 $_->{match} = qr/$_->{match}/
3244 if exists $_->{match};
3245 }
2553} 3246}
2554 3247
2555sub reload_facedata { 3248sub reload_facedata {
2556 load_facedata "$DATADIR/facedata" 3249 load_facedata "$DATADIR/facedata"
2557 or die "unable to load facedata\n"; 3250 or die "unable to load facedata\n";
2558} 3251}
2559 3252
2560sub reload_archetypes { 3253sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
2561 load_resource_file "$DATADIR/archetypes" 3259 load_resource_file "$DATADIR/archetypes"
2562 or die "unable to load archetypes\n"; 3260 or die "unable to load archetypes\n";
2563} 3261}
2564 3262
2565sub reload_treasures { 3263sub reload_treasures {
2581 3279
2582sub init { 3280sub init {
2583 reload_resources; 3281 reload_resources;
2584} 3282}
2585 3283
2586sub cfg_load { 3284sub reload_config {
2587 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2588 or return; 3286 or return;
2589 3287
2590 local $/; 3288 local $/;
2591 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2607sub main { 3305sub main {
2608 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2609 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2610 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2611 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2612 Event::one_event; 3311 Event::one_event;
2613 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2614 }; 3313 };
2615 3314
2616 cfg_load; 3315 reload_config;
2617 db_init; 3316 db_init;
2618 load_extensions; 3317 load_extensions;
2619 3318
2620 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2621 Event::loop; 3320 Event::loop;
2637 }, 3336 },
2638 ); 3337 );
2639 } 3338 }
2640} 3339}
2641 3340
3341sub write_runtime {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time.
3346
3347 IO::AIO::aio_utime $runtime, undef, undef;
3348
3349 my $guard = cf::lock_acquire "write_runtime";
3350
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3352 or return;
3353
3354 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server.
3357
3358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3359 and return;
3360
3361 # always fsync - this file is important
3362 aio_fsync $fh
3363 and return;
3364
3365 # touch it again to show we are up-to-date
3366 aio_utime $fh, undef, undef;
3367
3368 close $fh
3369 or return;
3370
3371 aio_rename "$runtime~", $runtime
3372 and return;
3373
3374 warn "runtime file written.\n";
3375
3376 1
3377}
3378
2642sub emergency_save() { 3379sub emergency_save() {
2643 my $freeze_guard = cf::freeze_mainloop; 3380 my $freeze_guard = cf::freeze_mainloop;
2644 3381
2645 warn "enter emergency perl save\n"; 3382 warn "enter emergency perl save\n";
2646 3383
2650 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2651 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2652 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2653 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2654 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2655 $pl->save; 3393 $pl->save;
2656 } 3394 }
2657 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2658 3396
2659 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
2707 3445
2708 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
2709 for (;;) { 3447 for (;;) {
2710 BDB::flush; 3448 BDB::flush;
2711 IO::AIO::flush; 3449 IO::AIO::flush;
2712 Coro::cede; 3450 Coro::cede_notself;
2713 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
2714 warn "iterate..."; 3452 warn "iterate...";
2715 } 3453 }
2716 3454
2717 ++$RELOAD; 3455 ++$RELOAD;
2721 %EXT_CORO = (); 3459 %EXT_CORO = ();
2722 3460
2723 warn "removing commands"; 3461 warn "removing commands";
2724 %COMMAND = (); 3462 %COMMAND = ();
2725 3463
2726 warn "removing ext commands"; 3464 warn "removing ext/exti commands";
2727 %EXTCMD = (); 3465 %EXTCMD = ();
3466 %EXTICMD = ();
2728 3467
2729 warn "unloading/nuking all extensions"; 3468 warn "unloading/nuking all extensions";
2730 for my $pkg (@EXTS) { 3469 for my $pkg (@EXTS) {
2731 warn "... unloading $pkg"; 3470 warn "... unloading $pkg";
2732 3471
2775 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
2776 require cf; 3515 require cf;
2777 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2778 3517
2779 warn "loading config and database again"; 3518 warn "loading config and database again";
2780 cf::cfg_load; 3519 cf::reload_config;
2781 3520
2782 warn "loading extensions"; 3521 warn "loading extensions";
2783 cf::load_extensions; 3522 cf::load_extensions;
2784 3523
2785 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
2821register_command "reload" => sub { 3560register_command "reload" => sub {
2822 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2823 3562
2824 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2825 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2826 async { reload_perl }; 3567 reload_perl;
3568 };
2827 } 3569 }
2828}; 3570};
2829 3571
2830unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2831 3573
2850 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2851 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2852 $signal->wait; 3594 $signal->wait;
2853} 3595}
2854 3596
2855 my $min = 1e6;#d#
2856 my $avg = 10;
2857$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
2858 reentrant => 0, 3598 reentrant => 0,
2859 parked => 1, 3599 parked => 1,
2860 prio => 0, 3600 prio => 0,
2861 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
2869 3609
2870 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
2871 3611
2872 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
2873 3613
2874 0 && sync_job {#d#
2875 for(1..10) {
2876 my $t = Event::time;
2877 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2878 or die;
2879
2880 $map->width (50);
2881 $map->height (50);
2882 $map->alloc;
2883 $map->_load_objects ("/tmp/x.map", 1);
2884 my $t = Event::time - $t;
2885
2886 #next unless $t < 0.0013;#d#
2887 if ($t < $min) {
2888 $min = $t;
2889 }
2890 $avg = $avg * 0.99 + $t * 0.01;
2891 }
2892 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2893 exit 0;
2894 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2895 };
2896
2897 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
2898 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
2899 3616
2900 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2901 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
2902 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
2903 write_runtime 3621 write_runtime
2904 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
2905 }; 3623 };
2906 } 3624 }
2907 3625
2908# my $AFTER = Event::time;
2909# warn $AFTER - $NOW;#d#
2910
2911 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2912 $sig->send; 3627 $sig->send;
2913 } 3628 }
2914 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
2915 $sig->send; 3630 $sig->send;
2925 3640
2926 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
2927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2928 3643
2929 _post_tick; 3644 _post_tick;
2930
2931
2932 }, 3645 },
2933); 3646);
2934 3647
2935{ 3648{
3649 BDB::min_parallel 8;
2936 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
2937 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
2938 reentrant => 0, 3652 reentrant => 0,
2939 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
2940 poll => 'r', 3654 poll => 'r',
2941 prio => 0, 3655 prio => 0,
2942 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
2943 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
2944 ); 3658 );
2945 BDB::min_parallel 8;
2946 3659
2947 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
2948 my $status; 3661 my $status;
2949 my $current = $Coro::current; 3662 my $current = $Coro::current;
2950 ( 3663 (
2959 ) 3672 )
2960 }; 3673 };
2961 3674
2962 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
2963 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2964 3681
2965 cf::sync_job { 3682 cf::sync_job {
2966 eval { 3683 eval {
2967 BDB::db_env_open 3684 BDB::db_env_open
2968 $DB_ENV, 3685 $DB_ENV,
2970 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2971 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2972 0666; 3689 0666;
2973 3690
2974 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2975
2976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2977 $DB_ENV->set_lk_detect;
2978 }; 3692 };
2979 3693
2980 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
2981 }; 3695 };
2982 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
2983} 3728}
2984 3729
2985{ 3730{
2986 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
2987 3732
2990 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
2991 reentrant => 0, 3736 reentrant => 0,
2992 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
2993 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
2994 poll => 'r', 3739 poll => 'r',
2995 prio => 6, 3740 prio => 0,
2996 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
2997 ); 3742 );
2998} 3743}
2999 3744
3000my $_log_backtrace; 3745my $_log_backtrace;
3006 3751
3007 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3008 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3009 ++$_log_backtrace; 3754 ++$_log_backtrace;
3010 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3011 my @bt = fork_call { 3758 my @bt = fork_call {
3012 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3013 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3014 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3015 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines