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.251 by root, Wed Apr 18 14:45:13 2007 UTC vs.
Revision 1.288 by root, Mon Jun 25 07:40:53 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 ();
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
59our $LIBDIR = datadir . "/ext"; 61
62our $CONFDIR = confdir;
63our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db";
60 73
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 75our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
75our $RUNTIME; 88our $RUNTIME;
76 89
77our %PLAYER; # all users 90our %PLAYER; # all users
78our %MAP; # all maps 91our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 93
83# used to convert map paths into valid unix filenames by replacing / by ∕ 94# used to convert map paths into valid unix filenames by replacing / by ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 96
97our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing
99our $tick_start; # for load detecting purposes
100
86binmode STDOUT; 101binmode STDOUT;
87binmode STDERR; 102binmode STDERR;
88 103
89# read virtual server time, if available 104# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
94} 109}
95 110
96mkdir cf::localdir; 111mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 113
103our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
104 115
105sub cf::map::normalise; 116sub cf::map::normalise;
106 117
117=item $cf::RUNTIME 128=item $cf::RUNTIME
118 129
119The time this server has run, starts at 0 and is increased by $cf::TICK on 130The time this server has run, starts at 0 and is increased by $cf::TICK on
120every server tick. 131every server tick.
121 132
122=item $cf::LIBDIR 133=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
134$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
135$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123 136
124The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
125be found. It will be added to C<@INC> automatically. 138directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and
140database environment.
126 141
127=item $cf::NOW 142=item $cf::NOW
128 143
129The time of the last (current) server tick. 144The time of the last (current) server tick.
130 145
131=item $cf::TICK 146=item $cf::TICK
132 147
133The interval between server ticks, in seconds. 148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG
151
152The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5.
155
156=item $cf::LOAD
157
158The raw value load value from the last tick.
134 159
135=item %cf::CFG 160=item %cf::CFG
136 161
137Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 163from wherever your confdir points to.
152 my $msg = join "", @_; 177 my $msg = join "", @_;
153 178
154 $msg .= "\n" 179 $msg .= "\n"
155 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
156 181
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 183
159 utf8::encode $msg; 184 utf8::encode $msg;
160 LOG llevError, $msg; 185 LOG llevError, $msg;
161 }; 186 };
162} 187}
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 193@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
194@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 195@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 196
171# we bless all objects into (empty) derived classes to force a method lookup 197# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 198# within the Safe compartment.
173for my $pkg (qw( 199for my $pkg (qw(
174 cf::global cf::attachable 200 cf::global cf::attachable
182} 208}
183 209
184$Event::DIED = sub { 210$Event::DIED = sub {
185 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
186}; 212};
213
214#############################################################################
187 215
188=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
189 217
190=over 4 218=over 4
191 219
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 239 $d
212 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
213} 241}
214 242
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
218 244
219Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
220 246
221=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
222 248
223Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
250
251=cut
252
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max
254
255sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) }
224 257
225=item cf::lock_wait $string 258=item cf::lock_wait $string
226 259
227Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
228 261
234returned. 267returned.
235 268
236Lock names should begin with a unique identifier (for example, cf::map::find 269Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
238 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
239=cut 276=cut
240 277
241our %LOCK; 278our %LOCK;
242 279
243sub lock_wait($) { 280sub lock_wait($) {
260 297
261 Coro::guard { 298 Coro::guard {
262 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
264 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
265} 308}
266 309
267sub freeze_mainloop { 310sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
269 312
284 327
285BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
286 329
287=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
288 331
289The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
291reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable.
292 336
293If it must be done, put the blocking parts into C<sync_job>. This will run 337If it must be done, put the blocking parts into C<sync_job>. This will run
294the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 339server will be frozen during this time, so the block should either finish
296fast or be very important. 340fast or be very important.
299 343
300sub sync_job(&) { 344sub sync_job(&) {
301 my ($job) = @_; 345 my ($job) = @_;
302 346
303 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
304 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
306 352
307 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 354 # (but this is cancel-safe)
319 365
320 while ($busy) { 366 while ($busy) {
321 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
322 } 368 }
323 369
370 $time = Event::time - $time;
371
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load
376
324 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
325 } else { 378 } else {
326 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
327 380
328 $job->() 381 $job->()
347 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
348 401
349 $coro 402 $coro
350} 403}
351 404
352sub write_runtime { 405=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 406
355 my $runtime = cf::localdir . "/runtime"; 407Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling.
356 411
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
358 or return;
359 413
360 my $value = $cf::RUNTIME + 90 + 10; 414sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 415 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 416
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
365 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
366 421
367 # always fsync - this file is important 422 if (my $pid = fork) {
368 aio_fsync $fh
369 and return;
370
371 close $fh 423 close $fh2;
372 or return;
373 424
374 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
375 and return; 426 $res = Coro::Storable::thaw $res;
376 427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
377 1 446 }
447}
448
449=item $value = cf::db_get $family => $key
450
451Returns a single value from the environment database.
452
453=item cf::db_put $family => $key => $value
454
455Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457
458=cut
459
460our $DB;
461
462sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477}
478
479sub db_get($$) {
480 my $key = "$_[0]/$_[1]";
481
482 cf::sync_job {
483 BDB::db_get $DB, undef, $key, my $data;
484
485 $! ? ()
486 : $data
487 }
488}
489
490sub db_put($$$) {
491 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
493}
494
495=item cf::cache $id => [$paths...], $processversion => $process
496
497Generic caching function that returns the value of the resource $id,
498caching and regenerating as required.
499
500This function can block.
501
502=cut
503
504sub cache {
505 my ($id, $src, $processversion, $process) = @_;
506
507 my $meta =
508 join "\x00",
509 $processversion,
510 map {
511 aio_stat $_
512 and Carp::croak "$_: $!";
513
514 ($_, (stat _)[7,9])
515 } @$src;
516
517 my $dbmeta = db_get cache => "$id/meta";
518 if ($dbmeta ne $meta) {
519 # changed, we may need to process
520
521 my @data;
522 my $md5;
523
524 for (0 .. $#$src) {
525 0 <= aio_load $src->[$_], $data[$_]
526 or Carp::croak "$src->[$_]: $!";
527 }
528
529 # if processing is expensive, check
530 # checksum first
531 if (1) {
532 $md5 =
533 join "\x00",
534 $processversion,
535 map {
536 Coro::cede;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src;
539
540
541 my $dbmd5 = db_get cache => "$id/md5";
542 if ($dbmd5 eq $md5) {
543 db_put cache => "$id/meta", $meta;
544
545 return db_get cache => "$id/data";
546 }
547 }
548
549 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time;
552
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
554
555 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta;
558
559 return $data;
560 }
561
562 db_get cache => "$id/data"
378} 563}
379 564
380=item cf::datalog type => key => value, ... 565=item cf::datalog type => key => value, ...
381 566
382Log a datalog packet of the given type with the given key-value pairs. 567Log a datalog packet of the given type with the given key-value pairs.
400attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
402 587
403In the following description, CLASS can be any of C<global>, C<object> 588In the following description, CLASS can be any of C<global>, C<object>
404C<player>, C<client> or C<map> (i.e. the attachable objects in 589C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 590Crossfire TRT).
406 591
407=over 4 592=over 4
408 593
409=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
410 595
573 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
574 759
575 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 764
580 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 766 my $pkg = shift @arg;
582 767
583 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
613 } 798 }
614 799
615 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
616 } else { 801 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 803 }
619 804
620 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
621} 806}
622 807
624 if (ref $_[0]) { 809 if (ref $_[0]) {
625 _object_attach @_; 810 _object_attach @_;
626 } else { 811 } else {
627 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
628 } 813 }
814 _recalc_want;
629}; 815};
630 816
631# all those should be optimised 817# all those should be optimised
632sub cf::attachable::detach { 818sub cf::attachable::detach {
633 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
637 reattach ($obj); 823 reattach ($obj);
638 } else { 824 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
640 } 826 }
827 _recalc_want;
641}; 828};
642 829
643sub cf::attachable::attached { 830sub cf::attachable::attached {
644 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
645 832
818 or return; 1005 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
820 } 1007 }
821 1008
822 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 1011 return ($data, $av);
825} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
826 1019
827############################################################################# 1020#############################################################################
828# command handling &c 1021# command handling &c
829 1022
830=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1037}
845 1038
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1040
848Register a callbackf ro execution when the client sends an extcmd packet. 1041Register a callback for execution when the client sends an (synchronous)
1042extcmd packet. Ext commands will be processed in the order they are
1043received by the server, like other user commands. The first argument is
1044the logged-in player. Ext commands can only be processed after a player
1045has logged in successfully.
849 1046
850If the callback returns something, it is sent back as if reply was being 1047If the callback returns something, it is sent back as if reply was being
851called. 1048called.
852 1049
1050=item cf::register_exticmd $name => \&callback($ns,$packet);
1051
1052Register a callback for execution when the client sends an (asynchronous)
1053exticmd packet. Exti commands are processed by the server as soon as they
1054are received, i.e. out of order w.r.t. other commands. The first argument
1055is a client socket. Exti commands can be received anytime, even before
1056log-in.
1057
1058If the callback returns something, it is sent back as if reply was being
1059called.
1060
853=cut 1061=cut
854 1062
855sub register_extcmd { 1063sub register_extcmd {
856 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
857 1065
858 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
859} 1073}
860 1074
861cf::player->attach ( 1075cf::player->attach (
862 on_command => sub { 1076 on_command => sub {
863 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
888 1102
889 cf::override; 1103 cf::override;
890 }, 1104 },
891); 1105);
892 1106
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
928 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1112 next unless -r $path;
930 eval { 1113
931 load_extension $ext; 1114 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1115 my $base = $1;
1116 my $pkg = $1;
1117 $pkg =~ s/[^[:word:]]/_/g;
1118 $pkg = "ext::$pkg";
1119
1120 open my $fh, "<:utf8", $path
1121 or die "$path: $!";
1122
1123 my $source = do { local $/; <$fh> };
1124
1125 my %ext = (
1126 path => $path,
1127 base => $base,
1128 pkg => $pkg,
1129 );
1130
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133
1134 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n"
1137 . $source
1138 . "\n};\n1";
1139
1140 $todo{$base} = \%ext;
1141 }
1142
1143 my %done;
1144 while (%todo) {
1145 my $progress;
1146
1147 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip
1150 unless exists $done{$_};
1151 }
1152
1153 warn "... loading '$k' into '$v->{pkg}'\n";
1154
1155 unless (eval $v->{source}) {
1156 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n";
1158
1159 if (exists $v->{meta}{mandatory}) {
1160 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n";
1162 exit 1;
1163 }
1164
1165 warn $msg;
1166 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
932 1 1171 }
933 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
934 } 1177 };
935} 1178}
936 1179
937############################################################################# 1180#############################################################################
938 1181
1182=back
1183
939=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
940 1185
941Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
942 1187
943=cut 1188=cut
955Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
956 1201
957=cut 1202=cut
958 1203
959sub playerdir($) { 1204sub playerdir($) {
960 cf::localdir 1205 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1207}
966 1208
967sub path($) { 1209sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1088while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1089 1331
1090=cut 1332=cut
1091 1333
1092sub list_logins { 1334sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1336 or return [];
1095 1337
1096 my @logins; 1338 my @logins;
1097 1339
1098 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1133 } 1375 }
1134 1376
1135 \@paths 1377 \@paths
1136} 1378}
1137 1379
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1381
1382Expand crossfire pod fragments into protocol xml.
1383
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1138=item $player->ext_reply ($msgid, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1139 1414
1140Sends an ext reply to the player. 1415Sends an ext reply to the player.
1141 1416
1142=cut 1417=cut
1143 1418
1144sub ext_reply($$%) { 1419sub ext_reply($$%) {
1145 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1146 1421
1147 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1148
1149 $self->send ("ext " . cf::to_json \%msg); 1423 $self->send ("ext " . cf::to_json \%msg);
1150} 1424}
1151 1425
1152=item $player->ext_event ($type, %msg) 1426=item $player->ext_event ($type, %msg)
1153 1427
1169 1443
1170package cf::region; 1444package cf::region;
1171 1445
1172=item cf::region::find_by_path $path 1446=item cf::region::find_by_path $path
1173 1447
1174Tries to decuce the probable region for a map knowing only its path. 1448Tries to decuce the likely region for a map knowing only its path.
1175 1449
1176=cut 1450=cut
1177 1451
1178sub find_by_path($) { 1452sub find_by_path($) {
1179 my ($path) = @_; 1453 my ($path) = @_;
1253 my ($self, $merge) = @_; 1527 my ($self, $merge) = @_;
1254 1528
1255 # we have to keep some variables in memory intact 1529 # we have to keep some variables in memory intact
1256 local $self->{path}; 1530 local $self->{path};
1257 local $self->{load_path}; 1531 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1532
1261 $self->SUPER::thawer_merge ($merge); 1533 $self->SUPER::thawer_merge ($merge);
1262} 1534}
1263 1535
1264sub normalise { 1536sub normalise {
1336 1608
1337# the original (read-only) location 1609# the original (read-only) location
1338sub load_path { 1610sub load_path {
1339 my ($self) = @_; 1611 my ($self) = @_;
1340 1612
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1613 "$MAPDIR/$self->{path}.map"
1342} 1614}
1343 1615
1344# the temporary/swap location 1616# the temporary/swap location
1345sub save_path { 1617sub save_path {
1346 my ($self) = @_; 1618 my ($self) = @_;
1347 1619
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1621 "$TMPDIR/$path.map"
1350} 1622}
1351 1623
1352# the unique path, undef == no special unique path 1624# the unique path, undef == no special unique path
1353sub uniq_path { 1625sub uniq_path {
1354 my ($self) = @_; 1626 my ($self) = @_;
1355 1627
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1629 "$UNIQUEDIR/$path"
1358} 1630}
1359 1631
1360# and all this just because we cannot iterate over 1632# and all this just because we cannot iterate over
1361# all maps in C++... 1633# all maps in C++...
1362sub change_all_map_light { 1634sub change_all_map_light {
1363 my ($change) = @_; 1635 my ($change) = @_;
1364 1636
1365 $_->change_map_light ($change) 1637 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1638 for grep $_->outdoor, values %cf::MAP;
1639}
1640
1641sub decay_objects {
1642 my ($self) = @_;
1643
1644 return if $self->{deny_reset};
1645
1646 $self->do_decay_objects;
1367} 1647}
1368 1648
1369sub unlink_save { 1649sub unlink_save {
1370 my ($self) = @_; 1650 my ($self) = @_;
1371 1651
1429 $self->load_header_orig 1709 $self->load_header_orig
1430 or return; 1710 or return;
1431 $self->prepare_orig; 1711 $self->prepare_orig;
1432 } 1712 }
1433 1713
1714 $self->{deny_reset} = 1
1715 if $self->no_reset;
1716
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1717 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1718 unless $self->default_region;
1436 1719
1437 1 1720 1
1438} 1721}
1453 $map->{last_save} = $cf::RUNTIME; 1736 $map->{last_save} = $cf::RUNTIME;
1454 1737
1455 $map->load_header 1738 $map->load_header
1456 or return; 1739 or return;
1457 1740
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1742 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1743 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1744 $map->reset;
1462 undef $guard; 1745 undef $guard;
1463 return find $path; 1746 return find $path;
1474 my ($self) = @_; 1757 my ($self) = @_;
1475 1758
1476 local $self->{deny_reset} = 1; # loading can take a long time 1759 local $self->{deny_reset} = 1; # loading can take a long time
1477 1760
1478 my $path = $self->{path}; 1761 my $path = $self->{path};
1762
1763 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1764 my $guard = cf::lock_acquire "map_load:$path";
1480 1765
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1766 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1767
1483 $self->in_memory (cf::MAP_LOADING); 1768 $self->in_memory (cf::MAP_LOADING);
1484 1769
1485 $self->alloc; 1770 $self->alloc;
1486 1771
1487 $self->pre_load; 1772 $self->pre_load;
1488 Coro::cede;
1489
1490 $self->_load_objects ($self->{load_path}, 1)
1491 or return;
1492
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original};
1495
1496 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0);
1501 }
1502 }
1503
1504 Coro::cede;
1505 # now do the right thing for maps
1506 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede; 1773 Coro::cede;
1514 $self->set_darkness_map; 1774
1775 $self->_load_objects ($self->{load_path}, 1)
1776 or return;
1777
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original};
1780
1781 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) {
1784 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0);
1786 }
1787 }
1788
1789 Coro::cede;
1790 # now do the right thing for maps
1791 $self->link_multipart_objects;
1515 $self->difficulty ($self->estimate_difficulty) 1792 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1793 unless $self->difficulty;
1517 Coro::cede; 1794 Coro::cede;
1795
1796 unless ($self->{deny_activate}) {
1797 $self->decay_objects;
1798 $self->fix_auto_apply;
1799 $self->update_buttons;
1800 Coro::cede;
1801 $self->set_darkness_map;
1802 Coro::cede;
1518 $self->activate; 1803 $self->activate;
1519 Coro::cede; 1804 }
1805
1806 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1807 }
1521 1808
1522 $self->post_load; 1809 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1810}
1527 1811
1528sub customise_for { 1812sub customise_for {
1529 my ($self, $ob) = @_; 1813 my ($self, $ob) = @_;
1530 1814
1531 return find "~" . $ob->name . "/" . $self->{path} 1815 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1816 if $self->per_player;
1817
1818# return find "?party/" . $ob->name . "/" . $self->{path}
1819# if $self->per_party;
1533 1820
1534 $self 1821 $self
1535} 1822}
1536 1823
1537# find and load all maps in the 3x3 area around a map 1824# find and load all maps in the 3x3 area around a map
1648 1935
1649sub reset_at { 1936sub reset_at {
1650 my ($self) = @_; 1937 my ($self) = @_;
1651 1938
1652 # TODO: safety, remove and allow resettable per-player maps 1939 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 1940 return 1e99 if $self->{deny_reset};
1655 1941
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1942 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1943 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 1944
1669 my ($self) = @_; 1955 my ($self) = @_;
1670 1956
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1957 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 1958
1673 return if $self->players; 1959 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 1960
1676 warn "resetting map ", $self->path;#d# 1961 warn "resetting map ", $self->path;
1677 1962
1678 $self->in_memory (cf::MAP_SWAPPED); 1963 $self->in_memory (cf::MAP_SWAPPED);
1679 1964
1680 # need to save uniques path 1965 # need to save uniques path
1681 unless ($self->{deny_save}) { 1966 unless ($self->{deny_save}) {
1713 $cf::MAP{$self->path} = $self; 1998 $cf::MAP{$self->path} = $self;
1714 1999
1715 $self->reset; # polite request, might not happen 2000 $self->reset; # polite request, might not happen
1716} 2001}
1717 2002
2003=item $maps = cf::map::tmp_maps
2004
2005Returns an arrayref with all map paths of currently instantiated and saved
2006maps. May block.
2007
2008=cut
2009
2010sub tmp_maps() {
2011 [
2012 map {
2013 utf8::decode $_;
2014 /\.map$/
2015 ? normalise $_
2016 : ()
2017 } @{ aio_readdir $TMPDIR or [] }
2018 ]
2019}
2020
2021=item $maps = cf::map::random_maps
2022
2023Returns an arrayref with all map paths of currently instantiated and saved
2024random maps. May block.
2025
2026=cut
2027
2028sub random_maps() {
2029 [
2030 map {
2031 utf8::decode $_;
2032 /\.map$/
2033 ? normalise "?random/$_"
2034 : ()
2035 } @{ aio_readdir $RANDOMDIR or [] }
2036 ]
2037}
2038
1718=item cf::map::unique_maps 2039=item cf::map::unique_maps
1719 2040
1720Returns an arrayref of paths of all shared maps that have 2041Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 2042instantiated unique items. May block.
1722 2043
1723=cut 2044=cut
1724 2045
1725sub unique_maps() { 2046sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2047 [
1727 or return; 2048 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 2049 utf8::decode $_;
1733 next if /\.pst$/; 2050 /\.map$/
1734 next unless /^$PATH_SEP/o; 2051 ? normalise $_
1735 2052 : ()
1736 push @paths, cf::map::normalise $_; 2053 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 2054 ]
1738
1739 \@paths
1740} 2055}
1741 2056
1742package cf; 2057package cf;
1743 2058
1744=back 2059=back
1790 2105
1791 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792 2107
1793 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
1794 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
1795 } else { 2111 } else {
2112 my $pl = $self->contr;
2113
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply (
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122
2123 } else {
1796 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
1797 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
1798 } 2127 }
1799} 2128}
1800 2129
1801=item $player_object->may ("access") 2130=item $player_object->may ("access")
1802 2131
1850 $self->deactivate_recursive; 2179 $self->deactivate_recursive;
1851 2180
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2181 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 2182
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 2184 if $self->map && $self->map->{path} ne "{link}";
1856 2185
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2186 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 2187}
1859 2188
1860sub cf::object::player::leave_link { 2189sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 2190 my ($self, $map, $x, $y) = @_;
2191
2192 return unless $self->contr->active;
1862 2193
1863 my $link_pos = delete $self->{_link_pos}; 2194 my $link_pos = delete $self->{_link_pos};
1864 2195
1865 unless ($map) { 2196 unless ($map) {
1866 # restore original map position 2197 # restore original map position
1889 2220
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2222 $self->enter_map ($map, $x, $y);
1892} 2223}
1893 2224
1894cf::player->attach (
1895 on_logout => sub {
1896 my ($pl) = @_;
1897
1898 # abort map switching before logout
1899 if ($pl->ob->{_link_pos}) {
1900 cf::sync_job {
1901 $pl->ob->leave_link
1902 };
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y) 2225=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927 2226
2227Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position.
2231
1928=cut 2232=cut
2233
2234our $GOTOGEN;
1929 2235
1930sub cf::object::player::goto { 2236sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2237 my ($self, $path, $x, $y, $check) = @_;
2238
2239 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2241
1933 $self->enter_link; 2242 $self->enter_link;
1934 2243
1935 (async { 2244 (async {
1936 my $map = eval { 2245 my $map = eval {
1937 my $map = cf::map::find $path; 2246 my $map = cf::map::find $path;
2247
2248 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2249 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map;
2251 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2253 }
2254
1939 $map 2255 $map
2256 };
2257
2258 if ($@) {
2259 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2260 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2261 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2262
2263 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2265 $self->leave_link ($map, $x, $y);
2266 }
1944 })->prio (1); 2267 })->prio (1);
1945} 2268}
1946 2269
1947=item $player_object->enter_exit ($exit_object) 2270=item $player_object->enter_exit ($exit_object)
1948 2271
1987 2310
1988 $rmp->{random_seed} ||= $exit->random_seed; 2311 $rmp->{random_seed} ||= $exit->random_seed;
1989 2312
1990 my $data = cf::to_json $rmp; 2313 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2314 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2315 my $meta = "$RANDOMDIR/$md5.meta";
1993 2316
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2318 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2319 undef $fh;
1997 aio_rename "$meta~", $meta; 2320 aio_rename "$meta~", $meta;
2053 2376
2054 utf8::encode $text; 2377 utf8::encode $text;
2055 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2056} 2379}
2057 2380
2381=item $client->send_msg ($color, $type, $msg, [extra...])
2382
2383Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet.
2387
2388=cut
2389
2390sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_;
2392
2393 $msg = $self->pl->expand_cfpod ($msg);
2394
2395 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) {
2409 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg")
2414 }
2415 }
2416 }
2417}
2418
2058=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2059 2420
2060Sends an exti event to the client. 2421Sends an ext event to the client.
2061 2422
2062=cut 2423=cut
2063 2424
2064sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2065 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
2072 2433
2073Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2074the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2435the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2075C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2436C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2076 2437
2077Queries can fail, so check the return code. Or don't, as queries will become 2438Queries can fail, so check the return code. Or don't, as queries will
2078reliable at some point in the future. 2439become reliable at some point in the future.
2079 2440
2080=cut 2441=cut
2081 2442
2082sub cf::client::query { 2443sub cf::client::query {
2083 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
2091 utf8::encode $text; 2452 utf8::encode $text;
2092 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093 2454
2094 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2095 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2096} 2459}
2097 2460
2098cf::client->attach ( 2461cf::client->attach (
2099 on_reply => sub { 2462 on_reply => sub {
2100 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
2114 $ns->send_packet ($ns->{query_queue}[0][0]); 2477 $ns->send_packet ($ns->{query_queue}[0][0]);
2115 } else { 2478 } else {
2116 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117 } 2480 }
2118 } 2481 }
2482 },
2483 on_exticmd => sub {
2484 my ($ns, $buf) = @_;
2485
2486 my $msg = eval { from_json $buf };
2487
2488 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 }
2495 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 }
2498
2499 cf::override;
2119 }, 2500 },
2120); 2501);
2121 2502
2122=item $client->async (\&cb) 2503=item $client->async (\&cb)
2123 2504
2262=back 2643=back
2263 2644
2264=cut 2645=cut
2265 2646
2266############################################################################# 2647#############################################################################
2267
2268=head2 EXTENSION DATABASE SUPPORT
2269
2270Crossfire maintains a very simple database for extension use. It can
2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272convert to/from binary).
2273
2274The parameter C<$family> should best start with the name of the extension
2275using it, it should be unique.
2276
2277=over 4
2278
2279=item $value = cf::db_get $family => $key
2280
2281Returns a single value from the database.
2282
2283=item cf::db_put $family => $key => $value
2284
2285Stores the given C<$value> in the family.
2286
2287=cut
2288
2289our $DB;
2290
2291sub db_init {
2292 unless ($DB) {
2293 $DB = BDB::db_create $DB_ENV;
2294
2295 cf::sync_job {
2296 eval {
2297 $DB->set_flags (BDB::CHKSUM);
2298
2299 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301 cf::cleanup "db_open(db): $!" if $!;
2302 };
2303 cf::cleanup "db_open(db): $@" if $@;
2304 };
2305 }
2306}
2307
2308sub db_get($$) {
2309 my $key = "$_[0]/$_[1]";
2310
2311 cf::sync_job {
2312 BDB::db_get $DB, undef, $key, my $data;
2313
2314 $! ? ()
2315 : $data
2316 }
2317}
2318
2319sub db_put($$$) {
2320 BDB::dbreq_pri 4;
2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 local $SIG{__WARN__};
2420 eval {
2421 local $SIG{__DIE__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 warn $@ if $@;
2429 _exit 0;
2430 }
2431}
2432
2433
2434
2435#############################################################################
2436# the server's init and main functions 2648# the server's init and main functions
2437 2649
2438sub load_facedata($) { 2650sub load_facedata($) {
2439 my ($path) = @_; 2651 my ($path) = @_;
2440 2652
2485 } 2697 }
2486 2698
2487 1 2699 1
2488} 2700}
2489 2701
2702sub reload_regions {
2703 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n";
2705}
2706
2490sub reload_facedata { 2707sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir 2708 load_facedata "$DATADIR/facedata"
2492 or die "unable to load facedata\n"; 2709 or die "unable to load facedata\n";
2493} 2710}
2494 2711
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes { 2712sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir 2713 load_resource_file "$DATADIR/archetypes"
2502 or die "unable to load archetypes\n"; 2714 or die "unable to load archetypes\n";
2503} 2715}
2504 2716
2505sub reload_treasures { 2717sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir 2718 load_resource_file "$DATADIR/treasures"
2507 or die "unable to load treasurelists\n"; 2719 or die "unable to load treasurelists\n";
2508} 2720}
2509 2721
2510sub reload_resources { 2722sub reload_resources {
2511 warn "reloading resource files...\n"; 2723 warn "reloading resource files...\n";
2512 2724
2513 reload_regions; 2725 reload_regions;
2514 reload_facedata; 2726 reload_facedata;
2727 #reload_archetypes;#d#
2515 reload_archetypes; 2728 reload_archetypes;
2516 reload_treasures; 2729 reload_treasures;
2517 2730
2518 warn "finished reloading resource files\n"; 2731 warn "finished reloading resource files\n";
2519} 2732}
2521sub init { 2734sub init {
2522 reload_resources; 2735 reload_resources;
2523} 2736}
2524 2737
2525sub cfg_load { 2738sub cfg_load {
2526 open my $fh, "<:utf8", cf::confdir . "/config" 2739 open my $fh, "<:utf8", "$CONFDIR/config"
2527 or return; 2740 or return;
2528 2741
2529 local $/; 2742 local $/;
2530 *CFG = YAML::Syck::Load <$fh>; 2743 *CFG = YAML::Syck::Load <$fh>;
2531 2744
2576 }, 2789 },
2577 ); 2790 );
2578 } 2791 }
2579} 2792}
2580 2793
2794sub write_runtime {
2795 my $runtime = "$LOCALDIR/runtime";
2796
2797 # first touch the runtime file to show we are still running:
2798 # the fsync below can take a very very long time.
2799
2800 IO::AIO::aio_utime $runtime, undef, undef;
2801
2802 my $guard = cf::lock_acquire "write_runtime";
2803
2804 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2805 or return;
2806
2807 my $value = $cf::RUNTIME + 90 + 10;
2808 # 10 is the runtime save interval, for a monotonic clock
2809 # 60 allows for the watchdog to kill the server.
2810
2811 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2812 and return;
2813
2814 # always fsync - this file is important
2815 aio_fsync $fh
2816 and return;
2817
2818 # touch it again to show we are up-to-date
2819 aio_utime $fh, undef, undef;
2820
2821 close $fh
2822 or return;
2823
2824 aio_rename "$runtime~", $runtime
2825 and return;
2826
2827 warn "runtime file written.\n";
2828
2829 1
2830}
2831
2581sub emergency_save() { 2832sub emergency_save() {
2582 my $freeze_guard = cf::freeze_mainloop; 2833 my $freeze_guard = cf::freeze_mainloop;
2583 2834
2584 warn "enter emergency perl save\n"; 2835 warn "enter emergency perl save\n";
2585 2836
2660 %EXT_CORO = (); 2911 %EXT_CORO = ();
2661 2912
2662 warn "removing commands"; 2913 warn "removing commands";
2663 %COMMAND = (); 2914 %COMMAND = ();
2664 2915
2665 warn "removing ext commands"; 2916 warn "removing ext/exti commands";
2666 %EXTCMD = (); 2917 %EXTCMD = ();
2918 %EXTICMD = ();
2667 2919
2668 warn "unloading/nuking all extensions"; 2920 warn "unloading/nuking all extensions";
2669 for my $pkg (@EXTS) { 2921 for my $pkg (@EXTS) {
2670 warn "... unloading $pkg"; 2922 warn "... unloading $pkg";
2671 2923
2701 Symbol::delete_package "safe::$_" 2953 Symbol::delete_package "safe::$_"
2702 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2954 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2703 2955
2704 warn "unloading cf.pm \"a bit\""; 2956 warn "unloading cf.pm \"a bit\"";
2705 delete $INC{"cf.pm"}; 2957 delete $INC{"cf.pm"};
2958 delete $INC{"cf/pod.pm"};
2706 2959
2707 # don't, removes xs symbols, too, 2960 # don't, removes xs symbols, too,
2708 # and global variables created in xs 2961 # and global variables created in xs
2709 #Symbol::delete_package __PACKAGE__; 2962 #Symbol::delete_package __PACKAGE__;
2710 2963
2788 my $signal = new Coro::Signal; 3041 my $signal = new Coro::Signal;
2789 push @WAIT_FOR_TICK_BEGIN, $signal; 3042 push @WAIT_FOR_TICK_BEGIN, $signal;
2790 $signal->wait; 3043 $signal->wait;
2791} 3044}
2792 3045
3046 my $min = 1e6;#d#
3047 my $avg = 10;
2793$TICK_WATCHER = Event->timer ( 3048$TICK_WATCHER = Event->timer (
2794 reentrant => 0, 3049 reentrant => 0,
2795 parked => 1, 3050 parked => 1,
2796 prio => 0, 3051 prio => 0,
2797 at => $NEXT_TICK || $TICK, 3052 at => $NEXT_TICK || $TICK,
2801 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2802 unless ++$bug_warning > 10; 3057 unless ++$bug_warning > 10;
2803 return; 3058 return;
2804 } 3059 }
2805 3060
2806 $NOW = Event::time; 3061 $NOW = $tick_start = Event::time;
2807 3062
2808 cf::server_tick; # one server iteration 3063 cf::server_tick; # one server iteration
3064
3065 0 && sync_job {#d#
3066 for(1..10) {
3067 my $t = Event::time;
3068 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3069 or die;
3070
3071 $map->width (50);
3072 $map->height (50);
3073 $map->alloc;
3074 $map->_load_objects ("/tmp/x.map", 1);
3075 my $t = Event::time - $t;
3076
3077 #next unless $t < 0.0013;#d#
3078 if ($t < $min) {
3079 $min = $t;
3080 }
3081 $avg = $avg * 0.99 + $t * 0.01;
3082 }
3083 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3084 exit 0;
3085 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3086 };
2809 3087
2810 $RUNTIME += $TICK; 3088 $RUNTIME += $TICK;
2811 $NEXT_TICK += $TICK; 3089 $NEXT_TICK += $TICK;
2812 3090
2813 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3091 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2819 } 3097 }
2820 3098
2821# my $AFTER = Event::time; 3099# my $AFTER = Event::time;
2822# warn $AFTER - $NOW;#d# 3100# warn $AFTER - $NOW;#d#
2823 3101
3102 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3103 $sig->send;
3104 }
3105 while (my $sig = shift @WAIT_FOR_TICK) {
3106 $sig->send;
3107 }
3108
3109 $NOW = Event::time;
3110
2824 # if we are delayed by four ticks or more, skip them all 3111 # if we are delayed by four ticks or more, skip them all
2825 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3112 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2826 3113
2827 $TICK_WATCHER->at ($NEXT_TICK); 3114 $TICK_WATCHER->at ($NEXT_TICK);
2828 $TICK_WATCHER->start; 3115 $TICK_WATCHER->start;
2829 3116
2830 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3117 $LOAD = ($NOW - $tick_start) / $TICK;
2831 $sig->send; 3118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2832 }
2833 while (my $sig = shift @WAIT_FOR_TICK) {
2834 $sig->send;
2835 }
2836 3119
2837 _post_tick; 3120 _post_tick;
3121
3122
2838 }, 3123 },
2839); 3124);
2840 3125
2841{ 3126{
2842 BDB::max_poll_time $TICK * 0.1; 3127 BDB::max_poll_time $TICK * 0.1;
2870 3155
2871 cf::sync_job { 3156 cf::sync_job {
2872 eval { 3157 eval {
2873 BDB::db_env_open 3158 BDB::db_env_open
2874 $DB_ENV, 3159 $DB_ENV,
2875 $BDB_ENV_DIR, 3160 $BDBDIR,
2876 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3161 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2877 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3162 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2878 0666; 3163 0666;
2879 3164
2880 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3165 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2881 3166
2882 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3167 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2883 $DB_ENV->set_lk_detect; 3168 $DB_ENV->set_lk_detect;
2884 }; 3169 };
2885 3170
2901 prio => 6, 3186 prio => 6,
2902 cb => \&IO::AIO::poll_cb, 3187 cb => \&IO::AIO::poll_cb,
2903 ); 3188 );
2904} 3189}
2905 3190
3191my $_log_backtrace;
3192
3193sub _log_backtrace {
3194 my ($msg, @addr) = @_;
3195
3196 $msg =~ s/\n//;
3197
3198 # limit the # of concurrent backtraces
3199 if ($_log_backtrace < 2) {
3200 ++$_log_backtrace;
3201 async {
3202 my @bt = fork_call {
3203 @addr = map { sprintf "%x", $_ } @addr;
3204 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3205 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3206 or die "addr2line: $!";
3207
3208 my @funcs;
3209 my @res = <$fh>;
3210 chomp for @res;
3211 while (@res) {
3212 my ($func, $line) = splice @res, 0, 2, ();
3213 push @funcs, "[$func] $line";
3214 }
3215
3216 @funcs
3217 };
3218
3219 LOG llevInfo, "[ABT] $msg\n";
3220 LOG llevInfo, "[ABT] $_\n" for @bt;
3221 --$_log_backtrace;
3222 };
3223 } else {
3224 LOG llevInfo, "[ABT] $msg\n";
3225 LOG llevInfo, "[ABT] [suppressed]\n";
3226 }
3227}
3228
2906# load additional modules 3229# load additional modules
2907use cf::pod; 3230use cf::pod;
2908 3231
2909END { cf::emergency_save } 3232END { cf::emergency_save }
2910 3233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines