ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines