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.372 by root, Sat Sep 15 13:25:33 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
205} 218}
206 219
207$Event::DIED = sub { 220$Event::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 my $signal = new Coro::Signal;
360
361 while () {
362 next_job:
363 my $avail = cf::till_tick;
364 if ($avail > 0.01) {
365 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) {
367 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send;
369 Coro::cede;
370 goto next_job;
371 }
372 }
373 }
374
375 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait;
379 } else {
380 Coro::schedule;
381 }
382 }
383};
384
385sub get_slot($;$$) {
386 my ($time, $pri, $name) = @_;
387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready;
394 $sig->wait;
395}
396
310=item cf::async { BLOCK } 397=item cf::async { BLOCK }
311 398
312Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 400C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 401thing you are allowed to do is call C<prio> on it.
317 404
318BEGIN { *async = \&Coro::async_pool } 405BEGIN { *async = \&Coro::async_pool }
319 406
320=item cf::sync_job { BLOCK } 407=item cf::sync_job { BLOCK }
321 408
322The design of crossfire+ requires that the main coro ($Coro::main) is 409The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 410is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable.
325 413
326If it must be done, put the blocking parts into C<sync_job>. This will run 414If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 415the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 416server will be frozen during this time, so the block should either finish
329fast or be very important. 417fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 477 $EXT_CORO{$coro+0} = $coro;
390 478
391 $coro 479 $coro
392} 480}
393 481
394sub write_runtime { 482=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 483
397 # first touch the runtime file to show we are still running: 484Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 485process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling.
399 488
400 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
816); 1026);
817 1027
818sub object_freezer_save { 1028sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
820 1030
1031 my $guard = cf::lock_acquire "io";
1032
821 sync_job { 1033 sync_job {
822 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
825 1038
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
848 } 1061 }
849 } else { 1062 } else {
850 aio_unlink $filename; 1063 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
852 } 1065 }
853 } 1066 };
1067
1068 undef $guard;
854} 1069}
855 1070
856sub object_freezer_as_string { 1071sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
858 1073
863 1078
864sub object_thawer_load { 1079sub object_thawer_load {
865 my ($filename) = @_; 1080 my ($filename) = @_;
866 1081
867 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
868 1085
869 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
870 or return; 1087 or return;
871 1088
872 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
874 or return; 1091 or return;
1092
1093 undef $guard;
875 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1095 }
877 1096
1097 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
880 return ($data, $av); 1101 ($data, $av)
881} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
882 1109
883############################################################################# 1110#############################################################################
884# command handling &c 1111# command handling &c
885 1112
886=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1127}
901 1128
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1130
904Register a callbackf ro execution when the client sends an extcmd packet. 1131Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is
1134the logged-in player. Ext commands can only be processed after a player
1135has logged in successfully.
905 1136
906If the callback returns something, it is sent back as if reply was being 1137If the callback returns something, it is sent back as if reply was being
907called. 1138called.
908 1139
1140=item cf::register_exticmd $name => \&callback($ns,$packet);
1141
1142Register a callback for execution when the client sends an (asynchronous)
1143exticmd packet. Exti commands are processed by the server as soon as they
1144are received, i.e. out of order w.r.t. other commands. The first argument
1145is a client socket. Exti commands can be received anytime, even before
1146log-in.
1147
1148If the callback returns something, it is sent back as if reply was being
1149called.
1150
909=cut 1151=cut
910 1152
911sub register_extcmd { 1153sub register_extcmd {
912 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
913 1155
914 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
915} 1163}
916 1164
917cf::player->attach ( 1165cf::player->attach (
918 on_command => sub { 1166 on_command => sub {
919 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
928 cf::override; 1176 cf::override;
929 }, 1177 },
930 on_extcmd => sub { 1178 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
932 1180
933 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1182
935 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
941 } else { 1198 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1200 }
944 1201
945 cf::override; 1202 cf::override;
946 }, 1203 },
947); 1204);
948 1205
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 { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
984 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1211 next unless -r $path;
986 eval { 1212
987 load_extension $ext; 1213 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1214 my $base = $1;
1215 my $pkg = $1;
1216 $pkg =~ s/[^[:word:]]/_/g;
1217 $pkg = "ext::$pkg";
1218
1219 open my $fh, "<:utf8", $path
1220 or die "$path: $!";
1221
1222 my $source = do { local $/; <$fh> };
1223
1224 my %ext = (
1225 path => $path,
1226 base => $base,
1227 pkg => $pkg,
1228 );
1229
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232
1233 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n"
1236 . $source
1237 . "\n};\n1";
1238
1239 $todo{$base} = \%ext;
1240 }
1241
1242 my %done;
1243 while (%todo) {
1244 my $progress;
1245
1246 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip
1249 unless exists $done{$_};
1250 }
1251
1252 warn "... loading '$k' into '$v->{pkg}'\n";
1253
1254 unless (eval $v->{source}) {
1255 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n";
1257
1258 if (exists $v->{meta}{mandatory}) {
1259 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n";
1261 exit 1;
1262 }
1263
1264 warn $msg;
1265 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
988 1 1270 }
989 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
990 } 1276 };
991} 1277}
992 1278
993############################################################################# 1279#############################################################################
994 1280
1281=back
1282
995=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
996 1284
997Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
998 1286
999=cut 1287=cut
1003use Coro::AIO; 1291use Coro::AIO;
1004 1292
1005=head3 cf::player 1293=head3 cf::player
1006 1294
1007=over 4 1295=over 4
1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1008 1310
1009=item cf::player::find $login 1311=item cf::player::find $login
1010 1312
1011Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1012 1314
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1354
1053 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1056 } 1363 }
1057 } 1364 }
1058} 1365}
1059 1366
1069 1376
1070 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1072 1379
1073 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1074 Coro::cede; 1381 cf::cede_to_tick;
1075} 1382}
1076 1383
1077sub new($) { 1384sub new($) {
1078 my ($login) = @_; 1385 my ($login) = @_;
1079 1386
1083 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1084 1391
1085 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1086 1393
1087 $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 (@_);
1088} 1405}
1089 1406
1090=item $pl->quit_character 1407=item $pl->quit_character
1091 1408
1092Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1464 or return [];
1148 1465
1149 my @logins; 1466 my @logins;
1150 1467
1151 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") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1155 1477
1156 utf8::decode $login; 1478 utf8::decode $login;
1157 push @logins, $login; 1479 push @logins, $login;
1158 } 1480 }
1159 1481
1186 } 1508 }
1187 1509
1188 \@paths 1510 \@paths
1189} 1511}
1190 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
1191=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1192 1565
1193Sends an ext reply to the player. 1566Sends an ext reply to the player.
1194 1567
1195=cut 1568=cut
1196 1569
1197sub ext_reply($$%) { 1570sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1199 1572
1200 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1574}
1204 1575
1205=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1206 1577
1207Sends an ext event to the client. 1578Sends an ext event to the client.
1208 1579
1209=cut 1580=cut
1210 1581
1211sub ext_event($$%) { 1582sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1213 1584
1214 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1215} 1586}
1216 1587
1217=head3 cf::region 1588=head3 cf::region
1218 1589
1219=over 4 1590=over 4
1222 1593
1223package cf::region; 1594package cf::region;
1224 1595
1225=item cf::region::find_by_path $path 1596=item cf::region::find_by_path $path
1226 1597
1227Tries 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.
1228 1599
1229=cut 1600=cut
1230 1601
1231sub find_by_path($) { 1602sub find_by_path($) {
1232 my ($path) = @_; 1603 my ($path) = @_;
1233 1604
1234 my ($match, $specificity); 1605 my ($match, $specificity);
1235 1606
1236 for my $region (list) { 1607 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1240 } 1611 }
1241 } 1612 }
1242 1613
1306 my ($self, $merge) = @_; 1677 my ($self, $merge) = @_;
1307 1678
1308 # we have to keep some variables in memory intact 1679 # we have to keep some variables in memory intact
1309 local $self->{path}; 1680 local $self->{path};
1310 local $self->{load_path}; 1681 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1682
1314 $self->SUPER::thawer_merge ($merge); 1683 $self->SUPER::thawer_merge ($merge);
1315} 1684}
1316 1685
1317sub normalise { 1686sub normalise {
1364 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1365 return $self; 1734 return $self;
1366 } 1735 }
1367 } 1736 }
1368 1737
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1739 ()
1371} 1740}
1372 1741
1373sub init { 1742sub init {
1374 my ($self) = @_; 1743 my ($self) = @_;
1417 1786
1418 $_->change_map_light ($change) 1787 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1788 for grep $_->outdoor, values %cf::MAP;
1420} 1789}
1421 1790
1791sub decay_objects {
1792 my ($self) = @_;
1793
1794 return if $self->{deny_reset};
1795
1796 $self->do_decay_objects;
1797}
1798
1422sub unlink_save { 1799sub unlink_save {
1423 my ($self) = @_; 1800 my ($self) = @_;
1424 1801
1425 utf8::encode (my $save = $self->save_path); 1802 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1803 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1806
1430sub load_header_from($) { 1807sub load_header_from($) {
1431 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1432 1809
1433 utf8::encode $path; 1810 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 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;
1439 1819
1440 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1441 1821
1442 1 1822 1
1443} 1823}
1482 $self->load_header_orig 1862 $self->load_header_orig
1483 or return; 1863 or return;
1484 $self->prepare_orig; 1864 $self->prepare_orig;
1485 } 1865 }
1486 1866
1867 $self->{deny_reset} = 1
1868 if $self->no_reset;
1869
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1870 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1871 unless $self->default_region;
1489 1872
1490 1 1873 1
1491} 1874}
1494sub find { 1877sub find {
1495 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1496 1879
1497 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1498 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1500 1884
1501 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1502 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
1503 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1504 or return; 1890 or return;
1505 1891
1506 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1507 1893
1508 $map->load_header 1894 $map->load_header
1509 or return; 1895 or return;
1510 1896
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1514 $map->reset; 1902 $map->reset;
1515 undef $guard;
1516 return find $path; 1903 return find $path;
1517 } 1904 }
1518 1905
1519 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1520 } 1907 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1530 1917
1531 my $path = $self->{path}; 1918 my $path = $self->{path};
1532 1919
1533 { 1920 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1535 1922
1923 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1925
1538 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1539 1927
1540 $self->alloc; 1928 $self->alloc;
1541 1929
1542 $self->pre_load; 1930 $self->pre_load;
1543 Coro::cede; 1931 cf::cede_to_tick;
1544 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1546 or return; 1936 or return;
1547 1937
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1550 1940
1551 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1942 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1945 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1556 } 1949 }
1557 } 1950 }
1558 1951
1559 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1560 # now do the right thing for maps 1955 # now do the right thing for maps
1561 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1958 unless $self->difficulty;
1564 Coro::cede; 1959 cf::cede_to_tick;
1565 1960
1566 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1962 $self->decay_objects;
1568 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1569 $self->update_buttons; 1964 $self->update_buttons;
1570 Coro::cede; 1965 cf::cede_to_tick;
1571 $self->set_darkness_map; 1966 $self->set_darkness_map;
1572 Coro::cede; 1967 cf::cede_to_tick;
1573 $self->activate; 1968 $self->activate;
1574 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1575 1973
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1975 }
1578 1976
1579 $self->post_load; 1977 $self->post_load;
1583 my ($self, $ob) = @_; 1981 my ($self, $ob) = @_;
1584 1982
1585 return find "~" . $ob->name . "/" . $self->{path} 1983 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1984 if $self->per_player;
1587 1985
1986# return find "?party/" . $ob->name . "/" . $self->{path}
1987# if $self->per_party;
1988
1588 $self 1989 $self
1589} 1990}
1590 1991
1591# 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
1592sub load_diag { 1993sub load_neighbours {
1593 my ($map) = @_; 1994 my ($map) = @_;
1594 1995
1595 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1596 1997
1597 for (0 .. 3) { 1998 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1599 or next; 2000 or next;
1600 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1601 or next; 2002 or next;
1602 $neigh->load; 2003 $neigh->load;
1603 2004
2005 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2008 }
1607 2009
1608 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1610 or next; 2013 or next;
1611 $neigh->load; 2014 $neigh->load;
1612 } 2015 }
1613} 2016}
1614 2017
1619} 2022}
1620 2023
1621sub do_load_sync { 2024sub do_load_sync {
1622 my ($map) = @_; 2025 my ($map) = @_;
1623 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1624 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1625} 2031}
1626 2032
1627our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1629 2035
1630sub find_async { 2036sub find_async {
1631 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1632 2038
1633 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1634 2040
1635 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2043 }
1638 2044
1639 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1640 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1641 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2050 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2051 $map->load if $v;
2052 }
1646 2053
1647 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1648 } 2055 }
1649 } 2056 }
1650 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1651 }; 2058 };
1652 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1655} 2062}
1656 2063
1657sub save { 2064sub save {
1658 my ($self) = @_; 2065 my ($self) = @_;
1659 2066
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2068
1662 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1663 2070
1664 return unless $self->dirty; 2071 return unless $self->dirty;
1665 2072
1688 my ($self) = @_; 2095 my ($self) = @_;
1689 2096
1690 # save first because save cedes 2097 # save first because save cedes
1691 $self->save; 2098 $self->save;
1692 2099
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2101
1695 return if $self->players; 2102 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2104 return if $self->{deny_save};
1698 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2110 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2111}
1702 2112
1703sub reset_at { 2113sub reset_at {
1704 my ($self) = @_; 2114 my ($self) = @_;
1705 2115
1706 # TODO: safety, remove and allow resettable per-player maps 2116 # 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}; 2117 return 1e99 if $self->{deny_reset};
1709 2118
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 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;
1712 2121
1723 my ($self) = @_; 2132 my ($self) = @_;
1724 2133
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2135
1727 return if $self->players; 2136 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2137
1730 warn "resetting map ", $self->path;#d# 2138 warn "resetting map ", $self->path;
1731 2139
1732 $self->in_memory (cf::MAP_SWAPPED); 2140 $self->in_memory (cf::MAP_SWAPPED);
1733 2141
1734 # need to save uniques path 2142 # need to save uniques path
1735 unless ($self->{deny_save}) { 2143 unless ($self->{deny_save}) {
1739 if $uniq; 2147 if $uniq;
1740 } 2148 }
1741 2149
1742 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
1743 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2154 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2155
1748 $self->unlink_save; 2156 $self->unlink_save;
1749 $self->destroy; 2157 $self->destroy;
1750} 2158}
1751 2159
1752my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
1753 2161
1754sub nuke { 2162sub nuke {
1755 my ($self) = @_; 2163 my ($self) = @_;
1756 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
1757 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
1758 2169
1759 $self->unlink_save; 2170 $self->unlink_save;
1760 2171
1761 bless $self, "cf::map"; 2172 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2177
1767 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
1768 2180
1769 $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 ]
1770} 2218}
1771 2219
1772=item cf::map::unique_maps 2220=item cf::map::unique_maps
1773 2221
1774Returns an arrayref of paths of all shared maps that have 2222Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2223instantiated unique items. May block.
1776 2224
1777=cut 2225=cut
1778 2226
1779sub unique_maps() { 2227sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2228 [
1781 or return; 2229 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2230 utf8::decode $_;
1787 next if /\.pst$/; 2231 /\.map$/
1788 next unless /^$PATH_SEP/o; 2232 ? normalise $_
1789 2233 : ()
1790 push @paths, cf::map::normalise $_; 2234 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2235 ]
1792
1793 \@paths
1794} 2236}
1795 2237
1796package cf; 2238package cf;
1797 2239
1798=back 2240=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2258 map { $_, inv_recursive_ $_->inv } @_
1817} 2259}
1818 2260
1819sub inv_recursive { 2261sub inv_recursive {
1820 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 }
1821} 2294}
1822 2295
1823package cf; 2296package cf;
1824 2297
1825=back 2298=back
1844 2317
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2318 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2319
1847 if ($self->{record_replies}) { 2320 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2321 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2322
1849 } 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 {
1850 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2333 }
1852 } 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 (@_);
1853} 2345}
1854 2346
1855=item $player_object->may ("access") 2347=item $player_object->may ("access")
1856 2348
1857Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2396 $self->deactivate_recursive;
1905 2397
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2398 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2399
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2401 if $self->map && $self->map->{path} ne "{link}";
1910 2402
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2403 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2404}
1913 2405
1914sub cf::object::player::leave_link { 2406sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2407 my ($self, $map, $x, $y) = @_;
2408
2409 return unless $self->contr->active;
1916 2410
1917 my $link_pos = delete $self->{_link_pos}; 2411 my $link_pos = delete $self->{_link_pos};
1918 2412
1919 unless ($map) { 2413 unless ($map) {
1920 # restore original map position 2414 # restore original map position
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
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)]) 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981 2443
1982Moves 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
1983her, loading and preparing them map, calling the provided $check callback 2445her, loading and preparing them map, calling the provided $check callback
1984that 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
1985the 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.
1986 2449
1987=cut 2450=cut
2451
2452our $GOTOGEN;
1988 2453
1989sub cf::object::player::goto { 2454sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
2456
2457 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991 2459
1992 $self->enter_link; 2460 $self->enter_link;
1993 2461
1994 (async { 2462 (async {
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
1995 my $map = eval { 2482 my $map = eval {
1996 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
1997 2484
1998 if ($map) { 2485 if ($map) {
1999 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2000 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2001 } else { 2488 } else {
2002 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2003 } 2490 }
2004 2491
2005 $map 2492 $map
2006 }; 2493 };
2007 2494
2008 if ($@) { 2495 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@; 2497 LOG llevError | logBacktrace, Carp::longmess $@;
2011 } 2498 }
2012 2499
2500 if ($gen == $self->{_goto_generation}) {
2501 delete $self->{_goto_generation};
2013 $self->leave_link ($map, $x, $y); 2502 $self->leave_link ($map, $x, $y);
2503 }
2504
2505 $done->() if $done;
2014 })->prio (1); 2506 })->prio (1);
2015} 2507}
2016 2508
2017=item $player_object->enter_exit ($exit_object) 2509=item $player_object->enter_exit ($exit_object)
2018 2510
2087 my $hp = $exit->stats->hp; 2579 my $hp = $exit->stats->hp;
2088 my $sp = $exit->stats->sp; 2580 my $sp = $exit->stats->sp;
2089 2581
2090 $self->enter_link; 2582 $self->enter_link;
2091 2583
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2092 (async { 2588 (async {
2093 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2094 unless (eval { 2590 unless (eval {
2095 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2096 2592
2123 2619
2124 utf8::encode $text; 2620 utf8::encode $text;
2125 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2126} 2622}
2127 2623
2624=item $client->send_msg ($channel, $msg, $color, [extra...])
2625
2626Send a drawinfo or msg packet to the client, formatting the msg for the
2627client if neccessary. C<$type> should be a string identifying the type of
2628the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet.
2630
2631=cut
2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "identify",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "examine",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646);
2647
2648sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_;
2650
2651 $msg = $self->pl->expand_cfpod ($msg);
2652
2653 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654
2655 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2657
2658 if (ref $channel) {
2659 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2664 }
2665
2666 $channel = $channel->{id};
2667 }
2668
2669 return unless @extra || length $msg;
2670
2671 if ($self->can_msg) {
2672 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF;
2675
2676 $self->send_packet ("msg " . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2678 } else {
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689
2690 $color &= cf::NDI_COLOR_MASK;
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703}
2704
2128=item $client->ext_event ($type, %msg) 2705=item $client->ext_msg ($type, @msg)
2129 2706
2130Sends an exti event to the client. 2707Sends an ext event to the client.
2131 2708
2132=cut 2709=cut
2133 2710
2134sub cf::client::ext_event($$%) { 2711sub cf::client::ext_msg($$@) {
2135 my ($self, $type, %msg) = @_; 2712 my ($self, $type, @msg) = @_;
2136 2713
2714 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove
2137 $msg{msgtype} = "event_$type"; 2717 push @msg, msgtype => "event_$type";
2138 $self->send_packet ("ext " . cf::to_json \%msg); 2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 }
2720}
2721
2722=item $client->ext_reply ($msgid, @msg)
2723
2724Sends an ext reply to the client.
2725
2726=cut
2727
2728sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_;
2730
2731 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 }
2139} 2738}
2140 2739
2141=item $success = $client->query ($flags, "text", \&cb) 2740=item $success = $client->query ($flags, "text", \&cb)
2142 2741
2143Queues a query to the client, calling the given callback with 2742Queues a query to the client, calling the given callback with
2144the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2743the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2145C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2744C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2146 2745
2147Queries can fail, so check the return code. Or don't, as queries will become 2746Queries can fail, so check the return code. Or don't, as queries will
2148reliable at some point in the future. 2747become reliable at some point in the future.
2149 2748
2150=cut 2749=cut
2151 2750
2152sub cf::client::query { 2751sub cf::client::query {
2153 my ($self, $flags, $text, $cb) = @_; 2752 my ($self, $flags, $text, $cb) = @_;
2161 utf8::encode $text; 2760 utf8::encode $text;
2162 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2761 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2163 2762
2164 $self->send_packet ($self->{query_queue}[0][0]) 2763 $self->send_packet ($self->{query_queue}[0][0])
2165 if @{ $self->{query_queue} } == 1; 2764 if @{ $self->{query_queue} } == 1;
2765
2766 1
2166} 2767}
2167 2768
2168cf::client->attach ( 2769cf::client->attach (
2770 on_connect => sub {
2771 my ($ns) = @_;
2772
2773 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2774 },
2169 on_reply => sub { 2775 on_reply => sub {
2170 my ($ns, $msg) = @_; 2776 my ($ns, $msg) = @_;
2171 2777
2172 # this weird shuffling is so that direct followup queries 2778 # this weird shuffling is so that direct followup queries
2173 # get handled first 2779 # get handled first
2185 } else { 2791 } else {
2186 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2792 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2187 } 2793 }
2188 } 2794 }
2189 }, 2795 },
2796 on_exticmd => sub {
2797 my ($ns, $buf) = @_;
2798
2799 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2800
2801 if (ref $msg) {
2802 my ($type, $reply, @payload) =
2803 "ARRAY" eq ref $msg
2804 ? @$msg
2805 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2806
2807 my @reply;
2808
2809 if (my $cb = $EXTICMD{$type}) {
2810 @reply = $cb->($ns, @payload);
2811 }
2812
2813 $ns->ext_reply ($reply, @reply)
2814 if $reply;
2815
2816 } else {
2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2818 }
2819
2820 cf::override;
2821 },
2190); 2822);
2191 2823
2192=item $client->async (\&cb) 2824=item $client->async (\&cb)
2193 2825
2194Create a new coroutine, running the specified callback. The coroutine will 2826Create a new coroutine, running the specified callback. The coroutine will
2235our $safe = new Safe "safe"; 2867our $safe = new Safe "safe";
2236our $safe_hole = new Safe::Hole; 2868our $safe_hole = new Safe::Hole;
2237 2869
2238$SIG{FPE} = 'IGNORE'; 2870$SIG{FPE} = 'IGNORE';
2239 2871
2240$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2872$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math
2874 grepstart grepwhile mapstart mapwhile
2875 sort time
2876));
2241 2877
2242# here we export the classes and methods available to script code 2878# here we export the classes and methods available to script code
2243 2879
2244=pod 2880=pod
2245 2881
2246The following functions and methods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2247 2883
2248 cf::object contr pay_amount pay_player map 2884 cf::object
2885 contr pay_amount pay_player map x y force_find force_add
2886 insert remove name archname title slaying race decrease_ob_nr
2887
2249 cf::object::player player 2888 cf::object::player
2250 cf::player peaceful 2889 player
2251 cf::map trigger 2890
2891 cf::player
2892 peaceful
2893
2894 cf::map
2895 trigger
2252 2896
2253=cut 2897=cut
2254 2898
2255for ( 2899for (
2256 ["cf::object" => qw(contr pay_amount pay_player map)], 2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2257 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2258 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2259 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2260) { 2906) {
2261 no strict 'refs'; 2907 no strict 'refs';
2332=back 2978=back
2333 2979
2334=cut 2980=cut
2335 2981
2336############################################################################# 2982#############################################################################
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 2983# the server's init and main functions
2512 2984
2513sub load_facedata($) { 2985sub load_facedata($) {
2514 my ($path) = @_; 2986 my ($path) = @_;
2987
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2515 2993
2516 warn "loading facedata from $path\n"; 2994 warn "loading facedata from $path\n";
2517 2995
2518 my $facedata; 2996 my $facedata;
2519 0 < aio_load $path, $facedata 2997 0 < aio_load $path, $facedata
2522 $facedata = Coro::Storable::thaw $facedata; 3000 $facedata = Coro::Storable::thaw $facedata;
2523 3001
2524 $facedata->{version} == 2 3002 $facedata->{version} == 2
2525 or cf::cleanup "$path: version mismatch, cannot proceed."; 3003 or cf::cleanup "$path: version mismatch, cannot proceed.";
2526 3004
3005 # patch in the exptable
3006 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3009 };
3010 cf::cede_to_tick;
3011
2527 { 3012 {
2528 my $faces = $facedata->{faceinfo}; 3013 my $faces = $facedata->{faceinfo};
2529 3014
2530 while (my ($face, $info) = each %$faces) { 3015 while (my ($face, $info) = each %$faces) {
2531 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3016 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2532 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3017 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap};
2533 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2534 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2535 Coro::cede; 3021
3022 cf::cede_to_tick;
2536 } 3023 }
2537 3024
2538 while (my ($face, $info) = each %$faces) { 3025 while (my ($face, $info) = each %$faces) {
2539 next unless $info->{smooth}; 3026 next unless $info->{smooth};
2540 my $idx = cf::face::find $face 3027 my $idx = cf::face::find $face
2541 or next; 3028 or next;
2542 if (my $smooth = cf::face::find $info->{smooth}) { 3029 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth;
2543 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2544 } else { 3032 } else {
2545 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3033 warn "smooth face '$info->{smooth}' not found for face '$face'";
2546 } 3034 }
2547 Coro::cede; 3035
3036 cf::cede_to_tick;
2548 } 3037 }
2549 } 3038 }
2550 3039
2551 { 3040 {
2552 my $anims = $facedata->{animinfo}; 3041 my $anims = $facedata->{animinfo};
2553 3042
2554 while (my ($anim, $info) = each %$anims) { 3043 while (my ($anim, $info) = each %$anims) {
2555 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3044 cf::anim::set $anim, $info->{frames}, $info->{facings};
2556 Coro::cede; 3045 cf::cede_to_tick;
2557 } 3046 }
2558 3047
2559 cf::anim::invalidate_all; # d'oh 3048 cf::anim::invalidate_all; # d'oh
2560 } 3049 }
2561 3050
3051 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource};
3055
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061
3062 if ($info->{type} & 1) {
3063 # prepend meta info
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else {
3072 $data = $info->{data};
3073 }
3074
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick;
3079 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 }
3099
2562 1 3100 1
2563} 3101}
2564 3102
3103register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_;
3105
3106 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v);
3108 }
3109};
3110
2565sub reload_regions { 3111sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = ();
3115
2566 load_resource_file "$MAPDIR/regions" 3116 load_resource_file "$MAPDIR/regions"
2567 or die "unable to load regions file\n"; 3117 or die "unable to load regions file\n";
3118
3119 for (cf::region::list) {
3120 $_->{match} = qr/$_->{match}/
3121 if exists $_->{match};
3122 }
2568} 3123}
2569 3124
2570sub reload_facedata { 3125sub reload_facedata {
2571 load_facedata "$DATADIR/facedata" 3126 load_facedata "$DATADIR/facedata"
2572 or die "unable to load facedata\n"; 3127 or die "unable to load facedata\n";
2573} 3128}
2574 3129
2575sub reload_archetypes { 3130sub reload_archetypes {
2576 load_resource_file "$DATADIR/archetypes" 3131 load_resource_file "$DATADIR/archetypes"
2577 or die "unable to load archetypes\n"; 3132 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
2578} 3138}
2579 3139
2580sub reload_treasures { 3140sub reload_treasures {
2581 load_resource_file "$DATADIR/treasures" 3141 load_resource_file "$DATADIR/treasures"
2582 or die "unable to load treasurelists\n"; 3142 or die "unable to load treasurelists\n";
2585sub reload_resources { 3145sub reload_resources {
2586 warn "reloading resource files...\n"; 3146 warn "reloading resource files...\n";
2587 3147
2588 reload_regions; 3148 reload_regions;
2589 reload_facedata; 3149 reload_facedata;
3150 #reload_archetypes;#d#
2590 reload_archetypes; 3151 reload_archetypes;
2591 reload_treasures; 3152 reload_treasures;
2592 3153
2593 warn "finished reloading resource files\n"; 3154 warn "finished reloading resource files\n";
2594} 3155}
2595 3156
2596sub init { 3157sub init {
2597 reload_resources; 3158 reload_resources;
2598} 3159}
2599 3160
2600sub cfg_load { 3161sub reload_config {
2601 open my $fh, "<:utf8", "$CONFDIR/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
2602 or return; 3163 or return;
2603 3164
2604 local $/; 3165 local $/;
2605 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
2625 (async { 3186 (async {
2626 Event::one_event; 3187 Event::one_event;
2627 })->prio (Coro::PRIO_MAX); 3188 })->prio (Coro::PRIO_MAX);
2628 }; 3189 };
2629 3190
2630 cfg_load; 3191 reload_config;
2631 db_init; 3192 db_init;
2632 load_extensions; 3193 load_extensions;
2633 3194
2634 $TICK_WATCHER->start; 3195 $TICK_WATCHER->start;
2635 Event::loop; 3196 Event::loop;
2651 }, 3212 },
2652 ); 3213 );
2653 } 3214 }
2654} 3215}
2655 3216
3217sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime";
3219
3220 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time.
3222
3223 IO::AIO::aio_utime $runtime, undef, undef;
3224
3225 my $guard = cf::lock_acquire "write_runtime";
3226
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3228 or return;
3229
3230 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server.
3233
3234 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3235 and return;
3236
3237 # always fsync - this file is important
3238 aio_fsync $fh
3239 and return;
3240
3241 # touch it again to show we are up-to-date
3242 aio_utime $fh, undef, undef;
3243
3244 close $fh
3245 or return;
3246
3247 aio_rename "$runtime~", $runtime
3248 and return;
3249
3250 warn "runtime file written.\n";
3251
3252 1
3253}
3254
2656sub emergency_save() { 3255sub emergency_save() {
2657 my $freeze_guard = cf::freeze_mainloop; 3256 my $freeze_guard = cf::freeze_mainloop;
2658 3257
2659 warn "enter emergency perl save\n"; 3258 warn "enter emergency perl save\n";
2660 3259
2735 %EXT_CORO = (); 3334 %EXT_CORO = ();
2736 3335
2737 warn "removing commands"; 3336 warn "removing commands";
2738 %COMMAND = (); 3337 %COMMAND = ();
2739 3338
2740 warn "removing ext commands"; 3339 warn "removing ext/exti commands";
2741 %EXTCMD = (); 3340 %EXTCMD = ();
3341 %EXTICMD = ();
2742 3342
2743 warn "unloading/nuking all extensions"; 3343 warn "unloading/nuking all extensions";
2744 for my $pkg (@EXTS) { 3344 for my $pkg (@EXTS) {
2745 warn "... unloading $pkg"; 3345 warn "... unloading $pkg";
2746 3346
2789 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
2790 require cf; 3390 require cf;
2791 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2792 3392
2793 warn "loading config and database again"; 3393 warn "loading config and database again";
2794 cf::cfg_load; 3394 cf::reload_config;
2795 3395
2796 warn "loading extensions"; 3396 warn "loading extensions";
2797 cf::load_extensions; 3397 cf::load_extensions;
2798 3398
2799 warn "reattaching attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
2864 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
2865 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
2866 $signal->wait; 3466 $signal->wait;
2867} 3467}
2868 3468
2869 my $min = 1e6;#d#
2870 my $avg = 10;
2871$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
2872 reentrant => 0, 3470 reentrant => 0,
2873 parked => 1, 3471 parked => 1,
2874 prio => 0, 3472 prio => 0,
2875 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
2883 3481
2884 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
2885 3483
2886 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
2887 3485
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; 3486 $RUNTIME += $TICK;
2912 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
2913 3488
2914 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2915 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
2917 write_runtime 3492 write_runtime
2918 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
2919 }; 3494 };
2920 } 3495 }
2921 3496
2922# my $AFTER = Event::time;
2923# warn $AFTER - $NOW;#d#
2924
2925 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2926 $sig->send; 3498 $sig->send;
2927 } 3499 }
2928 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
2929 $sig->send; 3501 $sig->send;
2939 3511
2940 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
2941 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2942 3514
2943 _post_tick; 3515 _post_tick;
2944
2945
2946 }, 3516 },
2947); 3517);
2948 3518
2949{ 3519{
3520 BDB::min_parallel 8;
2950 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
2951 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
2952 reentrant => 0, 3523 reentrant => 0,
2953 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
2954 poll => 'r', 3525 poll => 'r',
2955 prio => 0, 3526 prio => 0,
2956 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
2957 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
2958 ); 3529 );
2959 BDB::min_parallel 8;
2960 3530
2961 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
2962 my $status; 3532 my $status;
2963 my $current = $Coro::current; 3533 my $current = $Coro::current;
2964 ( 3534 (
2973 ) 3543 )
2974 }; 3544 };
2975 3545
2976 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
2977 $DB_ENV = BDB::db_env_create; 3547 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1);
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2978 3552
2979 cf::sync_job { 3553 cf::sync_job {
2980 eval { 3554 eval {
2981 BDB::db_env_open 3555 BDB::db_env_open
2982 $DB_ENV, 3556 $DB_ENV,
2984 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3558 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2985 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2986 0666; 3560 0666;
2987 3561
2988 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 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 }; 3563 };
2993 3564
2994 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
2995 }; 3566 };
2996 } 3567 }
3568
3569 $BDB_DEADLOCK_WATCHER = Event->timer (
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 );
3579 $BDB_CHECKPOINT_WATCHER = Event->timer (
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 );
3589 $BDB_TRICKLE_WATCHER = Event->timer (
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 );
2997} 3599}
2998 3600
2999{ 3601{
3000 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3001 3603

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines