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.258 by root, Sat Apr 21 17:43:42 2007 UTC vs.
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC

20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
90our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
91 94
92# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
95binmode STDOUT; 102binmode STDOUT;
96binmode STDERR; 103binmode STDERR;
97 104
98# read virtual server time, if available 105# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 146
140=item $cf::TICK 147=item $cf::TICK
141 148
142The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
143 150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
160
144=item %cf::CFG 161=item %cf::CFG
145 162
146Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 164from wherever your confdir points to.
148 165
149=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
150 167
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These 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 169returns 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. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
154 177
155=back 178=back
156 179
157=cut 180=cut
158 181
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 203
180# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 205# within the Safe compartment.
182for my $pkg (qw( 206for my $pkg (qw(
183 cf::global cf::attachable 207 cf::global cf::attachable
191} 215}
192 216
193$Event::DIED = sub { 217$Event::DIED = sub {
194 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
195}; 219};
220
221#############################################################################
196 222
197=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
198 224
199=over 4 225=over 4
200 226
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 246 $d
221 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
222} 248}
223 249
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
227 251
228Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
229 253
230=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
231 255
232Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
233 264
234=item cf::lock_wait $string 265=item cf::lock_wait $string
235 266
236Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
237 268
303 334
304BEGIN { *async = \&Coro::async_pool } 335BEGIN { *async = \&Coro::async_pool }
305 336
306=item cf::sync_job { BLOCK } 337=item cf::sync_job { BLOCK }
307 338
308The design of crossfire+ requires that the main coro ($Coro::main) is 339The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 340is 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. 341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable.
311 343
312If it must be done, put the blocking parts into C<sync_job>. This will run 344If 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 345the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 346server will be frozen during this time, so the block should either finish
315fast or be very important. 347fast or be very important.
318 350
319sub sync_job(&) { 351sub sync_job(&) {
320 my ($job) = @_; 352 my ($job) = @_;
321 353
322 if ($Coro::current == $Coro::main) { 354 if ($Coro::current == $Coro::main) {
355 my $time = Event::time;
356
323 # this is the main coro, too bad, we have to block 357 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 358 # till the operation succeeds, freezing the server :/
325 359
326 # TODO: use suspend/resume instead 360 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 361 # (but this is cancel-safe)
338 372
339 while ($busy) { 373 while ($busy) {
340 Coro::cede or Event::one_event; 374 Coro::cede or Event::one_event;
341 } 375 }
342 376
377 $time = Event::time - $time;
378
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load
383
343 wantarray ? @res : $res[0] 384 wantarray ? @res : $res[0]
344 } else { 385 } else {
345 # we are in another coroutine, how wonderful, everything just works 386 # we are in another coroutine, how wonderful, everything just works
346 387
347 $job->() 388 $job->()
366 $EXT_CORO{$coro+0} = $coro; 407 $EXT_CORO{$coro+0} = $coro;
367 408
368 $coro 409 $coro
369} 410}
370 411
371sub write_runtime { 412=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 413
374 my $runtime = "$LOCALDIR/runtime"; 414Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling.
375 418
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 419=cut
377 or return;
378 420
379 my $value = $cf::RUNTIME + 90 + 10; 421sub _store_scalar {
380 # 10 is the runtime save interval, for a monotonic clock 422 open my $fh, ">", \my $buf
381 # 60 allows for the watchdog to kill the server. 423 or die "fork_call: cannot open fh-to-buf in child : $!";
382 424 Storable::store_fd $_[0], $fh;
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
384 and return;
385
386 # always fsync - this file is important
387 aio_fsync $fh
388 and return;
389
390 close $fh 425 close $fh;
391 or return;
392 426
393 aio_rename "$runtime~", $runtime 427 $buf
394 and return; 428}
395 429
430sub fork_call(&@) {
431 my ($cb, @args) = @_;
432
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
434# or die "socketpair: $!";
435 pipe my $fh1, my $fh2
436 or die "pipe: $!";
437
438 if (my $pid = fork) {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals;
452 local $SIG{__WARN__};
453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
460 eval {
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
396 1 471 }
472}
473
474=item $value = cf::db_get $family => $key
475
476Returns a single value from the environment database.
477
478=item cf::db_put $family => $key => $value
479
480Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482
483=cut
484
485our $DB;
486
487sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job {
492 eval {
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 }
502}
503
504sub db_get($$) {
505 my $key = "$_[0]/$_[1]";
506
507 cf::sync_job {
508 BDB::db_get $DB, undef, $key, my $data;
509
510 $! ? ()
511 : $data
512 }
513}
514
515sub db_put($$$) {
516 BDB::dbreq_pri 4;
517 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
518}
519
520=item cf::cache $id => [$paths...], $processversion => $process
521
522Generic caching function that returns the value of the resource $id,
523caching and regenerating as required.
524
525This function can block.
526
527=cut
528
529sub cache {
530 my ($id, $src, $processversion, $process) = @_;
531
532 my $meta =
533 join "\x00",
534 $processversion,
535 map {
536 aio_stat $_
537 and Carp::croak "$_: $!";
538
539 ($_, (stat _)[7,9])
540 } @$src;
541
542 my $dbmeta = db_get cache => "$id/meta";
543 if ($dbmeta ne $meta) {
544 # changed, we may need to process
545
546 my @data;
547 my $md5;
548
549 for (0 .. $#$src) {
550 0 <= aio_load $src->[$_], $data[$_]
551 or Carp::croak "$src->[$_]: $!";
552 }
553
554 # if processing is expensive, check
555 # checksum first
556 if (1) {
557 $md5 =
558 join "\x00",
559 $processversion,
560 map {
561 Coro::cede;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src;
564
565
566 my $dbmd5 = db_get cache => "$id/md5";
567 if ($dbmd5 eq $md5) {
568 db_put cache => "$id/meta", $meta;
569
570 return db_get cache => "$id/data";
571 }
572 }
573
574 my $t1 = Time::HiRes::time;
575 my $data = $process->(\@data);
576 my $t2 = Time::HiRes::time;
577
578 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
579
580 db_put cache => "$id/data", $data;
581 db_put cache => "$id/md5" , $md5;
582 db_put cache => "$id/meta", $meta;
583
584 return $data;
585 }
586
587 db_get cache => "$id/data"
397} 588}
398 589
399=item cf::datalog type => key => value, ... 590=item cf::datalog type => key => value, ...
400 591
401Log a datalog packet of the given type with the given key-value pairs. 592Log 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") 610attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 611to it. All such attachable objects support the following methods.
421 612
422In the following description, CLASS can be any of C<global>, C<object> 613In 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 614C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 615Crossfire TRT).
425 616
426=over 4 617=over 4
427 618
428=item $attachable->attach ($attachment, key => $value...) 619=item $attachable->attach ($attachment, key => $value...)
429 620
592 $registry = $CB_TYPE[$object_type] ||= []; 783 $registry = $CB_TYPE[$object_type] ||= [];
593 784
594 } elsif ($type eq "subtype") { 785 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 786 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 787 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 788 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 789
599 } elsif ($type eq "package") { 790 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 791 my $pkg = shift @arg;
601 792
602 while (my ($name, $id) = each %cb_id) { 793 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 822 _attach $registry, $klass, @attach;
632 } 823 }
633 824
634 $obj->{$name} = \%arg; 825 $obj->{$name} = \%arg;
635 } else { 826 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 827 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 828 }
638 829
639 $obj->{_attachment}{$name} = undef; 830 $obj->{_attachment}{$name} = undef;
640} 831}
641 832
643 if (ref $_[0]) { 834 if (ref $_[0]) {
644 _object_attach @_; 835 _object_attach @_;
645 } else { 836 } else {
646 _attach shift->_attach_registry, @_; 837 _attach shift->_attach_registry, @_;
647 } 838 }
839 _recalc_want;
648}; 840};
649 841
650# all those should be optimised 842# all those should be optimised
651sub cf::attachable::detach { 843sub cf::attachable::detach {
652 my ($obj, $name) = @_; 844 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 847 delete $obj->{_attachment}{$name};
656 reattach ($obj); 848 reattach ($obj);
657 } else { 849 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 850 Carp::croak "cannot, currently, detach class attachments";
659 } 851 }
852 _recalc_want;
660}; 853};
661 854
662sub cf::attachable::attached { 855sub cf::attachable::attached {
663 my ($obj, $name) = @_; 856 my ($obj, $name) = @_;
664 857
679 "; 872 ";
680 die if $@; 873 die if $@;
681} 874}
682 875
683our $override; 876our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 878
686sub override { 879sub override {
687 $override = 1; 880 $override = 1;
688 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
689} 882}
690 883
691sub do_invoke { 884sub do_invoke {
692 my $event = shift; 885 my $event = shift;
693 my $callbacks = shift; 886 my $callbacks = shift;
694 887
695 @invoke_results = (); 888 @INVOKE_RESULTS = ();
696 889
697 local $override; 890 local $override;
698 891
699 for (@$callbacks) { 892 for (@$callbacks) {
700 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
717 910
718Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
719 912
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This 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 914removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 916
724=back 917=back
725 918
726=cut 919=cut
727 920
728############################################################################# 921#############################################################################
729# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
730 934
731sub reattach { 935sub reattach {
732 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 937 my ($obj) = @_;
734 938
837 or return; 1041 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1042 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1043 }
840 1044
841 warn sprintf "loading %s (%d)\n", 1045 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1046 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1047 return ($data, $av);
844} 1048}
1049
1050=head2 COMMAND CALLBACKS
1051
1052=over 4
1053
1054=cut
845 1055
846############################################################################# 1056#############################################################################
847# command handling &c 1057# command handling &c
848 1058
849=item cf::register_command $name => \&callback($ob,$args); 1059=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1072 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1073}
864 1074
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1075=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1076
867Register a callbackf ro execution when the client sends an extcmd packet. 1077Register a callback for execution when the client sends an (synchronous)
1078extcmd packet. Ext commands will be processed in the order they are
1079received by the server, like other user commands. The first argument is
1080the logged-in player. Ext commands can only be processed after a player
1081has logged in successfully.
868 1082
869If the callback returns something, it is sent back as if reply was being 1083If the callback returns something, it is sent back as if reply was being
870called. 1084called.
871 1085
1086=item cf::register_exticmd $name => \&callback($ns,$packet);
1087
1088Register a callback for execution when the client sends an (asynchronous)
1089exticmd packet. Exti commands are processed by the server as soon as they
1090are received, i.e. out of order w.r.t. other commands. The first argument
1091is a client socket. Exti commands can be received anytime, even before
1092log-in.
1093
1094If the callback returns something, it is sent back as if reply was being
1095called.
1096
872=cut 1097=cut
873 1098
874sub register_extcmd { 1099sub register_extcmd {
875 my ($name, $cb) = @_; 1100 my ($name, $cb) = @_;
876 1101
877 $EXTCMD{$name} = $cb; 1102 $EXTCMD{$name} = $cb;
1103}
1104
1105sub register_exticmd {
1106 my ($name, $cb) = @_;
1107
1108 $EXTICMD{$name} = $cb;
878} 1109}
879 1110
880cf::player->attach ( 1111cf::player->attach (
881 on_command => sub { 1112 on_command => sub {
882 my ($pl, $name, $params) = @_; 1113 my ($pl, $name, $params) = @_;
891 cf::override; 1122 cf::override;
892 }, 1123 },
893 on_extcmd => sub { 1124 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
895 1126
896 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1128
898 if (ref $msg) { 1129 if (ref $msg) {
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
900 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
901 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
907 1138
908 cf::override; 1139 cf::override;
909 }, 1140 },
910); 1141);
911 1142
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 { 1143sub load_extensions {
1144 cf::sync_job {
1145 my %todo;
1146
947 for my $ext (<$LIBDIR/*.ext>) { 1147 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1148 next unless -r $path;
949 eval { 1149
950 load_extension $ext; 1150 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1151 my $base = $1;
1152 my $pkg = $1;
1153 $pkg =~ s/[^[:word:]]/_/g;
1154 $pkg = "ext::$pkg";
1155
1156 open my $fh, "<:utf8", $path
1157 or die "$path: $!";
1158
1159 my $source = do { local $/; <$fh> };
1160
1161 my %ext = (
1162 path => $path,
1163 base => $base,
1164 pkg => $pkg,
1165 );
1166
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169
1170 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n"
1173 . $source
1174 . "\n};\n1";
1175
1176 $todo{$base} = \%ext;
1177 }
1178
1179 my %done;
1180 while (%todo) {
1181 my $progress;
1182
1183 while (my ($k, $v) = each %todo) {
1184 for (split /,\s*/, $v->{meta}{depends}) {
1185 goto skip
1186 unless exists $done{$_};
1187 }
1188
1189 warn "... loading '$k' into '$v->{pkg}'\n";
1190
1191 unless (eval $v->{source}) {
1192 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n";
1194
1195 if (exists $v->{meta}{mandatory}) {
1196 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n";
1198 exit 1;
1199 }
1200
1201 warn $msg;
1202 }
1203
1204 $done{$k} = delete $todo{$k};
1205 push @EXTS, $v->{pkg};
1206 $progress = 1;
951 1 1207 }
952 } or warn "$ext not loaded: $@"; 1208
1209 skip:
1210 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1211 unless $progress;
1212 }
953 } 1213 };
954} 1214}
955 1215
956############################################################################# 1216#############################################################################
1217
1218=back
957 1219
958=head2 CORE EXTENSIONS 1220=head2 CORE EXTENSIONS
959 1221
960Functions and methods that extend core crossfire objects. 1222Functions and methods that extend core crossfire objects.
961 1223
1149 } 1411 }
1150 1412
1151 \@paths 1413 \@paths
1152} 1414}
1153 1415
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1417
1418Expand crossfire pod fragments into protocol xml.
1419
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1154=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1155 1467
1156Sends an ext reply to the player. 1468Sends an ext reply to the player.
1157 1469
1158=cut 1470=cut
1159 1471
1160sub ext_reply($$%) { 1472sub ext_reply($$%) {
1161 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1162 1474
1163 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1164 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1477}
1167 1478
1168=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1169 1480
1170Sends an ext event to the client. 1481Sends an ext event to the client.
1185 1496
1186package cf::region; 1497package cf::region;
1187 1498
1188=item cf::region::find_by_path $path 1499=item cf::region::find_by_path $path
1189 1500
1190Tries to decuce the probable region for a map knowing only its path. 1501Tries to decuce the likely region for a map knowing only its path.
1191 1502
1192=cut 1503=cut
1193 1504
1194sub find_by_path($) { 1505sub find_by_path($) {
1195 my ($path) = @_; 1506 my ($path) = @_;
1196 1507
1197 my ($match, $specificity); 1508 my ($match, $specificity);
1198 1509
1199 for my $region (list) { 1510 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1203 } 1514 }
1204 } 1515 }
1205 1516
1269 my ($self, $merge) = @_; 1580 my ($self, $merge) = @_;
1270 1581
1271 # we have to keep some variables in memory intact 1582 # we have to keep some variables in memory intact
1272 local $self->{path}; 1583 local $self->{path};
1273 local $self->{load_path}; 1584 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1585
1277 $self->SUPER::thawer_merge ($merge); 1586 $self->SUPER::thawer_merge ($merge);
1278} 1587}
1279 1588
1280sub normalise { 1589sub normalise {
1327 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1328 return $self; 1637 return $self;
1329 } 1638 }
1330 } 1639 }
1331 1640
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1642 ()
1334} 1643}
1335 1644
1336sub init { 1645sub init {
1337 my ($self) = @_; 1646 my ($self) = @_;
1378sub change_all_map_light { 1687sub change_all_map_light {
1379 my ($change) = @_; 1688 my ($change) = @_;
1380 1689
1381 $_->change_map_light ($change) 1690 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1691 for grep $_->outdoor, values %cf::MAP;
1692}
1693
1694sub decay_objects {
1695 my ($self) = @_;
1696
1697 return if $self->{deny_reset};
1698
1699 $self->do_decay_objects;
1383} 1700}
1384 1701
1385sub unlink_save { 1702sub unlink_save {
1386 my ($self) = @_; 1703 my ($self) = @_;
1387 1704
1445 $self->load_header_orig 1762 $self->load_header_orig
1446 or return; 1763 or return;
1447 $self->prepare_orig; 1764 $self->prepare_orig;
1448 } 1765 }
1449 1766
1767 $self->{deny_reset} = 1
1768 if $self->no_reset;
1769
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1770 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1771 unless $self->default_region;
1452 1772
1453 1 1773 1
1454} 1774}
1469 $map->{last_save} = $cf::RUNTIME; 1789 $map->{last_save} = $cf::RUNTIME;
1470 1790
1471 $map->load_header 1791 $map->load_header
1472 or return; 1792 or return;
1473 1793
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1795 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1796 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1797 $map->reset;
1478 undef $guard; 1798 undef $guard;
1479 return find $path; 1799 return find $path;
1546 my ($self, $ob) = @_; 1866 my ($self, $ob) = @_;
1547 1867
1548 return find "~" . $ob->name . "/" . $self->{path} 1868 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1869 if $self->per_player;
1550 1870
1871# return find "?party/" . $ob->name . "/" . $self->{path}
1872# if $self->per_party;
1873
1551 $self 1874 $self
1552} 1875}
1553 1876
1554# find and load all maps in the 3x3 area around a map 1877# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1878sub load_diag {
1601 1924
1602 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1603 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1606 my $map = find $path 1929 if (my $map = find $path) {
1607 or next;
1608 $map->load; 1930 $map->load;
1931 }
1609 1932
1610 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1611 } 1934 }
1612 } 1935 }
1613 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
1665 1988
1666sub reset_at { 1989sub reset_at {
1667 my ($self) = @_; 1990 my ($self) = @_;
1668 1991
1669 # TODO: safety, remove and allow resettable per-player maps 1992 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 1993 return 1e99 if $self->{deny_reset};
1672 1994
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1995 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1996 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 1997
1686 my ($self) = @_; 2008 my ($self) = @_;
1687 2009
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2010 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2011
1690 return if $self->players; 2012 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2013
1693 warn "resetting map ", $self->path;#d# 2014 warn "resetting map ", $self->path;
1694 2015
1695 $self->in_memory (cf::MAP_SWAPPED); 2016 $self->in_memory (cf::MAP_SWAPPED);
1696 2017
1697 # need to save uniques path 2018 # need to save uniques path
1698 unless ($self->{deny_save}) { 2019 unless ($self->{deny_save}) {
1730 $cf::MAP{$self->path} = $self; 2051 $cf::MAP{$self->path} = $self;
1731 2052
1732 $self->reset; # polite request, might not happen 2053 $self->reset; # polite request, might not happen
1733} 2054}
1734 2055
2056=item $maps = cf::map::tmp_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059maps. May block.
2060
2061=cut
2062
2063sub tmp_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise $_
2069 : ()
2070 } @{ aio_readdir $TMPDIR or [] }
2071 ]
2072}
2073
2074=item $maps = cf::map::random_maps
2075
2076Returns an arrayref with all map paths of currently instantiated and saved
2077random maps. May block.
2078
2079=cut
2080
2081sub random_maps() {
2082 [
2083 map {
2084 utf8::decode $_;
2085 /\.map$/
2086 ? normalise "?random/$_"
2087 : ()
2088 } @{ aio_readdir $RANDOMDIR or [] }
2089 ]
2090}
2091
1735=item cf::map::unique_maps 2092=item cf::map::unique_maps
1736 2093
1737Returns an arrayref of paths of all shared maps that have 2094Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2095instantiated unique items. May block.
1739 2096
1740=cut 2097=cut
1741 2098
1742sub unique_maps() { 2099sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2100 [
1744 or return; 2101 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2102 utf8::decode $_;
1750 next if /\.pst$/; 2103 /\.map$/
1751 next unless /^$PATH_SEP/o; 2104 ? normalise $_
1752 2105 : ()
1753 push @paths, cf::map::normalise $_; 2106 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2107 ]
1755
1756 \@paths
1757} 2108}
1758 2109
1759package cf; 2110package cf;
1760 2111
1761=back 2112=back
1807 2158
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2159 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2160
1810 if ($self->{record_replies}) { 2161 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2162 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2163
1812 } else { 2164 } else {
2165 my $pl = $self->contr;
2166
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply (
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175
2176 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2177 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2178 $self->message ($msg, $flags);
2179 }
1815 } 2180 }
1816} 2181}
1817 2182
1818=item $player_object->may ("access") 2183=item $player_object->may ("access")
1819 2184
1862} 2227}
1863 2228
1864sub cf::object::player::enter_link { 2229sub cf::object::player::enter_link {
1865 my ($self) = @_; 2230 my ($self) = @_;
1866 2231
1867 $self->activate_recursive; 2232 $self->deactivate_recursive;
1868 2233
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2234 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2235
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2236 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2237 if $self->map && $self->map->{path} ne "{link}";
1873 2238
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2239 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2240}
1876 2241
1877sub cf::object::player::leave_link { 2242sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2243 my ($self, $map, $x, $y) = @_;
2244
2245 return unless $self->contr->active;
1879 2246
1880 my $link_pos = delete $self->{_link_pos}; 2247 my $link_pos = delete $self->{_link_pos};
1881 2248
1882 unless ($map) { 2249 unless ($map) {
1883 # restore original map position 2250 # restore original map position
1906 2273
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
1909} 2276}
1910 2277
1911cf::player->attach ( 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2279
1915 # abort map switching before logout 2280Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2281her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2282that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2283the new (success) or old (failed) map position. In either case, $done will
1919 }; 2284be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2285
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y)
1944
1945=cut 2286=cut
2287
2288our $GOTOGEN;
1946 2289
1947sub cf::object::player::goto { 2290sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2292
2293 # do generation counting so two concurrent goto's will be executed in-order
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2295
1950 $self->enter_link; 2296 $self->enter_link;
1951 2297
1952 (async { 2298 (async {
1953 my $map = eval { 2299 my $map = eval {
1954 my $map = cf::map::find $path; 2300 my $map = cf::map::find $path;
2301
2302 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2303 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map;
2305 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2307 }
2308
1956 $map 2309 $map
2310 };
2311
2312 if ($@) {
2313 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2314 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2315 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2316
2317 if ($gen == $self->{_goto_generation}) {
2318 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2320 }
2321
2322 $done->() if $done;
1961 })->prio (1); 2323 })->prio (1);
1962} 2324}
1963 2325
1964=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
1965 2327
2034 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2036 2398
2037 $self->enter_link; 2399 $self->enter_link;
2038 2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2039 (async { 2405 (async {
2040 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2407 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2043 2409
2070 2436
2071 utf8::encode $text; 2437 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2439}
2074 2440
2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2442
2443Send a drawinfo or msg packet to the client, formatting the msg for the
2444client if neccessary. C<$type> should be a string identifying the type of
2445the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet.
2447
2448=cut
2449
2450sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_;
2452
2453 $msg = $self->pl->expand_cfpod ($msg);
2454
2455 $color &= ~cf::NDI_UNIQUE; # just in case...
2456
2457 if (ref $channel) {
2458 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel);
2462 }
2463
2464 $channel = $channel->{id};
2465 }
2466
2467 return unless @extra || length $msg;
2468
2469 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) {
2483 if (0 && $msg =~ /\[/) {
2484 $self->send_packet ("drawextinfo $color 4 0 $msg")
2485 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492
2075=item $client->ext_event ($type, %msg) 2493=item $client->ext_event ($type, %msg)
2076 2494
2077Sends an exti event to the client. 2495Sends an ext event to the client.
2078 2496
2079=cut 2497=cut
2080 2498
2081sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2082 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2083 2501
2502 return unless $self->extcmd;
2503
2084 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2086} 2506}
2087 2507
2088=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2089 2509
2090Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2511the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2512C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2513
2094Queries can fail, so check the return code. Or don't, as queries will become 2514Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2515become reliable at some point in the future.
2096 2516
2097=cut 2517=cut
2098 2518
2099sub cf::client::query { 2519sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2520 my ($self, $flags, $text, $cb) = @_;
2108 utf8::encode $text; 2528 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2529 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2530
2111 $self->send_packet ($self->{query_queue}[0][0]) 2531 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2532 if @{ $self->{query_queue} } == 1;
2533
2534 1
2113} 2535}
2114 2536
2115cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2116 on_reply => sub { 2543 on_reply => sub {
2117 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2118 2545
2119 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2120 # get handled first 2547 # get handled first
2132 } else { 2559 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2560 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2561 }
2135 } 2562 }
2136 }, 2563 },
2564 on_exticmd => sub {
2565 my ($ns, $buf) = @_;
2566
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568
2569 if (ref $msg) {
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2571 if (my %reply = $cb->($ns, $msg)) {
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 }
2576 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 }
2579
2580 cf::override;
2581 },
2137); 2582);
2138 2583
2139=item $client->async (\&cb) 2584=item $client->async (\&cb)
2140 2585
2141Create a new coroutine, running the specified callback. The coroutine will 2586Create a new coroutine, running the specified callback. The coroutine will
2190 2635
2191=pod 2636=pod
2192 2637
2193The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2194 2639
2195 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2196 cf::object::player player 2644 cf::object::player
2197 cf::player peaceful 2645 player
2198 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2199 2652
2200=cut 2653=cut
2201 2654
2202for ( 2655for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2204 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2207) { 2661) {
2208 no strict 'refs'; 2662 no strict 'refs';
2279=back 2733=back
2280 2734
2281=cut 2735=cut
2282 2736
2283############################################################################# 2737#############################################################################
2284
2285=head2 EXTENSION DATABASE SUPPORT
2286
2287Crossfire maintains a very simple database for extension use. It can
2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289convert to/from binary).
2290
2291The parameter C<$family> should best start with the name of the extension
2292using it, it should be unique.
2293
2294=over 4
2295
2296=item $value = cf::db_get $family => $key
2297
2298Returns a single value from the database.
2299
2300=item cf::db_put $family => $key => $value
2301
2302Stores the given C<$value> in the family.
2303
2304=cut
2305
2306our $DB;
2307
2308sub db_init {
2309 unless ($DB) {
2310 $DB = BDB::db_create $DB_ENV;
2311
2312 cf::sync_job {
2313 eval {
2314 $DB->set_flags (BDB::CHKSUM);
2315
2316 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318 cf::cleanup "db_open(db): $!" if $!;
2319 };
2320 cf::cleanup "db_open(db): $@" if $@;
2321 };
2322 }
2323}
2324
2325sub db_get($$) {
2326 my $key = "$_[0]/$_[1]";
2327
2328 cf::sync_job {
2329 BDB::db_get $DB, undef, $key, my $data;
2330
2331 $! ? ()
2332 : $data
2333 }
2334}
2335
2336sub db_put($$$) {
2337 BDB::dbreq_pri 4;
2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 local $SIG{__WARN__};
2441 eval {
2442 local $SIG{__DIE__};
2443 close $fh1;
2444
2445 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 };
2448
2449 warn $@ if $@;
2450 _exit 0;
2451 }
2452}
2453
2454
2455
2456#############################################################################
2457# the server's init and main functions 2738# the server's init and main functions
2458 2739
2459sub load_facedata($) { 2740sub load_facedata($) {
2460 my ($path) = @_; 2741 my ($path) = @_;
2461 2742
2473 { 2754 {
2474 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2475 2756
2476 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2477 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2478 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2479 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2480 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2481 Coro::cede; 2763
2764 cf::cede_to_tick;
2482 } 2765 }
2483 2766
2484 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2485 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2486 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2487 or next; 2770 or next;
2488 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2489 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2490 } else { 2774 } else {
2491 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2492 } 2776 }
2493 Coro::cede; 2777
2778 cf::cede_to_tick;
2494 } 2779 }
2495 } 2780 }
2496 2781
2497 { 2782 {
2498 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2499 2784
2500 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2501 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2502 Coro::cede; 2787 cf::cede_to_tick;
2503 } 2788 }
2504 2789
2505 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2506 } 2821 }
2507 2822
2508 1 2823 1
2509} 2824}
2510 2825
2511sub reload_regions { 2826sub reload_regions {
2512 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2513 or die "unable to load regions file\n"; 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2514} 2834}
2515 2835
2516sub reload_facedata { 2836sub reload_facedata {
2517 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2518 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";
2519} 2839}
2520 2840
2521sub reload_archetypes { 2841sub reload_archetypes {
2522 load_resource_file "$DATADIR/archetypes" 2842 load_resource_file "$DATADIR/archetypes"
2523 or die "unable to load archetypes\n"; 2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2524} 2849}
2525 2850
2526sub reload_treasures { 2851sub reload_treasures {
2527 load_resource_file "$DATADIR/treasures" 2852 load_resource_file "$DATADIR/treasures"
2528 or die "unable to load treasurelists\n"; 2853 or die "unable to load treasurelists\n";
2531sub reload_resources { 2856sub reload_resources {
2532 warn "reloading resource files...\n"; 2857 warn "reloading resource files...\n";
2533 2858
2534 reload_regions; 2859 reload_regions;
2535 reload_facedata; 2860 reload_facedata;
2861 #reload_archetypes;#d#
2536 reload_archetypes; 2862 reload_archetypes;
2537 reload_treasures; 2863 reload_treasures;
2538 2864
2539 warn "finished reloading resource files\n"; 2865 warn "finished reloading resource files\n";
2540} 2866}
2597 }, 2923 },
2598 ); 2924 );
2599 } 2925 }
2600} 2926}
2601 2927
2928sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time.
2933
2934 IO::AIO::aio_utime $runtime, undef, undef;
2935
2936 my $guard = cf::lock_acquire "write_runtime";
2937
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2939 or return;
2940
2941 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server.
2944
2945 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2946 and return;
2947
2948 # always fsync - this file is important
2949 aio_fsync $fh
2950 and return;
2951
2952 # touch it again to show we are up-to-date
2953 aio_utime $fh, undef, undef;
2954
2955 close $fh
2956 or return;
2957
2958 aio_rename "$runtime~", $runtime
2959 and return;
2960
2961 warn "runtime file written.\n";
2962
2963 1
2964}
2965
2602sub emergency_save() { 2966sub emergency_save() {
2603 my $freeze_guard = cf::freeze_mainloop; 2967 my $freeze_guard = cf::freeze_mainloop;
2604 2968
2605 warn "enter emergency perl save\n"; 2969 warn "enter emergency perl save\n";
2606 2970
2681 %EXT_CORO = (); 3045 %EXT_CORO = ();
2682 3046
2683 warn "removing commands"; 3047 warn "removing commands";
2684 %COMMAND = (); 3048 %COMMAND = ();
2685 3049
2686 warn "removing ext commands"; 3050 warn "removing ext/exti commands";
2687 %EXTCMD = (); 3051 %EXTCMD = ();
3052 %EXTICMD = ();
2688 3053
2689 warn "unloading/nuking all extensions"; 3054 warn "unloading/nuking all extensions";
2690 for my $pkg (@EXTS) { 3055 for my $pkg (@EXTS) {
2691 warn "... unloading $pkg"; 3056 warn "... unloading $pkg";
2692 3057
2810 my $signal = new Coro::Signal; 3175 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 3176 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 3177 $signal->wait;
2813} 3178}
2814 3179
3180 my $min = 1e6;#d#
3181 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 3182$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 3183 reentrant => 0,
2817 parked => 1, 3184 parked => 1,
2818 prio => 0, 3185 prio => 0,
2819 at => $NEXT_TICK || $TICK, 3186 at => $NEXT_TICK || $TICK,
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 3191 unless ++$bug_warning > 10;
2825 return; 3192 return;
2826 } 3193 }
2827 3194
2828 $NOW = Event::time; 3195 $NOW = $tick_start = Event::time;
2829 3196
2830 cf::server_tick; # one server iteration 3197 cf::server_tick; # one server iteration
3198
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
2831 3221
2832 $RUNTIME += $TICK; 3222 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 3223 $NEXT_TICK += $TICK;
2834 3224
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2841 } 3231 }
2842 3232
2843# my $AFTER = Event::time; 3233# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 3234# warn $AFTER - $NOW;#d#
2845 3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send;
3238 }
3239 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send;
3241 }
3242
3243 $NOW = Event::time;
3244
2846 # if we are delayed by four ticks or more, skip them all 3245 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 3247
2849 $TICK_WATCHER->at ($NEXT_TICK); 3248 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 3249 $TICK_WATCHER->start;
2851 3250
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3251 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 3253
2859 _post_tick; 3254 _post_tick;
3255
3256
2860 }, 3257 },
2861); 3258);
2862 3259
2863{ 3260{
2864 BDB::max_poll_time $TICK * 0.1; 3261 BDB::max_poll_time $TICK * 0.1;
2923 prio => 6, 3320 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 3321 cb => \&IO::AIO::poll_cb,
2925 ); 3322 );
2926} 3323}
2927 3324
3325my $_log_backtrace;
3326
3327sub _log_backtrace {
3328 my ($msg, @addr) = @_;
3329
3330 $msg =~ s/\n//;
3331
3332 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace;
3335 async {
3336 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!";
3341
3342 my @funcs;
3343 my @res = <$fh>;
3344 chomp for @res;
3345 while (@res) {
3346 my ($func, $line) = splice @res, 0, 2, ();
3347 push @funcs, "[$func] $line";
3348 }
3349
3350 @funcs
3351 };
3352
3353 LOG llevInfo, "[ABT] $msg\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace;
3356 };
3357 } else {
3358 LOG llevInfo, "[ABT] $msg\n";
3359 LOG llevInfo, "[ABT] [suppressed]\n";
3360 }
3361}
3362
2928# load additional modules 3363# load additional modules
2929use cf::pod; 3364use cf::pod;
2930 3365
2931END { cf::emergency_save } 3366END { cf::emergency_save }
2932 3367

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines