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.271 by root, Fri Jun 1 06:04: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';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
205} 218}
206 219
207$Event::DIED = sub { 220$Event::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 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
310=item cf::async { BLOCK } 397=item cf::async { BLOCK }
311 398
312Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
313C<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
314thing you are allowed to do is call C<prio> on it. 401thing you are allowed to do is call C<prio> on it.
317 404
318BEGIN { *async = \&Coro::async_pool } 405BEGIN { *async = \&Coro::async_pool }
319 406
320=item cf::sync_job { BLOCK } 407=item cf::sync_job { BLOCK }
321 408
322The design of crossfire+ requires that the main coro ($Coro::main) is 409The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 410is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable.
325 413
326If 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
327the given BLOCK in another coroutine while waiting for the result. The 415the given BLOCK in another coroutine while waiting for the result. The
328server 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
329fast or be very important. 417fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 477 $EXT_CORO{$coro+0} = $coro;
390 478
391 $coro 479 $coro
392} 480}
393 481
394sub write_runtime { 482=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 483
397 # first touch the runtime file to show we are still running: 484Executes the given code block with the given arguments in a seperate
398 # 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.
399 488
400 IO::AIO::aio_utime $runtime, undef, undef; 489=cut
401 490
402 my $guard = cf::lock_acquire "write_runtime"; 491sub fork_call(&@) {
492 my ($cb, @args) = @_;
403 493
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 494 # we seemingly have to make a local copy of the whole thing,
405 or return; 495 # otherwise perl prematurely frees the stuff :/
496 # TODO: investigate and fix (likely this will be rather laborious)
406 497
407 my $value = $cf::RUNTIME + 90 + 10; 498 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 499 reset_signals;
409 # 60 allows for the watchdog to kill the server. 500 &$cb
501 }, @args;
410 502
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 503 wantarray ? @res : $res[-1]
412 and return; 504}
413 505
414 # always fsync - this file is important 506=item $value = cf::db_get $family => $key
415 aio_fsync $fh
416 and return;
417 507
418 # touch it again to show we are up-to-date 508Returns a single value from the environment database.
419 aio_utime $fh, undef, undef;
420 509
421 close $fh 510=item cf::db_put $family => $key => $value
422 or return;
423 511
424 aio_rename "$runtime~", $runtime 512Stores the given C<$value> in the family. It can currently store binary
425 and return; 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
426 514
427 warn "runtime file written.\n";#d# 515=item $db = cf::db_table "name"
428 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
429 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"
430} 631}
431 632
432=item cf::datalog type => key => value, ... 633=item cf::datalog type => key => value, ...
433 634
434Log 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.
452attach callbacks/event handlers (a collection of which is called an "attachment") 653attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 654to it. All such attachable objects support the following methods.
454 655
455In 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>
456C<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
457crossfire+). 658Crossfire TRT).
458 659
459=over 4 660=over 4
460 661
461=item $attachable->attach ($attachment, key => $value...) 662=item $attachable->attach ($attachment, key => $value...)
462 663
664 _attach $registry, $klass, @attach; 865 _attach $registry, $klass, @attach;
665 } 866 }
666 867
667 $obj->{$name} = \%arg; 868 $obj->{$name} = \%arg;
668 } else { 869 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 870 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 871 }
671 872
672 $obj->{_attachment}{$name} = undef; 873 $obj->{_attachment}{$name} = undef;
673} 874}
674 875
714 "; 915 ";
715 die if $@; 916 die if $@;
716} 917}
717 918
718our $override; 919our $override;
719our @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?
720 921
721sub override { 922sub override {
722 $override = 1; 923 $override = 1;
723 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
724} 925}
725 926
726sub do_invoke { 927sub do_invoke {
727 my $event = shift; 928 my $event = shift;
728 my $callbacks = shift; 929 my $callbacks = shift;
729 930
730 @invoke_results = (); 931 @INVOKE_RESULTS = ();
731 932
732 local $override; 933 local $override;
733 934
734 for (@$callbacks) { 935 for (@$callbacks) {
735 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
752 953
753Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
754 955
755This 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
756removed 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
757results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 959
759=back 960=back
760 961
761=cut 962=cut
762 963
763############################################################################# 964#############################################################################
764# 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}
765 977
766sub reattach { 978sub reattach {
767 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 980 my ($obj) = @_;
769 981
816sub object_freezer_save { 1028sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
818 1030
819 sync_job { 1031 sync_job {
820 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
823 1036
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
846 } 1059 }
847 } else { 1060 } else {
848 aio_unlink $filename; 1061 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
850 } 1063 }
851 } 1064 };
852} 1065}
853 1066
854sub object_freezer_as_string { 1067sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
856 1069
868 or return; 1081 or return;
869 1082
870 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
872 or return; 1085 or return;
1086
873 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1088 }
875 1089
1090 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1092 $decname, length $data, scalar @{$av || []};
1093
878 return ($data, $av); 1094 ($data, $av)
879} 1095}
1096
1097=head2 COMMAND CALLBACKS
1098
1099=over 4
1100
1101=cut
880 1102
881############################################################################# 1103#############################################################################
882# command handling &c 1104# command handling &c
883 1105
884=item cf::register_command $name => \&callback($ob,$args); 1106=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1119 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1120}
899 1121
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1122=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1123
902Register 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.
903 1129
904If 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
905called. 1131called.
906 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
907=cut 1144=cut
908 1145
909sub register_extcmd { 1146sub register_extcmd {
910 my ($name, $cb) = @_; 1147 my ($name, $cb) = @_;
911 1148
912 $EXTCMD{$name} = $cb; 1149 $EXTCMD{$name} = $cb;
1150}
1151
1152sub register_exticmd {
1153 my ($name, $cb) = @_;
1154
1155 $EXTICMD{$name} = $cb;
913} 1156}
914 1157
915cf::player->attach ( 1158cf::player->attach (
916 on_command => sub { 1159 on_command => sub {
917 my ($pl, $name, $params) = @_; 1160 my ($pl, $name, $params) = @_;
926 cf::override; 1169 cf::override;
927 }, 1170 },
928 on_extcmd => sub { 1171 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
930 1173
931 my $msg = eval { from_json $buf }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1175
933 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
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
939 } else { 1191 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1193 }
942 1194
943 cf::override; 1195 cf::override;
944 }, 1196 },
945); 1197);
946 1198
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1199sub load_extensions {
1200 cf::sync_job {
1201 my %todo;
1202
982 for my $ext (<$LIBDIR/*.ext>) { 1203 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1204 next unless -r $path;
984 eval { 1205
985 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;
986 1 1263 }
987 } or warn "$ext not loaded: $@"; 1264
1265 skip:
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1267 unless $progress;
1268 }
988 } 1269 };
989} 1270}
990 1271
991############################################################################# 1272#############################################################################
992 1273
1274=back
1275
993=head2 CORE EXTENSIONS 1276=head2 CORE EXTENSIONS
994 1277
995Functions and methods that extend core crossfire objects. 1278Functions and methods that extend core crossfire objects.
996 1279
997=cut 1280=cut
1001use Coro::AIO; 1284use Coro::AIO;
1002 1285
1003=head3 cf::player 1286=head3 cf::player
1004 1287
1005=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}
1006 1303
1007=item cf::player::find $login 1304=item cf::player::find $login
1008 1305
1009Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1010 1307
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1347
1051 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1052 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;
1053 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1054 } 1356 }
1055 } 1357 }
1056} 1358}
1057 1359
1067 1369
1068 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1070 1372
1071 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1072 Coro::cede; 1374 cf::cede_to_tick;
1073} 1375}
1074 1376
1075sub new($) { 1377sub new($) {
1076 my ($login) = @_; 1378 my ($login) = @_;
1077 1379
1081 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1082 1384
1083 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1084 1386
1085 $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 (@_);
1086} 1398}
1087 1399
1088=item $pl->quit_character 1400=item $pl->quit_character
1089 1401
1090Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1457 or return [];
1146 1458
1147 my @logins; 1459 my @logins;
1148 1460
1149 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") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1153 1470
1154 utf8::decode $login; 1471 utf8::decode $login;
1155 push @logins, $login; 1472 push @logins, $login;
1156 } 1473 }
1157 1474
1184 } 1501 }
1185 1502
1186 \@paths 1503 \@paths
1187} 1504}
1188 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
1189=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1190 1558
1191Sends an ext reply to the player. 1559Sends an ext reply to the player.
1192 1560
1193=cut 1561=cut
1194 1562
1195sub ext_reply($$%) { 1563sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1197 1565
1198 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1567}
1202 1568
1203=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1204 1570
1205Sends an ext event to the client. 1571Sends an ext event to the client.
1206 1572
1207=cut 1573=cut
1208 1574
1209sub ext_event($$%) { 1575sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1211 1577
1212 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1213} 1579}
1214 1580
1215=head3 cf::region 1581=head3 cf::region
1216 1582
1217=over 4 1583=over 4
1220 1586
1221package cf::region; 1587package cf::region;
1222 1588
1223=item cf::region::find_by_path $path 1589=item cf::region::find_by_path $path
1224 1590
1225Tries 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.
1226 1592
1227=cut 1593=cut
1228 1594
1229sub find_by_path($) { 1595sub find_by_path($) {
1230 my ($path) = @_; 1596 my ($path) = @_;
1231 1597
1232 my ($match, $specificity); 1598 my ($match, $specificity);
1233 1599
1234 for my $region (list) { 1600 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1601 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1602 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1603 if $region->specificity > $specificity;
1238 } 1604 }
1239 } 1605 }
1240 1606
1304 my ($self, $merge) = @_; 1670 my ($self, $merge) = @_;
1305 1671
1306 # we have to keep some variables in memory intact 1672 # we have to keep some variables in memory intact
1307 local $self->{path}; 1673 local $self->{path};
1308 local $self->{load_path}; 1674 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1675
1312 $self->SUPER::thawer_merge ($merge); 1676 $self->SUPER::thawer_merge ($merge);
1313} 1677}
1314 1678
1315sub normalise { 1679sub normalise {
1362 $self->init; # pass $1 etc. 1726 $self->init; # pass $1 etc.
1363 return $self; 1727 return $self;
1364 } 1728 }
1365 } 1729 }
1366 1730
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1731 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1732 ()
1369} 1733}
1370 1734
1371sub init { 1735sub init {
1372 my ($self) = @_; 1736 my ($self) = @_;
1415 1779
1416 $_->change_map_light ($change) 1780 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1781 for grep $_->outdoor, values %cf::MAP;
1418} 1782}
1419 1783
1784sub decay_objects {
1785 my ($self) = @_;
1786
1787 return if $self->{deny_reset};
1788
1789 $self->do_decay_objects;
1790}
1791
1420sub unlink_save { 1792sub unlink_save {
1421 my ($self) = @_; 1793 my ($self) = @_;
1422 1794
1423 utf8::encode (my $save = $self->save_path); 1795 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1796 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1799
1428sub load_header_from($) { 1800sub load_header_from($) {
1429 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1430 1802
1431 utf8::encode $path; 1803 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 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;
1437 1812
1438 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1439 1814
1440 1 1815 1
1441} 1816}
1480 $self->load_header_orig 1855 $self->load_header_orig
1481 or return; 1856 or return;
1482 $self->prepare_orig; 1857 $self->prepare_orig;
1483 } 1858 }
1484 1859
1860 $self->{deny_reset} = 1
1861 if $self->no_reset;
1862
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1863 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1864 unless $self->default_region;
1487 1865
1488 1 1866 1
1489} 1867}
1492sub find { 1870sub find {
1493 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1494 1872
1495 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1496 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1498 1877
1499 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1500 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
1501 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1502 or return; 1883 or return;
1503 1884
1504 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1505 1886
1506 $map->load_header 1887 $map->load_header
1507 or return; 1888 or return;
1508 1889
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1512 $map->reset; 1895 $map->reset;
1513 undef $guard;
1514 return find $path; 1896 return find $path;
1515 } 1897 }
1516 1898
1517 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1518 } 1900 }
1527 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1528 1910
1529 my $path = $self->{path}; 1911 my $path = $self->{path};
1530 1912
1531 { 1913 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1533 1915
1916 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 1918
1536 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1537 1920
1538 $self->alloc; 1921 $self->alloc;
1539 1922
1540 $self->pre_load; 1923 $self->pre_load;
1541 Coro::cede; 1924 cf::cede_to_tick;
1542 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1544 or return; 1929 or return;
1545 1930
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1548 1933
1549 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 1935 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 1938 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1554 } 1942 }
1555 } 1943 }
1556 1944
1557 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1558 # now do the right thing for maps 1948 # now do the right thing for maps
1559 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1951 unless $self->difficulty;
1562 Coro::cede; 1952 cf::cede_to_tick;
1563 1953
1564 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1955 $self->decay_objects;
1566 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1567 $self->update_buttons; 1957 $self->update_buttons;
1568 Coro::cede; 1958 cf::cede_to_tick;
1569 $self->set_darkness_map; 1959 $self->set_darkness_map;
1570 Coro::cede; 1960 cf::cede_to_tick;
1571 $self->activate; 1961 $self->activate;
1572 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1573 1966
1574 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 1968 }
1576 1969
1577 $self->post_load; 1970 $self->post_load;
1581 my ($self, $ob) = @_; 1974 my ($self, $ob) = @_;
1582 1975
1583 return find "~" . $ob->name . "/" . $self->{path} 1976 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1977 if $self->per_player;
1585 1978
1979# return find "?party/" . $ob->name . "/" . $self->{path}
1980# if $self->per_party;
1981
1586 $self 1982 $self
1587} 1983}
1588 1984
1589# 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
1590sub load_diag { 1986sub load_neighbours {
1591 my ($map) = @_; 1987 my ($map) = @_;
1592 1988
1593 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1594 1990
1595 for (0 .. 3) { 1991 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1597 or next; 1993 or next;
1598 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1599 or next; 1995 or next;
1600 $neigh->load; 1996 $neigh->load;
1601 1997
1998 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2001 }
1605 2002
1606 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1608 or next; 2006 or next;
1609 $neigh->load; 2007 $neigh->load;
1610 } 2008 }
1611} 2009}
1612 2010
1617} 2015}
1618 2016
1619sub do_load_sync { 2017sub do_load_sync {
1620 my ($map) = @_; 2018 my ($map) = @_;
1621 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1622 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1623} 2024}
1624 2025
1625our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1627 2028
1628sub find_async { 2029sub find_async {
1629 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1630 2031
1631 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1632 2033
1633 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2036 }
1636 2037
1637 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1638 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1639 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2043 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2044 $map->load if $v;
2045 }
1644 2046
1645 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1646 } 2048 }
1647 } 2049 }
1648 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1649 }; 2051 };
1650 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
1653} 2055}
1654 2056
1655sub save { 2057sub save {
1656 my ($self) = @_; 2058 my ($self) = @_;
1657 2059
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2061
1660 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1661 2063
1662 return unless $self->dirty; 2064 return unless $self->dirty;
1663 2065
1686 my ($self) = @_; 2088 my ($self) = @_;
1687 2089
1688 # save first because save cedes 2090 # save first because save cedes
1689 $self->save; 2091 $self->save;
1690 2092
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2094
1693 return if $self->players; 2095 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2097 return if $self->{deny_save};
1696 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2103 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2104}
1700 2105
1701sub reset_at { 2106sub reset_at {
1702 my ($self) = @_; 2107 my ($self) = @_;
1703 2108
1704 # TODO: safety, remove and allow resettable per-player maps 2109 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2110 return 1e99 if $self->{deny_reset};
1707 2111
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 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;
1710 2114
1721 my ($self) = @_; 2125 my ($self) = @_;
1722 2126
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2128
1725 return if $self->players; 2129 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2130
1728 warn "resetting map ", $self->path;#d# 2131 warn "resetting map ", $self->path;
1729 2132
1730 $self->in_memory (cf::MAP_SWAPPED); 2133 $self->in_memory (cf::MAP_SWAPPED);
1731 2134
1732 # need to save uniques path 2135 # need to save uniques path
1733 unless ($self->{deny_save}) { 2136 unless ($self->{deny_save}) {
1737 if $uniq; 2140 if $uniq;
1738 } 2141 }
1739 2142
1740 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
1741 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2147 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2148
1746 $self->unlink_save; 2149 $self->unlink_save;
1747 $self->destroy; 2150 $self->destroy;
1748} 2151}
1749 2152
1750my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
1751 2154
1752sub nuke { 2155sub nuke {
1753 my ($self) = @_; 2156 my ($self) = @_;
1754 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
1755 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
1756 2162
1757 $self->unlink_save; 2163 $self->unlink_save;
1758 2164
1759 bless $self, "cf::map"; 2165 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2170
1765 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
1766 2173
1767 $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 ]
1768} 2211}
1769 2212
1770=item cf::map::unique_maps 2213=item cf::map::unique_maps
1771 2214
1772Returns an arrayref of paths of all shared maps that have 2215Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2216instantiated unique items. May block.
1774 2217
1775=cut 2218=cut
1776 2219
1777sub unique_maps() { 2220sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2221 [
1779 or return; 2222 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2223 utf8::decode $_;
1785 next if /\.pst$/; 2224 /\.map$/
1786 next unless /^$PATH_SEP/o; 2225 ? normalise $_
1787 2226 : ()
1788 push @paths, cf::map::normalise $_; 2227 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2228 ]
1790
1791 \@paths
1792} 2229}
1793 2230
1794package cf; 2231package cf;
1795 2232
1796=back 2233=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2251 map { $_, inv_recursive_ $_->inv } @_
1815} 2252}
1816 2253
1817sub inv_recursive { 2254sub inv_recursive {
1818 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 }
1819} 2287}
1820 2288
1821package cf; 2289package cf;
1822 2290
1823=back 2291=back
1842 2310
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2311 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2312
1845 if ($self->{record_replies}) { 2313 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2314 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2315
1847 } 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 {
1848 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2326 }
1850 } 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 (@_);
1851} 2338}
1852 2339
1853=item $player_object->may ("access") 2340=item $player_object->may ("access")
1854 2341
1855Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
1934 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
1937 2424
1938 $map->load; 2425 $map->load;
1939 $map->load_diag; 2426 $map->load_neighbours;
1940 2427
1941 return unless $self->contr->active; 2428 return unless $self->contr->active;
1942 $self->activate_recursive; 2429 $self->activate_recursive;
1943 2430
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2432 $self->enter_map ($map, $x, $y);
1946} 2433}
1947 2434
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2436
1950Moves 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
1951her, loading and preparing them map, calling the provided $check callback 2438her, loading and preparing them map, calling the provided $check callback
1952that 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
1953the 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.
1954 2442
1955=cut 2443=cut
1956 2444
1957our $GOTOGEN; 2445our $GOTOGEN;
1958 2446
1959sub cf::object::player::goto { 2447sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2448 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2449
1962 # 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
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2452
1965 $self->enter_link; 2453 $self->enter_link;
1966 2454
1967 (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
1968 my $map = eval { 2475 my $map = eval {
1969 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
1970 2477
1971 if ($map) { 2478 if ($map) {
1972 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
1974 } else { 2481 } else {
1975 $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);
1976 } 2483 }
1977 2484
1978 $map 2485 $map
1979 }; 2486 };
1980 2487
1985 2492
1986 if ($gen == $self->{_goto_generation}) { 2493 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2494 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
1989 } 2496 }
2497
2498 $done->() if $done;
1990 })->prio (1); 2499 })->prio (1);
1991} 2500}
1992 2501
1993=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
1994 2503
2063 my $hp = $exit->stats->hp; 2572 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2573 my $sp = $exit->stats->sp;
2065 2574
2066 $self->enter_link; 2575 $self->enter_link;
2067 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
2068 (async { 2581 (async {
2069 $self->deactivate_recursive; # just to be sure 2582 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2583 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2584 $self->goto ($slaying, $hp, $sp);
2072 2585
2099 2612
2100 utf8::encode $text; 2613 utf8::encode $text;
2101 $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);
2102} 2615}
2103 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
2104=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2105 2699
2106Sends an exti event to the client. 2700Sends an ext event to the client.
2107 2701
2108=cut 2702=cut
2109 2703
2110sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2112 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2114 $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 }
2115} 2731}
2116 2732
2117=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2118 2734
2119Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2120the 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>,
2121C<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>.
2122 2738
2123Queries 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
2124reliable at some point in the future. 2740become reliable at some point in the future.
2125 2741
2126=cut 2742=cut
2127 2743
2128sub cf::client::query { 2744sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2745 my ($self, $flags, $text, $cb) = @_;
2137 utf8::encode $text; 2753 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2754 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2755
2140 $self->send_packet ($self->{query_queue}[0][0]) 2756 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2757 if @{ $self->{query_queue} } == 1;
2758
2759 1
2142} 2760}
2143 2761
2144cf::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 },
2145 on_reply => sub { 2768 on_reply => sub {
2146 my ($ns, $msg) = @_; 2769 my ($ns, $msg) = @_;
2147 2770
2148 # this weird shuffling is so that direct followup queries 2771 # this weird shuffling is so that direct followup queries
2149 # get handled first 2772 # get handled first
2161 } else { 2784 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2785 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2786 }
2164 } 2787 }
2165 }, 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 },
2166); 2815);
2167 2816
2168=item $client->async (\&cb) 2817=item $client->async (\&cb)
2169 2818
2170Create a new coroutine, running the specified callback. The coroutine will 2819Create a new coroutine, running the specified callback. The coroutine will
2211our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2213 2862
2214$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2215 2864
2216$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));
2217 2870
2218# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2219 2872
2220=pod 2873=pod
2221 2874
2222The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2223 2876
2224 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
2225 cf::object::player player 2881 cf::object::player
2226 cf::player peaceful 2882 player
2227 cf::map trigger 2883
2884 cf::player
2885 peaceful
2886
2887 cf::map
2888 trigger
2228 2889
2229=cut 2890=cut
2230 2891
2231for ( 2892for (
2232 ["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)],
2233 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2236) { 2899) {
2237 no strict 'refs'; 2900 no strict 'refs';
2308=back 2971=back
2309 2972
2310=cut 2973=cut
2311 2974
2312############################################################################# 2975#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483
2484#############################################################################
2485# the server's init and main functions 2976# the server's init and main functions
2486 2977
2487sub load_facedata($) { 2978sub load_facedata($) {
2488 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;
2489 2986
2490 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2491 2988
2492 my $facedata; 2989 my $facedata;
2493 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2496 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2497 2994
2498 $facedata->{version} == 2 2995 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 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
2501 { 3005 {
2502 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2503 3007
2504 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3014
3015 cf::cede_to_tick;
2510 } 3016 }
2511 3017
2512 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2514 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2515 or next; 3021 or next;
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3025 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3027 }
2521 Coro::cede; 3028
3029 cf::cede_to_tick;
2522 } 3030 }
2523 } 3031 }
2524 3032
2525 { 3033 {
2526 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2527 3035
2528 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3038 cf::cede_to_tick;
2531 } 3039 }
2532 3040
2533 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2534 } 3042 }
2535 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
2536 1 3093 1
2537} 3094}
2538 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
2539sub 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
2540 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2541 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 }
2542} 3116}
2543 3117
2544sub reload_facedata { 3118sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2547} 3121}
2548 3122
2549sub reload_archetypes { 3123sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes" 3124 load_resource_file "$DATADIR/archetypes"
2551 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";
2552} 3131}
2553 3132
2554sub reload_treasures { 3133sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures" 3134 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n"; 3135 or die "unable to load treasurelists\n";
2559sub reload_resources { 3138sub reload_resources {
2560 warn "reloading resource files...\n"; 3139 warn "reloading resource files...\n";
2561 3140
2562 reload_regions; 3141 reload_regions;
2563 reload_facedata; 3142 reload_facedata;
3143 #reload_archetypes;#d#
2564 reload_archetypes; 3144 reload_archetypes;
2565 reload_treasures; 3145 reload_treasures;
2566 3146
2567 warn "finished reloading resource files\n"; 3147 warn "finished reloading resource files\n";
2568} 3148}
2569 3149
2570sub init { 3150sub init {
2571 reload_resources; 3151 reload_resources;
2572} 3152}
2573 3153
2574sub cfg_load { 3154sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3156 or return;
2577 3157
2578 local $/; 3158 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2599 (async { 3179 (async {
2600 Event::one_event; 3180 Event::one_event;
2601 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2602 }; 3182 };
2603 3183
2604 cfg_load; 3184 reload_config;
2605 db_init; 3185 db_init;
2606 load_extensions; 3186 load_extensions;
2607 3187
2608 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2609 Event::loop; 3189 Event::loop;
2625 }, 3205 },
2626 ); 3206 );
2627 } 3207 }
2628} 3208}
2629 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
2630sub emergency_save() { 3248sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3249 my $freeze_guard = cf::freeze_mainloop;
2632 3250
2633 warn "enter emergency perl save\n"; 3251 warn "enter emergency perl save\n";
2634 3252
2709 %EXT_CORO = (); 3327 %EXT_CORO = ();
2710 3328
2711 warn "removing commands"; 3329 warn "removing commands";
2712 %COMMAND = (); 3330 %COMMAND = ();
2713 3331
2714 warn "removing ext commands"; 3332 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3333 %EXTCMD = ();
3334 %EXTICMD = ();
2716 3335
2717 warn "unloading/nuking all extensions"; 3336 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3337 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3338 warn "... unloading $pkg";
2720 3339
2763 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
2764 require cf; 3383 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3385
2767 warn "loading config and database again"; 3386 warn "loading config and database again";
2768 cf::cfg_load; 3387 cf::reload_config;
2769 3388
2770 warn "loading extensions"; 3389 warn "loading extensions";
2771 cf::load_extensions; 3390 cf::load_extensions;
2772 3391
2773 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
2838 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3459 $signal->wait;
2841} 3460}
2842 3461
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
2846 reentrant => 0, 3463 reentrant => 0,
2847 parked => 1, 3464 parked => 1,
2848 prio => 0, 3465 prio => 0,
2849 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
2857 3474
2858 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
2859 3476
2860 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
2861 3478
2862 0 && sync_job {#d#
2863 for(1..10) {
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 };
2884
2885 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
2887 3481
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
2891 write_runtime 3485 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
2893 }; 3487 };
2894 } 3488 }
2895 3489
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3491 $sig->send;
2901 } 3492 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3494 $sig->send;
2913 3504
2914 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3507
2917 _post_tick; 3508 _post_tick;
2918
2919
2920 }, 3509 },
2921); 3510);
2922 3511
2923{ 3512{
3513 BDB::min_parallel 8;
2924 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
2925 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
2926 reentrant => 0, 3516 reentrant => 0,
2927 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
2928 poll => 'r', 3518 poll => 'r',
2929 prio => 0, 3519 prio => 0,
2930 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
2932 ); 3522 );
2933 BDB::min_parallel 8;
2934 3523
2935 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
2936 my $status; 3525 my $status;
2937 my $current = $Coro::current; 3526 my $current = $Coro::current;
2938 ( 3527 (
2947 ) 3536 )
2948 }; 3537 };
2949 3538
2950 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
2951 $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);
2952 3545
2953 cf::sync_job { 3546 cf::sync_job {
2954 eval { 3547 eval {
2955 BDB::db_env_open 3548 BDB::db_env_open
2956 $DB_ENV, 3549 $DB_ENV,
2958 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
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3553 0666;
2961 3554
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3556 };
2967 3557
2968 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3559 };
2970 } 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 );
2971} 3592}
2972 3593
2973{ 3594{
2974 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
2975 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines