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.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 172returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 202@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
203@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 204@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 205
194# we bless all objects into (empty) derived classes to force a method lookup 206# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 207# within the Safe compartment.
196for my $pkg (qw( 208for my $pkg (qw(
197 cf::global cf::attachable 209 cf::global cf::attachable
205} 217}
206 218
207$Event::DIED = sub { 219$Event::DIED = sub {
208 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
209}; 221};
222
223#############################################################################
210 224
211=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
212 226
213=over 4 227=over 4
214 228
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 248 $d
235 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
236} 250}
237 251
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 252=item $ref = cf::from_json $json
241 253
242Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
243 255
244=item $json = cf::to_json $ref 256=item $json = cf::to_json $ref
245 257
246Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub to_json ($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) }
247 266
248=item cf::lock_wait $string 267=item cf::lock_wait $string
249 268
250Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
251 270
254Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
257returned. 276returned.
258 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
259Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
261 283
262=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
263 285
264Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
265 287
266=cut 288=cut
267 289
268our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
269 292
270sub lock_wait($) { 293sub lock_wait($) {
271 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
272 300
273 # wait for lock, if any 301 # wait for lock, if any
274 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 304 Coro::schedule;
282 310
283 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
284 lock_wait $key; 312 lock_wait $key;
285 313
286 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
287 316
288 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
291 } 321 }
292} 322}
293 323
305 }; 335 };
306 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
307 $guard 337 $guard
308} 338}
309 339
340=item cf::get_slot $time[, $priority[, $name]]
341
342Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede.
345
346The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class.
348
349Useful for short background jobs.
350
351=cut
352
353our @SLOT_QUEUE;
354our $SLOT_QUEUE;
355
356$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async {
358 my $signal = new Coro::Signal;
359
360 while () {
361 next_job:
362 my $avail = cf::till_tick;
363 if ($avail > 0.01) {
364 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) {
366 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send;
368 Coro::cede;
369 goto next_job;
370 }
371 }
372 }
373
374 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait;
378 } else {
379 Coro::schedule;
380 }
381 }
382};
383
384sub get_slot($;$$) {
385 my ($time, $pri, $name) = @_;
386
387 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal;
389
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready;
393 $sig->wait;
394}
395
310=item cf::async { BLOCK } 396=item cf::async { BLOCK }
311 397
312Currently the same as Coro::async_pool, meaning you cannot use 398Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 399C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 400thing you are allowed to do is call C<prio> on it.
317 403
318BEGIN { *async = \&Coro::async_pool } 404BEGIN { *async = \&Coro::async_pool }
319 405
320=item cf::sync_job { BLOCK } 406=item cf::sync_job { BLOCK }
321 407
322The design of crossfire+ requires that the main coro ($Coro::main) is 408The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 409is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable.
325 412
326If it must be done, put the blocking parts into C<sync_job>. This will run 413If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 414the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 415server will be frozen during this time, so the block should either finish
329fast or be very important. 416fast or be very important.
356 Coro::cede or Event::one_event; 443 Coro::cede or Event::one_event;
357 } 444 }
358 445
359 $time = Event::time - $time; 446 $time = Event::time - $time;
360 447
361 LOG llevError | logBacktrace, "long sync job\n" 448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5; 449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363 450
364 $tick_start += $time; # do not account sync jobs to server load 451 $tick_start += $time; # do not account sync jobs to server load
365 452
366 wantarray ? @res : $res[0] 453 wantarray ? @res : $res[0]
367 } else { 454 } else {
389 $EXT_CORO{$coro+0} = $coro; 476 $EXT_CORO{$coro+0} = $coro;
390 477
391 $coro 478 $coro
392} 479}
393 480
394sub write_runtime { 481=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 482
397 # first touch the runtime file to show we are still running: 483Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 484process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling.
399 487
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 488=cut
401 utime undef, undef, $fh; 489
490sub fork_call(&@) {
491 my ($cb, @args) = @_;
492
493 # we seemingly have to make a local copy of the whole thing,
494 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious)
496
497 my @res = Coro::Util::fork_eval {
498 reset_signals;
499 &$cb
500 }, @args;
501
502 wantarray ? @res : $res[-1]
503}
504
505=item $value = cf::db_get $family => $key
506
507Returns a single value from the environment database.
508
509=item cf::db_put $family => $key => $value
510
511Stores the given C<$value> in the family. It can currently store binary
512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
402 } 532 };
533 cf::cleanup "db_open(db): $@" if $@;
403 534
404 my $guard = cf::lock_acquire "write_runtime"; 535 $db
536}
405 537
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 538our $DB;
407 or return;
408 539
409 my $value = $cf::RUNTIME + 90 + 10; 540sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 541 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 542 $DB ||= db_table "db";
543 };
544}
412 545
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 546sub db_get($$) {
414 and return; 547 my $key = "$_[0]/$_[1]";
415 548
416 # always fsync - this file is important 549 cf::sync_job {
417 aio_fsync $fh 550 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 551
420 # touch it again to show we are up-to-date 552 $! ? ()
421 utime undef, undef, $fh; 553 : $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 554 }
555}
556
557sub db_put($$$) {
558 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
560}
561
562=item cf::cache $id => [$paths...], $processversion => $process
563
564Generic caching function that returns the value of the resource $id,
565caching and regenerating as required.
566
567This function can block.
568
569=cut
570
571sub cache {
572 my ($id, $src, $processversion, $process) = @_;
573
574 my $meta =
575 join "\x00",
576 $processversion,
577 map {
578 aio_stat $_
579 and Carp::croak "$_: $!";
580
581 ($_, (stat _)[7,9])
582 } @$src;
583
584 my $dbmeta = db_get cache => "$id/meta";
585 if ($dbmeta ne $meta) {
586 # changed, we may need to process
587
588 my @data;
589 my $md5;
590
591 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_]
593 or Carp::croak "$src->[$_]: $!";
594 }
595
596 # if processing is expensive, check
597 # checksum first
598 if (1) {
599 $md5 =
600 join "\x00",
601 $processversion,
602 map {
603 cf::cede_to_tick;
604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
605 } 0.. $#$src;
606
607
608 my $dbmd5 = db_get cache => "$id/md5";
609 if ($dbmd5 eq $md5) {
610 db_put cache => "$id/meta", $meta;
611
612 return db_get cache => "$id/data";
613 }
614 }
615
616 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time;
619
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
621
622 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta;
625
626 return $data;
627 }
628
629 db_get cache => "$id/data"
432} 630}
433 631
434=item cf::datalog type => key => value, ... 632=item cf::datalog type => key => value, ...
435 633
436Log a datalog packet of the given type with the given key-value pairs. 634Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 652attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 653to it. All such attachable objects support the following methods.
456 654
457In the following description, CLASS can be any of C<global>, C<object> 655In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 656C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 657Crossfire TRT).
460 658
461=over 4 659=over 4
462 660
463=item $attachable->attach ($attachment, key => $value...) 661=item $attachable->attach ($attachment, key => $value...)
464 662
627 $registry = $CB_TYPE[$object_type] ||= []; 825 $registry = $CB_TYPE[$object_type] ||= [];
628 826
629 } elsif ($type eq "subtype") { 827 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 828 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 829 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 830 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 831
634 } elsif ($type eq "package") { 832 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 833 my $pkg = shift @arg;
636 834
637 while (my ($name, $id) = each %cb_id) { 835 while (my ($name, $id) = each %cb_id) {
666 _attach $registry, $klass, @attach; 864 _attach $registry, $klass, @attach;
667 } 865 }
668 866
669 $obj->{$name} = \%arg; 867 $obj->{$name} = \%arg;
670 } else { 868 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 869 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 870 }
673 871
674 $obj->{_attachment}{$name} = undef; 872 $obj->{_attachment}{$name} = undef;
675} 873}
676 874
678 if (ref $_[0]) { 876 if (ref $_[0]) {
679 _object_attach @_; 877 _object_attach @_;
680 } else { 878 } else {
681 _attach shift->_attach_registry, @_; 879 _attach shift->_attach_registry, @_;
682 } 880 }
881 _recalc_want;
683}; 882};
684 883
685# all those should be optimised 884# all those should be optimised
686sub cf::attachable::detach { 885sub cf::attachable::detach {
687 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
690 delete $obj->{_attachment}{$name}; 889 delete $obj->{_attachment}{$name};
691 reattach ($obj); 890 reattach ($obj);
692 } else { 891 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 892 Carp::croak "cannot, currently, detach class attachments";
694 } 893 }
894 _recalc_want;
695}; 895};
696 896
697sub cf::attachable::attached { 897sub cf::attachable::attached {
698 my ($obj, $name) = @_; 898 my ($obj, $name) = @_;
699 899
714 "; 914 ";
715 die if $@; 915 die if $@;
716} 916}
717 917
718our $override; 918our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 919our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 920
721sub override { 921sub override {
722 $override = 1; 922 $override = 1;
723 @invoke_results = (); 923 @INVOKE_RESULTS = (@_);
724} 924}
725 925
726sub do_invoke { 926sub do_invoke {
727 my $event = shift; 927 my $event = shift;
728 my $callbacks = shift; 928 my $callbacks = shift;
729 929
730 @invoke_results = (); 930 @INVOKE_RESULTS = ();
731 931
732 local $override; 932 local $override;
733 933
734 for (@$callbacks) { 934 for (@$callbacks) {
735 eval { &{$_->[1]} }; 935 eval { &{$_->[1]} };
752 952
753Generate an object-specific event with the given arguments. 953Generate an object-specific event with the given arguments.
754 954
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 955This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756removed in future versions), and there is no public API to access override 956removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 957results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 958
759=back 959=back
760 960
761=cut 961=cut
762 962
763############################################################################# 963#############################################################################
764# object support 964# object support
965#
966
967sub _can_merge {
968 my ($ob1, $ob2) = @_;
969
970 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2
975}
765 976
766sub reattach { 977sub reattach {
767 # basically do the same as instantiate, without calling instantiate 978 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 979 my ($obj) = @_;
769 980
814); 1025);
815 1026
816sub object_freezer_save { 1027sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
818 1029
1030 my $guard = cf::lock_acquire "io";
1031
819 sync_job { 1032 sync_job {
820 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
823 1037
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
846 } 1060 }
847 } else { 1061 } else {
848 aio_unlink $filename; 1062 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
850 } 1064 }
851 } 1065 };
1066
1067 undef $guard;
852} 1068}
853 1069
854sub object_freezer_as_string { 1070sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
856 1072
861 1077
862sub object_thawer_load { 1078sub object_thawer_load {
863 my ($filename) = @_; 1079 my ($filename) = @_;
864 1080
865 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
866 1084
867 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
868 or return; 1086 or return;
869 1087
870 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
872 or return; 1090 or return;
1091
1092 undef $guard;
873 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1094 }
875 1095
1096 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1098 $decname, length $data, scalar @{$av || []};
1099
878 return ($data, $av); 1100 ($data, $av)
879} 1101}
1102
1103=head2 COMMAND CALLBACKS
1104
1105=over 4
1106
1107=cut
880 1108
881############################################################################# 1109#############################################################################
882# command handling &c 1110# command handling &c
883 1111
884=item cf::register_command $name => \&callback($ob,$args); 1112=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1125 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1126}
899 1127
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1128=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1129
902Register a callbackf ro execution when the client sends an extcmd packet. 1130Register a callback for execution when the client sends an (synchronous)
1131extcmd packet. Ext commands will be processed in the order they are
1132received by the server, like other user commands. The first argument is
1133the logged-in player. Ext commands can only be processed after a player
1134has logged in successfully.
903 1135
904If the callback returns something, it is sent back as if reply was being 1136If the callback returns something, it is sent back as if reply was being
905called. 1137called.
906 1138
1139=item cf::register_exticmd $name => \&callback($ns,$packet);
1140
1141Register a callback for execution when the client sends an (asynchronous)
1142exticmd packet. Exti commands are processed by the server as soon as they
1143are received, i.e. out of order w.r.t. other commands. The first argument
1144is a client socket. Exti commands can be received anytime, even before
1145log-in.
1146
1147If the callback returns something, it is sent back as if reply was being
1148called.
1149
907=cut 1150=cut
908 1151
909sub register_extcmd { 1152sub register_extcmd {
910 my ($name, $cb) = @_; 1153 my ($name, $cb) = @_;
911 1154
912 $EXTCMD{$name} = $cb; 1155 $EXTCMD{$name} = $cb;
1156}
1157
1158sub register_exticmd {
1159 my ($name, $cb) = @_;
1160
1161 $EXTICMD{$name} = $cb;
913} 1162}
914 1163
915cf::player->attach ( 1164cf::player->attach (
916 on_command => sub { 1165 on_command => sub {
917 my ($pl, $name, $params) = @_; 1166 my ($pl, $name, $params) = @_;
926 cf::override; 1175 cf::override;
927 }, 1176 },
928 on_extcmd => sub { 1177 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
930 1179
931 my $msg = eval { from_json $buf }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1181
933 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
939 } else { 1197 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1199 }
942 1200
943 cf::override; 1201 cf::override;
944 }, 1202 },
945); 1203);
946 1204
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
982 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1210 next unless -r $path;
984 eval { 1211
985 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
986 1 1269 }
987 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
988 } 1275 };
989} 1276}
990 1277
991############################################################################# 1278#############################################################################
992 1279
1280=back
1281
993=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
994 1283
995Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
996 1285
997=cut 1286=cut
1001use Coro::AIO; 1290use Coro::AIO;
1002 1291
1003=head3 cf::player 1292=head3 cf::player
1004 1293
1005=over 4 1294=over 4
1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1006 1309
1007=item cf::player::find $login 1310=item cf::player::find $login
1008 1311
1009Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1010 1313
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1353
1051 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1355 or return;
1356
1357 $f->next;
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1054 } 1363 }
1055 } 1364 }
1056} 1365}
1057 1366
1067 1376
1068 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1070 1379
1071 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1072 Coro::cede; 1381 cf::cede_to_tick;
1073} 1382}
1074 1383
1075sub new($) { 1384sub new($) {
1076 my ($login) = @_; 1385 my ($login) = @_;
1077 1386
1081 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1082 1391
1083 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1084 1393
1085 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1086} 1405}
1087 1406
1088=item $pl->quit_character 1407=item $pl->quit_character
1089 1408
1090Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1464 or return [];
1146 1465
1147 my @logins; 1466 my @logins;
1148 1467
1149 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1153 1477
1154 utf8::decode $login; 1478 utf8::decode $login;
1155 push @logins, $login; 1479 push @logins, $login;
1156 } 1480 }
1157 1481
1184 } 1508 }
1185 1509
1186 \@paths 1510 \@paths
1187} 1511}
1188 1512
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1514
1515Expand crossfire pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563
1189=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1190 1565
1191Sends an ext reply to the player. 1566Sends an ext reply to the player.
1192 1567
1193=cut 1568=cut
1194 1569
1195sub ext_reply($$%) { 1570sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1197 1572
1198 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1574}
1202 1575
1203=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1204 1577
1205Sends an ext event to the client. 1578Sends an ext event to the client.
1206 1579
1207=cut 1580=cut
1208 1581
1209sub ext_event($$%) { 1582sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1211 1584
1212 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1213} 1586}
1214 1587
1215=head3 cf::region 1588=head3 cf::region
1216 1589
1217=over 4 1590=over 4
1220 1593
1221package cf::region; 1594package cf::region;
1222 1595
1223=item cf::region::find_by_path $path 1596=item cf::region::find_by_path $path
1224 1597
1225Tries to decuce the probable region for a map knowing only its path. 1598Tries to decuce the likely region for a map knowing only its path.
1226 1599
1227=cut 1600=cut
1228 1601
1229sub find_by_path($) { 1602sub find_by_path($) {
1230 my ($path) = @_; 1603 my ($path) = @_;
1231 1604
1232 my ($match, $specificity); 1605 my ($match, $specificity);
1233 1606
1234 for my $region (list) { 1607 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1238 } 1611 }
1239 } 1612 }
1240 1613
1304 my ($self, $merge) = @_; 1677 my ($self, $merge) = @_;
1305 1678
1306 # we have to keep some variables in memory intact 1679 # we have to keep some variables in memory intact
1307 local $self->{path}; 1680 local $self->{path};
1308 local $self->{load_path}; 1681 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1682
1312 $self->SUPER::thawer_merge ($merge); 1683 $self->SUPER::thawer_merge ($merge);
1313} 1684}
1314 1685
1315sub normalise { 1686sub normalise {
1362 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1363 return $self; 1734 return $self;
1364 } 1735 }
1365 } 1736 }
1366 1737
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1739 ()
1369} 1740}
1370 1741
1371sub init { 1742sub init {
1372 my ($self) = @_; 1743 my ($self) = @_;
1415 1786
1416 $_->change_map_light ($change) 1787 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1788 for grep $_->outdoor, values %cf::MAP;
1418} 1789}
1419 1790
1791sub decay_objects {
1792 my ($self) = @_;
1793
1794 return if $self->{deny_reset};
1795
1796 $self->do_decay_objects;
1797}
1798
1420sub unlink_save { 1799sub unlink_save {
1421 my ($self) = @_; 1800 my ($self) = @_;
1422 1801
1423 utf8::encode (my $save = $self->save_path); 1802 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1803 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1806
1428sub load_header_from($) { 1807sub load_header_from($) {
1429 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1430 1809
1431 utf8::encode $path; 1810 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1437 1819
1438 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1439 1821
1440 1 1822 1
1441} 1823}
1480 $self->load_header_orig 1862 $self->load_header_orig
1481 or return; 1863 or return;
1482 $self->prepare_orig; 1864 $self->prepare_orig;
1483 } 1865 }
1484 1866
1867 $self->{deny_reset} = 1
1868 if $self->no_reset;
1869
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1870 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1871 unless $self->default_region;
1487 1872
1488 1 1873 1
1489} 1874}
1492sub find { 1877sub find {
1493 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1494 1879
1495 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1496 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1498 1884
1499 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1500 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1501 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1502 or return; 1890 or return;
1503 1891
1504 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1505 1893
1506 $map->load_header 1894 $map->load_header
1507 or return; 1895 or return;
1508 1896
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1512 $map->reset; 1902 $map->reset;
1513 undef $guard;
1514 return find $path; 1903 return find $path;
1515 } 1904 }
1516 1905
1517 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1518 } 1907 }
1527 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1528 1917
1529 my $path = $self->{path}; 1918 my $path = $self->{path};
1530 1919
1531 { 1920 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1533 1922
1923 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 1925
1536 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1537 1927
1538 $self->alloc; 1928 $self->alloc;
1539 1929
1540 $self->pre_load; 1930 $self->pre_load;
1541 Coro::cede; 1931 cf::cede_to_tick;
1542 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1544 or return; 1936 or return;
1545 1937
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1548 1940
1549 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 1942 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 1945 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1554 } 1949 }
1555 } 1950 }
1556 1951
1557 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1558 # now do the right thing for maps 1955 # now do the right thing for maps
1559 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1958 unless $self->difficulty;
1562 Coro::cede; 1959 cf::cede_to_tick;
1563 1960
1564 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1962 $self->decay_objects;
1566 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1567 $self->update_buttons; 1964 $self->update_buttons;
1568 Coro::cede; 1965 cf::cede_to_tick;
1569 $self->set_darkness_map; 1966 $self->set_darkness_map;
1570 Coro::cede; 1967 cf::cede_to_tick;
1571 $self->activate; 1968 $self->activate;
1572 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1573 1973
1574 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 1975 }
1576 1976
1577 $self->post_load; 1977 $self->post_load;
1581 my ($self, $ob) = @_; 1981 my ($self, $ob) = @_;
1582 1982
1583 return find "~" . $ob->name . "/" . $self->{path} 1983 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1984 if $self->per_player;
1585 1985
1986# return find "?party/" . $ob->name . "/" . $self->{path}
1987# if $self->per_party;
1988
1586 $self 1989 $self
1587} 1990}
1588 1991
1589# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1590sub load_diag { 1993sub load_neighbours {
1591 my ($map) = @_; 1994 my ($map) = @_;
1592 1995
1593 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1594 1997
1595 for (0 .. 3) { 1998 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1597 or next; 2000 or next;
1598 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1599 or next; 2002 or next;
1600 $neigh->load; 2003 $neigh->load;
1601 2004
2005 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2008 }
1605 2009
1606 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1608 or next; 2013 or next;
1609 $neigh->load; 2014 $neigh->load;
1610 } 2015 }
1611} 2016}
1612 2017
1617} 2022}
1618 2023
1619sub do_load_sync { 2024sub do_load_sync {
1620 my ($map) = @_; 2025 my ($map) = @_;
1621 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1622 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1623} 2031}
1624 2032
1625our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1627 2035
1628sub find_async { 2036sub find_async {
1629 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1630 2038
1631 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1632 2040
1633 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2043 }
1636 2044
1637 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1638 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1639 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2050 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2051 $map->load if $v;
2052 }
1644 2053
1645 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1646 } 2055 }
1647 } 2056 }
1648 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1649 }; 2058 };
1650 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1653} 2062}
1654 2063
1655sub save { 2064sub save {
1656 my ($self) = @_; 2065 my ($self) = @_;
1657 2066
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2068
1660 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1661 2070
1662 return unless $self->dirty; 2071 return unless $self->dirty;
1663 2072
1686 my ($self) = @_; 2095 my ($self) = @_;
1687 2096
1688 # save first because save cedes 2097 # save first because save cedes
1689 $self->save; 2098 $self->save;
1690 2099
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2101
1693 return if $self->players; 2102 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2104 return if $self->{deny_save};
1696 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2110 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2111}
1700 2112
1701sub reset_at { 2113sub reset_at {
1702 my ($self) = @_; 2114 my ($self) = @_;
1703 2115
1704 # TODO: safety, remove and allow resettable per-player maps 2116 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2117 return 1e99 if $self->{deny_reset};
1707 2118
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2121
1721 my ($self) = @_; 2132 my ($self) = @_;
1722 2133
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2135
1725 return if $self->players; 2136 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2137
1728 warn "resetting map ", $self->path;#d# 2138 warn "resetting map ", $self->path;
1729 2139
1730 $self->in_memory (cf::MAP_SWAPPED); 2140 $self->in_memory (cf::MAP_SWAPPED);
1731 2141
1732 # need to save uniques path 2142 # need to save uniques path
1733 unless ($self->{deny_save}) { 2143 unless ($self->{deny_save}) {
1737 if $uniq; 2147 if $uniq;
1738 } 2148 }
1739 2149
1740 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
1741 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2154 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2155
1746 $self->unlink_save; 2156 $self->unlink_save;
1747 $self->destroy; 2157 $self->destroy;
1748} 2158}
1749 2159
1750my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
1751 2161
1752sub nuke { 2162sub nuke {
1753 my ($self) = @_; 2163 my ($self) = @_;
1754 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
1755 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
1756 2169
1757 $self->unlink_save; 2170 $self->unlink_save;
1758 2171
1759 bless $self, "cf::map"; 2172 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2177
1765 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
1766 2180
1767 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2182}
2183
2184=item $maps = cf::map::tmp_maps
2185
2186Returns an arrayref with all map paths of currently instantiated and saved
2187maps. May block.
2188
2189=cut
2190
2191sub tmp_maps() {
2192 [
2193 map {
2194 utf8::decode $_;
2195 /\.map$/
2196 ? normalise $_
2197 : ()
2198 } @{ aio_readdir $TMPDIR or [] }
2199 ]
2200}
2201
2202=item $maps = cf::map::random_maps
2203
2204Returns an arrayref with all map paths of currently instantiated and saved
2205random maps. May block.
2206
2207=cut
2208
2209sub random_maps() {
2210 [
2211 map {
2212 utf8::decode $_;
2213 /\.map$/
2214 ? normalise "?random/$_"
2215 : ()
2216 } @{ aio_readdir $RANDOMDIR or [] }
2217 ]
1768} 2218}
1769 2219
1770=item cf::map::unique_maps 2220=item cf::map::unique_maps
1771 2221
1772Returns an arrayref of paths of all shared maps that have 2222Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2223instantiated unique items. May block.
1774 2224
1775=cut 2225=cut
1776 2226
1777sub unique_maps() { 2227sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2228 [
1779 or return; 2229 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2230 utf8::decode $_;
1785 next if /\.pst$/; 2231 /\.map$/
1786 next unless /^$PATH_SEP/o; 2232 ? normalise $_
1787 2233 : ()
1788 push @paths, cf::map::normalise $_; 2234 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2235 ]
1790
1791 \@paths
1792} 2236}
1793 2237
1794package cf; 2238package cf;
1795 2239
1796=back 2240=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2258 map { $_, inv_recursive_ $_->inv } @_
1815} 2259}
1816 2260
1817sub inv_recursive { 2261sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2263}
2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
1819} 2294}
1820 2295
1821package cf; 2296package cf;
1822 2297
1823=back 2298=back
1842 2317
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2318 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2319
1845 if ($self->{record_replies}) { 2320 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2321 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2322
1847 } else { 2323 } else {
2324 my $pl = $self->contr;
2325
2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2327 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329
2330 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2333 }
1850 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
1851} 2345}
1852 2346
1853=item $player_object->may ("access") 2347=item $player_object->may ("access")
1854 2348
1855Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
1902 $self->deactivate_recursive; 2396 $self->deactivate_recursive;
1903 2397
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2398 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 2399
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 2401 if $self->map && $self->map->{path} ne "{link}";
1908 2402
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2403 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 2404}
1911 2405
1912sub cf::object::player::leave_link { 2406sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 2407 my ($self, $map, $x, $y) = @_;
2408
2409 return unless $self->contr->active;
1914 2410
1915 my $link_pos = delete $self->{_link_pos}; 2411 my $link_pos = delete $self->{_link_pos};
1916 2412
1917 unless ($map) { 2413 unless ($map) {
1918 # restore original map position 2414 # restore original map position
1932 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
1933 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
1934 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
1935 2431
1936 $map->load; 2432 $map->load;
1937 $map->load_diag; 2433 $map->load_neighbours;
1938 2434
1939 return unless $self->contr->active; 2435 return unless $self->contr->active;
1940 $self->activate_recursive; 2436 $self->activate_recursive;
1941 2437
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
1944} 2440}
1945 2441
1946cf::player->attach ( 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1947 on_logout => sub {
1948 my ($pl) = @_;
1949 2443
1950 # abort map switching before logout 2444Moves the player to the given map-path and coordinates by first freezing
1951 if ($pl->ob->{_link_pos}) { 2445her, loading and preparing them map, calling the provided $check callback
1952 cf::sync_job { 2446that has to return the map if sucecssful, and then unfreezes the player on
1953 $pl->ob->leave_link 2447the new (success) or old (failed) map position. In either case, $done will
1954 }; 2448be called at the end of this process.
1955 }
1956 },
1957 on_login => sub {
1958 my ($pl) = @_;
1959 2449
1960 # try to abort aborted map switching on player login :)
1961 # should happen only on crashes
1962 if ($pl->ob->{_link_pos}) {
1963 $pl->ob->enter_link;
1964 (async {
1965 $pl->ob->reply (undef,
1966 "There was an internal problem at your last logout, "
1967 . "the server will try to bring you to your intended destination in a second.",
1968 cf::NDI_RED);
1969 # we need this sleep as the login has a concurrent enter_exit running
1970 # and this sleep increases chances of the player not ending up in scorn
1971 Coro::Timer::sleep 1;
1972 $pl->ob->leave_link;
1973 })->prio (2);
1974 }
1975 },
1976);
1977
1978=item $player_object->goto ($path, $x, $y)
1979
1980=cut 2450=cut
2451
2452our $GOTOGEN;
1981 2453
1982sub cf::object::player::goto { 2454sub cf::object::player::goto {
1983 my ($self, $path, $x, $y) = @_; 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;
1984 2459
1985 $self->enter_link; 2460 $self->enter_link;
1986 2461
1987 (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 # todo: use ob_blocked to check all tiles of the destination "object"
2469 # for suitability.
2470
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2472 }
2473 }
2474
1988 my $map = eval { 2475 my $map = eval {
1989 my $map = cf::map::find $path; 2476 my $map = cf::map::find $path;
2477
2478 if ($map) {
1990 $map = $map->customise_for ($self) if $map; 2479 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map;
2481 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2483 }
2484
1991 $map 2485 $map
2486 };
2487
2488 if ($@) {
2489 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2490 LOG llevError | logBacktrace, Carp::longmess $@;
1992 } or 2491 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 2492
2493 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
2496 }
2497
2498 $done->() if $done;
1996 })->prio (1); 2499 })->prio (1);
1997} 2500}
1998 2501
1999=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
2000 2503
2069 my $hp = $exit->stats->hp; 2572 my $hp = $exit->stats->hp;
2070 my $sp = $exit->stats->sp; 2573 my $sp = $exit->stats->sp;
2071 2574
2072 $self->enter_link; 2575 $self->enter_link;
2073 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
2074 (async { 2581 (async {
2075 $self->deactivate_recursive; # just to be sure 2582 $self->deactivate_recursive; # just to be sure
2076 unless (eval { 2583 unless (eval {
2077 $self->goto ($slaying, $hp, $sp); 2584 $self->goto ($slaying, $hp, $sp);
2078 2585
2105 2612
2106 utf8::encode $text; 2613 utf8::encode $text;
2107 $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);
2108} 2615}
2109 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
2110=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2111 2699
2112Sends an exti event to the client. 2700Sends an ext event to the client.
2113 2701
2114=cut 2702=cut
2115 2703
2116sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2117 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2118 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2119 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2120 $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 }
2121} 2731}
2122 2732
2123=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2124 2734
2125Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2126the 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>,
2127C<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>.
2128 2738
2129Queries 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
2130reliable at some point in the future. 2740become reliable at some point in the future.
2131 2741
2132=cut 2742=cut
2133 2743
2134sub cf::client::query { 2744sub cf::client::query {
2135 my ($self, $flags, $text, $cb) = @_; 2745 my ($self, $flags, $text, $cb) = @_;
2143 utf8::encode $text; 2753 utf8::encode $text;
2144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2754 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2145 2755
2146 $self->send_packet ($self->{query_queue}[0][0]) 2756 $self->send_packet ($self->{query_queue}[0][0])
2147 if @{ $self->{query_queue} } == 1; 2757 if @{ $self->{query_queue} } == 1;
2758
2759 1
2148} 2760}
2149 2761
2150cf::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 },
2151 on_reply => sub { 2768 on_reply => sub {
2152 my ($ns, $msg) = @_; 2769 my ($ns, $msg) = @_;
2153 2770
2154 # this weird shuffling is so that direct followup queries 2771 # this weird shuffling is so that direct followup queries
2155 # get handled first 2772 # get handled first
2167 } else { 2784 } else {
2168 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2785 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2169 } 2786 }
2170 } 2787 }
2171 }, 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 },
2172); 2815);
2173 2816
2174=item $client->async (\&cb) 2817=item $client->async (\&cb)
2175 2818
2176Create a new coroutine, running the specified callback. The coroutine will 2819Create a new coroutine, running the specified callback. The coroutine will
2217our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2218our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2219 2862
2220$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2221 2864
2222$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));
2223 2870
2224# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2225 2872
2226=pod 2873=pod
2227 2874
2228The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2229 2876
2230 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
2231 cf::object::player player 2881 cf::object::player
2232 cf::player peaceful 2882 player
2233 cf::map trigger 2883
2884 cf::player
2885 peaceful
2886
2887 cf::map
2888 trigger
2234 2889
2235=cut 2890=cut
2236 2891
2237for ( 2892for (
2238 ["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)],
2239 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2240 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2241 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2242) { 2899) {
2243 no strict 'refs'; 2900 no strict 'refs';
2314=back 2971=back
2315 2972
2316=cut 2973=cut
2317 2974
2318############################################################################# 2975#############################################################################
2319
2320=head2 EXTENSION DATABASE SUPPORT
2321
2322Crossfire maintains a very simple database for extension use. It can
2323currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2324convert to/from binary).
2325
2326The parameter C<$family> should best start with the name of the extension
2327using it, it should be unique.
2328
2329=over 4
2330
2331=item $value = cf::db_get $family => $key
2332
2333Returns a single value from the database.
2334
2335=item cf::db_put $family => $key => $value
2336
2337Stores the given C<$value> in the family.
2338
2339=cut
2340
2341our $DB;
2342
2343sub db_init {
2344 unless ($DB) {
2345 $DB = BDB::db_create $DB_ENV;
2346
2347 cf::sync_job {
2348 eval {
2349 $DB->set_flags (BDB::CHKSUM);
2350
2351 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2352 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2353 cf::cleanup "db_open(db): $!" if $!;
2354 };
2355 cf::cleanup "db_open(db): $@" if $@;
2356 };
2357 }
2358}
2359
2360sub db_get($$) {
2361 my $key = "$_[0]/$_[1]";
2362
2363 cf::sync_job {
2364 BDB::db_get $DB, undef, $key, my $data;
2365
2366 $! ? ()
2367 : $data
2368 }
2369}
2370
2371sub db_put($$$) {
2372 BDB::dbreq_pri 4;
2373 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2374}
2375
2376=item cf::cache $id => [$paths...], $processversion => $process
2377
2378Generic caching function that returns the value of the resource $id,
2379caching and regenerating as required.
2380
2381This function can block.
2382
2383=cut
2384
2385sub cache {
2386 my ($id, $src, $processversion, $process) = @_;
2387
2388 my $meta =
2389 join "\x00",
2390 $processversion,
2391 map {
2392 aio_stat $_
2393 and Carp::croak "$_: $!";
2394
2395 ($_, (stat _)[7,9])
2396 } @$src;
2397
2398 my $dbmeta = db_get cache => "$id/meta";
2399 if ($dbmeta ne $meta) {
2400 # changed, we may need to process
2401
2402 my @data;
2403 my $md5;
2404
2405 for (0 .. $#$src) {
2406 0 <= aio_load $src->[$_], $data[$_]
2407 or Carp::croak "$src->[$_]: $!";
2408 }
2409
2410 # if processing is expensive, check
2411 # checksum first
2412 if (1) {
2413 $md5 =
2414 join "\x00",
2415 $processversion,
2416 map {
2417 Coro::cede;
2418 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2419 } 0.. $#$src;
2420
2421
2422 my $dbmd5 = db_get cache => "$id/md5";
2423 if ($dbmd5 eq $md5) {
2424 db_put cache => "$id/meta", $meta;
2425
2426 return db_get cache => "$id/data";
2427 }
2428 }
2429
2430 my $t1 = Time::HiRes::time;
2431 my $data = $process->(\@data);
2432 my $t2 = Time::HiRes::time;
2433
2434 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2435
2436 db_put cache => "$id/data", $data;
2437 db_put cache => "$id/md5" , $md5;
2438 db_put cache => "$id/meta", $meta;
2439
2440 return $data;
2441 }
2442
2443 db_get cache => "$id/data"
2444}
2445
2446=item fork_call { }, $args
2447
2448Executes the given code block with the given arguments in a seperate
2449process, returning the results. Everything must be serialisable with
2450Coro::Storable. May, of course, block. Note that the executed sub may
2451never block itself or use any form of Event handling.
2452
2453=cut
2454
2455sub fork_call(&@) {
2456 my ($cb, @args) = @_;
2457
2458# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2459# or die "socketpair: $!";
2460 pipe my $fh1, my $fh2
2461 or die "pipe: $!";
2462
2463 if (my $pid = fork) {
2464 close $fh2;
2465
2466 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2467 $res = Coro::Storable::thaw $res;
2468
2469 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2470
2471 die $$res unless "ARRAY" eq ref $res;
2472
2473 return wantarray ? @$res : $res->[-1];
2474 } else {
2475 reset_signals;
2476 local $SIG{__WARN__};
2477 local $SIG{__DIE__};
2478 eval {
2479 close $fh1;
2480
2481 my @res = eval { $cb->(@args) };
2482 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2483 };
2484
2485 warn $@ if $@;
2486 _exit 0;
2487 }
2488}
2489
2490
2491
2492#############################################################################
2493# the server's init and main functions 2976# the server's init and main functions
2494 2977
2495sub load_facedata($) { 2978sub load_facedata($) {
2496 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;
2497 2986
2498 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2499 2988
2500 my $facedata; 2989 my $facedata;
2501 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2504 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2505 2994
2506 $facedata->{version} == 2 2995 $facedata->{version} == 2
2507 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2508 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
2509 { 3005 {
2510 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2511 3007
2512 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2513 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2514 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2515 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2516 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2517 Coro::cede; 3014
3015 cf::cede_to_tick;
2518 } 3016 }
2519 3017
2520 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2521 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2522 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2523 or next; 3021 or next;
2524 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2525 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2526 } else { 3025 } else {
2527 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2528 } 3027 }
2529 Coro::cede; 3028
3029 cf::cede_to_tick;
2530 } 3030 }
2531 } 3031 }
2532 3032
2533 { 3033 {
2534 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2535 3035
2536 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2537 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2538 Coro::cede; 3038 cf::cede_to_tick;
2539 } 3039 }
2540 3040
2541 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2542 } 3042 }
2543 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
2544 1 3093 1
2545} 3094}
2546 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
2547sub 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
2548 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2549 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 }
2550} 3116}
2551 3117
2552sub reload_facedata { 3118sub reload_facedata {
2553 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2554 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2555} 3121}
2556 3122
2557sub reload_archetypes { 3123sub reload_archetypes {
2558 load_resource_file "$DATADIR/archetypes" 3124 load_resource_file "$DATADIR/archetypes"
2559 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";
2560} 3131}
2561 3132
2562sub reload_treasures { 3133sub reload_treasures {
2563 load_resource_file "$DATADIR/treasures" 3134 load_resource_file "$DATADIR/treasures"
2564 or die "unable to load treasurelists\n"; 3135 or die "unable to load treasurelists\n";
2567sub reload_resources { 3138sub reload_resources {
2568 warn "reloading resource files...\n"; 3139 warn "reloading resource files...\n";
2569 3140
2570 reload_regions; 3141 reload_regions;
2571 reload_facedata; 3142 reload_facedata;
3143 #reload_archetypes;#d#
2572 reload_archetypes; 3144 reload_archetypes;
2573 reload_treasures; 3145 reload_treasures;
2574 3146
2575 warn "finished reloading resource files\n"; 3147 warn "finished reloading resource files\n";
2576} 3148}
2577 3149
2578sub init { 3150sub init {
2579 reload_resources; 3151 reload_resources;
2580} 3152}
2581 3153
2582sub cfg_load { 3154sub reload_config {
2583 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2584 or return; 3156 or return;
2585 3157
2586 local $/; 3158 local $/;
2587 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2607 (async { 3179 (async {
2608 Event::one_event; 3180 Event::one_event;
2609 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2610 }; 3182 };
2611 3183
2612 cfg_load; 3184 reload_config;
2613 db_init; 3185 db_init;
2614 load_extensions; 3186 load_extensions;
2615 3187
2616 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2617 Event::loop; 3189 Event::loop;
2633 }, 3205 },
2634 ); 3206 );
2635 } 3207 }
2636} 3208}
2637 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
2638sub emergency_save() { 3248sub emergency_save() {
2639 my $freeze_guard = cf::freeze_mainloop; 3249 my $freeze_guard = cf::freeze_mainloop;
2640 3250
2641 warn "enter emergency perl save\n"; 3251 warn "enter emergency perl save\n";
2642 3252
2717 %EXT_CORO = (); 3327 %EXT_CORO = ();
2718 3328
2719 warn "removing commands"; 3329 warn "removing commands";
2720 %COMMAND = (); 3330 %COMMAND = ();
2721 3331
2722 warn "removing ext commands"; 3332 warn "removing ext/exti commands";
2723 %EXTCMD = (); 3333 %EXTCMD = ();
3334 %EXTICMD = ();
2724 3335
2725 warn "unloading/nuking all extensions"; 3336 warn "unloading/nuking all extensions";
2726 for my $pkg (@EXTS) { 3337 for my $pkg (@EXTS) {
2727 warn "... unloading $pkg"; 3338 warn "... unloading $pkg";
2728 3339
2771 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
2772 require cf; 3383 require cf;
2773 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2774 3385
2775 warn "loading config and database again"; 3386 warn "loading config and database again";
2776 cf::cfg_load; 3387 cf::reload_config;
2777 3388
2778 warn "loading extensions"; 3389 warn "loading extensions";
2779 cf::load_extensions; 3390 cf::load_extensions;
2780 3391
2781 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
2845 3456
2846 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 3459 $signal->wait;
2849} 3460}
3461
3462our $stat_fh;
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
2850 3464
2851$TICK_WATCHER = Event->timer ( 3465$TICK_WATCHER = Event->timer (
2852 reentrant => 0, 3466 reentrant => 0,
2853 parked => 1, 3467 parked => 1,
2854 prio => 0, 3468 prio => 0,
2859 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2860 unless ++$bug_warning > 10; 3474 unless ++$bug_warning > 10;
2861 return; 3475 return;
2862 } 3476 }
2863 3477
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
2864 $NOW = $tick_start = Event::time; 3480 $NOW = $tick_start = Event::time;
2865 3481
2866 cf::server_tick; # one server iteration 3482 cf::server_tick; # one server iteration
2867 3483
2868 $RUNTIME += $TICK; 3484 $RUNTIME += $TICK;
2897 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
2898 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2899 3515
2900 _post_tick; 3516 _post_tick;
2901 3517
2902 3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
2903 }, 3521 },
2904); 3522);
2905 3523
2906{ 3524{
3525 BDB::min_parallel 8;
2907 BDB::max_poll_time $TICK * 0.1; 3526 BDB::max_poll_time $TICK * 0.1;
2908 $BDB_POLL_WATCHER = Event->io ( 3527 $BDB_POLL_WATCHER = Event->io (
2909 reentrant => 0, 3528 reentrant => 0,
2910 fd => BDB::poll_fileno, 3529 fd => BDB::poll_fileno,
2911 poll => 'r', 3530 poll => 'r',
2912 prio => 0, 3531 prio => 0,
2913 data => WF_AUTOCANCEL, 3532 data => WF_AUTOCANCEL,
2914 cb => \&BDB::poll_cb, 3533 cb => \&BDB::poll_cb,
2915 ); 3534 );
2916 BDB::min_parallel 8;
2917 3535
2918 BDB::set_sync_prepare { 3536 BDB::set_sync_prepare {
2919 my $status; 3537 my $status;
2920 my $current = $Coro::current; 3538 my $current = $Coro::current;
2921 ( 3539 (
2942 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2943 0666; 3561 0666;
2944 3562
2945 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2946 3564
2947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
2948 $DB_ENV->set_lk_detect; 3567 $DB_ENV->set_lk_detect;
2949 }; 3568 };
2950 3569
2951 cf::cleanup "db_env_open(db): $@" if $@; 3570 cf::cleanup "db_env_open(db): $@" if $@;
2952 }; 3571 };
2953 } 3572 }
3573
3574 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11,
3576 interval => 60,
3577 hard => 1,
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 );
3584 $BDB_TRICKLE_WATCHER = Event->timer (
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 );
2954} 3594}
2955 3595
2956{ 3596{
2957 IO::AIO::min_parallel 8; 3597 IO::AIO::min_parallel 8;
2958 3598

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines