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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 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 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 492=cut
401 utime undef, undef, $fh; 493
494sub fork_call(&@) {
495 my ($cb, @args) = @_;
496
497 # we seemingly have to make a local copy of the whole thing,
498 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious)
500
501 my @res = Coro::Util::fork_eval {
502 reset_signals;
503 &$cb
504 }, @args;
505
506 wantarray ? @res : $res[-1]
507}
508
509=item $value = cf::db_get $family => $key
510
511Returns a single value from the environment database.
512
513=item cf::db_put $family => $key => $value
514
515Stores the given C<$value> in the family. It can currently store binary
516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
517
518=item $db = cf::db_table "name"
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 $!;
402 } 536 };
537 cf::cleanup "db_open(db): $@" if $@;
403 538
404 my $guard = cf::lock_acquire "write_runtime"; 539 $db
540}
405 541
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 542our $DB;
407 or return;
408 543
409 my $value = $cf::RUNTIME + 90 + 10; 544sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 545 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 546 $DB ||= db_table "db";
547 };
548}
412 549
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 550sub db_get($$) {
414 and return; 551 my $key = "$_[0]/$_[1]";
415 552
416 # always fsync - this file is important 553 cf::sync_job {
417 aio_fsync $fh 554 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 555
420 # touch it again to show we are up-to-date 556 $! ? ()
421 utime undef, undef, $fh; 557 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 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"
432} 634}
433 635
434=item cf::datalog type => key => value, ... 636=item cf::datalog type => key => value, ...
435 637
436Log 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.
454attach callbacks/event handlers (a collection of which is called an "attachment") 656attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 657to it. All such attachable objects support the following methods.
456 658
457In 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>
458C<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
459crossfire+). 661Crossfire TRT).
460 662
461=over 4 663=over 4
462 664
463=item $attachable->attach ($attachment, key => $value...) 665=item $attachable->attach ($attachment, key => $value...)
464 666
666 _attach $registry, $klass, @attach; 868 _attach $registry, $klass, @attach;
667 } 869 }
668 870
669 $obj->{$name} = \%arg; 871 $obj->{$name} = \%arg;
670 } else { 872 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 873 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 874 }
673 875
674 $obj->{_attachment}{$name} = undef; 876 $obj->{_attachment}{$name} = undef;
675} 877}
676 878
716 "; 918 ";
717 die if $@; 919 die if $@;
718} 920}
719 921
720our $override; 922our $override;
721our @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?
722 924
723sub override { 925sub override {
724 $override = 1; 926 $override = 1;
725 @invoke_results = (); 927 @INVOKE_RESULTS = (@_);
726} 928}
727 929
728sub do_invoke { 930sub do_invoke {
729 my $event = shift; 931 my $event = shift;
730 my $callbacks = shift; 932 my $callbacks = shift;
731 933
732 @invoke_results = (); 934 @INVOKE_RESULTS = ();
733 935
734 local $override; 936 local $override;
735 937
736 for (@$callbacks) { 938 for (@$callbacks) {
737 eval { &{$_->[1]} }; 939 eval { &{$_->[1]} };
754 956
755Generate an object-specific event with the given arguments. 957Generate an object-specific event with the given arguments.
756 958
757This 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
758removed 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
759results (if you must, access C<@cf::invoke_results> directly). 961results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 962
761=back 963=back
762 964
763=cut 965=cut
764 966
765############################################################################# 967#############################################################################
766# 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}
767 980
768sub reattach { 981sub reattach {
769 # basically do the same as instantiate, without calling instantiate 982 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 983 my ($obj) = @_;
771 984
818sub object_freezer_save { 1031sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
820 1033
821 sync_job { 1034 sync_job {
822 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
825 1039
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
848 } 1062 }
849 } else { 1063 } else {
850 aio_unlink $filename; 1064 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
852 } 1066 }
853 } 1067 };
854} 1068}
855 1069
856sub object_freezer_as_string { 1070sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
858 1072
870 or return; 1084 or return;
871 1085
872 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
874 or return; 1088 or return;
1089
875 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1091 }
877 1092
1093 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1095 $decname, length $data, scalar @{$av || []};
1096
880 return ($data, $av); 1097 ($data, $av)
881} 1098}
1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
882 1105
883############################################################################# 1106#############################################################################
884# command handling &c 1107# command handling &c
885 1108
886=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1123}
901 1124
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1126
904Register 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.
905 1132
906If 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
907called. 1134called.
908 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
909=cut 1147=cut
910 1148
911sub register_extcmd { 1149sub register_extcmd {
912 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
913 1151
914 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
915} 1159}
916 1160
917cf::player->attach ( 1161cf::player->attach (
918 on_command => sub { 1162 on_command => sub {
919 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
928 cf::override; 1172 cf::override;
929 }, 1173 },
930 on_extcmd => sub { 1174 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
932 1176
933 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1178
935 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
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
941 } else { 1194 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1196 }
944 1197
945 cf::override; 1198 cf::override;
946 }, 1199 },
947); 1200);
948 1201
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1202sub load_extensions {
1203 cf::sync_job {
1204 my %todo;
1205
984 for my $ext (<$LIBDIR/*.ext>) { 1206 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1207 next unless -r $path;
986 eval { 1208
987 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;
988 1 1266 }
989 } or warn "$ext not loaded: $@"; 1267
1268 skip:
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1270 unless $progress;
1271 }
990 } 1272 };
991} 1273}
992 1274
993############################################################################# 1275#############################################################################
994 1276
1277=back
1278
995=head2 CORE EXTENSIONS 1279=head2 CORE EXTENSIONS
996 1280
997Functions and methods that extend core crossfire objects. 1281Functions and methods that extend core crossfire objects.
998 1282
999=cut 1283=cut
1003use Coro::AIO; 1287use Coro::AIO;
1004 1288
1005=head3 cf::player 1289=head3 cf::player
1006 1290
1007=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}
1008 1306
1009=item cf::player::find $login 1307=item cf::player::find $login
1010 1308
1011Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1012 1310
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1350
1053 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1054 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;
1055 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1056 } 1359 }
1057 } 1360 }
1058} 1361}
1059 1362
1069 1372
1070 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1072 1375
1073 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1074 Coro::cede; 1377 cf::cede_to_tick;
1075} 1378}
1076 1379
1077sub new($) { 1380sub new($) {
1078 my ($login) = @_; 1381 my ($login) = @_;
1079 1382
1083 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1084 1387
1085 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1086 1389
1087 $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 (@_);
1088} 1401}
1089 1402
1090=item $pl->quit_character 1403=item $pl->quit_character
1091 1404
1092Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1460 or return [];
1148 1461
1149 my @logins; 1462 my @logins;
1150 1463
1151 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") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1155 1473
1156 utf8::decode $login; 1474 utf8::decode $login;
1157 push @logins, $login; 1475 push @logins, $login;
1158 } 1476 }
1159 1477
1186 } 1504 }
1187 1505
1188 \@paths 1506 \@paths
1189} 1507}
1190 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
1191=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1192 1561
1193Sends an ext reply to the player. 1562Sends an ext reply to the player.
1194 1563
1195=cut 1564=cut
1196 1565
1197sub ext_reply($$%) { 1566sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1199 1568
1200 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1570}
1204 1571
1205=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1206 1573
1207Sends an ext event to the client. 1574Sends an ext event to the client.
1208 1575
1209=cut 1576=cut
1210 1577
1211sub ext_event($$%) { 1578sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1213 1580
1214 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1215} 1582}
1216 1583
1217=head3 cf::region 1584=head3 cf::region
1218 1585
1219=over 4 1586=over 4
1222 1589
1223package cf::region; 1590package cf::region;
1224 1591
1225=item cf::region::find_by_path $path 1592=item cf::region::find_by_path $path
1226 1593
1227Tries 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.
1228 1595
1229=cut 1596=cut
1230 1597
1231sub find_by_path($) { 1598sub find_by_path($) {
1232 my ($path) = @_; 1599 my ($path) = @_;
1233 1600
1234 my ($match, $specificity); 1601 my ($match, $specificity);
1235 1602
1236 for my $region (list) { 1603 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1604 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1605 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1606 if $region->specificity > $specificity;
1240 } 1607 }
1241 } 1608 }
1242 1609
1306 my ($self, $merge) = @_; 1673 my ($self, $merge) = @_;
1307 1674
1308 # we have to keep some variables in memory intact 1675 # we have to keep some variables in memory intact
1309 local $self->{path}; 1676 local $self->{path};
1310 local $self->{load_path}; 1677 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1678
1314 $self->SUPER::thawer_merge ($merge); 1679 $self->SUPER::thawer_merge ($merge);
1315} 1680}
1316 1681
1317sub normalise { 1682sub normalise {
1364 $self->init; # pass $1 etc. 1729 $self->init; # pass $1 etc.
1365 return $self; 1730 return $self;
1366 } 1731 }
1367 } 1732 }
1368 1733
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1734 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1735 ()
1371} 1736}
1372 1737
1373sub init { 1738sub init {
1374 my ($self) = @_; 1739 my ($self) = @_;
1417 1782
1418 $_->change_map_light ($change) 1783 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1784 for grep $_->outdoor, values %cf::MAP;
1420} 1785}
1421 1786
1787sub decay_objects {
1788 my ($self) = @_;
1789
1790 return if $self->{deny_reset};
1791
1792 $self->do_decay_objects;
1793}
1794
1422sub unlink_save { 1795sub unlink_save {
1423 my ($self) = @_; 1796 my ($self) = @_;
1424 1797
1425 utf8::encode (my $save = $self->save_path); 1798 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1799 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1802
1430sub load_header_from($) { 1803sub load_header_from($) {
1431 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1432 1805
1433 utf8::encode $path; 1806 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 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;
1439 1815
1440 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1441 1817
1442 1 1818 1
1443} 1819}
1482 $self->load_header_orig 1858 $self->load_header_orig
1483 or return; 1859 or return;
1484 $self->prepare_orig; 1860 $self->prepare_orig;
1485 } 1861 }
1486 1862
1863 $self->{deny_reset} = 1
1864 if $self->no_reset;
1865
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1866 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1867 unless $self->default_region;
1489 1868
1490 1 1869 1
1491} 1870}
1494sub find { 1873sub find {
1495 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1496 1875
1497 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1498 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1500 1880
1501 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1502 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
1503 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1504 or return; 1886 or return;
1505 1887
1506 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1507 1889
1508 $map->load_header 1890 $map->load_header
1509 or return; 1891 or return;
1510 1892
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1514 $map->reset; 1898 $map->reset;
1515 undef $guard;
1516 return find $path; 1899 return find $path;
1517 } 1900 }
1518 1901
1519 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1520 } 1903 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1530 1913
1531 my $path = $self->{path}; 1914 my $path = $self->{path};
1532 1915
1533 { 1916 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1535 1918
1919 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1921
1538 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1539 1923
1540 $self->alloc; 1924 $self->alloc;
1541 1925
1542 $self->pre_load; 1926 $self->pre_load;
1543 Coro::cede; 1927 cf::cede_to_tick;
1544 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1546 or return; 1932 or return;
1547 1933
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1550 1936
1551 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1938 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1941 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1556 } 1945 }
1557 } 1946 }
1558 1947
1559 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1560 # now do the right thing for maps 1951 # now do the right thing for maps
1561 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1954 unless $self->difficulty;
1564 Coro::cede; 1955 cf::cede_to_tick;
1565 1956
1566 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1958 $self->decay_objects;
1568 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1569 $self->update_buttons; 1960 $self->update_buttons;
1570 Coro::cede; 1961 cf::cede_to_tick;
1571 $self->set_darkness_map; 1962 $self->set_darkness_map;
1572 Coro::cede; 1963 cf::cede_to_tick;
1573 $self->activate; 1964 $self->activate;
1574 } 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1575 1969
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1971 }
1578 1972
1579 $self->post_load; 1973 $self->post_load;
1583 my ($self, $ob) = @_; 1977 my ($self, $ob) = @_;
1584 1978
1585 return find "~" . $ob->name . "/" . $self->{path} 1979 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1980 if $self->per_player;
1587 1981
1982# return find "?party/" . $ob->name . "/" . $self->{path}
1983# if $self->per_party;
1984
1588 $self 1985 $self
1589} 1986}
1590 1987
1591# 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
1592sub load_diag { 1989sub load_neighbours {
1593 my ($map) = @_; 1990 my ($map) = @_;
1594 1991
1595 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1596 1993
1597 for (0 .. 3) { 1994 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1599 or next; 1996 or next;
1600 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1601 or next; 1998 or next;
1602 $neigh->load; 1999 $neigh->load;
1603 2000
2001 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2004 }
1607 2005
1608 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1610 or next; 2009 or next;
1611 $neigh->load; 2010 $neigh->load;
1612 } 2011 }
1613} 2012}
1614 2013
1619} 2018}
1620 2019
1621sub do_load_sync { 2020sub do_load_sync {
1622 my ($map) = @_; 2021 my ($map) = @_;
1623 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1624 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1625} 2027}
1626 2028
1627our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1629 2031
1630sub find_async { 2032sub find_async {
1631 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1632 2034
1633 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1634 2036
1635 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2039 }
1638 2040
1639 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1640 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1641 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2048 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2049 $map->load if $v;
2050 }
1646 2051
1647 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1648 } 2053 }
1649 } 2054 }
1650 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1651 }; 2056 };
1652 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1655} 2060}
1656 2061
1657sub save { 2062sub save {
1658 my ($self) = @_; 2063 my ($self) = @_;
1659 2064
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2066
1662 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1663 2068
1664 return unless $self->dirty; 2069 return unless $self->dirty;
1665 2070
1671 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1672 2077
1673 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1674 2079
1675 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1677 }; 2083 };
1678 2084
1679 if ($uniq) { 2085 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1688 my ($self) = @_; 2094 my ($self) = @_;
1689 2095
1690 # save first because save cedes 2096 # save first because save cedes
1691 $self->save; 2097 $self->save;
1692 2098
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2100
1695 return if $self->players; 2101 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1698 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2109 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2110}
1702 2111
1703sub reset_at { 2112sub reset_at {
1704 my ($self) = @_; 2113 my ($self) = @_;
1705 2114
1706 # TODO: safety, remove and allow resettable per-player maps 2115 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2116 return 1e99 if $self->{deny_reset};
1709 2117
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 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;
1712 2120
1723 my ($self) = @_; 2131 my ($self) = @_;
1724 2132
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2134
1727 return if $self->players; 2135 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2136
1730 warn "resetting map ", $self->path;#d# 2137 warn "resetting map ", $self->path;
1731 2138
1732 $self->in_memory (cf::MAP_SWAPPED); 2139 $self->in_memory (cf::MAP_SWAPPED);
1733 2140
1734 # need to save uniques path 2141 # need to save uniques path
1735 unless ($self->{deny_save}) { 2142 unless ($self->{deny_save}) {
1739 if $uniq; 2146 if $uniq;
1740 } 2147 }
1741 2148
1742 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
1743 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2153 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2154
1748 $self->unlink_save; 2155 $self->unlink_save;
1749 $self->destroy; 2156 $self->destroy;
1750} 2157}
1751 2158
1752my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
1753 2160
1754sub nuke { 2161sub nuke {
1755 my ($self) = @_; 2162 my ($self) = @_;
1756 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
1757 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
1758 2168
1759 $self->unlink_save; 2169 $self->unlink_save;
1760 2170
1761 bless $self, "cf::map"; 2171 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2176
1767 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
1768 2179
1769 $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 ]
1770} 2217}
1771 2218
1772=item cf::map::unique_maps 2219=item cf::map::unique_maps
1773 2220
1774Returns an arrayref of paths of all shared maps that have 2221Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2222instantiated unique items. May block.
1776 2223
1777=cut 2224=cut
1778 2225
1779sub unique_maps() { 2226sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2227 [
1781 or return; 2228 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2229 utf8::decode $_;
1787 next if /\.pst$/; 2230 /\.map$/
1788 next unless /^$PATH_SEP/o; 2231 ? normalise $_
1789 2232 : ()
1790 push @paths, cf::map::normalise $_; 2233 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2234 ]
1792
1793 \@paths
1794} 2235}
1795 2236
1796package cf; 2237package cf;
1797 2238
1798=back 2239=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2257 map { $_, inv_recursive_ $_->inv } @_
1817} 2258}
1818 2259
1819sub inv_recursive { 2260sub inv_recursive {
1820 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 }
1821} 2293}
1822 2294
1823package cf; 2295package cf;
1824 2296
1825=back 2297=back
1844 2316
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2317 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2318
1847 if ($self->{record_replies}) { 2319 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2320 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2321
1849 } 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 {
1850 $msg = $npc->name . " says: $msg" if $npc; 2330 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2331 $self->message ($msg, $flags);
2332 }
1852 } 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 (@_);
1853} 2344}
1854 2345
1855=item $player_object->may ("access") 2346=item $player_object->may ("access")
1856 2347
1857Returns wether the given player is authorized to access resource "access" 2348Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2395 $self->deactivate_recursive;
1905 2396
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2397 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2398
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2400 if $self->map && $self->map->{path} ne "{link}";
1910 2401
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2402 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2403}
1913 2404
1914sub cf::object::player::leave_link { 2405sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2406 my ($self, $map, $x, $y) = @_;
2407
2408 return unless $self->contr->active;
1916 2409
1917 my $link_pos = delete $self->{_link_pos}; 2410 my $link_pos = delete $self->{_link_pos};
1918 2411
1919 unless ($map) { 2412 unless ($map) {
1920 # restore original map position 2413 # restore original map position
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
1948cf::player->attach ( 2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 on_logout => sub {
1950 my ($pl) = @_;
1951 2442
1952 # abort map switching before logout 2443Moves the player to the given map-path and coordinates by first freezing
1953 if ($pl->ob->{_link_pos}) { 2444her, loading and preparing them map, calling the provided $check callback
1954 cf::sync_job { 2445that has to return the map if sucecssful, and then unfreezes the player on
1955 $pl->ob->leave_link 2446the new (success) or old (failed) map position. In either case, $done will
1956 }; 2447be called at the end of this process.
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961 2448
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y)
1981
1982=cut 2449=cut
2450
2451our $GOTOGEN;
1983 2452
1984sub cf::object::player::goto { 2453sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 2454 my ($self, $path, $x, $y, $check, $done) = @_;
2455
2456 # do generation counting so two concurrent goto's will be executed in-order
2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 2458
1987 $self->enter_link; 2459 $self->enter_link;
1988 2460
1989 (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
1990 my $map = eval { 2483 my $map = eval {
1991 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2485
2486 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 2487 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map;
2489 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 }
2492
1993 $map 2493 $map
2494 };
2495
2496 if ($@) {
2497 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2498 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 2499 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 2500
2501 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2504 }
2505
2506 $done->() if $done;
1998 })->prio (1); 2507 })->prio (1);
1999} 2508}
2000 2509
2001=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
2002 2511
2071 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
2072 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
2073 2582
2074 $self->enter_link; 2583 $self->enter_link;
2075 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
2076 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2077 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2078 unless (eval { 2593 unless (eval {
2079 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2080 2595
2081 1; 2596 1;
2107 2622
2108 utf8::encode $text; 2623 utf8::encode $text;
2109 $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);
2110} 2625}
2111 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 => "identify",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "examine",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649);
2650
2651sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_;
2653
2654 $msg = $self->pl->expand_cfpod ($msg);
2655
2656 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657
2658 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2660
2661 if (ref $channel) {
2662 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667 }
2668
2669 $channel = $channel->{id};
2670 }
2671
2672 return unless @extra || length $msg;
2673
2674 if ($self->can_msg) {
2675 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF;
2678
2679 $self->send_packet ("msg " . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2681 } else {
2682 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones
2684 for ($msg) {
2685 1 while
2686 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2687 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2688 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2689 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2690 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2691 }
2692
2693 $color &= cf::NDI_COLOR_MASK;
2694
2695 utf8::encode $msg;
2696
2697 if (0 && $msg =~ /\[/) {
2698 # COMMAND/INFO
2699 $self->send_packet ("drawextinfo $color 10 8 $msg")
2700 } else {
2701 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2702 $self->send_packet ("drawinfo $color $msg")
2703 }
2704 }
2705 }
2706}
2707
2112=item $client->ext_event ($type, %msg) 2708=item $client->ext_msg ($type, @msg)
2113 2709
2114Sends an exti event to the client. 2710Sends an ext event to the client.
2115 2711
2116=cut 2712=cut
2117 2713
2118sub cf::client::ext_event($$%) { 2714sub cf::client::ext_msg($$@) {
2119 my ($self, $type, %msg) = @_; 2715 my ($self, $type, @msg) = @_;
2120 2716
2717 if ($self->extcmd == 2) {
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2719 } elsif ($self->extcmd == 1) { # TODO: remove
2121 $msg{msgtype} = "event_$type"; 2720 push @msg, msgtype => "event_$type";
2122 $self->send_packet ("ext " . cf::to_json \%msg); 2721 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2722 }
2723}
2724
2725=item $client->ext_reply ($msgid, @msg)
2726
2727Sends an ext reply to the client.
2728
2729=cut
2730
2731sub cf::client::ext_reply($$@) {
2732 my ($self, $id, @msg) = @_;
2733
2734 if ($self->extcmd == 2) {
2735 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2736 } elsif ($self->extcmd == 1) {
2737 #TODO: version 1, remove
2738 unshift @msg, msgtype => "reply", msgid => $id;
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2123} 2741}
2124 2742
2125=item $success = $client->query ($flags, "text", \&cb) 2743=item $success = $client->query ($flags, "text", \&cb)
2126 2744
2127Queues a query to the client, calling the given callback with 2745Queues a query to the client, calling the given callback with
2128the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2746the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2129C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2747C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2130 2748
2131Queries can fail, so check the return code. Or don't, as queries will become 2749Queries can fail, so check the return code. Or don't, as queries will
2132reliable at some point in the future. 2750become reliable at some point in the future.
2133 2751
2134=cut 2752=cut
2135 2753
2136sub cf::client::query { 2754sub cf::client::query {
2137 my ($self, $flags, $text, $cb) = @_; 2755 my ($self, $flags, $text, $cb) = @_;
2145 utf8::encode $text; 2763 utf8::encode $text;
2146 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2764 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2147 2765
2148 $self->send_packet ($self->{query_queue}[0][0]) 2766 $self->send_packet ($self->{query_queue}[0][0])
2149 if @{ $self->{query_queue} } == 1; 2767 if @{ $self->{query_queue} } == 1;
2768
2769 1
2150} 2770}
2151 2771
2152cf::client->attach ( 2772cf::client->attach (
2773 on_connect => sub {
2774 my ($ns) = @_;
2775
2776 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2777 },
2153 on_reply => sub { 2778 on_reply => sub {
2154 my ($ns, $msg) = @_; 2779 my ($ns, $msg) = @_;
2155 2780
2156 # this weird shuffling is so that direct followup queries 2781 # this weird shuffling is so that direct followup queries
2157 # get handled first 2782 # get handled first
2169 } else { 2794 } else {
2170 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2795 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2171 } 2796 }
2172 } 2797 }
2173 }, 2798 },
2799 on_exticmd => sub {
2800 my ($ns, $buf) = @_;
2801
2802 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2803
2804 if (ref $msg) {
2805 my ($type, $reply, @payload) =
2806 "ARRAY" eq ref $msg
2807 ? @$msg
2808 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2809
2810 my @reply;
2811
2812 if (my $cb = $EXTICMD{$type}) {
2813 @reply = $cb->($ns, @payload);
2814 }
2815
2816 $ns->ext_reply ($reply, @reply)
2817 if $reply;
2818
2819 } else {
2820 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2821 }
2822
2823 cf::override;
2824 },
2174); 2825);
2175 2826
2176=item $client->async (\&cb) 2827=item $client->async (\&cb)
2177 2828
2178Create a new coroutine, running the specified callback. The coroutine will 2829Create a new coroutine, running the specified callback. The coroutine will
2219our $safe = new Safe "safe"; 2870our $safe = new Safe "safe";
2220our $safe_hole = new Safe::Hole; 2871our $safe_hole = new Safe::Hole;
2221 2872
2222$SIG{FPE} = 'IGNORE'; 2873$SIG{FPE} = 'IGNORE';
2223 2874
2224$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2875$safe->permit_only (Opcode::opset qw(
2876 :base_core :base_mem :base_orig :base_math
2877 grepstart grepwhile mapstart mapwhile
2878 sort time
2879));
2225 2880
2226# here we export the classes and methods available to script code 2881# here we export the classes and methods available to script code
2227 2882
2228=pod 2883=pod
2229 2884
2230The following functions and methods are available within a safe environment: 2885The following functions and methods are available within a safe environment:
2231 2886
2232 cf::object contr pay_amount pay_player map 2887 cf::object
2888 contr pay_amount pay_player map x y force_find force_add
2889 insert remove name archname title slaying race decrease_ob_nr
2890
2233 cf::object::player player 2891 cf::object::player
2234 cf::player peaceful 2892 player
2235 cf::map trigger 2893
2894 cf::player
2895 peaceful
2896
2897 cf::map
2898 trigger
2236 2899
2237=cut 2900=cut
2238 2901
2239for ( 2902for (
2240 ["cf::object" => qw(contr pay_amount pay_player map)], 2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race
2905 decrease_ob_nr)],
2241 ["cf::object::player" => qw(player)], 2906 ["cf::object::player" => qw(player)],
2242 ["cf::player" => qw(peaceful)], 2907 ["cf::player" => qw(peaceful)],
2243 ["cf::map" => qw(trigger)], 2908 ["cf::map" => qw(trigger)],
2244) { 2909) {
2245 no strict 'refs'; 2910 no strict 'refs';
2316=back 2981=back
2317 2982
2318=cut 2983=cut
2319 2984
2320############################################################################# 2985#############################################################################
2321
2322=head2 EXTENSION DATABASE SUPPORT
2323
2324Crossfire maintains a very simple database for extension use. It can
2325currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2326convert to/from binary).
2327
2328The parameter C<$family> should best start with the name of the extension
2329using it, it should be unique.
2330
2331=over 4
2332
2333=item $value = cf::db_get $family => $key
2334
2335Returns a single value from the database.
2336
2337=item cf::db_put $family => $key => $value
2338
2339Stores the given C<$value> in the family.
2340
2341=cut
2342
2343our $DB;
2344
2345sub db_init {
2346 unless ($DB) {
2347 $DB = BDB::db_create $DB_ENV;
2348
2349 cf::sync_job {
2350 eval {
2351 $DB->set_flags (BDB::CHKSUM);
2352
2353 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2354 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2355 cf::cleanup "db_open(db): $!" if $!;
2356 };
2357 cf::cleanup "db_open(db): $@" if $@;
2358 };
2359 }
2360}
2361
2362sub db_get($$) {
2363 my $key = "$_[0]/$_[1]";
2364
2365 cf::sync_job {
2366 BDB::db_get $DB, undef, $key, my $data;
2367
2368 $! ? ()
2369 : $data
2370 }
2371}
2372
2373sub db_put($$$) {
2374 BDB::dbreq_pri 4;
2375 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2376}
2377
2378=item cf::cache $id => [$paths...], $processversion => $process
2379
2380Generic caching function that returns the value of the resource $id,
2381caching and regenerating as required.
2382
2383This function can block.
2384
2385=cut
2386
2387sub cache {
2388 my ($id, $src, $processversion, $process) = @_;
2389
2390 my $meta =
2391 join "\x00",
2392 $processversion,
2393 map {
2394 aio_stat $_
2395 and Carp::croak "$_: $!";
2396
2397 ($_, (stat _)[7,9])
2398 } @$src;
2399
2400 my $dbmeta = db_get cache => "$id/meta";
2401 if ($dbmeta ne $meta) {
2402 # changed, we may need to process
2403
2404 my @data;
2405 my $md5;
2406
2407 for (0 .. $#$src) {
2408 0 <= aio_load $src->[$_], $data[$_]
2409 or Carp::croak "$src->[$_]: $!";
2410 }
2411
2412 # if processing is expensive, check
2413 # checksum first
2414 if (1) {
2415 $md5 =
2416 join "\x00",
2417 $processversion,
2418 map {
2419 Coro::cede;
2420 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2421 } 0.. $#$src;
2422
2423
2424 my $dbmd5 = db_get cache => "$id/md5";
2425 if ($dbmd5 eq $md5) {
2426 db_put cache => "$id/meta", $meta;
2427
2428 return db_get cache => "$id/data";
2429 }
2430 }
2431
2432 my $t1 = Time::HiRes::time;
2433 my $data = $process->(\@data);
2434 my $t2 = Time::HiRes::time;
2435
2436 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2437
2438 db_put cache => "$id/data", $data;
2439 db_put cache => "$id/md5" , $md5;
2440 db_put cache => "$id/meta", $meta;
2441
2442 return $data;
2443 }
2444
2445 db_get cache => "$id/data"
2446}
2447
2448=item fork_call { }, $args
2449
2450Executes the given code block with the given arguments in a seperate
2451process, returning the results. Everything must be serialisable with
2452Coro::Storable. May, of course, block. Note that the executed sub may
2453never block itself or use any form of Event handling.
2454
2455=cut
2456
2457sub fork_call(&@) {
2458 my ($cb, @args) = @_;
2459
2460# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2461# or die "socketpair: $!";
2462 pipe my $fh1, my $fh2
2463 or die "pipe: $!";
2464
2465 if (my $pid = fork) {
2466 close $fh2;
2467
2468 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2469 $res = Coro::Storable::thaw $res;
2470
2471 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2472
2473 die $$res unless "ARRAY" eq ref $res;
2474
2475 return wantarray ? @$res : $res->[-1];
2476 } else {
2477 reset_signals;
2478 local $SIG{__WARN__};
2479 local $SIG{__DIE__};
2480 eval {
2481 close $fh1;
2482
2483 my @res = eval { $cb->(@args) };
2484 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2485 };
2486
2487 warn $@ if $@;
2488 _exit 0;
2489 }
2490}
2491
2492
2493
2494#############################################################################
2495# the server's init and main functions 2986# the server's init and main functions
2496 2987
2497sub load_facedata($) { 2988sub load_facedata($) {
2498 my ($path) = @_; 2989 my ($path) = @_;
2990
2991 # HACK to clear player env face cache, we need some signal framework
2992 # for this (global event?)
2993 %ext::player_env::MUSIC_FACE_CACHE = ();
2994
2995 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2499 2996
2500 warn "loading facedata from $path\n"; 2997 warn "loading facedata from $path\n";
2501 2998
2502 my $facedata; 2999 my $facedata;
2503 0 < aio_load $path, $facedata 3000 0 < aio_load $path, $facedata
2506 $facedata = Coro::Storable::thaw $facedata; 3003 $facedata = Coro::Storable::thaw $facedata;
2507 3004
2508 $facedata->{version} == 2 3005 $facedata->{version} == 2
2509 or cf::cleanup "$path: version mismatch, cannot proceed."; 3006 or cf::cleanup "$path: version mismatch, cannot proceed.";
2510 3007
3008 # patch in the exptable
3009 $facedata->{resource}{"res/exp_table"} = {
3010 type => FT_RSRC,
3011 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3012 };
3013 cf::cede_to_tick;
3014
2511 { 3015 {
2512 my $faces = $facedata->{faceinfo}; 3016 my $faces = $facedata->{faceinfo};
2513 3017
2514 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2515 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3019 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2516 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3020 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap};
2517 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2518 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2519 Coro::cede; 3024
3025 cf::cede_to_tick;
2520 } 3026 }
2521 3027
2522 while (my ($face, $info) = each %$faces) { 3028 while (my ($face, $info) = each %$faces) {
2523 next unless $info->{smooth}; 3029 next unless $info->{smooth};
2524 my $idx = cf::face::find $face 3030 my $idx = cf::face::find $face
2525 or next; 3031 or next;
2526 if (my $smooth = cf::face::find $info->{smooth}) { 3032 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth;
2527 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2528 } else { 3035 } else {
2529 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3036 warn "smooth face '$info->{smooth}' not found for face '$face'";
2530 } 3037 }
2531 Coro::cede; 3038
3039 cf::cede_to_tick;
2532 } 3040 }
2533 } 3041 }
2534 3042
2535 { 3043 {
2536 my $anims = $facedata->{animinfo}; 3044 my $anims = $facedata->{animinfo};
2537 3045
2538 while (my ($anim, $info) = each %$anims) { 3046 while (my ($anim, $info) = each %$anims) {
2539 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3047 cf::anim::set $anim, $info->{frames}, $info->{facings};
2540 Coro::cede; 3048 cf::cede_to_tick;
2541 } 3049 }
2542 3050
2543 cf::anim::invalidate_all; # d'oh 3051 cf::anim::invalidate_all; # d'oh
2544 } 3052 }
2545 3053
3054 {
3055 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource};
3058
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data;
3064
3065 if ($info->{type} & 1) {
3066 # prepend meta info
3067
3068 my $meta = $enc->encode ({
3069 name => $name,
3070 %{ $info->{meta} || {} },
3071 });
3072
3073 $data = pack "(w/a*)*", $meta, $info->{data};
3074 } else {
3075 $data = $info->{data};
3076 }
3077
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick;
3082 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 }
3102
2546 1 3103 1
2547} 3104}
2548 3105
3106register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_;
3108
3109 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v);
3111 }
3112};
3113
2549sub reload_regions { 3114sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = ();
3118
2550 load_resource_file "$MAPDIR/regions" 3119 load_resource_file "$MAPDIR/regions"
2551 or die "unable to load regions file\n"; 3120 or die "unable to load regions file\n";
3121
3122 for (cf::region::list) {
3123 $_->{match} = qr/$_->{match}/
3124 if exists $_->{match};
3125 }
2552} 3126}
2553 3127
2554sub reload_facedata { 3128sub reload_facedata {
2555 load_facedata "$DATADIR/facedata" 3129 load_facedata "$DATADIR/facedata"
2556 or die "unable to load facedata\n"; 3130 or die "unable to load facedata\n";
2557} 3131}
2558 3132
2559sub reload_archetypes { 3133sub reload_archetypes {
2560 load_resource_file "$DATADIR/archetypes" 3134 load_resource_file "$DATADIR/archetypes"
2561 or die "unable to load archetypes\n"; 3135 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
2562} 3141}
2563 3142
2564sub reload_treasures { 3143sub reload_treasures {
2565 load_resource_file "$DATADIR/treasures" 3144 load_resource_file "$DATADIR/treasures"
2566 or die "unable to load treasurelists\n"; 3145 or die "unable to load treasurelists\n";
2569sub reload_resources { 3148sub reload_resources {
2570 warn "reloading resource files...\n"; 3149 warn "reloading resource files...\n";
2571 3150
2572 reload_regions; 3151 reload_regions;
2573 reload_facedata; 3152 reload_facedata;
3153 #reload_archetypes;#d#
2574 reload_archetypes; 3154 reload_archetypes;
2575 reload_treasures; 3155 reload_treasures;
2576 3156
2577 warn "finished reloading resource files\n"; 3157 warn "finished reloading resource files\n";
2578} 3158}
2579 3159
2580sub init { 3160sub init {
2581 reload_resources; 3161 reload_resources;
2582} 3162}
2583 3163
2584sub cfg_load { 3164sub reload_config {
2585 open my $fh, "<:utf8", "$CONFDIR/config" 3165 open my $fh, "<:utf8", "$CONFDIR/config"
2586 or return; 3166 or return;
2587 3167
2588 local $/; 3168 local $/;
2589 *CFG = YAML::Syck::Load <$fh>; 3169 *CFG = YAML::Syck::Load <$fh>;
2605sub main { 3185sub main {
2606 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
2607 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
2608 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2609 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
2610 Event::one_event; 3191 Event::one_event;
2611 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
2612 }; 3193 };
2613 3194
2614 cfg_load; 3195 reload_config;
2615 db_init; 3196 db_init;
2616 load_extensions; 3197 load_extensions;
2617 3198
2618 $TICK_WATCHER->start; 3199 $TICK_WATCHER->start;
2619 Event::loop; 3200 Event::loop;
2635 }, 3216 },
2636 ); 3217 );
2637 } 3218 }
2638} 3219}
2639 3220
3221sub write_runtime {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time.
3226
3227 IO::AIO::aio_utime $runtime, undef, undef;
3228
3229 my $guard = cf::lock_acquire "write_runtime";
3230
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3232 or return;
3233
3234 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server.
3237
3238 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3239 and return;
3240
3241 # always fsync - this file is important
3242 aio_fsync $fh
3243 and return;
3244
3245 # touch it again to show we are up-to-date
3246 aio_utime $fh, undef, undef;
3247
3248 close $fh
3249 or return;
3250
3251 aio_rename "$runtime~", $runtime
3252 and return;
3253
3254 warn "runtime file written.\n";
3255
3256 1
3257}
3258
2640sub emergency_save() { 3259sub emergency_save() {
2641 my $freeze_guard = cf::freeze_mainloop; 3260 my $freeze_guard = cf::freeze_mainloop;
2642 3261
2643 warn "enter emergency perl save\n"; 3262 warn "enter emergency perl save\n";
2644 3263
2719 %EXT_CORO = (); 3338 %EXT_CORO = ();
2720 3339
2721 warn "removing commands"; 3340 warn "removing commands";
2722 %COMMAND = (); 3341 %COMMAND = ();
2723 3342
2724 warn "removing ext commands"; 3343 warn "removing ext/exti commands";
2725 %EXTCMD = (); 3344 %EXTCMD = ();
3345 %EXTICMD = ();
2726 3346
2727 warn "unloading/nuking all extensions"; 3347 warn "unloading/nuking all extensions";
2728 for my $pkg (@EXTS) { 3348 for my $pkg (@EXTS) {
2729 warn "... unloading $pkg"; 3349 warn "... unloading $pkg";
2730 3350
2773 warn "reloading cf.pm"; 3393 warn "reloading cf.pm";
2774 require cf; 3394 require cf;
2775 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2776 3396
2777 warn "loading config and database again"; 3397 warn "loading config and database again";
2778 cf::cfg_load; 3398 cf::reload_config;
2779 3399
2780 warn "loading extensions"; 3400 warn "loading extensions";
2781 cf::load_extensions; 3401 cf::load_extensions;
2782 3402
2783 warn "reattaching attachments to objects/players"; 3403 warn "reattaching attachments to objects/players";
2819register_command "reload" => sub { 3439register_command "reload" => sub {
2820 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
2821 3441
2822 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
2823 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
3444 async {
3445 $Coro::current->{desc} = "perl_reload";
2824 async { reload_perl }; 3446 reload_perl;
3447 };
2825 } 3448 }
2826}; 3449};
2827 3450
2828unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
2829 3452
2871 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
2872 3495
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2874 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
2875 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
2876 write_runtime 3500 write_runtime
2877 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
2878 }; 3502 };
2879 } 3503 }
2880 3504
2881# my $AFTER = Event::time;
2882# warn $AFTER - $NOW;#d#
2883
2884 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2885 $sig->send; 3506 $sig->send;
2886 } 3507 }
2887 while (my $sig = shift @WAIT_FOR_TICK) { 3508 while (my $sig = shift @WAIT_FOR_TICK) {
2888 $sig->send; 3509 $sig->send;
2898 3519
2899 $LOAD = ($NOW - $tick_start) / $TICK; 3520 $LOAD = ($NOW - $tick_start) / $TICK;
2900 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2901 3522
2902 _post_tick; 3523 _post_tick;
2903
2904
2905 }, 3524 },
2906); 3525);
2907 3526
2908{ 3527{
3528 BDB::min_parallel 8;
2909 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
2910 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
2911 reentrant => 0, 3531 reentrant => 0,
2912 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
2913 poll => 'r', 3533 poll => 'r',
2914 prio => 0, 3534 prio => 0,
2915 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
2916 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
2917 ); 3537 );
2918 BDB::min_parallel 8;
2919 3538
2920 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
2921 my $status; 3540 my $status;
2922 my $current = $Coro::current; 3541 my $current = $Coro::current;
2923 ( 3542 (
2932 ) 3551 )
2933 }; 3552 };
2934 3553
2935 unless ($DB_ENV) { 3554 unless ($DB_ENV) {
2936 $DB_ENV = BDB::db_env_create; 3555 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3557 | BDB::LOG_AUTOREMOVE, 1);
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2937 3560
2938 cf::sync_job { 3561 cf::sync_job {
2939 eval { 3562 eval {
2940 BDB::db_env_open 3563 BDB::db_env_open
2941 $DB_ENV, 3564 $DB_ENV,
2943 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2944 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2945 0666; 3568 0666;
2946 3569
2947 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2948
2949 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2950 $DB_ENV->set_lk_detect;
2951 }; 3571 };
2952 3572
2953 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
2954 }; 3574 };
2955 } 3575 }
3576
3577 $BDB_DEADLOCK_WATCHER = Event->timer (
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 );
3587 $BDB_CHECKPOINT_WATCHER = Event->timer (
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 );
3597 $BDB_TRICKLE_WATCHER = Event->timer (
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 );
2956} 3607}
2957 3608
2958{ 3609{
2959 IO::AIO::min_parallel 8; 3610 IO::AIO::min_parallel 8;
2960 3611
2979 3630
2980 # limit the # of concurrent backtraces 3631 # limit the # of concurrent backtraces
2981 if ($_log_backtrace < 2) { 3632 if ($_log_backtrace < 2) {
2982 ++$_log_backtrace; 3633 ++$_log_backtrace;
2983 async { 3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
2984 my @bt = fork_call { 3637 my @bt = fork_call {
2985 @addr = map { sprintf "%x", $_ } @addr; 3638 @addr = map { sprintf "%x", $_ } @addr;
2986 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2987 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2988 or die "addr2line: $!"; 3641 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines