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.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';
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
814); 1026);
815 1027
816sub object_freezer_save { 1028sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
818 1030
1031 my $guard = cf::lock_acquire "io";
1032
819 sync_job { 1033 sync_job {
820 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
823 1038
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
846 } 1061 }
847 } else { 1062 } else {
848 aio_unlink $filename; 1063 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
850 } 1065 }
851 } 1066 };
1067
1068 undef $guard;
852} 1069}
853 1070
854sub object_freezer_as_string { 1071sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
856 1073
861 1078
862sub object_thawer_load { 1079sub object_thawer_load {
863 my ($filename) = @_; 1080 my ($filename) = @_;
864 1081
865 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
866 1085
867 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
868 or return; 1087 or return;
869 1088
870 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
872 or return; 1091 or return;
1092
1093 undef $guard;
873 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1095 }
875 1096
1097 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
878 return ($data, $av); 1101 ($data, $av)
879} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
880 1109
881############################################################################# 1110#############################################################################
882# command handling &c 1111# command handling &c
883 1112
884=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1127}
899 1128
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1130
902Register 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.
903 1136
904If 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
905called. 1138called.
906 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
907=cut 1151=cut
908 1152
909sub register_extcmd { 1153sub register_extcmd {
910 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
911 1155
912 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
913} 1163}
914 1164
915cf::player->attach ( 1165cf::player->attach (
916 on_command => sub { 1166 on_command => sub {
917 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
926 cf::override; 1176 cf::override;
927 }, 1177 },
928 on_extcmd => sub { 1178 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
930 1180
931 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1182
933 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
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
939 } else { 1198 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1200 }
942 1201
943 cf::override; 1202 cf::override;
944 }, 1203 },
945); 1204);
946 1205
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 { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
982 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1211 next unless -r $path;
984 eval { 1212
985 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;
986 1 1270 }
987 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
988 } 1276 };
989} 1277}
990 1278
991############################################################################# 1279#############################################################################
992 1280
1281=back
1282
993=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
994 1284
995Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
996 1286
997=cut 1287=cut
1001use Coro::AIO; 1291use Coro::AIO;
1002 1292
1003=head3 cf::player 1293=head3 cf::player
1004 1294
1005=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}
1006 1310
1007=item cf::player::find $login 1311=item cf::player::find $login
1008 1312
1009Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1010 1314
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1354
1051 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1052 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;
1053 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1054 } 1364 }
1055 } 1365 }
1056} 1366}
1057 1367
1067 1377
1068 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1070 1380
1071 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1072 Coro::cede; 1382 cf::cede_to_tick;
1073} 1383}
1074 1384
1075sub new($) { 1385sub new($) {
1076 my ($login) = @_; 1386 my ($login) = @_;
1077 1387
1081 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1082 1392
1083 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1084 1394
1085 $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 (@_);
1086} 1406}
1087 1407
1088=item $pl->quit_character 1408=item $pl->quit_character
1089 1409
1090Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1465 or return [];
1146 1466
1147 my @logins; 1467 my @logins;
1148 1468
1149 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") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1153 1478
1154 utf8::decode $login; 1479 utf8::decode $login;
1155 push @logins, $login; 1480 push @logins, $login;
1156 } 1481 }
1157 1482
1184 } 1509 }
1185 1510
1186 \@paths 1511 \@paths
1187} 1512}
1188 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
1189=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1190 1566
1191Sends an ext reply to the player. 1567Sends an ext reply to the player.
1192 1568
1193=cut 1569=cut
1194 1570
1195sub ext_reply($$%) { 1571sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1197 1573
1198 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1575}
1202 1576
1203=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1204 1578
1205Sends an ext event to the client. 1579Sends an ext event to the client.
1206 1580
1207=cut 1581=cut
1208 1582
1209sub ext_event($$%) { 1583sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1211 1585
1212 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1213} 1587}
1214 1588
1215=head3 cf::region 1589=head3 cf::region
1216 1590
1217=over 4 1591=over 4
1220 1594
1221package cf::region; 1595package cf::region;
1222 1596
1223=item cf::region::find_by_path $path 1597=item cf::region::find_by_path $path
1224 1598
1225Tries 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.
1226 1600
1227=cut 1601=cut
1228 1602
1229sub find_by_path($) { 1603sub find_by_path($) {
1230 my ($path) = @_; 1604 my ($path) = @_;
1231 1605
1232 my ($match, $specificity); 1606 my ($match, $specificity);
1233 1607
1234 for my $region (list) { 1608 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1609 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1610 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1611 if $region->specificity > $specificity;
1238 } 1612 }
1239 } 1613 }
1240 1614
1304 my ($self, $merge) = @_; 1678 my ($self, $merge) = @_;
1305 1679
1306 # we have to keep some variables in memory intact 1680 # we have to keep some variables in memory intact
1307 local $self->{path}; 1681 local $self->{path};
1308 local $self->{load_path}; 1682 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1683
1312 $self->SUPER::thawer_merge ($merge); 1684 $self->SUPER::thawer_merge ($merge);
1313} 1685}
1314 1686
1315sub normalise { 1687sub normalise {
1362 $self->init; # pass $1 etc. 1734 $self->init; # pass $1 etc.
1363 return $self; 1735 return $self;
1364 } 1736 }
1365 } 1737 }
1366 1738
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1739 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1740 ()
1369} 1741}
1370 1742
1371sub init { 1743sub init {
1372 my ($self) = @_; 1744 my ($self) = @_;
1415 1787
1416 $_->change_map_light ($change) 1788 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1789 for grep $_->outdoor, values %cf::MAP;
1418} 1790}
1419 1791
1792sub decay_objects {
1793 my ($self) = @_;
1794
1795 return if $self->{deny_reset};
1796
1797 $self->do_decay_objects;
1798}
1799
1420sub unlink_save { 1800sub unlink_save {
1421 my ($self) = @_; 1801 my ($self) = @_;
1422 1802
1423 utf8::encode (my $save = $self->save_path); 1803 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1804 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1807
1428sub load_header_from($) { 1808sub load_header_from($) {
1429 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1430 1810
1431 utf8::encode $path; 1811 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 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;
1437 1820
1438 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1439 1822
1440 1 1823 1
1441} 1824}
1480 $self->load_header_orig 1863 $self->load_header_orig
1481 or return; 1864 or return;
1482 $self->prepare_orig; 1865 $self->prepare_orig;
1483 } 1866 }
1484 1867
1868 $self->{deny_reset} = 1
1869 if $self->no_reset;
1870
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1871 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1872 unless $self->default_region;
1487 1873
1488 1 1874 1
1489} 1875}
1492sub find { 1878sub find {
1493 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1494 1880
1495 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1496 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1498 1885
1499 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1500 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
1501 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1502 or return; 1891 or return;
1503 1892
1504 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1505 1894
1506 $map->load_header 1895 $map->load_header
1507 or return; 1896 or return;
1508 1897
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1512 $map->reset; 1903 $map->reset;
1513 undef $guard;
1514 return find $path; 1904 return find $path;
1515 } 1905 }
1516 1906
1517 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1518 } 1908 }
1527 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1528 1918
1529 my $path = $self->{path}; 1919 my $path = $self->{path};
1530 1920
1531 { 1921 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1533 1923
1924 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 1926
1536 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1537 1928
1538 $self->alloc; 1929 $self->alloc;
1539 1930
1540 $self->pre_load; 1931 $self->pre_load;
1541 Coro::cede; 1932 cf::cede_to_tick;
1542 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1544 or return; 1937 or return;
1545 1938
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1548 1941
1549 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 1943 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 1946 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1554 } 1950 }
1555 } 1951 }
1556 1952
1557 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1558 # now do the right thing for maps 1956 # now do the right thing for maps
1559 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1959 unless $self->difficulty;
1562 Coro::cede; 1960 cf::cede_to_tick;
1563 1961
1564 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1963 $self->decay_objects;
1566 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1567 $self->update_buttons; 1965 $self->update_buttons;
1568 Coro::cede; 1966 cf::cede_to_tick;
1569 $self->set_darkness_map; 1967 $self->set_darkness_map;
1570 Coro::cede; 1968 cf::cede_to_tick;
1571 $self->activate; 1969 $self->activate;
1572 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1573 1974
1574 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 1976 }
1576 1977
1577 $self->post_load; 1978 $self->post_load;
1581 my ($self, $ob) = @_; 1982 my ($self, $ob) = @_;
1582 1983
1583 return find "~" . $ob->name . "/" . $self->{path} 1984 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1985 if $self->per_player;
1585 1986
1987# return find "?party/" . $ob->name . "/" . $self->{path}
1988# if $self->per_party;
1989
1586 $self 1990 $self
1587} 1991}
1588 1992
1589# 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
1590sub load_diag { 1994sub load_neighbours {
1591 my ($map) = @_; 1995 my ($map) = @_;
1592 1996
1593 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1594 1998
1595 for (0 .. 3) { 1999 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1597 or next; 2001 or next;
1598 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1599 or next; 2003 or next;
1600 $neigh->load; 2004 $neigh->load;
1601 2005
2006 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2009 }
1605 2010
1606 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1608 or next; 2014 or next;
1609 $neigh->load; 2015 $neigh->load;
1610 } 2016 }
1611} 2017}
1612 2018
1617} 2023}
1618 2024
1619sub do_load_sync { 2025sub do_load_sync {
1620 my ($map) = @_; 2026 my ($map) = @_;
1621 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1622 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1623} 2032}
1624 2033
1625our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1627 2036
1628sub find_async { 2037sub find_async {
1629 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1630 2039
1631 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1632 2041
1633 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2044 }
1636 2045
1637 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1638 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1639 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2051 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2052 $map->load if $v;
2053 }
1644 2054
1645 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1646 } 2056 }
1647 } 2057 }
1648 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1649 }; 2059 };
1650 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1653} 2063}
1654 2064
1655sub save { 2065sub save {
1656 my ($self) = @_; 2066 my ($self) = @_;
1657 2067
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2069
1660 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1661 2071
1662 return unless $self->dirty; 2072 return unless $self->dirty;
1663 2073
1686 my ($self) = @_; 2096 my ($self) = @_;
1687 2097
1688 # save first because save cedes 2098 # save first because save cedes
1689 $self->save; 2099 $self->save;
1690 2100
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2102
1693 return if $self->players; 2103 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2105 return if $self->{deny_save};
1696 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2111 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2112}
1700 2113
1701sub reset_at { 2114sub reset_at {
1702 my ($self) = @_; 2115 my ($self) = @_;
1703 2116
1704 # TODO: safety, remove and allow resettable per-player maps 2117 # 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}; 2118 return 1e99 if $self->{deny_reset};
1707 2119
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 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;
1710 2122
1721 my ($self) = @_; 2133 my ($self) = @_;
1722 2134
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2136
1725 return if $self->players; 2137 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2138
1728 warn "resetting map ", $self->path;#d# 2139 warn "resetting map ", $self->path;
1729 2140
1730 $self->in_memory (cf::MAP_SWAPPED); 2141 $self->in_memory (cf::MAP_SWAPPED);
1731 2142
1732 # need to save uniques path 2143 # need to save uniques path
1733 unless ($self->{deny_save}) { 2144 unless ($self->{deny_save}) {
1737 if $uniq; 2148 if $uniq;
1738 } 2149 }
1739 2150
1740 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
1741 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2155 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2156
1746 $self->unlink_save; 2157 $self->unlink_save;
1747 $self->destroy; 2158 $self->destroy;
1748} 2159}
1749 2160
1750my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
1751 2162
1752sub nuke { 2163sub nuke {
1753 my ($self) = @_; 2164 my ($self) = @_;
1754 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
1755 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
1756 2170
1757 $self->unlink_save; 2171 $self->unlink_save;
1758 2172
1759 bless $self, "cf::map"; 2173 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2178
1765 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
1766 2181
1767 $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 ]
1768} 2219}
1769 2220
1770=item cf::map::unique_maps 2221=item cf::map::unique_maps
1771 2222
1772Returns an arrayref of paths of all shared maps that have 2223Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2224instantiated unique items. May block.
1774 2225
1775=cut 2226=cut
1776 2227
1777sub unique_maps() { 2228sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2229 [
1779 or return; 2230 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2231 utf8::decode $_;
1785 next if /\.pst$/; 2232 /\.map$/
1786 next unless /^$PATH_SEP/o; 2233 ? normalise $_
1787 2234 : ()
1788 push @paths, cf::map::normalise $_; 2235 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2236 ]
1790
1791 \@paths
1792} 2237}
1793 2238
1794package cf; 2239package cf;
1795 2240
1796=back 2241=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2259 map { $_, inv_recursive_ $_->inv } @_
1815} 2260}
1816 2261
1817sub inv_recursive { 2262sub inv_recursive {
1818 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 }
1819} 2295}
1820 2296
1821package cf; 2297package cf;
1822 2298
1823=back 2299=back
1842 2318
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2319 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2320
1845 if ($self->{record_replies}) { 2321 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2322 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2323
1847 } 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 {
1848 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2334 }
1850 } 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 (@_);
1851} 2346}
1852 2347
1853=item $player_object->may ("access") 2348=item $player_object->may ("access")
1854 2349
1855Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
1934 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
1937 2432
1938 $map->load; 2433 $map->load;
1939 $map->load_diag; 2434 $map->load_neighbours;
1940 2435
1941 return unless $self->contr->active; 2436 return unless $self->contr->active;
1942 $self->activate_recursive; 2437 $self->activate_recursive;
1943 2438
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2440 $self->enter_map ($map, $x, $y);
1946} 2441}
1947 2442
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2444
1950Moves 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
1951her, loading and preparing them map, calling the provided $check callback 2446her, loading and preparing them map, calling the provided $check callback
1952that 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
1953the 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.
1954 2450
1955=cut 2451=cut
1956 2452
1957our $GOTOGEN; 2453our $GOTOGEN;
1958 2454
1959sub cf::object::player::goto { 2455sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2456 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2457
1962 # 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
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2460
1965 $self->enter_link; 2461 $self->enter_link;
1966 2462
1967 (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
1968 my $map = eval { 2483 my $map = eval {
1969 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
1970 2485
1971 if ($map) { 2486 if ($map) {
1972 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
1974 } else { 2489 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1976 } 2491 }
1977 2492
1978 $map 2493 $map
1979 }; 2494 };
1980 2495
1985 2500
1986 if ($gen == $self->{_goto_generation}) { 2501 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2502 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
1989 } 2504 }
2505
2506 $done->() if $done;
1990 })->prio (1); 2507 })->prio (1);
1991} 2508}
1992 2509
1993=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
1994 2511
2063 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
2065 2582
2066 $self->enter_link; 2583 $self->enter_link;
2067 2584
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2068 (async { 2589 (async {
2069 $self->deactivate_recursive; # just to be sure 2590 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2591 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2592 $self->goto ($slaying, $hp, $sp);
2072 2593
2099 2620
2100 utf8::encode $text; 2621 utf8::encode $text;
2101 $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);
2102} 2623}
2103 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
2104=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2105 2707
2106Sends an exti event to the client. 2708Sends an ext event to the client.
2107 2709
2108=cut 2710=cut
2109 2711
2110sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2112 2714
2715 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2114 $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 }
2115} 2739}
2116 2740
2117=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2118 2742
2119Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2120the 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>,
2121C<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>.
2122 2746
2123Queries 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
2124reliable at some point in the future. 2748become reliable at some point in the future.
2125 2749
2126=cut 2750=cut
2127 2751
2128sub cf::client::query { 2752sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2753 my ($self, $flags, $text, $cb) = @_;
2137 utf8::encode $text; 2761 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2762 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2763
2140 $self->send_packet ($self->{query_queue}[0][0]) 2764 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2765 if @{ $self->{query_queue} } == 1;
2766
2767 1
2142} 2768}
2143 2769
2144cf::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 },
2145 on_reply => sub { 2776 on_reply => sub {
2146 my ($ns, $msg) = @_; 2777 my ($ns, $msg) = @_;
2147 2778
2148 # this weird shuffling is so that direct followup queries 2779 # this weird shuffling is so that direct followup queries
2149 # get handled first 2780 # get handled first
2161 } else { 2792 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2793 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2794 }
2164 } 2795 }
2165 }, 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 },
2166); 2823);
2167 2824
2168=item $client->async (\&cb) 2825=item $client->async (\&cb)
2169 2826
2170Create a new coroutine, running the specified callback. The coroutine will 2827Create a new coroutine, running the specified callback. The coroutine will
2211our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2213 2870
2214$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2215 2872
2216$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));
2217 2878
2218# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2219 2880
2220=pod 2881=pod
2221 2882
2222The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2223 2884
2224 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
2225 cf::object::player player 2889 cf::object::player
2226 cf::player peaceful 2890 player
2227 cf::map trigger 2891
2892 cf::player
2893 peaceful
2894
2895 cf::map
2896 trigger
2228 2897
2229=cut 2898=cut
2230 2899
2231for ( 2900for (
2232 ["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)],
2233 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2236) { 2907) {
2237 no strict 'refs'; 2908 no strict 'refs';
2308=back 2979=back
2309 2980
2310=cut 2981=cut
2311 2982
2312############################################################################# 2983#############################################################################
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 2984# the server's init and main functions
2486 2985
2487sub load_facedata($) { 2986sub load_facedata($) {
2488 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;
2489 2994
2490 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2491 2996
2492 my $facedata; 2997 my $facedata;
2493 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2496 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2497 3002
2498 $facedata->{version} == 2 3003 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 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
2501 { 3013 {
2502 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2503 3015
2504 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3018 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3022
3023 cf::cede_to_tick;
2510 } 3024 }
2511 3025
2512 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3027 next unless $info->{smooth};
2514 my $idx = cf::face::find $face 3028 my $idx = cf::face::find $face
2515 or next; 3029 or next;
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3030 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3033 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3034 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3035 }
2521 Coro::cede; 3036
3037 cf::cede_to_tick;
2522 } 3038 }
2523 } 3039 }
2524 3040
2525 { 3041 {
2526 my $anims = $facedata->{animinfo}; 3042 my $anims = $facedata->{animinfo};
2527 3043
2528 while (my ($anim, $info) = each %$anims) { 3044 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3045 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3046 cf::cede_to_tick;
2531 } 3047 }
2532 3048
2533 cf::anim::invalidate_all; # d'oh 3049 cf::anim::invalidate_all; # d'oh
2534 } 3050 }
2535 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
2536 1 3101 1
2537} 3102}
2538 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
2539sub 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
2540 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2541 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 }
2542} 3124}
2543 3125
2544sub reload_facedata { 3126sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3127 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3128 or die "unable to load facedata\n";
2547} 3129}
2548 3130
2549sub reload_archetypes { 3131sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes" 3132 load_resource_file "$DATADIR/archetypes"
2551 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";
2552} 3139}
2553 3140
2554sub reload_treasures { 3141sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures" 3142 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n"; 3143 or die "unable to load treasurelists\n";
2559sub reload_resources { 3146sub reload_resources {
2560 warn "reloading resource files...\n"; 3147 warn "reloading resource files...\n";
2561 3148
2562 reload_regions; 3149 reload_regions;
2563 reload_facedata; 3150 reload_facedata;
3151 #reload_archetypes;#d#
2564 reload_archetypes; 3152 reload_archetypes;
2565 reload_treasures; 3153 reload_treasures;
2566 3154
2567 warn "finished reloading resource files\n"; 3155 warn "finished reloading resource files\n";
2568} 3156}
2569 3157
2570sub init { 3158sub init {
2571 reload_resources; 3159 reload_resources;
2572} 3160}
2573 3161
2574sub cfg_load { 3162sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3164 or return;
2577 3165
2578 local $/; 3166 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2599 (async { 3187 (async {
2600 Event::one_event; 3188 Event::one_event;
2601 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2602 }; 3190 };
2603 3191
2604 cfg_load; 3192 reload_config;
2605 db_init; 3193 db_init;
2606 load_extensions; 3194 load_extensions;
2607 3195
2608 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2609 Event::loop; 3197 Event::loop;
2625 }, 3213 },
2626 ); 3214 );
2627 } 3215 }
2628} 3216}
2629 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
2630sub emergency_save() { 3256sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3257 my $freeze_guard = cf::freeze_mainloop;
2632 3258
2633 warn "enter emergency perl save\n"; 3259 warn "enter emergency perl save\n";
2634 3260
2709 %EXT_CORO = (); 3335 %EXT_CORO = ();
2710 3336
2711 warn "removing commands"; 3337 warn "removing commands";
2712 %COMMAND = (); 3338 %COMMAND = ();
2713 3339
2714 warn "removing ext commands"; 3340 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3341 %EXTCMD = ();
3342 %EXTICMD = ();
2716 3343
2717 warn "unloading/nuking all extensions"; 3344 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3345 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3346 warn "... unloading $pkg";
2720 3347
2763 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
2764 require cf; 3391 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3393
2767 warn "loading config and database again"; 3394 warn "loading config and database again";
2768 cf::cfg_load; 3395 cf::reload_config;
2769 3396
2770 warn "loading extensions"; 3397 warn "loading extensions";
2771 cf::load_extensions; 3398 cf::load_extensions;
2772 3399
2773 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
2838 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3467 $signal->wait;
2841} 3468}
2842 3469
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
2846 reentrant => 0, 3471 reentrant => 0,
2847 parked => 1, 3472 parked => 1,
2848 prio => 0, 3473 prio => 0,
2849 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
2857 3482
2858 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
2859 3484
2860 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
2861 3486
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; 3487 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
2887 3489
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
2891 write_runtime 3493 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
2893 }; 3495 };
2894 } 3496 }
2895 3497
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3499 $sig->send;
2901 } 3500 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3502 $sig->send;
2913 3512
2914 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3515
2917 _post_tick; 3516 _post_tick;
2918
2919
2920 }, 3517 },
2921); 3518);
2922 3519
2923{ 3520{
3521 BDB::min_parallel 8;
2924 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
2925 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
2926 reentrant => 0, 3524 reentrant => 0,
2927 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
2928 poll => 'r', 3526 poll => 'r',
2929 prio => 0, 3527 prio => 0,
2930 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
2932 ); 3530 );
2933 BDB::min_parallel 8;
2934 3531
2935 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
2936 my $status; 3533 my $status;
2937 my $current = $Coro::current; 3534 my $current = $Coro::current;
2938 ( 3535 (
2947 ) 3544 )
2948 }; 3545 };
2949 3546
2950 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
2951 $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);
2952 3553
2953 cf::sync_job { 3554 cf::sync_job {
2954 eval { 3555 eval {
2955 BDB::db_env_open 3556 BDB::db_env_open
2956 $DB_ENV, 3557 $DB_ENV,
2958 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
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3561 0666;
2961 3562
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 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 }; 3564 };
2967 3565
2968 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3567 };
2970 } 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 );
2971} 3600}
2972 3601
2973{ 3602{
2974 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
2975 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines