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.272 by root, Sun Jun 3 15:32:50 2007 UTC vs.
Revision 1.376 by root, Mon Oct 1 00:44:44 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines