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.269 by root, Tue May 22 21:35:26 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
205} 218}
206 219
207$Event::DIED = sub { 220$Event::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 my $signal = new Coro::Signal;
360
361 while () {
362 next_job:
363 my $avail = cf::till_tick;
364 if ($avail > 0.01) {
365 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) {
367 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send;
369 Coro::cede;
370 goto next_job;
371 }
372 }
373 }
374
375 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait;
379 } else {
380 Coro::schedule;
381 }
382 }
383};
384
385sub get_slot($;$$) {
386 my ($time, $pri, $name) = @_;
387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready;
394 $sig->wait;
395}
396
310=item cf::async { BLOCK } 397=item cf::async { BLOCK }
311 398
312Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 400C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 401thing you are allowed to do is call C<prio> on it.
317 404
318BEGIN { *async = \&Coro::async_pool } 405BEGIN { *async = \&Coro::async_pool }
319 406
320=item cf::sync_job { BLOCK } 407=item cf::sync_job { BLOCK }
321 408
322The design of crossfire+ requires that the main coro ($Coro::main) is 409The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 410is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable.
325 413
326If it must be done, put the blocking parts into C<sync_job>. This will run 414If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 415the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 416server will be frozen during this time, so the block should either finish
329fast or be very important. 417fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 477 $EXT_CORO{$coro+0} = $coro;
390 478
391 $coro 479 $coro
392} 480}
393 481
394sub write_runtime { 482=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 483
397 # first touch the runtime file to show we are still running: 484Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 485process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling.
399 488
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 489=cut
401 utime undef, undef, $fh; 490
491sub fork_call(&@) {
492 my ($cb, @args) = @_;
493
494 # we seemingly have to make a local copy of the whole thing,
495 # otherwise perl prematurely frees the stuff :/
496 # TODO: investigate and fix (likely this will be rather laborious)
497
498 my @res = Coro::Util::fork_eval {
499 reset_signals;
500 &$cb
501 }, @args;
502
503 wantarray ? @res : $res[-1]
504}
505
506=item $value = cf::db_get $family => $key
507
508Returns a single value from the environment database.
509
510=item cf::db_put $family => $key => $value
511
512Stores the given C<$value> in the family. It can currently store binary
513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
514
515=item $db = cf::db_table "name"
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 $!;
402 } 533 };
534 cf::cleanup "db_open(db): $@" if $@;
403 535
404 my $guard = cf::lock_acquire "write_runtime"; 536 $db
537}
405 538
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 539our $DB;
407 or return;
408 540
409 my $value = $cf::RUNTIME + 90 + 10; 541sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 542 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 543 $DB ||= db_table "db";
544 };
545}
412 546
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 547sub db_get($$) {
414 and return; 548 my $key = "$_[0]/$_[1]";
415 549
416 # always fsync - this file is important 550 cf::sync_job {
417 aio_fsync $fh 551 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 552
420 # touch it again to show we are up-to-date 553 $! ? ()
421 utime undef, undef, $fh; 554 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 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"
432} 631}
433 632
434=item cf::datalog type => key => value, ... 633=item cf::datalog type => key => value, ...
435 634
436Log 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.
454attach callbacks/event handlers (a collection of which is called an "attachment") 653attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 654to it. All such attachable objects support the following methods.
456 655
457In 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>
458C<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
459crossfire+). 658Crossfire TRT).
460 659
461=over 4 660=over 4
462 661
463=item $attachable->attach ($attachment, key => $value...) 662=item $attachable->attach ($attachment, key => $value...)
464 663
666 _attach $registry, $klass, @attach; 865 _attach $registry, $klass, @attach;
667 } 866 }
668 867
669 $obj->{$name} = \%arg; 868 $obj->{$name} = \%arg;
670 } else { 869 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 870 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 871 }
673 872
674 $obj->{_attachment}{$name} = undef; 873 $obj->{_attachment}{$name} = undef;
675} 874}
676 875
716 "; 915 ";
717 die if $@; 916 die if $@;
718} 917}
719 918
720our $override; 919our $override;
721our @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?
722 921
723sub override { 922sub override {
724 $override = 1; 923 $override = 1;
725 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
726} 925}
727 926
728sub do_invoke { 927sub do_invoke {
729 my $event = shift; 928 my $event = shift;
730 my $callbacks = shift; 929 my $callbacks = shift;
731 930
732 @invoke_results = (); 931 @INVOKE_RESULTS = ();
733 932
734 local $override; 933 local $override;
735 934
736 for (@$callbacks) { 935 for (@$callbacks) {
737 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
754 953
755Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
756 955
757This 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
758removed 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
759results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 959
761=back 960=back
762 961
763=cut 962=cut
764 963
765############################################################################# 964#############################################################################
766# 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}
767 977
768sub reattach { 978sub reattach {
769 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 980 my ($obj) = @_;
771 981
818sub object_freezer_save { 1028sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
820 1030
821 sync_job { 1031 sync_job {
822 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
825 1036
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
848 } 1059 }
849 } else { 1060 } else {
850 aio_unlink $filename; 1061 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
852 } 1063 }
853 } 1064 };
854} 1065}
855 1066
856sub object_freezer_as_string { 1067sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
858 1069
870 or return; 1081 or return;
871 1082
872 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
874 or return; 1085 or return;
1086
875 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1088 }
877 1089
1090 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1092 $decname, length $data, scalar @{$av || []};
1093
880 return ($data, $av); 1094 ($data, $av)
881} 1095}
1096
1097=head2 COMMAND CALLBACKS
1098
1099=over 4
1100
1101=cut
882 1102
883############################################################################# 1103#############################################################################
884# command handling &c 1104# command handling &c
885 1105
886=item cf::register_command $name => \&callback($ob,$args); 1106=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1119 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1120}
901 1121
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1122=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1123
904Register a callbackf ro execution when the client sends an extcmd packet. 1124Register a callback for execution when the client sends an (synchronous)
1125extcmd packet. Ext commands will be processed in the order they are
1126received by the server, like other user commands. The first argument is
1127the logged-in player. Ext commands can only be processed after a player
1128has logged in successfully.
905 1129
906If the callback returns something, it is sent back as if reply was being 1130If the callback returns something, it is sent back as if reply was being
907called. 1131called.
908 1132
1133=item cf::register_exticmd $name => \&callback($ns,$packet);
1134
1135Register a callback for execution when the client sends an (asynchronous)
1136exticmd packet. Exti commands are processed by the server as soon as they
1137are received, i.e. out of order w.r.t. other commands. The first argument
1138is a client socket. Exti commands can be received anytime, even before
1139log-in.
1140
1141If the callback returns something, it is sent back as if reply was being
1142called.
1143
909=cut 1144=cut
910 1145
911sub register_extcmd { 1146sub register_extcmd {
912 my ($name, $cb) = @_; 1147 my ($name, $cb) = @_;
913 1148
914 $EXTCMD{$name} = $cb; 1149 $EXTCMD{$name} = $cb;
1150}
1151
1152sub register_exticmd {
1153 my ($name, $cb) = @_;
1154
1155 $EXTICMD{$name} = $cb;
915} 1156}
916 1157
917cf::player->attach ( 1158cf::player->attach (
918 on_command => sub { 1159 on_command => sub {
919 my ($pl, $name, $params) = @_; 1160 my ($pl, $name, $params) = @_;
928 cf::override; 1169 cf::override;
929 }, 1170 },
930 on_extcmd => sub { 1171 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
932 1173
933 my $msg = eval { from_json $buf }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1175
935 if (ref $msg) { 1176 if (ref $msg) {
1177 my ($type, $reply, @payload) =
1178 "ARRAY" eq ref $msg
1179 ? @$msg
1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1181
1182 my @reply;
1183
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
941 } else { 1191 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1193 }
944 1194
945 cf::override; 1195 cf::override;
946 }, 1196 },
947); 1197);
948 1198
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1199sub load_extensions {
1200 cf::sync_job {
1201 my %todo;
1202
984 for my $ext (<$LIBDIR/*.ext>) { 1203 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1204 next unless -r $path;
986 eval { 1205
987 load_extension $ext; 1206 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1207 my $base = $1;
1208 my $pkg = $1;
1209 $pkg =~ s/[^[:word:]]/_/g;
1210 $pkg = "ext::$pkg";
1211
1212 open my $fh, "<:utf8", $path
1213 or die "$path: $!";
1214
1215 my $source = do { local $/; <$fh> };
1216
1217 my %ext = (
1218 path => $path,
1219 base => $base,
1220 pkg => $pkg,
1221 );
1222
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225
1226 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n"
1229 . $source
1230 . "\n};\n1";
1231
1232 $todo{$base} = \%ext;
1233 }
1234
1235 my %done;
1236 while (%todo) {
1237 my $progress;
1238
1239 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip
1242 unless exists $done{$_};
1243 }
1244
1245 warn "... loading '$k' into '$v->{pkg}'\n";
1246
1247 unless (eval $v->{source}) {
1248 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n";
1250
1251 if (exists $v->{meta}{mandatory}) {
1252 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n";
1254 exit 1;
1255 }
1256
1257 warn $msg;
1258 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
988 1 1263 }
989 } or warn "$ext not loaded: $@"; 1264
1265 skip:
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1267 unless $progress;
1268 }
990 } 1269 };
991} 1270}
992 1271
993############################################################################# 1272#############################################################################
994 1273
1274=back
1275
995=head2 CORE EXTENSIONS 1276=head2 CORE EXTENSIONS
996 1277
997Functions and methods that extend core crossfire objects. 1278Functions and methods that extend core crossfire objects.
998 1279
999=cut 1280=cut
1003use Coro::AIO; 1284use Coro::AIO;
1004 1285
1005=head3 cf::player 1286=head3 cf::player
1006 1287
1007=over 4 1288=over 4
1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1008 1303
1009=item cf::player::find $login 1304=item cf::player::find $login
1010 1305
1011Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1012 1307
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1347
1053 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1056 } 1356 }
1057 } 1357 }
1058} 1358}
1059 1359
1069 1369
1070 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1072 1372
1073 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1074 Coro::cede; 1374 cf::cede_to_tick;
1075} 1375}
1076 1376
1077sub new($) { 1377sub new($) {
1078 my ($login) = @_; 1378 my ($login) = @_;
1079 1379
1083 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1084 1384
1085 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1086 1386
1087 $self 1387 $self
1388}
1389
1390=item $player->send_msg ($channel, $msg, $color, [extra...])
1391
1392=cut
1393
1394sub send_msg {
1395 my $ns = shift->ns
1396 or return;
1397 $ns->send_msg (@_);
1088} 1398}
1089 1399
1090=item $pl->quit_character 1400=item $pl->quit_character
1091 1401
1092Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1457 or return [];
1148 1458
1149 my @logins; 1459 my @logins;
1150 1460
1151 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1155 1470
1156 utf8::decode $login; 1471 utf8::decode $login;
1157 push @logins, $login; 1472 push @logins, $login;
1158 } 1473 }
1159 1474
1186 } 1501 }
1187 1502
1188 \@paths 1503 \@paths
1189} 1504}
1190 1505
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1507
1508Expand crossfire pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556
1191=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1192 1558
1193Sends an ext reply to the player. 1559Sends an ext reply to the player.
1194 1560
1195=cut 1561=cut
1196 1562
1197sub ext_reply($$%) { 1563sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1199 1565
1200 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1567}
1204 1568
1205=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1206 1570
1207Sends an ext event to the client. 1571Sends an ext event to the client.
1208 1572
1209=cut 1573=cut
1210 1574
1211sub ext_event($$%) { 1575sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1213 1577
1214 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1215} 1579}
1216 1580
1217=head3 cf::region 1581=head3 cf::region
1218 1582
1219=over 4 1583=over 4
1222 1586
1223package cf::region; 1587package cf::region;
1224 1588
1225=item cf::region::find_by_path $path 1589=item cf::region::find_by_path $path
1226 1590
1227Tries to decuce the probable region for a map knowing only its path. 1591Tries to decuce the likely region for a map knowing only its path.
1228 1592
1229=cut 1593=cut
1230 1594
1231sub find_by_path($) { 1595sub find_by_path($) {
1232 my ($path) = @_; 1596 my ($path) = @_;
1233 1597
1234 my ($match, $specificity); 1598 my ($match, $specificity);
1235 1599
1236 for my $region (list) { 1600 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1601 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1602 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1603 if $region->specificity > $specificity;
1240 } 1604 }
1241 } 1605 }
1242 1606
1306 my ($self, $merge) = @_; 1670 my ($self, $merge) = @_;
1307 1671
1308 # we have to keep some variables in memory intact 1672 # we have to keep some variables in memory intact
1309 local $self->{path}; 1673 local $self->{path};
1310 local $self->{load_path}; 1674 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1675
1314 $self->SUPER::thawer_merge ($merge); 1676 $self->SUPER::thawer_merge ($merge);
1315} 1677}
1316 1678
1317sub normalise { 1679sub normalise {
1364 $self->init; # pass $1 etc. 1726 $self->init; # pass $1 etc.
1365 return $self; 1727 return $self;
1366 } 1728 }
1367 } 1729 }
1368 1730
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1731 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1732 ()
1371} 1733}
1372 1734
1373sub init { 1735sub init {
1374 my ($self) = @_; 1736 my ($self) = @_;
1417 1779
1418 $_->change_map_light ($change) 1780 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1781 for grep $_->outdoor, values %cf::MAP;
1420} 1782}
1421 1783
1784sub decay_objects {
1785 my ($self) = @_;
1786
1787 return if $self->{deny_reset};
1788
1789 $self->do_decay_objects;
1790}
1791
1422sub unlink_save { 1792sub unlink_save {
1423 my ($self) = @_; 1793 my ($self) = @_;
1424 1794
1425 utf8::encode (my $save = $self->save_path); 1795 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1796 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1799
1430sub load_header_from($) { 1800sub load_header_from($) {
1431 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1432 1802
1433 utf8::encode $path; 1803 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1439 1812
1440 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1441 1814
1442 1 1815 1
1443} 1816}
1482 $self->load_header_orig 1855 $self->load_header_orig
1483 or return; 1856 or return;
1484 $self->prepare_orig; 1857 $self->prepare_orig;
1485 } 1858 }
1486 1859
1860 $self->{deny_reset} = 1
1861 if $self->no_reset;
1862
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1863 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1864 unless $self->default_region;
1489 1865
1490 1 1866 1
1491} 1867}
1494sub find { 1870sub find {
1495 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1496 1872
1497 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1498 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1500 1877
1501 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1503 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1504 or return; 1883 or return;
1505 1884
1506 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1507 1886
1508 $map->load_header 1887 $map->load_header
1509 or return; 1888 or return;
1510 1889
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1514 $map->reset; 1895 $map->reset;
1515 undef $guard;
1516 return find $path; 1896 return find $path;
1517 } 1897 }
1518 1898
1519 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1520 } 1900 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1530 1910
1531 my $path = $self->{path}; 1911 my $path = $self->{path};
1532 1912
1533 { 1913 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1535 1915
1916 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1918
1538 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1539 1920
1540 $self->alloc; 1921 $self->alloc;
1541 1922
1542 $self->pre_load; 1923 $self->pre_load;
1543 Coro::cede; 1924 cf::cede_to_tick;
1544 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1546 or return; 1929 or return;
1547 1930
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1550 1933
1551 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1935 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1938 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1556 } 1942 }
1557 } 1943 }
1558 1944
1559 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1560 # now do the right thing for maps 1948 # now do the right thing for maps
1561 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1951 unless $self->difficulty;
1564 Coro::cede; 1952 cf::cede_to_tick;
1565 1953
1566 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1955 $self->decay_objects;
1568 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1569 $self->update_buttons; 1957 $self->update_buttons;
1570 Coro::cede; 1958 cf::cede_to_tick;
1571 $self->set_darkness_map; 1959 $self->set_darkness_map;
1572 Coro::cede; 1960 cf::cede_to_tick;
1573 $self->activate; 1961 $self->activate;
1574 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1575 1966
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1968 }
1578 1969
1579 $self->post_load; 1970 $self->post_load;
1583 my ($self, $ob) = @_; 1974 my ($self, $ob) = @_;
1584 1975
1585 return find "~" . $ob->name . "/" . $self->{path} 1976 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1977 if $self->per_player;
1587 1978
1979# return find "?party/" . $ob->name . "/" . $self->{path}
1980# if $self->per_party;
1981
1588 $self 1982 $self
1589} 1983}
1590 1984
1591# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1986sub load_neighbours {
1593 my ($map) = @_; 1987 my ($map) = @_;
1594 1988
1595 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1596 1990
1597 for (0 .. 3) { 1991 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1599 or next; 1993 or next;
1600 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1601 or next; 1995 or next;
1602 $neigh->load; 1996 $neigh->load;
1603 1997
1998 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2001 }
1607 2002
1608 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1610 or next; 2006 or next;
1611 $neigh->load; 2007 $neigh->load;
1612 } 2008 }
1613} 2009}
1614 2010
1619} 2015}
1620 2016
1621sub do_load_sync { 2017sub do_load_sync {
1622 my ($map) = @_; 2018 my ($map) = @_;
1623 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1624 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1625} 2024}
1626 2025
1627our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1629 2028
1630sub find_async { 2029sub find_async {
1631 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1632 2031
1633 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1634 2033
1635 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2036 }
1638 2037
1639 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1640 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1641 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2043 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2044 $map->load if $v;
2045 }
1646 2046
1647 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1648 } 2048 }
1649 } 2049 }
1650 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1651 }; 2051 };
1652 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
1655} 2055}
1656 2056
1657sub save { 2057sub save {
1658 my ($self) = @_; 2058 my ($self) = @_;
1659 2059
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2061
1662 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1663 2063
1664 return unless $self->dirty; 2064 return unless $self->dirty;
1665 2065
1688 my ($self) = @_; 2088 my ($self) = @_;
1689 2089
1690 # save first because save cedes 2090 # save first because save cedes
1691 $self->save; 2091 $self->save;
1692 2092
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2094
1695 return if $self->players; 2095 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2097 return if $self->{deny_save};
1698 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2103 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2104}
1702 2105
1703sub reset_at { 2106sub reset_at {
1704 my ($self) = @_; 2107 my ($self) = @_;
1705 2108
1706 # TODO: safety, remove and allow resettable per-player maps 2109 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2110 return 1e99 if $self->{deny_reset};
1709 2111
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2113 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2114
1723 my ($self) = @_; 2125 my ($self) = @_;
1724 2126
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2128
1727 return if $self->players; 2129 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2130
1730 warn "resetting map ", $self->path;#d# 2131 warn "resetting map ", $self->path;
1731 2132
1732 $self->in_memory (cf::MAP_SWAPPED); 2133 $self->in_memory (cf::MAP_SWAPPED);
1733 2134
1734 # need to save uniques path 2135 # need to save uniques path
1735 unless ($self->{deny_save}) { 2136 unless ($self->{deny_save}) {
1739 if $uniq; 2140 if $uniq;
1740 } 2141 }
1741 2142
1742 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
1743 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2147 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2148
1748 $self->unlink_save; 2149 $self->unlink_save;
1749 $self->destroy; 2150 $self->destroy;
1750} 2151}
1751 2152
1752my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
1753 2154
1754sub nuke { 2155sub nuke {
1755 my ($self) = @_; 2156 my ($self) = @_;
1756 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
1757 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
1758 2162
1759 $self->unlink_save; 2163 $self->unlink_save;
1760 2164
1761 bless $self, "cf::map"; 2165 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2170
1767 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
1768 2173
1769 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2175}
2176
2177=item $maps = cf::map::tmp_maps
2178
2179Returns an arrayref with all map paths of currently instantiated and saved
2180maps. May block.
2181
2182=cut
2183
2184sub tmp_maps() {
2185 [
2186 map {
2187 utf8::decode $_;
2188 /\.map$/
2189 ? normalise $_
2190 : ()
2191 } @{ aio_readdir $TMPDIR or [] }
2192 ]
2193}
2194
2195=item $maps = cf::map::random_maps
2196
2197Returns an arrayref with all map paths of currently instantiated and saved
2198random maps. May block.
2199
2200=cut
2201
2202sub random_maps() {
2203 [
2204 map {
2205 utf8::decode $_;
2206 /\.map$/
2207 ? normalise "?random/$_"
2208 : ()
2209 } @{ aio_readdir $RANDOMDIR or [] }
2210 ]
1770} 2211}
1771 2212
1772=item cf::map::unique_maps 2213=item cf::map::unique_maps
1773 2214
1774Returns an arrayref of paths of all shared maps that have 2215Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2216instantiated unique items. May block.
1776 2217
1777=cut 2218=cut
1778 2219
1779sub unique_maps() { 2220sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2221 [
1781 or return; 2222 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2223 utf8::decode $_;
1787 next if /\.pst$/; 2224 /\.map$/
1788 next unless /^$PATH_SEP/o; 2225 ? normalise $_
1789 2226 : ()
1790 push @paths, cf::map::normalise $_; 2227 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2228 ]
1792
1793 \@paths
1794} 2229}
1795 2230
1796package cf; 2231package cf;
1797 2232
1798=back 2233=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2251 map { $_, inv_recursive_ $_->inv } @_
1817} 2252}
1818 2253
1819sub inv_recursive { 2254sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2256}
2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
1821} 2287}
1822 2288
1823package cf; 2289package cf;
1824 2290
1825=back 2291=back
1844 2310
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2311 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2312
1847 if ($self->{record_replies}) { 2313 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2314 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2315
1849 } else { 2316 } else {
2317 my $pl = $self->contr;
2318
2319 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2320 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322
2323 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2326 }
1852 } 2327 }
2328}
2329
2330=item $object->send_msg ($channel, $msg, $color, [extra...])
2331
2332=cut
2333
2334sub cf::object::send_msg {
2335 my $pl = shift->contr
2336 or return;
2337 $pl->send_msg (@_);
1853} 2338}
1854 2339
1855=item $player_object->may ("access") 2340=item $player_object->may ("access")
1856 2341
1857Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2389 $self->deactivate_recursive;
1905 2390
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2391 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2392
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2393 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2394 if $self->map && $self->map->{path} ne "{link}";
1910 2395
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2396 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2397}
1913 2398
1914sub cf::object::player::leave_link { 2399sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2400 my ($self, $map, $x, $y) = @_;
2401
2402 return unless $self->contr->active;
1916 2403
1917 my $link_pos = delete $self->{_link_pos}; 2404 my $link_pos = delete $self->{_link_pos};
1918 2405
1919 unless ($map) { 2406 unless ($map) {
1920 # restore original map position 2407 # restore original map position
1934 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
1937 2424
1938 $map->load; 2425 $map->load;
1939 $map->load_diag; 2426 $map->load_neighbours;
1940 2427
1941 return unless $self->contr->active; 2428 return unless $self->contr->active;
1942 $self->activate_recursive; 2429 $self->activate_recursive;
1943 2430
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2432 $self->enter_map ($map, $x, $y);
1946} 2433}
1947 2434
1948cf::player->attach (
1949 on_logout => sub {
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981 2436
1982Moves the player to the given map-path and coordinates by first freezing 2437Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback 2438her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on 2439that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position. 2440the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process.
1986 2442
1987=cut 2443=cut
2444
2445our $GOTOGEN;
1988 2446
1989sub cf::object::player::goto { 2447sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 2448 my ($self, $path, $x, $y, $check, $done) = @_;
2449
2450 # do generation counting so two concurrent goto's will be executed in-order
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991 2452
1992 $self->enter_link; 2453 $self->enter_link;
1993 2454
1994 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
1995 my $map = eval { 2475 my $map = eval {
1996 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
1997 2477
1998 if ($map) { 2478 if ($map) {
1999 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2000 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2001 } else { 2481 } else {
2002 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2003 } 2483 }
2004 2484
2005 $map 2485 $map
2006 }; 2486 };
2007 2487
2008 if ($@) { 2488 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@; 2490 LOG llevError | logBacktrace, Carp::longmess $@;
2011 } 2491 }
2012 2492
2493 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation};
2013 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
2496 }
2497
2498 $done->() if $done;
2014 })->prio (1); 2499 })->prio (1);
2015} 2500}
2016 2501
2017=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
2018 2503
2087 my $hp = $exit->stats->hp; 2572 my $hp = $exit->stats->hp;
2088 my $sp = $exit->stats->sp; 2573 my $sp = $exit->stats->sp;
2089 2574
2090 $self->enter_link; 2575 $self->enter_link;
2091 2576
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2092 (async { 2581 (async {
2093 $self->deactivate_recursive; # just to be sure 2582 $self->deactivate_recursive; # just to be sure
2094 unless (eval { 2583 unless (eval {
2095 $self->goto ($slaying, $hp, $sp); 2584 $self->goto ($slaying, $hp, $sp);
2096 2585
2123 2612
2124 utf8::encode $text; 2613 utf8::encode $text;
2125 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2126} 2615}
2127 2616
2617=item $client->send_msg ($channel, $msg, $color, [extra...])
2618
2619Send a drawinfo or msg packet to the client, formatting the msg for the
2620client if neccessary. C<$type> should be a string identifying the type of
2621the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet.
2623
2624=cut
2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2641sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_;
2643
2644 $msg = $self->pl->expand_cfpod ($msg);
2645
2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2650
2651 if (ref $channel) {
2652 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2657 }
2658
2659 $channel = $channel->{id};
2660 }
2661
2662 return unless @extra || length $msg;
2663
2664 if ($self->can_msg) {
2665 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF;
2668
2669 $self->send_packet ("msg " . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2671 } else {
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682
2683 $color &= cf::NDI_COLOR_MASK;
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696}
2697
2128=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2129 2699
2130Sends an exti event to the client. 2700Sends an ext event to the client.
2131 2701
2132=cut 2702=cut
2133 2703
2134sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2135 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2136 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2137 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2138 $self->send_packet ("ext " . cf::to_json \%msg); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 }
2139} 2731}
2140 2732
2141=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2142 2734
2143Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2144the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2736the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2145C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2737C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2146 2738
2147Queries can fail, so check the return code. Or don't, as queries will become 2739Queries can fail, so check the return code. Or don't, as queries will
2148reliable at some point in the future. 2740become reliable at some point in the future.
2149 2741
2150=cut 2742=cut
2151 2743
2152sub cf::client::query { 2744sub cf::client::query {
2153 my ($self, $flags, $text, $cb) = @_; 2745 my ($self, $flags, $text, $cb) = @_;
2161 utf8::encode $text; 2753 utf8::encode $text;
2162 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2754 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2163 2755
2164 $self->send_packet ($self->{query_queue}[0][0]) 2756 $self->send_packet ($self->{query_queue}[0][0])
2165 if @{ $self->{query_queue} } == 1; 2757 if @{ $self->{query_queue} } == 1;
2758
2759 1
2166} 2760}
2167 2761
2168cf::client->attach ( 2762cf::client->attach (
2763 on_connect => sub {
2764 my ($ns) = @_;
2765
2766 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2767 },
2169 on_reply => sub { 2768 on_reply => sub {
2170 my ($ns, $msg) = @_; 2769 my ($ns, $msg) = @_;
2171 2770
2172 # this weird shuffling is so that direct followup queries 2771 # this weird shuffling is so that direct followup queries
2173 # get handled first 2772 # get handled first
2185 } else { 2784 } else {
2186 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2785 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2187 } 2786 }
2188 } 2787 }
2189 }, 2788 },
2789 on_exticmd => sub {
2790 my ($ns, $buf) = @_;
2791
2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2793
2794 if (ref $msg) {
2795 my ($type, $reply, @payload) =
2796 "ARRAY" eq ref $msg
2797 ? @$msg
2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2799
2800 my @reply;
2801
2802 if (my $cb = $EXTICMD{$type}) {
2803 @reply = $cb->($ns, @payload);
2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2809 } else {
2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2811 }
2812
2813 cf::override;
2814 },
2190); 2815);
2191 2816
2192=item $client->async (\&cb) 2817=item $client->async (\&cb)
2193 2818
2194Create a new coroutine, running the specified callback. The coroutine will 2819Create a new coroutine, running the specified callback. The coroutine will
2235our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2236our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2237 2862
2238$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2239 2864
2240$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2865$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math
2867 grepstart grepwhile mapstart mapwhile
2868 sort time
2869));
2241 2870
2242# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2243 2872
2244=pod 2873=pod
2245 2874
2246The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2247 2876
2248 cf::object contr pay_amount pay_player map 2877 cf::object
2878 contr pay_amount pay_player map x y force_find force_add
2879 insert remove name archname title slaying race decrease_ob_nr
2880
2249 cf::object::player player 2881 cf::object::player
2250 cf::player peaceful 2882 player
2251 cf::map trigger 2883
2884 cf::player
2885 peaceful
2886
2887 cf::map
2888 trigger
2252 2889
2253=cut 2890=cut
2254 2891
2255for ( 2892for (
2256 ["cf::object" => qw(contr pay_amount pay_player map)], 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race
2895 decrease_ob_nr)],
2257 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2258 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2259 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2260) { 2899) {
2261 no strict 'refs'; 2900 no strict 'refs';
2332=back 2971=back
2333 2972
2334=cut 2973=cut
2335 2974
2336############################################################################# 2975#############################################################################
2337
2338=head2 EXTENSION DATABASE SUPPORT
2339
2340Crossfire maintains a very simple database for extension use. It can
2341currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2342convert to/from binary).
2343
2344The parameter C<$family> should best start with the name of the extension
2345using it, it should be unique.
2346
2347=over 4
2348
2349=item $value = cf::db_get $family => $key
2350
2351Returns a single value from the database.
2352
2353=item cf::db_put $family => $key => $value
2354
2355Stores the given C<$value> in the family.
2356
2357=cut
2358
2359our $DB;
2360
2361sub db_init {
2362 unless ($DB) {
2363 $DB = BDB::db_create $DB_ENV;
2364
2365 cf::sync_job {
2366 eval {
2367 $DB->set_flags (BDB::CHKSUM);
2368
2369 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2370 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2371 cf::cleanup "db_open(db): $!" if $!;
2372 };
2373 cf::cleanup "db_open(db): $@" if $@;
2374 };
2375 }
2376}
2377
2378sub db_get($$) {
2379 my $key = "$_[0]/$_[1]";
2380
2381 cf::sync_job {
2382 BDB::db_get $DB, undef, $key, my $data;
2383
2384 $! ? ()
2385 : $data
2386 }
2387}
2388
2389sub db_put($$$) {
2390 BDB::dbreq_pri 4;
2391 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2392}
2393
2394=item cf::cache $id => [$paths...], $processversion => $process
2395
2396Generic caching function that returns the value of the resource $id,
2397caching and regenerating as required.
2398
2399This function can block.
2400
2401=cut
2402
2403sub cache {
2404 my ($id, $src, $processversion, $process) = @_;
2405
2406 my $meta =
2407 join "\x00",
2408 $processversion,
2409 map {
2410 aio_stat $_
2411 and Carp::croak "$_: $!";
2412
2413 ($_, (stat _)[7,9])
2414 } @$src;
2415
2416 my $dbmeta = db_get cache => "$id/meta";
2417 if ($dbmeta ne $meta) {
2418 # changed, we may need to process
2419
2420 my @data;
2421 my $md5;
2422
2423 for (0 .. $#$src) {
2424 0 <= aio_load $src->[$_], $data[$_]
2425 or Carp::croak "$src->[$_]: $!";
2426 }
2427
2428 # if processing is expensive, check
2429 # checksum first
2430 if (1) {
2431 $md5 =
2432 join "\x00",
2433 $processversion,
2434 map {
2435 Coro::cede;
2436 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2437 } 0.. $#$src;
2438
2439
2440 my $dbmd5 = db_get cache => "$id/md5";
2441 if ($dbmd5 eq $md5) {
2442 db_put cache => "$id/meta", $meta;
2443
2444 return db_get cache => "$id/data";
2445 }
2446 }
2447
2448 my $t1 = Time::HiRes::time;
2449 my $data = $process->(\@data);
2450 my $t2 = Time::HiRes::time;
2451
2452 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2453
2454 db_put cache => "$id/data", $data;
2455 db_put cache => "$id/md5" , $md5;
2456 db_put cache => "$id/meta", $meta;
2457
2458 return $data;
2459 }
2460
2461 db_get cache => "$id/data"
2462}
2463
2464=item fork_call { }, $args
2465
2466Executes the given code block with the given arguments in a seperate
2467process, returning the results. Everything must be serialisable with
2468Coro::Storable. May, of course, block. Note that the executed sub may
2469never block itself or use any form of Event handling.
2470
2471=cut
2472
2473sub fork_call(&@) {
2474 my ($cb, @args) = @_;
2475
2476# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2477# or die "socketpair: $!";
2478 pipe my $fh1, my $fh2
2479 or die "pipe: $!";
2480
2481 if (my $pid = fork) {
2482 close $fh2;
2483
2484 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2485 $res = Coro::Storable::thaw $res;
2486
2487 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2488
2489 die $$res unless "ARRAY" eq ref $res;
2490
2491 return wantarray ? @$res : $res->[-1];
2492 } else {
2493 reset_signals;
2494 local $SIG{__WARN__};
2495 local $SIG{__DIE__};
2496 eval {
2497 close $fh1;
2498
2499 my @res = eval { $cb->(@args) };
2500 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2501 };
2502
2503 warn $@ if $@;
2504 _exit 0;
2505 }
2506}
2507
2508
2509
2510#############################################################################
2511# the server's init and main functions 2976# the server's init and main functions
2512 2977
2513sub load_facedata($) { 2978sub load_facedata($) {
2514 my ($path) = @_; 2979 my ($path) = @_;
2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2515 2986
2516 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2517 2988
2518 my $facedata; 2989 my $facedata;
2519 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2522 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2523 2994
2524 $facedata->{version} == 2 2995 $facedata->{version} == 2
2525 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2526 2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
3004
2527 { 3005 {
2528 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2529 3007
2530 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2531 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2532 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2533 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2534 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2535 Coro::cede; 3014
3015 cf::cede_to_tick;
2536 } 3016 }
2537 3017
2538 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2539 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2540 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2541 or next; 3021 or next;
2542 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2543 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2544 } else { 3025 } else {
2545 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2546 } 3027 }
2547 Coro::cede; 3028
3029 cf::cede_to_tick;
2548 } 3030 }
2549 } 3031 }
2550 3032
2551 { 3033 {
2552 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2553 3035
2554 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2555 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2556 Coro::cede; 3038 cf::cede_to_tick;
2557 } 3039 }
2558 3040
2559 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2560 } 3042 }
2561 3043
3044 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource};
3048
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054
3055 if ($info->{type} & 1) {
3056 # prepend meta info
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else {
3065 $data = $info->{data};
3066 }
3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick;
3072 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 }
3092
2562 1 3093 1
2563} 3094}
2564 3095
3096register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_;
3098
3099 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v);
3101 }
3102};
3103
2565sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2566 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2567 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
3111
3112 for (cf::region::list) {
3113 $_->{match} = qr/$_->{match}/
3114 if exists $_->{match};
3115 }
2568} 3116}
2569 3117
2570sub reload_facedata { 3118sub reload_facedata {
2571 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2572 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2573} 3121}
2574 3122
2575sub reload_archetypes { 3123sub reload_archetypes {
2576 load_resource_file "$DATADIR/archetypes" 3124 load_resource_file "$DATADIR/archetypes"
2577 or die "unable to load archetypes\n"; 3125 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
2578} 3131}
2579 3132
2580sub reload_treasures { 3133sub reload_treasures {
2581 load_resource_file "$DATADIR/treasures" 3134 load_resource_file "$DATADIR/treasures"
2582 or die "unable to load treasurelists\n"; 3135 or die "unable to load treasurelists\n";
2585sub reload_resources { 3138sub reload_resources {
2586 warn "reloading resource files...\n"; 3139 warn "reloading resource files...\n";
2587 3140
2588 reload_regions; 3141 reload_regions;
2589 reload_facedata; 3142 reload_facedata;
3143 #reload_archetypes;#d#
2590 reload_archetypes; 3144 reload_archetypes;
2591 reload_treasures; 3145 reload_treasures;
2592 3146
2593 warn "finished reloading resource files\n"; 3147 warn "finished reloading resource files\n";
2594} 3148}
2595 3149
2596sub init { 3150sub init {
2597 reload_resources; 3151 reload_resources;
2598} 3152}
2599 3153
2600sub cfg_load { 3154sub reload_config {
2601 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2602 or return; 3156 or return;
2603 3157
2604 local $/; 3158 local $/;
2605 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2625 (async { 3179 (async {
2626 Event::one_event; 3180 Event::one_event;
2627 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2628 }; 3182 };
2629 3183
2630 cfg_load; 3184 reload_config;
2631 db_init; 3185 db_init;
2632 load_extensions; 3186 load_extensions;
2633 3187
2634 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2635 Event::loop; 3189 Event::loop;
2651 }, 3205 },
2652 ); 3206 );
2653 } 3207 }
2654} 3208}
2655 3209
3210sub write_runtime {
3211 my $runtime = "$LOCALDIR/runtime";
3212
3213 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time.
3215
3216 IO::AIO::aio_utime $runtime, undef, undef;
3217
3218 my $guard = cf::lock_acquire "write_runtime";
3219
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3221 or return;
3222
3223 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server.
3226
3227 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3228 and return;
3229
3230 # always fsync - this file is important
3231 aio_fsync $fh
3232 and return;
3233
3234 # touch it again to show we are up-to-date
3235 aio_utime $fh, undef, undef;
3236
3237 close $fh
3238 or return;
3239
3240 aio_rename "$runtime~", $runtime
3241 and return;
3242
3243 warn "runtime file written.\n";
3244
3245 1
3246}
3247
2656sub emergency_save() { 3248sub emergency_save() {
2657 my $freeze_guard = cf::freeze_mainloop; 3249 my $freeze_guard = cf::freeze_mainloop;
2658 3250
2659 warn "enter emergency perl save\n"; 3251 warn "enter emergency perl save\n";
2660 3252
2735 %EXT_CORO = (); 3327 %EXT_CORO = ();
2736 3328
2737 warn "removing commands"; 3329 warn "removing commands";
2738 %COMMAND = (); 3330 %COMMAND = ();
2739 3331
2740 warn "removing ext commands"; 3332 warn "removing ext/exti commands";
2741 %EXTCMD = (); 3333 %EXTCMD = ();
3334 %EXTICMD = ();
2742 3335
2743 warn "unloading/nuking all extensions"; 3336 warn "unloading/nuking all extensions";
2744 for my $pkg (@EXTS) { 3337 for my $pkg (@EXTS) {
2745 warn "... unloading $pkg"; 3338 warn "... unloading $pkg";
2746 3339
2789 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
2790 require cf; 3383 require cf;
2791 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2792 3385
2793 warn "loading config and database again"; 3386 warn "loading config and database again";
2794 cf::cfg_load; 3387 cf::reload_config;
2795 3388
2796 warn "loading extensions"; 3389 warn "loading extensions";
2797 cf::load_extensions; 3390 cf::load_extensions;
2798 3391
2799 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
2864 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
2865 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
2866 $signal->wait; 3459 $signal->wait;
2867} 3460}
2868 3461
2869 my $min = 1e6;#d#
2870 my $avg = 10;
2871$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
2872 reentrant => 0, 3463 reentrant => 0,
2873 parked => 1, 3464 parked => 1,
2874 prio => 0, 3465 prio => 0,
2875 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
2883 3474
2884 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
2885 3476
2886 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
2887 3478
2888 0 && sync_job {#d#
2889 for(1..10) {
2890 my $t = Event::time;
2891 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2892 or die;
2893
2894 $map->width (50);
2895 $map->height (50);
2896 $map->alloc;
2897 $map->_load_objects ("/tmp/x.map", 1);
2898 my $t = Event::time - $t;
2899
2900 #next unless $t < 0.0013;#d#
2901 if ($t < $min) {
2902 $min = $t;
2903 }
2904 $avg = $avg * 0.99 + $t * 0.01;
2905 }
2906 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2907 exit 0;
2908 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2909 };
2910
2911 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
2912 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
2913 3481
2914 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2915 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
2917 write_runtime 3485 write_runtime
2918 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
2919 }; 3487 };
2920 } 3488 }
2921 3489
2922# my $AFTER = Event::time;
2923# warn $AFTER - $NOW;#d#
2924
2925 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2926 $sig->send; 3491 $sig->send;
2927 } 3492 }
2928 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
2929 $sig->send; 3494 $sig->send;
2939 3504
2940 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
2941 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2942 3507
2943 _post_tick; 3508 _post_tick;
2944
2945
2946 }, 3509 },
2947); 3510);
2948 3511
2949{ 3512{
3513 BDB::min_parallel 8;
2950 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
2951 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
2952 reentrant => 0, 3516 reentrant => 0,
2953 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
2954 poll => 'r', 3518 poll => 'r',
2955 prio => 0, 3519 prio => 0,
2956 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
2957 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
2958 ); 3522 );
2959 BDB::min_parallel 8;
2960 3523
2961 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
2962 my $status; 3525 my $status;
2963 my $current = $Coro::current; 3526 my $current = $Coro::current;
2964 ( 3527 (
2973 ) 3536 )
2974 }; 3537 };
2975 3538
2976 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
2977 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2978 3545
2979 cf::sync_job { 3546 cf::sync_job {
2980 eval { 3547 eval {
2981 BDB::db_env_open 3548 BDB::db_env_open
2982 $DB_ENV, 3549 $DB_ENV,
2984 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2985 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2986 0666; 3553 0666;
2987 3554
2988 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2989
2990 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2991 $DB_ENV->set_lk_detect;
2992 }; 3556 };
2993 3557
2994 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
2995 }; 3559 };
2996 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
2997} 3592}
2998 3593
2999{ 3594{
3000 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3001 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines