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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines