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.260 by root, Fri Apr 27 19:53:05 2007 UTC vs.
Revision 1.310 by elmex, Mon Jul 16 15:43:49 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
837 or return; 1030 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1031 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1032 }
840 1033
841 warn sprintf "loading %s (%d)\n", 1034 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1035 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1036 return ($data, $av);
844} 1037}
1038
1039=head2 COMMAND CALLBACKS
1040
1041=over 4
1042
1043=cut
845 1044
846############################################################################# 1045#############################################################################
847# command handling &c 1046# command handling &c
848 1047
849=item cf::register_command $name => \&callback($ob,$args); 1048=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1061 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1062}
864 1063
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1064=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1065
867Register a callbackf ro execution when the client sends an extcmd packet. 1066Register a callback for execution when the client sends an (synchronous)
1067extcmd packet. Ext commands will be processed in the order they are
1068received by the server, like other user commands. The first argument is
1069the logged-in player. Ext commands can only be processed after a player
1070has logged in successfully.
868 1071
869If the callback returns something, it is sent back as if reply was being 1072If the callback returns something, it is sent back as if reply was being
870called. 1073called.
871 1074
1075=item cf::register_exticmd $name => \&callback($ns,$packet);
1076
1077Register a callback for execution when the client sends an (asynchronous)
1078exticmd packet. Exti commands are processed by the server as soon as they
1079are received, i.e. out of order w.r.t. other commands. The first argument
1080is a client socket. Exti commands can be received anytime, even before
1081log-in.
1082
1083If the callback returns something, it is sent back as if reply was being
1084called.
1085
872=cut 1086=cut
873 1087
874sub register_extcmd { 1088sub register_extcmd {
875 my ($name, $cb) = @_; 1089 my ($name, $cb) = @_;
876 1090
877 $EXTCMD{$name} = $cb; 1091 $EXTCMD{$name} = $cb;
1092}
1093
1094sub register_exticmd {
1095 my ($name, $cb) = @_;
1096
1097 $EXTICMD{$name} = $cb;
878} 1098}
879 1099
880cf::player->attach ( 1100cf::player->attach (
881 on_command => sub { 1101 on_command => sub {
882 my ($pl, $name, $params) = @_; 1102 my ($pl, $name, $params) = @_;
891 cf::override; 1111 cf::override;
892 }, 1112 },
893 on_extcmd => sub { 1113 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1114 my ($pl, $buf) = @_;
895 1115
896 my $msg = eval { from_json $buf }; 1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1117
898 if (ref $msg) { 1118 if (ref $msg) {
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
900 if (my %reply = $cb->($pl, $msg)) { 1120 if (my %reply = $cb->($pl, $msg)) {
901 $pl->ext_reply ($msg->{msgid}, %reply); 1121 $pl->ext_reply ($msg->{msgid}, %reply);
907 1127
908 cf::override; 1128 cf::override;
909 }, 1129 },
910); 1130);
911 1131
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 { 1132sub load_extensions {
1133 cf::sync_job {
1134 my %todo;
1135
947 for my $ext (<$LIBDIR/*.ext>) { 1136 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1137 next unless -r $path;
949 eval { 1138
950 load_extension $ext; 1139 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1140 my $base = $1;
1141 my $pkg = $1;
1142 $pkg =~ s/[^[:word:]]/_/g;
1143 $pkg = "ext::$pkg";
1144
1145 open my $fh, "<:utf8", $path
1146 or die "$path: $!";
1147
1148 my $source = do { local $/; <$fh> };
1149
1150 my %ext = (
1151 path => $path,
1152 base => $base,
1153 pkg => $pkg,
1154 );
1155
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158
1159 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n"
1162 . $source
1163 . "\n};\n1";
1164
1165 $todo{$base} = \%ext;
1166 }
1167
1168 my %done;
1169 while (%todo) {
1170 my $progress;
1171
1172 while (my ($k, $v) = each %todo) {
1173 for (split /,\s*/, $v->{meta}{depends}) {
1174 goto skip
1175 unless exists $done{$_};
1176 }
1177
1178 warn "... loading '$k' into '$v->{pkg}'\n";
1179
1180 unless (eval $v->{source}) {
1181 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n";
1183
1184 if (exists $v->{meta}{mandatory}) {
1185 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n";
1187 exit 1;
1188 }
1189
1190 warn $msg;
1191 }
1192
1193 $done{$k} = delete $todo{$k};
1194 push @EXTS, $v->{pkg};
1195 $progress = 1;
951 1 1196 }
952 } or warn "$ext not loaded: $@"; 1197
1198 skip:
1199 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1200 unless $progress;
1201 }
953 } 1202 };
954} 1203}
955 1204
956############################################################################# 1205#############################################################################
1206
1207=back
957 1208
958=head2 CORE EXTENSIONS 1209=head2 CORE EXTENSIONS
959 1210
960Functions and methods that extend core crossfire objects. 1211Functions and methods that extend core crossfire objects.
961 1212
1149 } 1400 }
1150 1401
1151 \@paths 1402 \@paths
1152} 1403}
1153 1404
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1406
1407Expand crossfire pod fragments into protocol xml.
1408
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1154=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
1155 1456
1156Sends an ext reply to the player. 1457Sends an ext reply to the player.
1157 1458
1158=cut 1459=cut
1159 1460
1160sub ext_reply($$%) { 1461sub ext_reply($$%) {
1161 my ($self, $id, %msg) = @_; 1462 my ($self, $id, %msg) = @_;
1162 1463
1163 $msg{msgid} = $id; 1464 $msg{msgid} = $id;
1164 1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1466}
1167 1467
1168=item $player->ext_event ($type, %msg) 1468=item $player->ext_event ($type, %msg)
1169 1469
1170Sends an ext event to the client. 1470Sends an ext event to the client.
1185 1485
1186package cf::region; 1486package cf::region;
1187 1487
1188=item cf::region::find_by_path $path 1488=item cf::region::find_by_path $path
1189 1489
1190Tries to decuce the probable region for a map knowing only its path. 1490Tries to decuce the likely region for a map knowing only its path.
1191 1491
1192=cut 1492=cut
1193 1493
1194sub find_by_path($) { 1494sub find_by_path($) {
1195 my ($path) = @_; 1495 my ($path) = @_;
1196 1496
1197 my ($match, $specificity); 1497 my ($match, $specificity);
1198 1498
1199 for my $region (list) { 1499 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1203 } 1503 }
1204 } 1504 }
1205 1505
1269 my ($self, $merge) = @_; 1569 my ($self, $merge) = @_;
1270 1570
1271 # we have to keep some variables in memory intact 1571 # we have to keep some variables in memory intact
1272 local $self->{path}; 1572 local $self->{path};
1273 local $self->{load_path}; 1573 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1574
1277 $self->SUPER::thawer_merge ($merge); 1575 $self->SUPER::thawer_merge ($merge);
1278} 1576}
1279 1577
1280sub normalise { 1578sub normalise {
1327 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1328 return $self; 1626 return $self;
1329 } 1627 }
1330 } 1628 }
1331 1629
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1631 ()
1334} 1632}
1335 1633
1336sub init { 1634sub init {
1337 my ($self) = @_; 1635 my ($self) = @_;
1378sub change_all_map_light { 1676sub change_all_map_light {
1379 my ($change) = @_; 1677 my ($change) = @_;
1380 1678
1381 $_->change_map_light ($change) 1679 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1680 for grep $_->outdoor, values %cf::MAP;
1681}
1682
1683sub decay_objects {
1684 my ($self) = @_;
1685
1686 return if $self->{deny_reset};
1687
1688 $self->do_decay_objects;
1383} 1689}
1384 1690
1385sub unlink_save { 1691sub unlink_save {
1386 my ($self) = @_; 1692 my ($self) = @_;
1387 1693
1445 $self->load_header_orig 1751 $self->load_header_orig
1446 or return; 1752 or return;
1447 $self->prepare_orig; 1753 $self->prepare_orig;
1448 } 1754 }
1449 1755
1756 $self->{deny_reset} = 1
1757 if $self->no_reset;
1758
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1759 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1760 unless $self->default_region;
1452 1761
1453 1 1762 1
1454} 1763}
1469 $map->{last_save} = $cf::RUNTIME; 1778 $map->{last_save} = $cf::RUNTIME;
1470 1779
1471 $map->load_header 1780 $map->load_header
1472 or return; 1781 or return;
1473 1782
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1784 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1785 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1786 $map->reset;
1478 undef $guard; 1787 undef $guard;
1479 return find $path; 1788 return find $path;
1546 my ($self, $ob) = @_; 1855 my ($self, $ob) = @_;
1547 1856
1548 return find "~" . $ob->name . "/" . $self->{path} 1857 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1858 if $self->per_player;
1550 1859
1860# return find "?party/" . $ob->name . "/" . $self->{path}
1861# if $self->per_party;
1862
1551 $self 1863 $self
1552} 1864}
1553 1865
1554# find and load all maps in the 3x3 area around a map 1866# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1867sub load_diag {
1601 1913
1602 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1603 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1606 my $map = find $path 1918 if (my $map = find $path) {
1607 or next;
1608 $map->load; 1919 $map->load;
1920 }
1609 1921
1610 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1611 } 1923 }
1612 } 1924 }
1613 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
1665 1977
1666sub reset_at { 1978sub reset_at {
1667 my ($self) = @_; 1979 my ($self) = @_;
1668 1980
1669 # TODO: safety, remove and allow resettable per-player maps 1981 # 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}; 1982 return 1e99 if $self->{deny_reset};
1672 1983
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1984 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1985 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 1986
1686 my ($self) = @_; 1997 my ($self) = @_;
1687 1998
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1999 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2000
1690 return if $self->players; 2001 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2002
1693 warn "resetting map ", $self->path;#d# 2003 warn "resetting map ", $self->path;
1694 2004
1695 $self->in_memory (cf::MAP_SWAPPED); 2005 $self->in_memory (cf::MAP_SWAPPED);
1696 2006
1697 # need to save uniques path 2007 # need to save uniques path
1698 unless ($self->{deny_save}) { 2008 unless ($self->{deny_save}) {
1730 $cf::MAP{$self->path} = $self; 2040 $cf::MAP{$self->path} = $self;
1731 2041
1732 $self->reset; # polite request, might not happen 2042 $self->reset; # polite request, might not happen
1733} 2043}
1734 2044
2045=item $maps = cf::map::tmp_maps
2046
2047Returns an arrayref with all map paths of currently instantiated and saved
2048maps. May block.
2049
2050=cut
2051
2052sub tmp_maps() {
2053 [
2054 map {
2055 utf8::decode $_;
2056 /\.map$/
2057 ? normalise $_
2058 : ()
2059 } @{ aio_readdir $TMPDIR or [] }
2060 ]
2061}
2062
2063=item $maps = cf::map::random_maps
2064
2065Returns an arrayref with all map paths of currently instantiated and saved
2066random maps. May block.
2067
2068=cut
2069
2070sub random_maps() {
2071 [
2072 map {
2073 utf8::decode $_;
2074 /\.map$/
2075 ? normalise "?random/$_"
2076 : ()
2077 } @{ aio_readdir $RANDOMDIR or [] }
2078 ]
2079}
2080
1735=item cf::map::unique_maps 2081=item cf::map::unique_maps
1736 2082
1737Returns an arrayref of paths of all shared maps that have 2083Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2084instantiated unique items. May block.
1739 2085
1740=cut 2086=cut
1741 2087
1742sub unique_maps() { 2088sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2089 [
1744 or return; 2090 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2091 utf8::decode $_;
1750 next if /\.pst$/; 2092 /\.map$/
1751 next unless /^$PATH_SEP/o; 2093 ? normalise $_
1752 2094 : ()
1753 push @paths, cf::map::normalise $_; 2095 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2096 ]
1755
1756 \@paths
1757} 2097}
1758 2098
1759package cf; 2099package cf;
1760 2100
1761=back 2101=back
1807 2147
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2148 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2149
1810 if ($self->{record_replies}) { 2150 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2151 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2152
1812 } else { 2153 } else {
2154 my $pl = $self->contr;
2155
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply (
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164
2165 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2166 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2167 $self->message ($msg, $flags);
2168 }
1815 } 2169 }
1816} 2170}
1817 2171
1818=item $player_object->may ("access") 2172=item $player_object->may ("access")
1819 2173
1867 $self->deactivate_recursive; 2221 $self->deactivate_recursive;
1868 2222
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2223 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2224
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2225 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2226 if $self->map && $self->map->{path} ne "{link}";
1873 2227
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2228 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2229}
1876 2230
1877sub cf::object::player::leave_link { 2231sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2232 my ($self, $map, $x, $y) = @_;
2233
2234 return unless $self->contr->active;
1879 2235
1880 my $link_pos = delete $self->{_link_pos}; 2236 my $link_pos = delete $self->{_link_pos};
1881 2237
1882 unless ($map) { 2238 unless ($map) {
1883 # restore original map position 2239 # restore original map position
1906 2262
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
1909} 2265}
1910 2266
1911cf::player->attach ( 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2268
1915 # abort map switching before logout 2269Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2270her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2271that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2272the new (success) or old (failed) map position. In either case, $done will
1919 }; 2273be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2274
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 2275=cut
2276
2277our $GOTOGEN;
1946 2278
1947sub cf::object::player::goto { 2279sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2281
2282 # do generation counting so two concurrent goto's will be executed in-order
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2284
1950 $self->enter_link; 2285 $self->enter_link;
1951 2286
1952 (async { 2287 (async {
1953 my $map = eval { 2288 my $map = eval {
1954 my $map = cf::map::find $path; 2289 my $map = cf::map::find $path;
2290
2291 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2292 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map;
2294 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2296 }
2297
1956 $map 2298 $map
2299 };
2300
2301 if ($@) {
2302 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2303 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2304 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2305
2306 if ($gen == $self->{_goto_generation}) {
2307 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2309 }
2310
2311 $done->() if $done;
1961 })->prio (1); 2312 })->prio (1);
1962} 2313}
1963 2314
1964=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
1965 2316
2034 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2036 2387
2037 $self->enter_link; 2388 $self->enter_link;
2038 2389
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2039 (async { 2394 (async {
2040 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2396 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2043 2398
2070 2425
2071 utf8::encode $text; 2426 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2428}
2074 2429
2430=item $client->send_msg ($color, $type, $msg, [extra...])
2431
2432Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet.
2436
2437=cut
2438
2439sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_;
2441
2442 $msg = $self->pl->expand_cfpod ($msg);
2443
2444 return unless @extra || length $msg;
2445
2446 if ($self->can_msg) {
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2448 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) {
2460 if (0 && $msg =~ /\[/) {
2461 $self->send_packet ("drawextinfo $color 4 0 $msg")
2462 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg")
2465 }
2466 }
2467 }
2468}
2469
2075=item $client->ext_event ($type, %msg) 2470=item $client->ext_event ($type, %msg)
2076 2471
2077Sends an exti event to the client. 2472Sends an ext event to the client.
2078 2473
2079=cut 2474=cut
2080 2475
2081sub cf::client::ext_event($$%) { 2476sub cf::client::ext_event($$%) {
2082 my ($self, $type, %msg) = @_; 2477 my ($self, $type, %msg) = @_;
2083 2478
2479 return unless $self->extcmd;
2480
2084 $msg{msgtype} = "event_$type"; 2481 $msg{msgtype} = "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2086} 2483}
2087 2484
2088=item $success = $client->query ($flags, "text", \&cb) 2485=item $success = $client->query ($flags, "text", \&cb)
2089 2486
2090Queues a query to the client, calling the given callback with 2487Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2488the 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>. 2489C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2490
2094Queries can fail, so check the return code. Or don't, as queries will become 2491Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2492become reliable at some point in the future.
2096 2493
2097=cut 2494=cut
2098 2495
2099sub cf::client::query { 2496sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2497 my ($self, $flags, $text, $cb) = @_;
2108 utf8::encode $text; 2505 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2506 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2507
2111 $self->send_packet ($self->{query_queue}[0][0]) 2508 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2509 if @{ $self->{query_queue} } == 1;
2510
2511 1
2113} 2512}
2114 2513
2115cf::client->attach ( 2514cf::client->attach (
2515 on_connect => sub {
2516 my ($ns) = @_;
2517
2518 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2519 },
2116 on_reply => sub { 2520 on_reply => sub {
2117 my ($ns, $msg) = @_; 2521 my ($ns, $msg) = @_;
2118 2522
2119 # this weird shuffling is so that direct followup queries 2523 # this weird shuffling is so that direct followup queries
2120 # get handled first 2524 # get handled first
2132 } else { 2536 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2537 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2538 }
2135 } 2539 }
2136 }, 2540 },
2541 on_exticmd => sub {
2542 my ($ns, $buf) = @_;
2543
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545
2546 if (ref $msg) {
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2548 if (my %reply = $cb->($ns, $msg)) {
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 }
2553 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 }
2556
2557 cf::override;
2558 },
2137); 2559);
2138 2560
2139=item $client->async (\&cb) 2561=item $client->async (\&cb)
2140 2562
2141Create a new coroutine, running the specified callback. The coroutine will 2563Create a new coroutine, running the specified callback. The coroutine will
2190 2612
2191=pod 2613=pod
2192 2614
2193The following functions and methods are available within a safe environment: 2615The following functions and methods are available within a safe environment:
2194 2616
2195 cf::object contr pay_amount pay_player map 2617 cf::object
2618 contr pay_amount pay_player map x y force_find force_add
2619 insert remove
2620
2196 cf::object::player player 2621 cf::object::player
2197 cf::player peaceful 2622 player
2198 cf::map trigger 2623
2624 cf::player
2625 peaceful
2626
2627 cf::map
2628 trigger
2199 2629
2200=cut 2630=cut
2201 2631
2202for ( 2632for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2634 insert remove)],
2204 ["cf::object::player" => qw(player)], 2635 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 2636 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 2637 ["cf::map" => qw(trigger)],
2207) { 2638) {
2208 no strict 'refs'; 2639 no strict 'refs';
2279=back 2710=back
2280 2711
2281=cut 2712=cut
2282 2713
2283############################################################################# 2714#############################################################################
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 2715# the server's init and main functions
2458 2716
2459sub load_facedata($) { 2717sub load_facedata($) {
2460 my ($path) = @_; 2718 my ($path) = @_;
2461 2719
2473 { 2731 {
2474 my $faces = $facedata->{faceinfo}; 2732 my $faces = $facedata->{faceinfo};
2475 2733
2476 while (my ($face, $info) = each %$faces) { 2734 while (my ($face, $info) = each %$faces) {
2477 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2735 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2478 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2736 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap};
2479 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2480 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2481 Coro::cede; 2740
2741 cf::cede_to_tick;
2482 } 2742 }
2483 2743
2484 while (my ($face, $info) = each %$faces) { 2744 while (my ($face, $info) = each %$faces) {
2485 next unless $info->{smooth}; 2745 next unless $info->{smooth};
2486 my $idx = cf::face::find $face 2746 my $idx = cf::face::find $face
2487 or next; 2747 or next;
2488 if (my $smooth = cf::face::find $info->{smooth}) { 2748 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth;
2489 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2490 } else { 2751 } else {
2491 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2752 warn "smooth face '$info->{smooth}' not found for face '$face'";
2492 } 2753 }
2493 Coro::cede; 2754
2755 cf::cede_to_tick;
2494 } 2756 }
2495 } 2757 }
2496 2758
2497 { 2759 {
2498 my $anims = $facedata->{animinfo}; 2760 my $anims = $facedata->{animinfo};
2499 2761
2500 while (my ($anim, $info) = each %$anims) { 2762 while (my ($anim, $info) = each %$anims) {
2501 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2763 cf::anim::set $anim, $info->{frames}, $info->{facings};
2502 Coro::cede; 2764 cf::cede_to_tick;
2503 } 2765 }
2504 2766
2505 cf::anim::invalidate_all; # d'oh 2767 cf::anim::invalidate_all; # d'oh
2768 }
2769
2770 {
2771 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775
2776 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784
2785 if ($name =~ /\.jpg$/) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 }
2795
2796 cf::cede_to_tick;
2797 }
2506 } 2798 }
2507 2799
2508 1 2800 1
2509} 2801}
2510 2802
2511sub reload_regions { 2803sub reload_regions {
2512 load_resource_file "$MAPDIR/regions" 2804 load_resource_file "$MAPDIR/regions"
2513 or die "unable to load regions file\n"; 2805 or die "unable to load regions file\n";
2806
2807 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/
2809 if exists $_->{match};
2810 }
2514} 2811}
2515 2812
2516sub reload_facedata { 2813sub reload_facedata {
2517 load_facedata "$DATADIR/facedata" 2814 load_facedata "$DATADIR/facedata"
2518 or die "unable to load facedata\n"; 2815 or die "unable to load facedata\n";
2519} 2816}
2520 2817
2521sub reload_archetypes { 2818sub reload_archetypes {
2522 load_resource_file "$DATADIR/archetypes" 2819 load_resource_file "$DATADIR/archetypes"
2523 or die "unable to load archetypes\n"; 2820 or die "unable to load archetypes\n";
2821 #d# NEED to laod twice to resolve forward references
2822 # this really needs to be done in an extra post-pass
2823 # (which needs to be synchronous, so solve it differently)
2824 load_resource_file "$DATADIR/archetypes"
2825 or die "unable to load archetypes\n";
2524} 2826}
2525 2827
2526sub reload_treasures { 2828sub reload_treasures {
2527 load_resource_file "$DATADIR/treasures" 2829 load_resource_file "$DATADIR/treasures"
2528 or die "unable to load treasurelists\n"; 2830 or die "unable to load treasurelists\n";
2531sub reload_resources { 2833sub reload_resources {
2532 warn "reloading resource files...\n"; 2834 warn "reloading resource files...\n";
2533 2835
2534 reload_regions; 2836 reload_regions;
2535 reload_facedata; 2837 reload_facedata;
2838 #reload_archetypes;#d#
2536 reload_archetypes; 2839 reload_archetypes;
2537 reload_treasures; 2840 reload_treasures;
2538 2841
2539 warn "finished reloading resource files\n"; 2842 warn "finished reloading resource files\n";
2540} 2843}
2597 }, 2900 },
2598 ); 2901 );
2599 } 2902 }
2600} 2903}
2601 2904
2905sub write_runtime {
2906 my $runtime = "$LOCALDIR/runtime";
2907
2908 # first touch the runtime file to show we are still running:
2909 # the fsync below can take a very very long time.
2910
2911 IO::AIO::aio_utime $runtime, undef, undef;
2912
2913 my $guard = cf::lock_acquire "write_runtime";
2914
2915 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2916 or return;
2917
2918 my $value = $cf::RUNTIME + 90 + 10;
2919 # 10 is the runtime save interval, for a monotonic clock
2920 # 60 allows for the watchdog to kill the server.
2921
2922 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2923 and return;
2924
2925 # always fsync - this file is important
2926 aio_fsync $fh
2927 and return;
2928
2929 # touch it again to show we are up-to-date
2930 aio_utime $fh, undef, undef;
2931
2932 close $fh
2933 or return;
2934
2935 aio_rename "$runtime~", $runtime
2936 and return;
2937
2938 warn "runtime file written.\n";
2939
2940 1
2941}
2942
2602sub emergency_save() { 2943sub emergency_save() {
2603 my $freeze_guard = cf::freeze_mainloop; 2944 my $freeze_guard = cf::freeze_mainloop;
2604 2945
2605 warn "enter emergency perl save\n"; 2946 warn "enter emergency perl save\n";
2606 2947
2681 %EXT_CORO = (); 3022 %EXT_CORO = ();
2682 3023
2683 warn "removing commands"; 3024 warn "removing commands";
2684 %COMMAND = (); 3025 %COMMAND = ();
2685 3026
2686 warn "removing ext commands"; 3027 warn "removing ext/exti commands";
2687 %EXTCMD = (); 3028 %EXTCMD = ();
3029 %EXTICMD = ();
2688 3030
2689 warn "unloading/nuking all extensions"; 3031 warn "unloading/nuking all extensions";
2690 for my $pkg (@EXTS) { 3032 for my $pkg (@EXTS) {
2691 warn "... unloading $pkg"; 3033 warn "... unloading $pkg";
2692 3034
2810 my $signal = new Coro::Signal; 3152 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 3153 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 3154 $signal->wait;
2813} 3155}
2814 3156
3157 my $min = 1e6;#d#
3158 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 3159$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 3160 reentrant => 0,
2817 parked => 1, 3161 parked => 1,
2818 prio => 0, 3162 prio => 0,
2819 at => $NEXT_TICK || $TICK, 3163 at => $NEXT_TICK || $TICK,
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3167 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 3168 unless ++$bug_warning > 10;
2825 return; 3169 return;
2826 } 3170 }
2827 3171
2828 $NOW = Event::time; 3172 $NOW = $tick_start = Event::time;
2829 3173
2830 cf::server_tick; # one server iteration 3174 cf::server_tick; # one server iteration
3175
3176 0 && sync_job {#d#
3177 for(1..10) {
3178 my $t = Event::time;
3179 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3180 or die;
3181
3182 $map->width (50);
3183 $map->height (50);
3184 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1);
3186 my $t = Event::time - $t;
3187
3188 #next unless $t < 0.0013;#d#
3189 if ($t < $min) {
3190 $min = $t;
3191 }
3192 $avg = $avg * 0.99 + $t * 0.01;
3193 }
3194 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195 exit 0;
3196 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197 };
2831 3198
2832 $RUNTIME += $TICK; 3199 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 3200 $NEXT_TICK += $TICK;
2834 3201
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3202 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2841 } 3208 }
2842 3209
2843# my $AFTER = Event::time; 3210# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 3211# warn $AFTER - $NOW;#d#
2845 3212
3213 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214 $sig->send;
3215 }
3216 while (my $sig = shift @WAIT_FOR_TICK) {
3217 $sig->send;
3218 }
3219
3220 $NOW = Event::time;
3221
2846 # if we are delayed by four ticks or more, skip them all 3222 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3223 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 3224
2849 $TICK_WATCHER->at ($NEXT_TICK); 3225 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 3226 $TICK_WATCHER->start;
2851 3227
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3228 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 3229 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 3230
2859 _post_tick; 3231 _post_tick;
3232
3233
2860 }, 3234 },
2861); 3235);
2862 3236
2863{ 3237{
2864 BDB::max_poll_time $TICK * 0.1; 3238 BDB::max_poll_time $TICK * 0.1;
2923 prio => 6, 3297 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 3298 cb => \&IO::AIO::poll_cb,
2925 ); 3299 );
2926} 3300}
2927 3301
3302my $_log_backtrace;
3303
2928sub _log_backtrace { 3304sub _log_backtrace {
2929 my ($msg, @addr) = @_; 3305 my ($msg, @addr) = @_;
2930 3306
3307 $msg =~ s/\n//;
3308
3309 # limit the # of concurrent backtraces
3310 if ($_log_backtrace < 2) {
3311 ++$_log_backtrace;
2931 async { 3312 async {
2932 my @bt = fork_call { 3313 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3314 @addr = map { sprintf "%x", $_ } @addr;
3315 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2934 open my $fh, "exec addr2line -C -f -i -e \Q$^X\E @addr 2>&1 |" 3316 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2935 or die "addr2line: $!"; 3317 or die "addr2line: $!";
2936 3318
2937 my @funcs; 3319 my @funcs;
2938 my @res = <$fh>; 3320 my @res = <$fh>;
2939 chomp for @res; 3321 chomp for @res;
2940 while (@res) { 3322 while (@res) {
2941 my ($func, $line) = splice @res, 0, 2, (); 3323 my ($func, $line) = splice @res, 0, 2, ();
2942 push @funcs, "[$func] $line"; 3324 push @funcs, "[$func] $line";
3325 }
3326
3327 @funcs
2943 } 3328 };
2944 3329
2945 @funcs 3330 LOG llevInfo, "[ABT] $msg\n";
3331 LOG llevInfo, "[ABT] $_\n" for @bt;
3332 --$_log_backtrace;
2946 }; 3333 };
2947 3334 } else {
2948 $msg =~ s/\n//;
2949
2950 LOG llevInfo, "[ABT] $msg\n"; 3335 LOG llevInfo, "[ABT] $msg\n";
2951 LOG llevInfo, "[ABT] $_\n" for @bt; 3336 LOG llevInfo, "[ABT] [suppressed]\n";
2952 }; 3337 }
2953} 3338}
2954 3339
2955# load additional modules 3340# load additional modules
2956use cf::pod; 3341use cf::pod;
2957 3342

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines