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.371 by root, Thu Sep 13 16:16:01 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
815); 1026);
816 1027
817sub object_freezer_save { 1028sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
819 1030
1031 my $guard = cf::lock_acquire "io";
1032
820 sync_job { 1033 sync_job {
821 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
824 1038
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
847 } 1061 }
848 } else { 1062 } else {
849 aio_unlink $filename; 1063 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
851 } 1065 }
852 } 1066 };
1067
1068 undef $guard;
853} 1069}
854 1070
855sub object_freezer_as_string { 1071sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
857 1073
862 1078
863sub object_thawer_load { 1079sub object_thawer_load {
864 my ($filename) = @_; 1080 my ($filename) = @_;
865 1081
866 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
867 1085
868 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
869 or return; 1087 or return;
870 1088
871 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
873 or return; 1091 or return;
1092
1093 undef $guard;
874 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
875 } 1095 }
876 1096
1097 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
879 return ($data, $av); 1101 ($data, $av)
880} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
881 1109
882############################################################################# 1110#############################################################################
883# command handling &c 1111# command handling &c
884 1112
885=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1127}
900 1128
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1130
903Register a callbackf ro execution when the client sends an extcmd packet. 1131Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is
1134the logged-in player. Ext commands can only be processed after a player
1135has logged in successfully.
904 1136
905If the callback returns something, it is sent back as if reply was being 1137If the callback returns something, it is sent back as if reply was being
906called. 1138called.
907 1139
1140=item cf::register_exticmd $name => \&callback($ns,$packet);
1141
1142Register a callback for execution when the client sends an (asynchronous)
1143exticmd packet. Exti commands are processed by the server as soon as they
1144are received, i.e. out of order w.r.t. other commands. The first argument
1145is a client socket. Exti commands can be received anytime, even before
1146log-in.
1147
1148If the callback returns something, it is sent back as if reply was being
1149called.
1150
908=cut 1151=cut
909 1152
910sub register_extcmd { 1153sub register_extcmd {
911 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
912 1155
913 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
914} 1163}
915 1164
916cf::player->attach ( 1165cf::player->attach (
917 on_command => sub { 1166 on_command => sub {
918 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
927 cf::override; 1176 cf::override;
928 }, 1177 },
929 on_extcmd => sub { 1178 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
931 1180
932 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1182
934 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
940 } else { 1198 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1200 }
943 1201
944 cf::override; 1202 cf::override;
945 }, 1203 },
946); 1204);
947 1205
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 { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
983 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1211 next unless -r $path;
985 eval { 1212
986 load_extension $ext; 1213 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1214 my $base = $1;
1215 my $pkg = $1;
1216 $pkg =~ s/[^[:word:]]/_/g;
1217 $pkg = "ext::$pkg";
1218
1219 open my $fh, "<:utf8", $path
1220 or die "$path: $!";
1221
1222 my $source = do { local $/; <$fh> };
1223
1224 my %ext = (
1225 path => $path,
1226 base => $base,
1227 pkg => $pkg,
1228 );
1229
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232
1233 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n"
1236 . $source
1237 . "\n};\n1";
1238
1239 $todo{$base} = \%ext;
1240 }
1241
1242 my %done;
1243 while (%todo) {
1244 my $progress;
1245
1246 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip
1249 unless exists $done{$_};
1250 }
1251
1252 warn "... loading '$k' into '$v->{pkg}'\n";
1253
1254 unless (eval $v->{source}) {
1255 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n";
1257
1258 if (exists $v->{meta}{mandatory}) {
1259 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n";
1261 exit 1;
1262 }
1263
1264 warn $msg;
1265 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
987 1 1270 }
988 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
989 } 1276 };
990} 1277}
991 1278
992############################################################################# 1279#############################################################################
993 1280
1281=back
1282
994=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
995 1284
996Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
997 1286
998=cut 1287=cut
1002use Coro::AIO; 1291use Coro::AIO;
1003 1292
1004=head3 cf::player 1293=head3 cf::player
1005 1294
1006=over 4 1295=over 4
1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1007 1310
1008=item cf::player::find $login 1311=item cf::player::find $login
1009 1312
1010Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1011 1314
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1354
1052 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1055 } 1364 }
1056 } 1365 }
1057} 1366}
1058 1367
1068 1377
1069 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1071 1380
1072 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1073 Coro::cede; 1382 cf::cede_to_tick;
1074} 1383}
1075 1384
1076sub new($) { 1385sub new($) {
1077 my ($login) = @_; 1386 my ($login) = @_;
1078 1387
1082 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1083 1392
1084 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1085 1394
1086 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1087} 1406}
1088 1407
1089=item $pl->quit_character 1408=item $pl->quit_character
1090 1409
1091Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1465 or return [];
1147 1466
1148 my @logins; 1467 my @logins;
1149 1468
1150 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1154 1478
1155 utf8::decode $login; 1479 utf8::decode $login;
1156 push @logins, $login; 1480 push @logins, $login;
1157 } 1481 }
1158 1482
1185 } 1509 }
1186 1510
1187 \@paths 1511 \@paths
1188} 1512}
1189 1513
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1515
1516Expand crossfire pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564
1190=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1191 1566
1192Sends an ext reply to the player. 1567Sends an ext reply to the player.
1193 1568
1194=cut 1569=cut
1195 1570
1196sub ext_reply($$%) { 1571sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1198 1573
1199 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1575}
1203 1576
1204=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1205 1578
1206Sends an ext event to the client. 1579Sends an ext event to the client.
1207 1580
1208=cut 1581=cut
1209 1582
1210sub ext_event($$%) { 1583sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1212 1585
1213 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1214} 1587}
1215 1588
1216=head3 cf::region 1589=head3 cf::region
1217 1590
1218=over 4 1591=over 4
1221 1594
1222package cf::region; 1595package cf::region;
1223 1596
1224=item cf::region::find_by_path $path 1597=item cf::region::find_by_path $path
1225 1598
1226Tries to decuce the probable region for a map knowing only its path. 1599Tries to decuce the likely region for a map knowing only its path.
1227 1600
1228=cut 1601=cut
1229 1602
1230sub find_by_path($) { 1603sub find_by_path($) {
1231 my ($path) = @_; 1604 my ($path) = @_;
1232 1605
1233 my ($match, $specificity); 1606 my ($match, $specificity);
1234 1607
1235 for my $region (list) { 1608 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1609 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1610 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1611 if $region->specificity > $specificity;
1239 } 1612 }
1240 } 1613 }
1241 1614
1305 my ($self, $merge) = @_; 1678 my ($self, $merge) = @_;
1306 1679
1307 # we have to keep some variables in memory intact 1680 # we have to keep some variables in memory intact
1308 local $self->{path}; 1681 local $self->{path};
1309 local $self->{load_path}; 1682 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1683
1313 $self->SUPER::thawer_merge ($merge); 1684 $self->SUPER::thawer_merge ($merge);
1314} 1685}
1315 1686
1316sub normalise { 1687sub normalise {
1363 $self->init; # pass $1 etc. 1734 $self->init; # pass $1 etc.
1364 return $self; 1735 return $self;
1365 } 1736 }
1366 } 1737 }
1367 1738
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1739 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1740 ()
1370} 1741}
1371 1742
1372sub init { 1743sub init {
1373 my ($self) = @_; 1744 my ($self) = @_;
1416 1787
1417 $_->change_map_light ($change) 1788 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1789 for grep $_->outdoor, values %cf::MAP;
1419} 1790}
1420 1791
1792sub decay_objects {
1793 my ($self) = @_;
1794
1795 return if $self->{deny_reset};
1796
1797 $self->do_decay_objects;
1798}
1799
1421sub unlink_save { 1800sub unlink_save {
1422 my ($self) = @_; 1801 my ($self) = @_;
1423 1802
1424 utf8::encode (my $save = $self->save_path); 1803 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1804 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1428 1807
1429sub load_header_from($) { 1808sub load_header_from($) {
1430 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1431 1810
1432 utf8::encode $path; 1811 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1438 1820
1439 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1440 1822
1441 1 1823 1
1442} 1824}
1481 $self->load_header_orig 1863 $self->load_header_orig
1482 or return; 1864 or return;
1483 $self->prepare_orig; 1865 $self->prepare_orig;
1484 } 1866 }
1485 1867
1868 $self->{deny_reset} = 1
1869 if $self->no_reset;
1870
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1871 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1872 unless $self->default_region;
1488 1873
1489 1 1874 1
1490} 1875}
1493sub find { 1878sub find {
1494 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1495 1880
1496 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1497 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1499 1885
1500 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1502 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1503 or return; 1891 or return;
1504 1892
1505 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1506 1894
1507 $map->load_header 1895 $map->load_header
1508 or return; 1896 or return;
1509 1897
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1513 $map->reset; 1903 $map->reset;
1514 undef $guard;
1515 return find $path; 1904 return find $path;
1516 } 1905 }
1517 1906
1518 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1519 } 1908 }
1528 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1529 1918
1530 my $path = $self->{path}; 1919 my $path = $self->{path};
1531 1920
1532 { 1921 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1534 1923
1924 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 1926
1537 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1538 1928
1539 $self->alloc; 1929 $self->alloc;
1540 1930
1541 $self->pre_load; 1931 $self->pre_load;
1542 Coro::cede; 1932 cf::cede_to_tick;
1543 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1545 or return; 1937 or return;
1546 1938
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1549 1941
1550 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 1943 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 1946 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1555 } 1950 }
1556 } 1951 }
1557 1952
1558 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1559 # now do the right thing for maps 1956 # now do the right thing for maps
1560 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 1959 unless $self->difficulty;
1563 Coro::cede; 1960 cf::cede_to_tick;
1564 1961
1565 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 1963 $self->decay_objects;
1567 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1568 $self->update_buttons; 1965 $self->update_buttons;
1569 Coro::cede; 1966 cf::cede_to_tick;
1570 $self->set_darkness_map; 1967 $self->set_darkness_map;
1571 Coro::cede; 1968 cf::cede_to_tick;
1572 $self->activate; 1969 $self->activate;
1573 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1574 1974
1575 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 1976 }
1577 1977
1578 $self->post_load; 1978 $self->post_load;
1582 my ($self, $ob) = @_; 1982 my ($self, $ob) = @_;
1583 1983
1584 return find "~" . $ob->name . "/" . $self->{path} 1984 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 1985 if $self->per_player;
1586 1986
1987# return find "?party/" . $ob->name . "/" . $self->{path}
1988# if $self->per_party;
1989
1587 $self 1990 $self
1588} 1991}
1589 1992
1590# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1591sub load_diag { 1994sub load_neighbours {
1592 my ($map) = @_; 1995 my ($map) = @_;
1593 1996
1594 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1595 1998
1596 for (0 .. 3) { 1999 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1598 or next; 2001 or next;
1599 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1600 or next; 2003 or next;
1601 $neigh->load; 2004 $neigh->load;
1602 2005
2006 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2009 }
1606 2010
1607 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1609 or next; 2014 or next;
1610 $neigh->load; 2015 $neigh->load;
1611 } 2016 }
1612} 2017}
1613 2018
1618} 2023}
1619 2024
1620sub do_load_sync { 2025sub do_load_sync {
1621 my ($map) = @_; 2026 my ($map) = @_;
1622 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1623 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1624} 2032}
1625 2033
1626our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1628 2036
1629sub find_async { 2037sub find_async {
1630 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1631 2039
1632 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1633 2041
1634 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2044 }
1637 2045
1638 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1639 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1640 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2051 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2052 $map->load if $v;
2053 }
1645 2054
1646 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1647 } 2056 }
1648 } 2057 }
1649 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1650 }; 2059 };
1651 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1654} 2063}
1655 2064
1656sub save { 2065sub save {
1657 my ($self) = @_; 2066 my ($self) = @_;
1658 2067
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2069
1661 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1662 2071
1663 return unless $self->dirty; 2072 return unless $self->dirty;
1664 2073
1687 my ($self) = @_; 2096 my ($self) = @_;
1688 2097
1689 # save first because save cedes 2098 # save first because save cedes
1690 $self->save; 2099 $self->save;
1691 2100
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2102
1694 return if $self->players; 2103 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2105 return if $self->{deny_save};
1697 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2111 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2112}
1701 2113
1702sub reset_at { 2114sub reset_at {
1703 my ($self) = @_; 2115 my ($self) = @_;
1704 2116
1705 # TODO: safety, remove and allow resettable per-player maps 2117 # 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}; 2118 return 1e99 if $self->{deny_reset};
1708 2119
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2121 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2122
1722 my ($self) = @_; 2133 my ($self) = @_;
1723 2134
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2136
1726 return if $self->players; 2137 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2138
1729 warn "resetting map ", $self->path;#d# 2139 warn "resetting map ", $self->path;
1730 2140
1731 $self->in_memory (cf::MAP_SWAPPED); 2141 $self->in_memory (cf::MAP_SWAPPED);
1732 2142
1733 # need to save uniques path 2143 # need to save uniques path
1734 unless ($self->{deny_save}) { 2144 unless ($self->{deny_save}) {
1738 if $uniq; 2148 if $uniq;
1739 } 2149 }
1740 2150
1741 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
1742 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2155 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2156
1747 $self->unlink_save; 2157 $self->unlink_save;
1748 $self->destroy; 2158 $self->destroy;
1749} 2159}
1750 2160
1751my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
1752 2162
1753sub nuke { 2163sub nuke {
1754 my ($self) = @_; 2164 my ($self) = @_;
1755 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
1756 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
1757 2170
1758 $self->unlink_save; 2171 $self->unlink_save;
1759 2172
1760 bless $self, "cf::map"; 2173 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2178
1766 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
1767 2181
1768 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2183}
2184
2185=item $maps = cf::map::tmp_maps
2186
2187Returns an arrayref with all map paths of currently instantiated and saved
2188maps. May block.
2189
2190=cut
2191
2192sub tmp_maps() {
2193 [
2194 map {
2195 utf8::decode $_;
2196 /\.map$/
2197 ? normalise $_
2198 : ()
2199 } @{ aio_readdir $TMPDIR or [] }
2200 ]
2201}
2202
2203=item $maps = cf::map::random_maps
2204
2205Returns an arrayref with all map paths of currently instantiated and saved
2206random maps. May block.
2207
2208=cut
2209
2210sub random_maps() {
2211 [
2212 map {
2213 utf8::decode $_;
2214 /\.map$/
2215 ? normalise "?random/$_"
2216 : ()
2217 } @{ aio_readdir $RANDOMDIR or [] }
2218 ]
1769} 2219}
1770 2220
1771=item cf::map::unique_maps 2221=item cf::map::unique_maps
1772 2222
1773Returns an arrayref of paths of all shared maps that have 2223Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2224instantiated unique items. May block.
1775 2225
1776=cut 2226=cut
1777 2227
1778sub unique_maps() { 2228sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2229 [
1780 or return; 2230 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2231 utf8::decode $_;
1786 next if /\.pst$/; 2232 /\.map$/
1787 next unless /^$PATH_SEP/o; 2233 ? normalise $_
1788 2234 : ()
1789 push @paths, cf::map::normalise $_; 2235 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2236 ]
1791
1792 \@paths
1793} 2237}
1794 2238
1795package cf; 2239package cf;
1796 2240
1797=back 2241=back
1815 map { $_, inv_recursive_ $_->inv } @_ 2259 map { $_, inv_recursive_ $_->inv } @_
1816} 2260}
1817 2261
1818sub inv_recursive { 2262sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2264}
2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
1820} 2295}
1821 2296
1822package cf; 2297package cf;
1823 2298
1824=back 2299=back
1843 2318
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2319 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2320
1846 if ($self->{record_replies}) { 2321 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2322 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2323
1848 } else { 2324 } else {
2325 my $pl = $self->contr;
2326
2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2328 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330
2331 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2334 }
1851 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
1852} 2346}
1853 2347
1854=item $player_object->may ("access") 2348=item $player_object->may ("access")
1855 2349
1856Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
1935 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
1938 2432
1939 $map->load; 2433 $map->load;
1940 $map->load_diag; 2434 $map->load_neighbours;
1941 2435
1942 return unless $self->contr->active; 2436 return unless $self->contr->active;
1943 $self->activate_recursive; 2437 $self->activate_recursive;
1944 2438
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2440 $self->enter_map ($map, $x, $y);
1947} 2441}
1948 2442
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2444
1951Moves the player to the given map-path and coordinates by first freezing 2445Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2446her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2447that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2448the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process.
1955 2450
1956=cut 2451=cut
1957 2452
1958our $GOTOGEN; 2453our $GOTOGEN;
1959 2454
1960sub cf::object::player::goto { 2455sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2456 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2457
1963 # do generation counting so two concurrent goto's will be executed in-order 2458 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2460
1966 $self->enter_link; 2461 $self->enter_link;
1967 2462
1968 (async { 2463 (async {
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
1969 my $map = eval { 2483 my $map = eval {
1970 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
1971 2485
1972 if ($map) { 2486 if ($map) {
1973 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
1975 } else { 2489 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2491 }
1978 2492
1979 $map 2493 $map
1980 }; 2494 };
1981 2495
1986 2500
1987 if ($gen == $self->{_goto_generation}) { 2501 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2502 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
1990 } 2504 }
2505
2506 $done->() if $done;
1991 })->prio (1); 2507 })->prio (1);
1992} 2508}
1993 2509
1994=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
1995 2511
2064 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
2066 2582
2067 $self->enter_link; 2583 $self->enter_link;
2068 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
2069 (async { 2589 (async {
2070 $self->deactivate_recursive; # just to be sure 2590 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2591 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2592 $self->goto ($slaying, $hp, $sp);
2073 2593
2100 2620
2101 utf8::encode $text; 2621 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2623}
2104 2624
2625=item $client->send_msg ($channel, $msg, $color, [extra...])
2626
2627Send a drawinfo or msg packet to the client, formatting the msg for the
2628client if neccessary. C<$type> should be a string identifying the type of
2629the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet.
2631
2632=cut
2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2649sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_;
2651
2652 $msg = $self->pl->expand_cfpod ($msg);
2653
2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2658
2659 if (ref $channel) {
2660 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2665 }
2666
2667 $channel = $channel->{id};
2668 }
2669
2670 return unless @extra || length $msg;
2671
2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2679 } else {
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 }
2704}
2705
2105=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2106 2707
2107Sends an exti event to the client. 2708Sends an ext event to the client.
2108 2709
2109=cut 2710=cut
2110 2711
2111sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2113 2714
2715 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2116} 2739}
2117 2740
2118=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2119 2742
2120Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2744the 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>. 2745C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2746
2124Queries can fail, so check the return code. Or don't, as queries will become 2747Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2748become reliable at some point in the future.
2126 2749
2127=cut 2750=cut
2128 2751
2129sub cf::client::query { 2752sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2753 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 2761 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2762 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2763
2141 $self->send_packet ($self->{query_queue}[0][0]) 2764 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2765 if @{ $self->{query_queue} } == 1;
2766
2767 1
2143} 2768}
2144 2769
2145cf::client->attach ( 2770cf::client->attach (
2771 on_connect => sub {
2772 my ($ns) = @_;
2773
2774 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2775 },
2146 on_reply => sub { 2776 on_reply => sub {
2147 my ($ns, $msg) = @_; 2777 my ($ns, $msg) = @_;
2148 2778
2149 # this weird shuffling is so that direct followup queries 2779 # this weird shuffling is so that direct followup queries
2150 # get handled first 2780 # get handled first
2162 } else { 2792 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2793 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2794 }
2165 } 2795 }
2166 }, 2796 },
2797 on_exticmd => sub {
2798 my ($ns, $buf) = @_;
2799
2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2801
2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2810 if (my $cb = $EXTICMD{$type}) {
2811 @reply = $cb->($ns, @payload);
2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2817 } else {
2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2819 }
2820
2821 cf::override;
2822 },
2167); 2823);
2168 2824
2169=item $client->async (\&cb) 2825=item $client->async (\&cb)
2170 2826
2171Create a new coroutine, running the specified callback. The coroutine will 2827Create a new coroutine, running the specified callback. The coroutine will
2212our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2214 2870
2215$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2216 2872
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2218 2878
2219# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2220 2880
2221=pod 2881=pod
2222 2882
2223The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2224 2884
2225 cf::object contr pay_amount pay_player map 2885 cf::object
2886 contr pay_amount pay_player map x y force_find force_add
2887 insert remove name archname title slaying race decrease_ob_nr
2888
2226 cf::object::player player 2889 cf::object::player
2227 cf::player peaceful 2890 player
2228 cf::map trigger 2891
2892 cf::player
2893 peaceful
2894
2895 cf::map
2896 trigger
2229 2897
2230=cut 2898=cut
2231 2899
2232for ( 2900for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2903 decrease_ob_nr)],
2234 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2237) { 2907) {
2238 no strict 'refs'; 2908 no strict 'refs';
2309=back 2979=back
2310 2980
2311=cut 2981=cut
2312 2982
2313############################################################################# 2983#############################################################################
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 2984# the server's init and main functions
2487 2985
2488sub load_facedata($) { 2986sub load_facedata($) {
2489 my ($path) = @_; 2987 my ($path) = @_;
2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 2994
2491 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2492 2996
2493 my $facedata; 2997 my $facedata;
2494 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2497 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2498 3002
2499 $facedata->{version} == 2 3003 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
3012
2502 { 3013 {
2503 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2504 3015
2505 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3018 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3022
3023 cf::cede_to_tick;
2511 } 3024 }
2512 3025
2513 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3027 next unless $info->{smooth};
2515 my $idx = cf::face::find $face 3028 my $idx = cf::face::find $face
2516 or next; 3029 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3030 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3033 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3034 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3035 }
2522 Coro::cede; 3036
3037 cf::cede_to_tick;
2523 } 3038 }
2524 } 3039 }
2525 3040
2526 { 3041 {
2527 my $anims = $facedata->{animinfo}; 3042 my $anims = $facedata->{animinfo};
2528 3043
2529 while (my ($anim, $info) = each %$anims) { 3044 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3045 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3046 cf::cede_to_tick;
2532 } 3047 }
2533 3048
2534 cf::anim::invalidate_all; # d'oh 3049 cf::anim::invalidate_all; # d'oh
2535 } 3050 }
2536 3051
3052 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource};
3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062
3063 if ($info->{type} & 1) {
3064 # prepend meta info
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else {
3073 $data = $info->{data};
3074 }
3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick;
3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 }
3100
2537 1 3101 1
2538} 3102}
2539 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2540sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2541 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
3119
3120 for (cf::region::list) {
3121 $_->{match} = qr/$_->{match}/
3122 if exists $_->{match};
3123 }
2543} 3124}
2544 3125
2545sub reload_facedata { 3126sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3127 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3128 or die "unable to load facedata\n";
2548} 3129}
2549 3130
2550sub reload_archetypes { 3131sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes" 3132 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3133 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
2553} 3139}
2554 3140
2555sub reload_treasures { 3141sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures" 3142 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n"; 3143 or die "unable to load treasurelists\n";
2560sub reload_resources { 3146sub reload_resources {
2561 warn "reloading resource files...\n"; 3147 warn "reloading resource files...\n";
2562 3148
2563 reload_regions; 3149 reload_regions;
2564 reload_facedata; 3150 reload_facedata;
3151 #reload_archetypes;#d#
2565 reload_archetypes; 3152 reload_archetypes;
2566 reload_treasures; 3153 reload_treasures;
2567 3154
2568 warn "finished reloading resource files\n"; 3155 warn "finished reloading resource files\n";
2569} 3156}
2570 3157
2571sub init { 3158sub init {
2572 reload_resources; 3159 reload_resources;
2573} 3160}
2574 3161
2575sub cfg_load { 3162sub reload_config {
2576 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2577 or return; 3164 or return;
2578 3165
2579 local $/; 3166 local $/;
2580 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2600 (async { 3187 (async {
2601 Event::one_event; 3188 Event::one_event;
2602 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2603 }; 3190 };
2604 3191
2605 cfg_load; 3192 reload_config;
2606 db_init; 3193 db_init;
2607 load_extensions; 3194 load_extensions;
2608 3195
2609 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2610 Event::loop; 3197 Event::loop;
2626 }, 3213 },
2627 ); 3214 );
2628 } 3215 }
2629} 3216}
2630 3217
3218sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime";
3220
3221 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time.
3223
3224 IO::AIO::aio_utime $runtime, undef, undef;
3225
3226 my $guard = cf::lock_acquire "write_runtime";
3227
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3229 or return;
3230
3231 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server.
3234
3235 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3236 and return;
3237
3238 # always fsync - this file is important
3239 aio_fsync $fh
3240 and return;
3241
3242 # touch it again to show we are up-to-date
3243 aio_utime $fh, undef, undef;
3244
3245 close $fh
3246 or return;
3247
3248 aio_rename "$runtime~", $runtime
3249 and return;
3250
3251 warn "runtime file written.\n";
3252
3253 1
3254}
3255
2631sub emergency_save() { 3256sub emergency_save() {
2632 my $freeze_guard = cf::freeze_mainloop; 3257 my $freeze_guard = cf::freeze_mainloop;
2633 3258
2634 warn "enter emergency perl save\n"; 3259 warn "enter emergency perl save\n";
2635 3260
2710 %EXT_CORO = (); 3335 %EXT_CORO = ();
2711 3336
2712 warn "removing commands"; 3337 warn "removing commands";
2713 %COMMAND = (); 3338 %COMMAND = ();
2714 3339
2715 warn "removing ext commands"; 3340 warn "removing ext/exti commands";
2716 %EXTCMD = (); 3341 %EXTCMD = ();
3342 %EXTICMD = ();
2717 3343
2718 warn "unloading/nuking all extensions"; 3344 warn "unloading/nuking all extensions";
2719 for my $pkg (@EXTS) { 3345 for my $pkg (@EXTS) {
2720 warn "... unloading $pkg"; 3346 warn "... unloading $pkg";
2721 3347
2764 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
2765 require cf; 3391 require cf;
2766 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2767 3393
2768 warn "loading config and database again"; 3394 warn "loading config and database again";
2769 cf::cfg_load; 3395 cf::reload_config;
2770 3396
2771 warn "loading extensions"; 3397 warn "loading extensions";
2772 cf::load_extensions; 3398 cf::load_extensions;
2773 3399
2774 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
2839 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait; 3467 $signal->wait;
2842} 3468}
2843 3469
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2846$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
2847 reentrant => 0, 3471 reentrant => 0,
2848 parked => 1, 3472 parked => 1,
2849 prio => 0, 3473 prio => 0,
2850 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
2858 3482
2859 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
2860 3484
2861 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
2862 3486
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; 3487 $RUNTIME += $TICK;
2887 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
2888 3489
2889 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2890 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 write_runtime 3493 write_runtime
2893 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
2894 }; 3495 };
2895 } 3496 }
2896 3497
2897# my $AFTER = Event::time;
2898# warn $AFTER - $NOW;#d#
2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send; 3499 $sig->send;
2902 } 3500 }
2903 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send; 3502 $sig->send;
2914 3512
2915 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917 3515
2918 _post_tick; 3516 _post_tick;
2919
2920
2921 }, 3517 },
2922); 3518);
2923 3519
2924{ 3520{
3521 BDB::min_parallel 8;
2925 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
2926 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
2927 reentrant => 0, 3524 reentrant => 0,
2928 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
2929 poll => 'r', 3526 poll => 'r',
2930 prio => 0, 3527 prio => 0,
2931 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
2932 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
2933 ); 3530 );
2934 BDB::min_parallel 8;
2935 3531
2936 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
2937 my $status; 3533 my $status;
2938 my $current = $Coro::current; 3534 my $current = $Coro::current;
2939 ( 3535 (
2948 ) 3544 )
2949 }; 3545 };
2950 3546
2951 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
2952 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2953 3553
2954 cf::sync_job { 3554 cf::sync_job {
2955 eval { 3555 eval {
2956 BDB::db_env_open 3556 BDB::db_env_open
2957 $DB_ENV, 3557 $DB_ENV,
2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2961 0666; 3561 0666;
2962 3562
2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 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 }; 3564 };
2968 3565
2969 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
2970 }; 3567 };
2971 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
2972} 3600}
2973 3601
2974{ 3602{
2975 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
2976 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines