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.256 by root, Sat Apr 21 16:56:32 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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;
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
94 102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
239 271
240Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
244 279
245Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
247 282
248=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
291 }; 326 };
292 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
293 $guard 328 $guard
294} 329}
295 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
296=item cf::async { BLOCK } 387=item cf::async { BLOCK }
297 388
298Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
303 394
304BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
305 396
306=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
307 398
308The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
311 403
312If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
315fast or be very important. 407fast or be very important.
318 410
319sub sync_job(&) { 411sub sync_job(&) {
320 my ($job) = @_; 412 my ($job) = @_;
321 413
322 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
323 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
325 419
326 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 421 # (but this is cancel-safe)
338 432
339 while ($busy) { 433 while ($busy) {
340 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
341 } 435 }
342 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
343 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
344 } else { 445 } else {
345 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
346 447
347 $job->() 448 $job->()
366 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
367 468
368 $coro 469 $coro
369} 470}
370 471
371sub write_runtime { 472=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 473
374 my $runtime = "$LOCALDIR/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
375 478
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
377 or return;
378 480
379 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 483
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
384 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
385 487
386 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 489 reset_signals;
388 and return; 490 &$cb
491 }, @args;
389 492
390 close $fh 493 wantarray ? @res : $res[-1]
391 or return; 494}
392 495
393 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
394 and return;
395 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
396 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
397} 610}
398 611
399=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
400 613
401Log a datalog packet of the given type with the given key-value pairs. 614Log a datalog packet of the given type with the given key-value pairs.
419attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
421 634
422In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 637Crossfire TRT).
425 638
426=over 4 639=over 4
427 640
428=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
429 642
592 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
593 806
594 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 811
599 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 813 my $pkg = shift @arg;
601 814
602 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
632 } 845 }
633 846
634 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
635 } else { 848 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 850 }
638 851
639 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
640} 853}
641 854
643 if (ref $_[0]) { 856 if (ref $_[0]) {
644 _object_attach @_; 857 _object_attach @_;
645 } else { 858 } else {
646 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
647 } 860 }
861 _recalc_want;
648}; 862};
649 863
650# all those should be optimised 864# all those should be optimised
651sub cf::attachable::detach { 865sub cf::attachable::detach {
652 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
656 reattach ($obj); 870 reattach ($obj);
657 } else { 871 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
659 } 873 }
874 _recalc_want;
660}; 875};
661 876
662sub cf::attachable::attached { 877sub cf::attachable::attached {
663 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
664 879
679 "; 894 ";
680 die if $@; 895 die if $@;
681} 896}
682 897
683our $override; 898our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 900
686sub override { 901sub override {
687 $override = 1; 902 $override = 1;
688 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
689} 904}
690 905
691sub do_invoke { 906sub do_invoke {
692 my $event = shift; 907 my $event = shift;
693 my $callbacks = shift; 908 my $callbacks = shift;
694 909
695 @invoke_results = (); 910 @INVOKE_RESULTS = ();
696 911
697 local $override; 912 local $override;
698 913
699 for (@$callbacks) { 914 for (@$callbacks) {
700 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
717 932
718Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
719 934
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 938
724=back 939=back
725 940
726=cut 941=cut
727 942
728############################################################################# 943#############################################################################
729# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
730 956
731sub reattach { 957sub reattach {
732 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 959 my ($obj) = @_;
734 960
778 }, 1004 },
779); 1005);
780 1006
781sub object_freezer_save { 1007sub object_freezer_save {
782 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
783 1011
784 sync_job { 1012 sync_job {
785 if (length $$rdata) { 1013 if (length $$rdata) {
786 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
787 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
811 } 1039 }
812 } else { 1040 } else {
813 aio_unlink $filename; 1041 aio_unlink $filename;
814 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
815 } 1043 }
816 } 1044 };
1045
1046 undef $guard;
817} 1047}
818 1048
819sub object_freezer_as_string { 1049sub object_freezer_as_string {
820 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
821 1051
826 1056
827sub object_thawer_load { 1057sub object_thawer_load {
828 my ($filename) = @_; 1058 my ($filename) = @_;
829 1059
830 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
831 1063
832 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
833 or return; 1065 or return;
834 1066
835 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
836 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
837 or return; 1069 or return;
1070
1071 undef $guard;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1073 }
840 1074
841 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1076 $filename, length $data, scalar @{$av || []};
1077
843 return ($data, $av); 1078 ($data, $av)
844} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
845 1086
846############################################################################# 1087#############################################################################
847# command handling &c 1088# command handling &c
848 1089
849=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1104}
864 1105
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1107
867Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
868 1113
869If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
870called. 1115called.
871 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
872=cut 1128=cut
873 1129
874sub register_extcmd { 1130sub register_extcmd {
875 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
876 1132
877 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
878} 1140}
879 1141
880cf::player->attach ( 1142cf::player->attach (
881 on_command => sub { 1143 on_command => sub {
882 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
891 cf::override; 1153 cf::override;
892 }, 1154 },
893 on_extcmd => sub { 1155 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
895 1157
896 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1159
898 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
904 } else { 1175 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1177 }
907 1178
908 cf::override; 1179 cf::override;
909 }, 1180 },
910); 1181);
911 1182
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1183sub load_extensions {
1184 cf::sync_job {
1185 my %todo;
1186
947 for my $ext (<$LIBDIR/*.ext>) { 1187 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1188 next unless -r $path;
949 eval { 1189
950 load_extension $ext; 1190 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1191 my $base = $1;
1192 my $pkg = $1;
1193 $pkg =~ s/[^[:word:]]/_/g;
1194 $pkg = "ext::$pkg";
1195
1196 open my $fh, "<:utf8", $path
1197 or die "$path: $!";
1198
1199 my $source = do { local $/; <$fh> };
1200
1201 my %ext = (
1202 path => $path,
1203 base => $base,
1204 pkg => $pkg,
1205 );
1206
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209
1210 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n"
1213 . $source
1214 . "\n};\n1";
1215
1216 $todo{$base} = \%ext;
1217 }
1218
1219 my %done;
1220 while (%todo) {
1221 my $progress;
1222
1223 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip
1226 unless exists $done{$_};
1227 }
1228
1229 warn "... loading '$k' into '$v->{pkg}'\n";
1230
1231 unless (eval $v->{source}) {
1232 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n";
1234
1235 if (exists $v->{meta}{mandatory}) {
1236 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n";
1238 exit 1;
1239 }
1240
1241 warn $msg;
1242 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
951 1 1247 }
952 } or warn "$ext not loaded: $@"; 1248
1249 skip:
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1251 unless $progress;
1252 }
953 } 1253 };
954} 1254}
955 1255
956############################################################################# 1256#############################################################################
1257
1258=back
957 1259
958=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
959 1261
960Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
961 1263
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1015 1317
1016 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1017 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1018 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1019 } 1327 }
1020 } 1328 }
1021} 1329}
1022 1330
1032 1340
1033 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1035 1343
1036 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1037 Coro::cede; 1345 cf::cede_to_tick;
1038} 1346}
1039 1347
1040sub new($) { 1348sub new($) {
1041 my ($login) = @_; 1349 my ($login) = @_;
1042 1350
1046 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1047 1355
1048 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1049 1357
1050 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1051} 1369}
1052 1370
1053=item $pl->quit_character 1371=item $pl->quit_character
1054 1372
1055Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1110 or return []; 1428 or return [];
1111 1429
1112 my @logins; 1430 my @logins;
1113 1431
1114 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1115 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1116 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1117 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1118 1441
1119 utf8::decode $login; 1442 utf8::decode $login;
1120 push @logins, $login; 1443 push @logins, $login;
1121 } 1444 }
1122 1445
1149 } 1472 }
1150 1473
1151 \@paths 1474 \@paths
1152} 1475}
1153 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1154=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1155 1529
1156Sends an ext reply to the player. 1530Sends an ext reply to the player.
1157 1531
1158=cut 1532=cut
1159 1533
1160sub ext_reply($$%) { 1534sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1162 1536
1163 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1538}
1167 1539
1168=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1169 1541
1170Sends an ext event to the client. 1542Sends an ext event to the client.
1171 1543
1172=cut 1544=cut
1173 1545
1174sub ext_event($$%) { 1546sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1176 1548
1177 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1178} 1550}
1179 1551
1180=head3 cf::region 1552=head3 cf::region
1181 1553
1182=over 4 1554=over 4
1185 1557
1186package cf::region; 1558package cf::region;
1187 1559
1188=item cf::region::find_by_path $path 1560=item cf::region::find_by_path $path
1189 1561
1190Tries to decuce the probable region for a map knowing only its path. 1562Tries to decuce the likely region for a map knowing only its path.
1191 1563
1192=cut 1564=cut
1193 1565
1194sub find_by_path($) { 1566sub find_by_path($) {
1195 my ($path) = @_; 1567 my ($path) = @_;
1196 1568
1197 my ($match, $specificity); 1569 my ($match, $specificity);
1198 1570
1199 for my $region (list) { 1571 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1203 } 1575 }
1204 } 1576 }
1205 1577
1269 my ($self, $merge) = @_; 1641 my ($self, $merge) = @_;
1270 1642
1271 # we have to keep some variables in memory intact 1643 # we have to keep some variables in memory intact
1272 local $self->{path}; 1644 local $self->{path};
1273 local $self->{load_path}; 1645 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1646
1277 $self->SUPER::thawer_merge ($merge); 1647 $self->SUPER::thawer_merge ($merge);
1278} 1648}
1279 1649
1280sub normalise { 1650sub normalise {
1327 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1328 return $self; 1698 return $self;
1329 } 1699 }
1330 } 1700 }
1331 1701
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1703 ()
1334} 1704}
1335 1705
1336sub init { 1706sub init {
1337 my ($self) = @_; 1707 my ($self) = @_;
1380 1750
1381 $_->change_map_light ($change) 1751 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1752 for grep $_->outdoor, values %cf::MAP;
1383} 1753}
1384 1754
1755sub decay_objects {
1756 my ($self) = @_;
1757
1758 return if $self->{deny_reset};
1759
1760 $self->do_decay_objects;
1761}
1762
1385sub unlink_save { 1763sub unlink_save {
1386 my ($self) = @_; 1764 my ($self) = @_;
1387 1765
1388 utf8::encode (my $save = $self->save_path); 1766 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1767 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1392 1770
1393sub load_header_from($) { 1771sub load_header_from($) {
1394 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1395 1773
1396 utf8::encode $path; 1774 utf8::encode $path;
1397 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1398 # or return;
1399
1400 $self->_load_header ($path)
1401 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1402 1783
1403 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1404 1785
1405 1 1786 1
1406} 1787}
1445 $self->load_header_orig 1826 $self->load_header_orig
1446 or return; 1827 or return;
1447 $self->prepare_orig; 1828 $self->prepare_orig;
1448 } 1829 }
1449 1830
1831 $self->{deny_reset} = 1
1832 if $self->no_reset;
1833
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1834 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1835 unless $self->default_region;
1452 1836
1453 1 1837 1
1454} 1838}
1469 $map->{last_save} = $cf::RUNTIME; 1853 $map->{last_save} = $cf::RUNTIME;
1470 1854
1471 $map->load_header 1855 $map->load_header
1472 or return; 1856 or return;
1473 1857
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1859 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1860 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1861 $map->reset;
1478 undef $guard; 1862 undef $guard;
1479 return find $path; 1863 return find $path;
1492 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1493 1877
1494 my $path = $self->{path}; 1878 my $path = $self->{path};
1495 1879
1496 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1497 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1498 1883
1499 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1500 1885
1501 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1502 1887
1503 $self->alloc; 1888 $self->alloc;
1504 1889
1505 $self->pre_load; 1890 $self->pre_load;
1506 Coro::cede; 1891 cf::cede_to_tick;
1507 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1508 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1509 or return; 1896 or return;
1510 1897
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1513 1900
1514 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq; 1902 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1517 $self->clear_unique_items; 1905 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1519 } 1909 }
1520 } 1910 }
1521 1911
1522 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1523 # now do the right thing for maps 1915 # now do the right thing for maps
1524 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1525 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1526 unless $self->difficulty; 1918 unless $self->difficulty;
1527 Coro::cede; 1919 cf::cede_to_tick;
1528 1920
1529 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1530 $self->decay_objects; 1922 $self->decay_objects;
1531 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1532 $self->update_buttons; 1924 $self->update_buttons;
1533 Coro::cede; 1925 cf::cede_to_tick;
1534 $self->set_darkness_map; 1926 $self->set_darkness_map;
1535 Coro::cede; 1927 cf::cede_to_tick;
1536 $self->activate; 1928 $self->activate;
1537 } 1929 }
1538 1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1933
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 } 1935 }
1543 1936
1544 $self->post_load; 1937 $self->post_load;
1545} 1938}
1546 1939
1548 my ($self, $ob) = @_; 1941 my ($self, $ob) = @_;
1549 1942
1550 return find "~" . $ob->name . "/" . $self->{path} 1943 return find "~" . $ob->name . "/" . $self->{path}
1551 if $self->per_player; 1944 if $self->per_player;
1552 1945
1946# return find "?party/" . $ob->name . "/" . $self->{path}
1947# if $self->per_party;
1948
1553 $self 1949 $self
1554} 1950}
1555 1951
1556# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1557sub load_diag { 1953sub load_neighbours {
1558 my ($map) = @_; 1954 my ($map) = @_;
1559 1955
1560 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1561 1957
1562 for (0 .. 3) { 1958 for (0 .. 3) {
1563 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1564 or next; 1960 or next;
1565 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1566 or next; 1962 or next;
1567 $neigh->load; 1963 $neigh->load;
1568 1964
1965 push @neigh,
1569 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1570 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1571 } 1968 }
1572 1969
1573 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1574 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1575 or next; 1973 or next;
1576 $neigh->load; 1974 $neigh->load;
1577 } 1975 }
1578} 1976}
1579 1977
1584} 1982}
1585 1983
1586sub do_load_sync { 1984sub do_load_sync {
1587 my ($map) = @_; 1985 my ($map) = @_;
1588 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1589 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1590} 1991}
1591 1992
1592our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1593our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1594 1995
1595sub find_async { 1996sub find_async {
1596 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1597 1998
1598 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1599 2000
1600 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1601 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1602 } 2003 }
1603 2004
1604 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1605 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1606 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1607 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1608 my $map = find $path 2010 if (my $map = find $k) {
1609 or next;
1610 $map->load; 2011 $map->load if $v;
2012 }
1611 2013
1612 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1613 } 2015 }
1614 } 2016 }
1615 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1616 }; 2018 };
1617 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1620} 2022}
1621 2023
1622sub save { 2024sub save {
1623 my ($self) = @_; 2025 my ($self) = @_;
1624 2026
1625 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1626 2028
1627 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1628 2030
1629 return unless $self->dirty; 2031 return unless $self->dirty;
1630 2032
1653 my ($self) = @_; 2055 my ($self) = @_;
1654 2056
1655 # save first because save cedes 2057 # save first because save cedes
1656 $self->save; 2058 $self->save;
1657 2059
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2061
1660 return if $self->players; 2062 return if $self->players;
1661 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1662 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1663 2065
1667 2069
1668sub reset_at { 2070sub reset_at {
1669 my ($self) = @_; 2071 my ($self) = @_;
1670 2072
1671 # TODO: safety, remove and allow resettable per-player maps 2073 # TODO: safety, remove and allow resettable per-player maps
1672 return 1e99 if $self->isa ("ext::map_per_player");#d#
1673 return 1e99 if $self->{deny_reset}; 2074 return 1e99 if $self->{deny_reset};
1674 2075
1675 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2076 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1676 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2077 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1677 2078
1688 my ($self) = @_; 2089 my ($self) = @_;
1689 2090
1690 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2091 my $lock = cf::lock_acquire "map_data:$self->{path}";
1691 2092
1692 return if $self->players; 2093 return if $self->players;
1693 return if $self->isa ("ext::map_per_player");#d#
1694 2094
1695 warn "resetting map ", $self->path;#d# 2095 warn "resetting map ", $self->path;
1696 2096
1697 $self->in_memory (cf::MAP_SWAPPED); 2097 $self->in_memory (cf::MAP_SWAPPED);
1698 2098
1699 # need to save uniques path 2099 # need to save uniques path
1700 unless ($self->{deny_save}) { 2100 unless ($self->{deny_save}) {
1717my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1718 2118
1719sub nuke { 2119sub nuke {
1720 my ($self) = @_; 2120 my ($self) = @_;
1721 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1722 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1723 2126
1724 $self->unlink_save; 2127 $self->unlink_save;
1725 2128
1726 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1727 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1728 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1729 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1730 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1731 2134
1732 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1733 2137
1734 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2139}
2140
2141=item $maps = cf::map::tmp_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144maps. May block.
2145
2146=cut
2147
2148sub tmp_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise $_
2154 : ()
2155 } @{ aio_readdir $TMPDIR or [] }
2156 ]
2157}
2158
2159=item $maps = cf::map::random_maps
2160
2161Returns an arrayref with all map paths of currently instantiated and saved
2162random maps. May block.
2163
2164=cut
2165
2166sub random_maps() {
2167 [
2168 map {
2169 utf8::decode $_;
2170 /\.map$/
2171 ? normalise "?random/$_"
2172 : ()
2173 } @{ aio_readdir $RANDOMDIR or [] }
2174 ]
1735} 2175}
1736 2176
1737=item cf::map::unique_maps 2177=item cf::map::unique_maps
1738 2178
1739Returns an arrayref of paths of all shared maps that have 2179Returns an arrayref of paths of all shared maps that have
1740instantiated unique items. May block. 2180instantiated unique items. May block.
1741 2181
1742=cut 2182=cut
1743 2183
1744sub unique_maps() { 2184sub unique_maps() {
1745 my $files = aio_readdir $UNIQUEDIR 2185 [
1746 or return; 2186 map {
1747
1748 my @paths;
1749
1750 for (@$files) {
1751 utf8::decode $_; 2187 utf8::decode $_;
1752 next if /\.pst$/; 2188 /\.map$/
1753 next unless /^$PATH_SEP/o; 2189 ? normalise $_
1754 2190 : ()
1755 push @paths, cf::map::normalise $_; 2191 } @{ aio_readdir $UNIQUEDIR or [] }
1756 } 2192 ]
1757
1758 \@paths
1759} 2193}
1760 2194
1761package cf; 2195package cf;
1762 2196
1763=back 2197=back
1781 map { $_, inv_recursive_ $_->inv } @_ 2215 map { $_, inv_recursive_ $_->inv } @_
1782} 2216}
1783 2217
1784sub inv_recursive { 2218sub inv_recursive {
1785 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2220}
2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
1786} 2251}
1787 2252
1788package cf; 2253package cf;
1789 2254
1790=back 2255=back
1809 2274
1810 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1811 2276
1812 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1813 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1814 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1815 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1816 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1817 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1818} 2302}
1819 2303
1820=item $player_object->may ("access") 2304=item $player_object->may ("access")
1821 2305
1822Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
1869 $self->deactivate_recursive; 2353 $self->deactivate_recursive;
1870 2354
1871 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2355 return if UNIVERSAL::isa $self->map, "ext::map_link";
1872 2356
1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1874 if $self->map; 2358 if $self->map && $self->map->{path} ne "{link}";
1875 2359
1876 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2360 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1877} 2361}
1878 2362
1879sub cf::object::player::leave_link { 2363sub cf::object::player::leave_link {
1880 my ($self, $map, $x, $y) = @_; 2364 my ($self, $map, $x, $y) = @_;
2365
2366 return unless $self->contr->active;
1881 2367
1882 my $link_pos = delete $self->{_link_pos}; 2368 my $link_pos = delete $self->{_link_pos};
1883 2369
1884 unless ($map) { 2370 unless ($map) {
1885 # restore original map position 2371 # restore original map position
1899 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
1900 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
1901 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
1902 2388
1903 $map->load; 2389 $map->load;
1904 $map->load_diag; 2390 $map->load_neighbours;
1905 2391
1906 return unless $self->contr->active; 2392 return unless $self->contr->active;
1907 $self->activate_recursive; 2393 $self->activate_recursive;
1908 2394
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1910 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
1911} 2397}
1912 2398
1913cf::player->attach ( 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1914 on_logout => sub {
1915 my ($pl) = @_;
1916 2400
1917 # abort map switching before logout 2401Moves the player to the given map-path and coordinates by first freezing
1918 if ($pl->ob->{_link_pos}) { 2402her, loading and preparing them map, calling the provided $check callback
1919 cf::sync_job { 2403that has to return the map if sucecssful, and then unfreezes the player on
1920 $pl->ob->leave_link 2404the new (success) or old (failed) map position. In either case, $done will
1921 }; 2405be called at the end of this process.
1922 }
1923 },
1924 on_login => sub {
1925 my ($pl) = @_;
1926 2406
1927 # try to abort aborted map switching on player login :)
1928 # should happen only on crashes
1929 if ($pl->ob->{_link_pos}) {
1930 $pl->ob->enter_link;
1931 (async {
1932 $pl->ob->reply (undef,
1933 "There was an internal problem at your last logout, "
1934 . "the server will try to bring you to your intended destination in a second.",
1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1938 Coro::Timer::sleep 1;
1939 $pl->ob->leave_link;
1940 })->prio (2);
1941 }
1942 },
1943);
1944
1945=item $player_object->goto ($path, $x, $y)
1946
1947=cut 2407=cut
2408
2409our $GOTOGEN;
1948 2410
1949sub cf::object::player::goto { 2411sub cf::object::player::goto {
1950 my ($self, $path, $x, $y) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2413
2414 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1951 2416
1952 $self->enter_link; 2417 $self->enter_link;
1953 2418
1954 (async { 2419 (async {
1955 my $map = eval { 2420 my $map = eval {
1956 my $map = cf::map::find $path; 2421 my $map = cf::map::find $path;
2422
2423 if ($map) {
1957 $map = $map->customise_for ($self) if $map; 2424 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map;
2426 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2428 }
2429
1958 $map 2430 $map
2431 };
2432
2433 if ($@) {
2434 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2435 LOG llevError | logBacktrace, Carp::longmess $@;
1959 } or 2436 }
1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1961 2437
2438 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation};
1962 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2441 }
2442
2443 $done->() if $done;
1963 })->prio (1); 2444 })->prio (1);
1964} 2445}
1965 2446
1966=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
1967 2448
2036 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2037 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2038 2519
2039 $self->enter_link; 2520 $self->enter_link;
2040 2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2041 (async { 2526 (async {
2042 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2043 unless (eval { 2528 unless (eval {
2044 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2045 2530
2072 2557
2073 utf8::encode $text; 2558 utf8::encode $text;
2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2075} 2560}
2076 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2077=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2078 2644
2079Sends an exti event to the client. 2645Sends an ext event to the client.
2080 2646
2081=cut 2647=cut
2082 2648
2083sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2084 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2085 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2086 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2087 $self->send_packet ("ext " . cf::to_json \%msg); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2088} 2676}
2089 2677
2090=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2091 2679
2092Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2093the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2094C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2095 2683
2096Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2097reliable at some point in the future. 2685become reliable at some point in the future.
2098 2686
2099=cut 2687=cut
2100 2688
2101sub cf::client::query { 2689sub cf::client::query {
2102 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2110 utf8::encode $text; 2698 utf8::encode $text;
2111 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2112 2700
2113 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2114 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2115} 2705}
2116 2706
2117cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2118 on_reply => sub { 2713 on_reply => sub {
2119 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2120 2715
2121 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2122 # get handled first 2717 # get handled first
2134 } else { 2729 } else {
2135 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2136 } 2731 }
2137 } 2732 }
2138 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2139); 2760);
2140 2761
2141=item $client->async (\&cb) 2762=item $client->async (\&cb)
2142 2763
2143Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2184our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2185our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2186 2807
2187$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2188 2809
2189$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2190 2815
2191# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2192 2817
2193=pod 2818=pod
2194 2819
2195The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2196 2821
2197 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2198 cf::object::player player 2826 cf::object::player
2199 cf::player peaceful 2827 player
2200 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2201 2834
2202=cut 2835=cut
2203 2836
2204for ( 2837for (
2205 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2206 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2207 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2208 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2209) { 2844) {
2210 no strict 'refs'; 2845 no strict 'refs';
2281=back 2916=back
2282 2917
2283=cut 2918=cut
2284 2919
2285############################################################################# 2920#############################################################################
2286
2287=head2 EXTENSION DATABASE SUPPORT
2288
2289Crossfire maintains a very simple database for extension use. It can
2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2291convert to/from binary).
2292
2293The parameter C<$family> should best start with the name of the extension
2294using it, it should be unique.
2295
2296=over 4
2297
2298=item $value = cf::db_get $family => $key
2299
2300Returns a single value from the database.
2301
2302=item cf::db_put $family => $key => $value
2303
2304Stores the given C<$value> in the family.
2305
2306=cut
2307
2308our $DB;
2309
2310sub db_init {
2311 unless ($DB) {
2312 $DB = BDB::db_create $DB_ENV;
2313
2314 cf::sync_job {
2315 eval {
2316 $DB->set_flags (BDB::CHKSUM);
2317
2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2320 cf::cleanup "db_open(db): $!" if $!;
2321 };
2322 cf::cleanup "db_open(db): $@" if $@;
2323 };
2324 }
2325}
2326
2327sub db_get($$) {
2328 my $key = "$_[0]/$_[1]";
2329
2330 cf::sync_job {
2331 BDB::db_get $DB, undef, $key, my $data;
2332
2333 $! ? ()
2334 : $data
2335 }
2336}
2337
2338sub db_put($$$) {
2339 BDB::dbreq_pri 4;
2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2341}
2342
2343=item cf::cache $id => [$paths...], $processversion => $process
2344
2345Generic caching function that returns the value of the resource $id,
2346caching and regenerating as required.
2347
2348This function can block.
2349
2350=cut
2351
2352sub cache {
2353 my ($id, $src, $processversion, $process) = @_;
2354
2355 my $meta =
2356 join "\x00",
2357 $processversion,
2358 map {
2359 aio_stat $_
2360 and Carp::croak "$_: $!";
2361
2362 ($_, (stat _)[7,9])
2363 } @$src;
2364
2365 my $dbmeta = db_get cache => "$id/meta";
2366 if ($dbmeta ne $meta) {
2367 # changed, we may need to process
2368
2369 my @data;
2370 my $md5;
2371
2372 for (0 .. $#$src) {
2373 0 <= aio_load $src->[$_], $data[$_]
2374 or Carp::croak "$src->[$_]: $!";
2375 }
2376
2377 # if processing is expensive, check
2378 # checksum first
2379 if (1) {
2380 $md5 =
2381 join "\x00",
2382 $processversion,
2383 map {
2384 Coro::cede;
2385 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2386 } 0.. $#$src;
2387
2388
2389 my $dbmd5 = db_get cache => "$id/md5";
2390 if ($dbmd5 eq $md5) {
2391 db_put cache => "$id/meta", $meta;
2392
2393 return db_get cache => "$id/data";
2394 }
2395 }
2396
2397 my $t1 = Time::HiRes::time;
2398 my $data = $process->(\@data);
2399 my $t2 = Time::HiRes::time;
2400
2401 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2402
2403 db_put cache => "$id/data", $data;
2404 db_put cache => "$id/md5" , $md5;
2405 db_put cache => "$id/meta", $meta;
2406
2407 return $data;
2408 }
2409
2410 db_get cache => "$id/data"
2411}
2412
2413=item fork_call { }, $args
2414
2415Executes the given code block with the given arguments in a seperate
2416process, returning the results. Everything must be serialisable with
2417Coro::Storable. May, of course, block. Note that the executed sub may
2418never block itself or use any form of Event handling.
2419
2420=cut
2421
2422sub fork_call(&@) {
2423 my ($cb, @args) = @_;
2424
2425# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2426# or die "socketpair: $!";
2427 pipe my $fh1, my $fh2
2428 or die "pipe: $!";
2429
2430 if (my $pid = fork) {
2431 close $fh2;
2432
2433 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2434 $res = Coro::Storable::thaw $res;
2435
2436 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2437
2438 die $$res unless "ARRAY" eq ref $res;
2439
2440 return wantarray ? @$res : $res->[-1];
2441 } else {
2442 local $SIG{__WARN__};
2443 eval {
2444 local $SIG{__DIE__};
2445 close $fh1;
2446
2447 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 };
2450
2451 warn $@ if $@;
2452 _exit 0;
2453 }
2454}
2455
2456
2457
2458#############################################################################
2459# the server's init and main functions 2921# the server's init and main functions
2460 2922
2461sub load_facedata($) { 2923sub load_facedata($) {
2462 my ($path) = @_; 2924 my ($path) = @_;
2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2463 2931
2464 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2465 2933
2466 my $facedata; 2934 my $facedata;
2467 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2470 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2471 2939
2472 $facedata->{version} == 2 2940 $facedata->{version} == 2
2473 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2474 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2475 { 2950 {
2476 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2477 2952
2478 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2479 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2480 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2481 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2482 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2483 Coro::cede; 2959
2960 cf::cede_to_tick;
2484 } 2961 }
2485 2962
2486 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2487 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2488 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2489 or next; 2966 or next;
2490 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2491 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2492 } else { 2970 } else {
2493 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2494 } 2972 }
2495 Coro::cede; 2973
2974 cf::cede_to_tick;
2496 } 2975 }
2497 } 2976 }
2498 2977
2499 { 2978 {
2500 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2501 2980
2502 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2503 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2504 Coro::cede; 2983 cf::cede_to_tick;
2505 } 2984 }
2506 2985
2507 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2508 } 2987 }
2509 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
2510 1 3038 1
2511} 3039}
2512 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2513sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2514 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2515 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
2516} 3061}
2517 3062
2518sub reload_facedata { 3063sub reload_facedata {
2519 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2520 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2521} 3066}
2522 3067
2523sub reload_archetypes { 3068sub reload_archetypes {
2524 load_resource_file "$DATADIR/archetypes" 3069 load_resource_file "$DATADIR/archetypes"
2525 or die "unable to load archetypes\n"; 3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
2526} 3076}
2527 3077
2528sub reload_treasures { 3078sub reload_treasures {
2529 load_resource_file "$DATADIR/treasures" 3079 load_resource_file "$DATADIR/treasures"
2530 or die "unable to load treasurelists\n"; 3080 or die "unable to load treasurelists\n";
2533sub reload_resources { 3083sub reload_resources {
2534 warn "reloading resource files...\n"; 3084 warn "reloading resource files...\n";
2535 3085
2536 reload_regions; 3086 reload_regions;
2537 reload_facedata; 3087 reload_facedata;
3088 #reload_archetypes;#d#
2538 reload_archetypes; 3089 reload_archetypes;
2539 reload_treasures; 3090 reload_treasures;
2540 3091
2541 warn "finished reloading resource files\n"; 3092 warn "finished reloading resource files\n";
2542} 3093}
2543 3094
2544sub init { 3095sub init {
2545 reload_resources; 3096 reload_resources;
2546} 3097}
2547 3098
2548sub cfg_load { 3099sub reload_config {
2549 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2550 or return; 3101 or return;
2551 3102
2552 local $/; 3103 local $/;
2553 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2573 (async { 3124 (async {
2574 Event::one_event; 3125 Event::one_event;
2575 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2576 }; 3127 };
2577 3128
2578 cfg_load; 3129 reload_config;
2579 db_init; 3130 db_init;
2580 load_extensions; 3131 load_extensions;
2581 3132
2582 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2583 Event::loop; 3134 Event::loop;
2599 }, 3150 },
2600 ); 3151 );
2601 } 3152 }
2602} 3153}
2603 3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
3191}
3192
2604sub emergency_save() { 3193sub emergency_save() {
2605 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2606 3195
2607 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2608 3197
2683 %EXT_CORO = (); 3272 %EXT_CORO = ();
2684 3273
2685 warn "removing commands"; 3274 warn "removing commands";
2686 %COMMAND = (); 3275 %COMMAND = ();
2687 3276
2688 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2689 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2690 3280
2691 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2692 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2693 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2694 3284
2737 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2738 require cf; 3328 require cf;
2739 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2740 3330
2741 warn "loading config and database again"; 3331 warn "loading config and database again";
2742 cf::cfg_load; 3332 cf::reload_config;
2743 3333
2744 warn "loading extensions"; 3334 warn "loading extensions";
2745 cf::load_extensions; 3335 cf::load_extensions;
2746 3336
2747 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2812 my $signal = new Coro::Signal; 3402 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal; 3403 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait; 3404 $signal->wait;
2815} 3405}
2816 3406
3407 my $min = 1e6;#d#
3408 my $avg = 10;
2817$TICK_WATCHER = Event->timer ( 3409$TICK_WATCHER = Event->timer (
2818 reentrant => 0, 3410 reentrant => 0,
2819 parked => 1, 3411 parked => 1,
2820 prio => 0, 3412 prio => 0,
2821 at => $NEXT_TICK || $TICK, 3413 at => $NEXT_TICK || $TICK,
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10; 3418 unless ++$bug_warning > 10;
2827 return; 3419 return;
2828 } 3420 }
2829 3421
2830 $NOW = Event::time; 3422 $NOW = $tick_start = Event::time;
2831 3423
2832 cf::server_tick; # one server iteration 3424 cf::server_tick; # one server iteration
3425
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
2833 3448
2834 $RUNTIME += $TICK; 3449 $RUNTIME += $TICK;
2835 $NEXT_TICK += $TICK; 3450 $NEXT_TICK += $TICK;
2836 3451
2837 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2843 } 3458 }
2844 3459
2845# my $AFTER = Event::time; 3460# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d# 3461# warn $AFTER - $NOW;#d#
2847 3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send;
3465 }
3466 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send;
3468 }
3469
3470 $NOW = Event::time;
3471
2848 # if we are delayed by four ticks or more, skip them all 3472 # if we are delayed by four ticks or more, skip them all
2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2850 3474
2851 $TICK_WATCHER->at ($NEXT_TICK); 3475 $TICK_WATCHER->at ($NEXT_TICK);
2852 $TICK_WATCHER->start; 3476 $TICK_WATCHER->start;
2853 3477
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3478 $LOAD = ($NOW - $tick_start) / $TICK;
2855 $sig->send; 3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860 3480
2861 _post_tick; 3481 _post_tick;
3482
3483
2862 }, 3484 },
2863); 3485);
2864 3486
2865{ 3487{
2866 BDB::max_poll_time $TICK * 0.1; 3488 BDB::max_poll_time $TICK * 0.1;
2925 prio => 6, 3547 prio => 6,
2926 cb => \&IO::AIO::poll_cb, 3548 cb => \&IO::AIO::poll_cb,
2927 ); 3549 );
2928} 3550}
2929 3551
3552my $_log_backtrace;
3553
3554sub _log_backtrace {
3555 my ($msg, @addr) = @_;
3556
3557 $msg =~ s/\n//;
3558
3559 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace;
3562 async {
3563 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!";
3568
3569 my @funcs;
3570 my @res = <$fh>;
3571 chomp for @res;
3572 while (@res) {
3573 my ($func, $line) = splice @res, 0, 2, ();
3574 push @funcs, "[$func] $line";
3575 }
3576
3577 @funcs
3578 };
3579
3580 LOG llevInfo, "[ABT] $msg\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace;
3583 };
3584 } else {
3585 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n";
3587 }
3588}
3589
2930# load additional modules 3590# load additional modules
2931use cf::pod; 3591use cf::pod;
2932 3592
2933END { cf::emergency_save } 3593END { cf::emergency_save }
2934 3594

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines