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.365 by root, Tue Sep 11 13:27:56 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These 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 172returns 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. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 202@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
203@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 204@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 205
194# we bless all objects into (empty) derived classes to force a method lookup 206# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 207# within the Safe compartment.
196for my $pkg (qw( 208for my $pkg (qw(
197 cf::global cf::attachable 209 cf::global cf::attachable
205} 217}
206 218
207$Event::DIED = sub { 219$Event::DIED = sub {
208 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
209}; 221};
222
223#############################################################################
210 224
211=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
212 226
213=over 4 227=over 4
214 228
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 248 $d
235 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
236} 250}
237 251
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 252=item $ref = cf::from_json $json
241 253
242Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
243 255
244=item $json = cf::to_json $ref 256=item $json = cf::to_json $ref
245 257
246Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub to_json ($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) }
247 266
248=item cf::lock_wait $string 267=item cf::lock_wait $string
249 268
250Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
251 270
254Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
257returned. 276returned.
258 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
259Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
261 283
262=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
263 285
264Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
265 287
266=cut 288=cut
267 289
268our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
269 292
270sub lock_wait($) { 293sub lock_wait($) {
271 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
272 300
273 # wait for lock, if any 301 # wait for lock, if any
274 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 304 Coro::schedule;
282 310
283 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
284 lock_wait $key; 312 lock_wait $key;
285 313
286 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
287 316
288 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
291 } 321 }
292} 322}
293 323
305 }; 335 };
306 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
307 $guard 337 $guard
308} 338}
309 339
340=item cf::get_slot $time[, $priority[, $name]]
341
342Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede.
345
346The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class.
348
349Useful for short background jobs.
350
351=cut
352
353our @SLOT_QUEUE;
354our $SLOT_QUEUE;
355
356$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async {
358 my $signal = new Coro::Signal;
359
360 while () {
361 next_job:
362 my $avail = cf::till_tick;
363 if ($avail > 0.01) {
364 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) {
366 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send;
368 Coro::cede;
369 goto next_job;
370 }
371 }
372 }
373
374 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait;
378 } else {
379 Coro::schedule;
380 }
381 }
382};
383
384sub get_slot($;$$) {
385 my ($time, $pri, $name) = @_;
386
387 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal;
389
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready;
393 $sig->wait;
394}
395
310=item cf::async { BLOCK } 396=item cf::async { BLOCK }
311 397
312Currently the same as Coro::async_pool, meaning you cannot use 398Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 399C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 400thing you are allowed to do is call C<prio> on it.
317 403
318BEGIN { *async = \&Coro::async_pool } 404BEGIN { *async = \&Coro::async_pool }
319 405
320=item cf::sync_job { BLOCK } 406=item cf::sync_job { BLOCK }
321 407
322The design of crossfire+ requires that the main coro ($Coro::main) is 408The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 409is 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. 410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable.
325 412
326If it must be done, put the blocking parts into C<sync_job>. This will run 413If 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 414the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 415server will be frozen during this time, so the block should either finish
329fast or be very important. 416fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 476 $EXT_CORO{$coro+0} = $coro;
390 477
391 $coro 478 $coro
392} 479}
393 480
394sub write_runtime { 481=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 482
397 # first touch the runtime file to show we are still running: 483Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 484process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling.
399 487
400 IO::AIO::aio_utime $runtime, undef, undef; 488=cut
401 489
402 my $guard = cf::lock_acquire "write_runtime"; 490sub fork_call(&@) {
491 my ($cb, @args) = @_;
403 492
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 493 # we seemingly have to make a local copy of the whole thing,
405 or return; 494 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious)
406 496
407 my $value = $cf::RUNTIME + 90 + 10; 497 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 498 reset_signals;
409 # 60 allows for the watchdog to kill the server. 499 &$cb
500 }, @args;
410 501
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 502 wantarray ? @res : $res[-1]
412 and return; 503}
413 504
414 # always fsync - this file is important 505=item $value = cf::db_get $family => $key
415 aio_fsync $fh
416 and return;
417 506
418 # touch it again to show we are up-to-date 507Returns a single value from the environment database.
419 aio_utime $fh, undef, undef;
420 508
421 close $fh 509=item cf::db_put $family => $key => $value
422 or return;
423 510
424 aio_rename "$runtime~", $runtime 511Stores the given C<$value> in the family. It can currently store binary
425 and return; 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
426 513
427 warn "runtime file written.\n";#d# 514=item $db = cf::db_table "name"
428 515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
537
538our $DB;
539
540sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db";
543 };
544}
545
546sub db_get($$) {
547 my $key = "$_[0]/$_[1]";
548
549 cf::sync_job {
550 BDB::db_get $DB, undef, $key, my $data;
551
552 $! ? ()
553 : $data
429 1 554 }
555}
556
557sub db_put($$$) {
558 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
560}
561
562=item cf::cache $id => [$paths...], $processversion => $process
563
564Generic caching function that returns the value of the resource $id,
565caching and regenerating as required.
566
567This function can block.
568
569=cut
570
571sub cache {
572 my ($id, $src, $processversion, $process) = @_;
573
574 my $meta =
575 join "\x00",
576 $processversion,
577 map {
578 aio_stat $_
579 and Carp::croak "$_: $!";
580
581 ($_, (stat _)[7,9])
582 } @$src;
583
584 my $dbmeta = db_get cache => "$id/meta";
585 if ($dbmeta ne $meta) {
586 # changed, we may need to process
587
588 my @data;
589 my $md5;
590
591 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_]
593 or Carp::croak "$src->[$_]: $!";
594 }
595
596 # if processing is expensive, check
597 # checksum first
598 if (1) {
599 $md5 =
600 join "\x00",
601 $processversion,
602 map {
603 cf::cede_to_tick;
604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
605 } 0.. $#$src;
606
607
608 my $dbmd5 = db_get cache => "$id/md5";
609 if ($dbmd5 eq $md5) {
610 db_put cache => "$id/meta", $meta;
611
612 return db_get cache => "$id/data";
613 }
614 }
615
616 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time;
619
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
621
622 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta;
625
626 return $data;
627 }
628
629 db_get cache => "$id/data"
430} 630}
431 631
432=item cf::datalog type => key => value, ... 632=item cf::datalog type => key => value, ...
433 633
434Log a datalog packet of the given type with the given key-value pairs. 634Log 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") 652attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 653to it. All such attachable objects support the following methods.
454 654
455In the following description, CLASS can be any of C<global>, C<object> 655In 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 656C<player>, C<client> or C<map> (i.e. the attachable objects in
457crossfire+). 657Crossfire TRT).
458 658
459=over 4 659=over 4
460 660
461=item $attachable->attach ($attachment, key => $value...) 661=item $attachable->attach ($attachment, key => $value...)
462 662
664 _attach $registry, $klass, @attach; 864 _attach $registry, $klass, @attach;
665 } 865 }
666 866
667 $obj->{$name} = \%arg; 867 $obj->{$name} = \%arg;
668 } else { 868 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 869 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 870 }
671 871
672 $obj->{_attachment}{$name} = undef; 872 $obj->{_attachment}{$name} = undef;
673} 873}
674 874
714 "; 914 ";
715 die if $@; 915 die if $@;
716} 916}
717 917
718our $override; 918our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 919our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 920
721sub override { 921sub override {
722 $override = 1; 922 $override = 1;
723 @invoke_results = (); 923 @INVOKE_RESULTS = (@_);
724} 924}
725 925
726sub do_invoke { 926sub do_invoke {
727 my $event = shift; 927 my $event = shift;
728 my $callbacks = shift; 928 my $callbacks = shift;
729 929
730 @invoke_results = (); 930 @INVOKE_RESULTS = ();
731 931
732 local $override; 932 local $override;
733 933
734 for (@$callbacks) { 934 for (@$callbacks) {
735 eval { &{$_->[1]} }; 935 eval { &{$_->[1]} };
752 952
753Generate an object-specific event with the given arguments. 953Generate an object-specific event with the given arguments.
754 954
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 955This 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 956removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 957results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 958
759=back 959=back
760 960
761=cut 961=cut
762 962
763############################################################################# 963#############################################################################
764# object support 964# object support
965#
966
967sub _can_merge {
968 my ($ob1, $ob2) = @_;
969
970 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2
975}
765 976
766sub reattach { 977sub reattach {
767 # basically do the same as instantiate, without calling instantiate 978 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 979 my ($obj) = @_;
769 980
814); 1025);
815 1026
816sub object_freezer_save { 1027sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
818 1029
1030 my $guard = cf::lock_acquire "io";
1031
819 sync_job { 1032 sync_job {
820 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
823 1037
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
846 } 1060 }
847 } else { 1061 } else {
848 aio_unlink $filename; 1062 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
850 } 1064 }
851 } 1065 };
1066
1067 undef $guard;
852} 1068}
853 1069
854sub object_freezer_as_string { 1070sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
856 1072
861 1077
862sub object_thawer_load { 1078sub object_thawer_load {
863 my ($filename) = @_; 1079 my ($filename) = @_;
864 1080
865 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
866 1084
867 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
868 or return; 1086 or return;
869 1087
870 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
872 or return; 1090 or return;
1091
1092 undef $guard;
873 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1094 }
875 1095
1096 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1098 $decname, length $data, scalar @{$av || []};
1099
878 return ($data, $av); 1100 ($data, $av)
879} 1101}
1102
1103=head2 COMMAND CALLBACKS
1104
1105=over 4
1106
1107=cut
880 1108
881############################################################################# 1109#############################################################################
882# command handling &c 1110# command handling &c
883 1111
884=item cf::register_command $name => \&callback($ob,$args); 1112=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1125 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1126}
899 1127
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1128=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1129
902Register a callbackf ro execution when the client sends an extcmd packet. 1130Register a callback for execution when the client sends an (synchronous)
1131extcmd packet. Ext commands will be processed in the order they are
1132received by the server, like other user commands. The first argument is
1133the logged-in player. Ext commands can only be processed after a player
1134has logged in successfully.
903 1135
904If the callback returns something, it is sent back as if reply was being 1136If the callback returns something, it is sent back as if reply was being
905called. 1137called.
906 1138
1139=item cf::register_exticmd $name => \&callback($ns,$packet);
1140
1141Register a callback for execution when the client sends an (asynchronous)
1142exticmd packet. Exti commands are processed by the server as soon as they
1143are received, i.e. out of order w.r.t. other commands. The first argument
1144is a client socket. Exti commands can be received anytime, even before
1145log-in.
1146
1147If the callback returns something, it is sent back as if reply was being
1148called.
1149
907=cut 1150=cut
908 1151
909sub register_extcmd { 1152sub register_extcmd {
910 my ($name, $cb) = @_; 1153 my ($name, $cb) = @_;
911 1154
912 $EXTCMD{$name} = $cb; 1155 $EXTCMD{$name} = $cb;
1156}
1157
1158sub register_exticmd {
1159 my ($name, $cb) = @_;
1160
1161 $EXTICMD{$name} = $cb;
913} 1162}
914 1163
915cf::player->attach ( 1164cf::player->attach (
916 on_command => sub { 1165 on_command => sub {
917 my ($pl, $name, $params) = @_; 1166 my ($pl, $name, $params) = @_;
926 cf::override; 1175 cf::override;
927 }, 1176 },
928 on_extcmd => sub { 1177 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
930 1179
931 my $msg = eval { from_json $buf }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1181
933 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
939 } else { 1197 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1199 }
942 1200
943 cf::override; 1201 cf::override;
944 }, 1202 },
945); 1203);
946 1204
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 { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
982 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1210 next unless -r $path;
984 eval { 1211
985 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
986 1 1269 }
987 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
988 } 1275 };
989} 1276}
990 1277
991############################################################################# 1278#############################################################################
992 1279
1280=back
1281
993=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
994 1283
995Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
996 1285
997=cut 1286=cut
1001use Coro::AIO; 1290use Coro::AIO;
1002 1291
1003=head3 cf::player 1292=head3 cf::player
1004 1293
1005=over 4 1294=over 4
1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1006 1309
1007=item cf::player::find $login 1310=item cf::player::find $login
1008 1311
1009Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1010 1313
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1353
1051 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1355 or return;
1356
1357 $f->next;
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 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2468 }
2469 }
2470
1968 my $map = eval { 2471 my $map = eval {
1969 my $map = cf::map::find $path; 2472 my $map = cf::map::find $path;
1970 2473
1971 if ($map) { 2474 if ($map) {
1972 $map = $map->customise_for ($self); 2475 $map = $map->customise_for ($self);
1985 2488
1986 if ($gen == $self->{_goto_generation}) { 2489 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2490 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2491 $self->leave_link ($map, $x, $y);
1989 } 2492 }
2493
2494 $done->() if $done;
1990 })->prio (1); 2495 })->prio (1);
1991} 2496}
1992 2497
1993=item $player_object->enter_exit ($exit_object) 2498=item $player_object->enter_exit ($exit_object)
1994 2499
2063 my $hp = $exit->stats->hp; 2568 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2569 my $sp = $exit->stats->sp;
2065 2570
2066 $self->enter_link; 2571 $self->enter_link;
2067 2572
2573 # if exit is damned, update players death & WoR home-position
2574 $self->contr->savebed ($slaying, $hp, $sp)
2575 if $exit->flag (FLAG_DAMNED);
2576
2068 (async { 2577 (async {
2069 $self->deactivate_recursive; # just to be sure 2578 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2579 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2580 $self->goto ($slaying, $hp, $sp);
2072 2581
2099 2608
2100 utf8::encode $text; 2609 utf8::encode $text;
2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2610 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102} 2611}
2103 2612
2613=item $client->send_msg ($channel, $msg, $color, [extra...])
2614
2615Send a drawinfo or msg packet to the client, formatting the msg for the
2616client if neccessary. C<$type> should be a string identifying the type of
2617the message, with C<log> being the default. If C<$color> is negative, suppress
2618the message unless the client supports the msg packet.
2619
2620=cut
2621
2622our %CHANNEL = (
2623 "c/identify" => {
2624 id => "identify",
2625 title => "Identify",
2626 reply => undef,
2627 tooltip => "Items recently identified",
2628 },
2629 "c/examine" => {
2630 id => "examine",
2631 title => "Examine",
2632 reply => undef,
2633 tooltip => "Signs and other items you examined",
2634 },
2635);
2636
2637sub cf::client::send_msg {
2638 my ($self, $channel, $msg, $color, @extra) = @_;
2639
2640 $msg = $self->pl->expand_cfpod ($msg);
2641
2642 $color &= cf::NDI_CLIENT_MASK; # just in case...
2643
2644 # check predefined channels, for the benefit of C
2645 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2646
2647 if (ref $channel) {
2648 # send meta info to client, if not yet sent
2649 unless (exists $self->{channel}{$channel->{id}}) {
2650 $self->{channel}{$channel->{id}} = $channel;
2651 $self->ext_msg (channel_info => $channel)
2652 if $self->can_msg;
2653 }
2654
2655 $channel = $channel->{id};
2656 }
2657
2658 return unless @extra || length $msg;
2659
2660 if ($self->can_msg) {
2661 # default colour, mask it out
2662 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2663 if $color & cf::NDI_DEF;
2664
2665 $self->send_packet ("msg " . $self->{json_coder}->encode (
2666 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2667 } else {
2668 if ($color >= 0) {
2669 # replace some tags by gcfclient-compatible ones
2670 for ($msg) {
2671 1 while
2672 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2673 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2674 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2675 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2676 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2677 }
2678
2679 $color &= cf::NDI_COLOR_MASK;
2680
2681 utf8::encode $msg;
2682
2683 if (0 && $msg =~ /\[/) {
2684 # COMMAND/INFO
2685 $self->send_packet ("drawextinfo $color 10 8 $msg")
2686 } else {
2687 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2688 $self->send_packet ("drawinfo $color $msg")
2689 }
2690 }
2691 }
2692}
2693
2104=item $client->ext_event ($type, %msg) 2694=item $client->ext_msg ($type, @msg)
2105 2695
2106Sends an exti event to the client. 2696Sends an ext event to the client.
2107 2697
2108=cut 2698=cut
2109 2699
2110sub cf::client::ext_event($$%) { 2700sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2701 my ($self, $type, @msg) = @_;
2112 2702
2703 if ($self->extcmd == 2) {
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2705 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2706 push @msg, msgtype => "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg); 2707 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2708 }
2709}
2710
2711=item $client->ext_reply ($msgid, @msg)
2712
2713Sends an ext reply to the client.
2714
2715=cut
2716
2717sub cf::client::ext_reply($$@) {
2718 my ($self, $id, @msg) = @_;
2719
2720 if ($self->extcmd == 2) {
2721 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2722 } elsif ($self->extcmd == 1) {
2723 #TODO: version 1, remove
2724 unshift @msg, msgtype => "reply", msgid => $id;
2725 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2726 }
2115} 2727}
2116 2728
2117=item $success = $client->query ($flags, "text", \&cb) 2729=item $success = $client->query ($flags, "text", \&cb)
2118 2730
2119Queues a query to the client, calling the given callback with 2731Queues a query to the client, calling the given callback with
2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2732the 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>. 2733C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122 2734
2123Queries can fail, so check the return code. Or don't, as queries will become 2735Queries can fail, so check the return code. Or don't, as queries will
2124reliable at some point in the future. 2736become reliable at some point in the future.
2125 2737
2126=cut 2738=cut
2127 2739
2128sub cf::client::query { 2740sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2741 my ($self, $flags, $text, $cb) = @_;
2137 utf8::encode $text; 2749 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2750 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2751
2140 $self->send_packet ($self->{query_queue}[0][0]) 2752 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2753 if @{ $self->{query_queue} } == 1;
2754
2755 1
2142} 2756}
2143 2757
2144cf::client->attach ( 2758cf::client->attach (
2759 on_connect => sub {
2760 my ($ns) = @_;
2761
2762 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2763 },
2145 on_reply => sub { 2764 on_reply => sub {
2146 my ($ns, $msg) = @_; 2765 my ($ns, $msg) = @_;
2147 2766
2148 # this weird shuffling is so that direct followup queries 2767 # this weird shuffling is so that direct followup queries
2149 # get handled first 2768 # get handled first
2161 } else { 2780 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2781 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2782 }
2164 } 2783 }
2165 }, 2784 },
2785 on_exticmd => sub {
2786 my ($ns, $buf) = @_;
2787
2788 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2789
2790 if (ref $msg) {
2791 my ($type, $reply, @payload) =
2792 "ARRAY" eq ref $msg
2793 ? @$msg
2794 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2795
2796 my @reply;
2797
2798 if (my $cb = $EXTICMD{$type}) {
2799 @reply = $cb->($ns, @payload);
2800 }
2801
2802 $ns->ext_reply ($reply, @reply)
2803 if $reply;
2804
2805 } else {
2806 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2807 }
2808
2809 cf::override;
2810 },
2166); 2811);
2167 2812
2168=item $client->async (\&cb) 2813=item $client->async (\&cb)
2169 2814
2170Create a new coroutine, running the specified callback. The coroutine will 2815Create a new coroutine, running the specified callback. The coroutine will
2211our $safe = new Safe "safe"; 2856our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 2857our $safe_hole = new Safe::Hole;
2213 2858
2214$SIG{FPE} = 'IGNORE'; 2859$SIG{FPE} = 'IGNORE';
2215 2860
2216$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2861$safe->permit_only (Opcode::opset qw(
2862 :base_core :base_mem :base_orig :base_math
2863 grepstart grepwhile mapstart mapwhile
2864 sort time
2865));
2217 2866
2218# here we export the classes and methods available to script code 2867# here we export the classes and methods available to script code
2219 2868
2220=pod 2869=pod
2221 2870
2222The following functions and methods are available within a safe environment: 2871The following functions and methods are available within a safe environment:
2223 2872
2224 cf::object contr pay_amount pay_player map 2873 cf::object
2874 contr pay_amount pay_player map x y force_find force_add
2875 insert remove name archname title slaying race decrease_ob_nr
2876
2225 cf::object::player player 2877 cf::object::player
2226 cf::player peaceful 2878 player
2227 cf::map trigger 2879
2880 cf::player
2881 peaceful
2882
2883 cf::map
2884 trigger
2228 2885
2229=cut 2886=cut
2230 2887
2231for ( 2888for (
2232 ["cf::object" => qw(contr pay_amount pay_player map)], 2889 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2890 insert remove inv name archname title slaying race
2891 decrease_ob_nr)],
2233 ["cf::object::player" => qw(player)], 2892 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 2893 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 2894 ["cf::map" => qw(trigger)],
2236) { 2895) {
2237 no strict 'refs'; 2896 no strict 'refs';
2308=back 2967=back
2309 2968
2310=cut 2969=cut
2311 2970
2312############################################################################# 2971#############################################################################
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 2972# the server's init and main functions
2486 2973
2487sub load_facedata($) { 2974sub load_facedata($) {
2488 my ($path) = @_; 2975 my ($path) = @_;
2976
2977 # HACK to clear player env face cache, we need some signal framework
2978 # for this (global event?)
2979 %ext::player_env::MUSIC_FACE_CACHE = ();
2980
2981 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489 2982
2490 warn "loading facedata from $path\n"; 2983 warn "loading facedata from $path\n";
2491 2984
2492 my $facedata; 2985 my $facedata;
2493 0 < aio_load $path, $facedata 2986 0 < aio_load $path, $facedata
2496 $facedata = Coro::Storable::thaw $facedata; 2989 $facedata = Coro::Storable::thaw $facedata;
2497 2990
2498 $facedata->{version} == 2 2991 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 2992 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 2993
2994 # patch in the exptable
2995 $facedata->{resource}{"res/exp_table"} = {
2996 type => FT_RSRC,
2997 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2998 };
2999 cf::cede_to_tick;
3000
2501 { 3001 {
2502 my $faces = $facedata->{faceinfo}; 3002 my $faces = $facedata->{faceinfo};
2503 3003
2504 while (my ($face, $info) = each %$faces) { 3004 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3005 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3006 cf::face::set_visibility $idx, $info->{visibility};
3007 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3008 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3009 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3010
3011 cf::cede_to_tick;
2510 } 3012 }
2511 3013
2512 while (my ($face, $info) = each %$faces) { 3014 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3015 next unless $info->{smooth};
2514 my $idx = cf::face::find $face 3016 my $idx = cf::face::find $face
2515 or next; 3017 or next;
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3018 if (my $smooth = cf::face::find $info->{smooth}) {
3019 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3020 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3021 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3022 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3023 }
2521 Coro::cede; 3024
3025 cf::cede_to_tick;
2522 } 3026 }
2523 } 3027 }
2524 3028
2525 { 3029 {
2526 my $anims = $facedata->{animinfo}; 3030 my $anims = $facedata->{animinfo};
2527 3031
2528 while (my ($anim, $info) = each %$anims) { 3032 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3033 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3034 cf::cede_to_tick;
2531 } 3035 }
2532 3036
2533 cf::anim::invalidate_all; # d'oh 3037 cf::anim::invalidate_all; # d'oh
2534 } 3038 }
2535 3039
3040 {
3041 # TODO: for gcfclient pleasure, we should give resources
3042 # that gcfclient doesn't grok a >10000 face index.
3043 my $res = $facedata->{resource};
3044
3045 my $soundconf = delete $res->{"res/sound.conf"};
3046
3047 while (my ($name, $info) = each %$res) {
3048 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3049 my $data;
3050
3051 if ($info->{type} & 1) {
3052 # prepend meta info
3053
3054 my $meta = $enc->encode ({
3055 name => $name,
3056 %{ $info->{meta} || {} },
3057 });
3058
3059 $data = pack "(w/a*)*", $meta, $info->{data};
3060 } else {
3061 $data = $info->{data};
3062 }
3063
3064 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3065 cf::face::set_type $idx, $info->{type};
3066
3067 cf::cede_to_tick;
3068 }
3069
3070 if ($soundconf) {
3071 $soundconf = $enc->decode (delete $soundconf->{data});
3072
3073 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3074 my $sound = $soundconf->{compat}[$_]
3075 or next;
3076
3077 my $face = cf::face::find "sound/$sound->[1]";
3078 cf::sound::set $sound->[0] => $face;
3079 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3080 }
3081
3082 while (my ($k, $v) = each %{$soundconf->{event}}) {
3083 my $face = cf::face::find "sound/$v";
3084 cf::sound::set $k => $face;
3085 }
3086 }
3087 }
3088
2536 1 3089 1
2537} 3090}
2538 3091
3092register_exticmd fx_want => sub {
3093 my ($ns, $want) = @_;
3094
3095 while (my ($k, $v) = each %$want) {
3096 $ns->fx_want ($k, $v);
3097 }
3098};
3099
2539sub reload_regions { 3100sub reload_regions {
3101 # HACK to clear player env face cache, we need some signal framework
3102 # for this (global event?)
3103 %ext::player_env::MUSIC_FACE_CACHE = ();
3104
2540 load_resource_file "$MAPDIR/regions" 3105 load_resource_file "$MAPDIR/regions"
2541 or die "unable to load regions file\n"; 3106 or die "unable to load regions file\n";
3107
3108 for (cf::region::list) {
3109 $_->{match} = qr/$_->{match}/
3110 if exists $_->{match};
3111 }
2542} 3112}
2543 3113
2544sub reload_facedata { 3114sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3115 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3116 or die "unable to load facedata\n";
2547} 3117}
2548 3118
2549sub reload_archetypes { 3119sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes" 3120 load_resource_file "$DATADIR/archetypes"
2551 or die "unable to load archetypes\n"; 3121 or die "unable to load archetypes\n";
3122 #d# NEED to laod twice to resolve forward references
3123 # this really needs to be done in an extra post-pass
3124 # (which needs to be synchronous, so solve it differently)
3125 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n";
2552} 3127}
2553 3128
2554sub reload_treasures { 3129sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures" 3130 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n"; 3131 or die "unable to load treasurelists\n";
2559sub reload_resources { 3134sub reload_resources {
2560 warn "reloading resource files...\n"; 3135 warn "reloading resource files...\n";
2561 3136
2562 reload_regions; 3137 reload_regions;
2563 reload_facedata; 3138 reload_facedata;
3139 #reload_archetypes;#d#
2564 reload_archetypes; 3140 reload_archetypes;
2565 reload_treasures; 3141 reload_treasures;
2566 3142
2567 warn "finished reloading resource files\n"; 3143 warn "finished reloading resource files\n";
2568} 3144}
2569 3145
2570sub init { 3146sub init {
2571 reload_resources; 3147 reload_resources;
2572} 3148}
2573 3149
2574sub cfg_load { 3150sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3151 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3152 or return;
2577 3153
2578 local $/; 3154 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3155 *CFG = YAML::Syck::Load <$fh>;
2599 (async { 3175 (async {
2600 Event::one_event; 3176 Event::one_event;
2601 })->prio (Coro::PRIO_MAX); 3177 })->prio (Coro::PRIO_MAX);
2602 }; 3178 };
2603 3179
2604 cfg_load; 3180 reload_config;
2605 db_init; 3181 db_init;
2606 load_extensions; 3182 load_extensions;
2607 3183
2608 $TICK_WATCHER->start; 3184 $TICK_WATCHER->start;
2609 Event::loop; 3185 Event::loop;
2625 }, 3201 },
2626 ); 3202 );
2627 } 3203 }
2628} 3204}
2629 3205
3206sub write_runtime {
3207 my $runtime = "$LOCALDIR/runtime";
3208
3209 # first touch the runtime file to show we are still running:
3210 # the fsync below can take a very very long time.
3211
3212 IO::AIO::aio_utime $runtime, undef, undef;
3213
3214 my $guard = cf::lock_acquire "write_runtime";
3215
3216 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3217 or return;
3218
3219 my $value = $cf::RUNTIME + 90 + 10;
3220 # 10 is the runtime save interval, for a monotonic clock
3221 # 60 allows for the watchdog to kill the server.
3222
3223 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3224 and return;
3225
3226 # always fsync - this file is important
3227 aio_fsync $fh
3228 and return;
3229
3230 # touch it again to show we are up-to-date
3231 aio_utime $fh, undef, undef;
3232
3233 close $fh
3234 or return;
3235
3236 aio_rename "$runtime~", $runtime
3237 and return;
3238
3239 warn "runtime file written.\n";
3240
3241 1
3242}
3243
2630sub emergency_save() { 3244sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3245 my $freeze_guard = cf::freeze_mainloop;
2632 3246
2633 warn "enter emergency perl save\n"; 3247 warn "enter emergency perl save\n";
2634 3248
2709 %EXT_CORO = (); 3323 %EXT_CORO = ();
2710 3324
2711 warn "removing commands"; 3325 warn "removing commands";
2712 %COMMAND = (); 3326 %COMMAND = ();
2713 3327
2714 warn "removing ext commands"; 3328 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3329 %EXTCMD = ();
3330 %EXTICMD = ();
2716 3331
2717 warn "unloading/nuking all extensions"; 3332 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3333 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3334 warn "... unloading $pkg";
2720 3335
2763 warn "reloading cf.pm"; 3378 warn "reloading cf.pm";
2764 require cf; 3379 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3380 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3381
2767 warn "loading config and database again"; 3382 warn "loading config and database again";
2768 cf::cfg_load; 3383 cf::reload_config;
2769 3384
2770 warn "loading extensions"; 3385 warn "loading extensions";
2771 cf::load_extensions; 3386 cf::load_extensions;
2772 3387
2773 warn "reattaching attachments to objects/players"; 3388 warn "reattaching attachments to objects/players";
2838 my $signal = new Coro::Signal; 3453 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3454 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3455 $signal->wait;
2841} 3456}
2842 3457
2843 my $min = 1e6;#d# 3458our $stat_fh;
2844 my $avg = 10; 3459sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3460
2845$TICK_WATCHER = Event->timer ( 3461$TICK_WATCHER = Event->timer (
2846 reentrant => 0, 3462 reentrant => 0,
2847 parked => 1, 3463 parked => 1,
2848 prio => 0, 3464 prio => 0,
2849 at => $NEXT_TICK || $TICK, 3465 at => $NEXT_TICK || $TICK,
2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3469 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2854 unless ++$bug_warning > 10; 3470 unless ++$bug_warning > 10;
2855 return; 3471 return;
2856 } 3472 }
2857 3473
3474 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3475
2858 $NOW = $tick_start = Event::time; 3476 $NOW = $tick_start = Event::time;
2859 3477
2860 cf::server_tick; # one server iteration 3478 cf::server_tick; # one server iteration
2861
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 3479
2885 $RUNTIME += $TICK; 3480 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK; 3481 $NEXT_TICK += $TICK;
2887 3482
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3483 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2914 $LOAD = ($NOW - $tick_start) / $TICK; 3509 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3510 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3511
2917 _post_tick; 3512 _post_tick;
2918 3513
2919 3514 # gather some statistics#d#
3515 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3516 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
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 (
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3556 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3557 0666;
2961 3558
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3559 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963 3560
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3561 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3562 | BDB::LOG_AUTOREMOVE, 1);
2965 $DB_ENV->set_lk_detect; 3563 $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_CHECKPOINT_WATCHER = Event->timer (
3571 after => 11,
3572 interval => 60,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3578 },
3579 );
3580 $BDB_TRICKLE_WATCHER = Event->timer (
3581 after => 5,
3582 interval => 10,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3588 },
3589 );
2971} 3590}
2972 3591
2973{ 3592{
2974 IO::AIO::min_parallel 8; 3593 IO::AIO::min_parallel 8;
2975 3594

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines