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.248 by root, Tue Apr 17 18:40:32 2007 UTC vs.
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.61 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
22 24
25use JSON::XS 1.4 ();
23use BDB (); 26use BDB ();
24use Data::Dumper; 27use Data::Dumper;
25use Digest::MD5; 28use Digest::MD5;
26use Fcntl; 29use Fcntl;
27use YAML::Syck (); 30use YAML::Syck ();
47our %COMMAND = (); 50our %COMMAND = ();
48our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
49 52
50our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
54 58
55our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
56our @EVENT; 60our @EVENT;
57our $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";
58 73
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 75our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
73our $RUNTIME; 88our $RUNTIME;
74 89
75our %PLAYER; # all users 90our %PLAYER; # all users
76our %MAP; # all maps 91our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 93
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 101binmode STDOUT;
85binmode STDERR; 102binmode STDERR;
86 103
87# read virtual server time, if available 104# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
92} 109}
93 110
94mkdir cf::localdir; 111mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 113
101our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
102 115
103sub cf::map::normalise; 116sub cf::map::normalise;
104 117
115=item $cf::RUNTIME 128=item $cf::RUNTIME
116 129
117The 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
118every server tick. 131every server tick.
119 132
120=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
121 136
122The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 141
125=item $cf::NOW 142=item $cf::NOW
126 143
127The time of the last (current) server tick. 144The time of the last (current) server tick.
128 145
129=item $cf::TICK 146=item $cf::TICK
130 147
131The 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.
132 159
133=item %cf::CFG 160=item %cf::CFG
134 161
135Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 163from wherever your confdir points to.
146=cut 173=cut
147 174
148BEGIN { 175BEGIN {
149 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 177 my $msg = join "", @_;
151 utf8::encode $msg;
152 178
153 $msg .= "\n" 179 $msg .= "\n"
154 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
155 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
156 LOG llevError, $msg; 185 LOG llevError, $msg;
157 }; 186 };
158} 187}
159 188
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 196
167# 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
168# within the Safe compartment. 198# within the Safe compartment.
169for my $pkg (qw( 199for my $pkg (qw(
170 cf::global cf::attachable 200 cf::global cf::attachable
178} 208}
179 209
180$Event::DIED = sub { 210$Event::DIED = sub {
181 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
182}; 212};
213
214#############################################################################
183 215
184=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
185 217
186=over 4 218=over 4
187 219
206 $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;
207 $d 239 $d
208 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
209} 241}
210 242
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
214 244
215Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
216 246
217=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
218 248
219Converts 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->utf8->max_size (1e6); # accept ~1mb max
254
255sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) }
220 257
221=item cf::lock_wait $string 258=item cf::lock_wait $string
222 259
223Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
224 261
230returned. 267returned.
231 268
232Lock 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
233uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
234 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
235=cut 276=cut
236 277
237our %LOCK; 278our %LOCK;
238 279
239sub lock_wait($) { 280sub lock_wait($) {
256 297
257 Coro::guard { 298 Coro::guard {
258 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
260 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
261} 308}
262 309
263sub freeze_mainloop { 310sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
265 312
280 327
281BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
282 329
283=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
284 331
285The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. 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.
288 336
289If 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
290the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
291server 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
292fast or be very important. 340fast or be very important.
295 343
296sub sync_job(&) { 344sub sync_job(&) {
297 my ($job) = @_; 345 my ($job) = @_;
298 346
299 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
300 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
302 352
303 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 354 # (but this is cancel-safe)
315 365
316 while ($busy) { 366 while ($busy) {
317 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
318 } 368 }
319 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
320 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
321 } else { 378 } else {
322 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
323 380
324 $job->() 381 $job->()
343 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
344 401
345 $coro 402 $coro
346} 403}
347 404
348sub write_runtime { 405=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 406
351 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.
352 411
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
354 or return;
355 413
356 my $value = $cf::RUNTIME + 90 + 10; 414sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 415 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 416
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
361 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
362 421
363 # always fsync - this file is important 422 if (my $pid = fork) {
364 aio_fsync $fh
365 and return;
366
367 close $fh 423 close $fh2;
368 or return;
369 424
370 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
371 and return; 426 $res = Coro::Storable::thaw $res;
372 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;
373 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"
374} 563}
375 564
376=item cf::datalog type => key => value, ... 565=item cf::datalog type => key => value, ...
377 566
378Log 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.
396attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
398 587
399In 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>
400C<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
401crossfire+). 590Crossfire TRT).
402 591
403=over 4 592=over 4
404 593
405=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
406 595
569 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
570 759
571 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 764
576 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 766 my $pkg = shift @arg;
578 767
579 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
609 } 798 }
610 799
611 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
612 } else { 801 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 803 }
615 804
616 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
617} 806}
618 807
620 if (ref $_[0]) { 809 if (ref $_[0]) {
621 _object_attach @_; 810 _object_attach @_;
622 } else { 811 } else {
623 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
624 } 813 }
814 _recalc_want;
625}; 815};
626 816
627# all those should be optimised 817# all those should be optimised
628sub cf::attachable::detach { 818sub cf::attachable::detach {
629 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
633 reattach ($obj); 823 reattach ($obj);
634 } else { 824 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
636 } 826 }
827 _recalc_want;
637}; 828};
638 829
639sub cf::attachable::attached { 830sub cf::attachable::attached {
640 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
641 832
814 or return; 1005 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1007 }
817 1008
818 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1011 return ($data, $av);
821} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
822 1019
823############################################################################# 1020#############################################################################
824# command handling &c 1021# command handling &c
825 1022
826=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1037}
841 1038
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1040
844Register 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.
845 1046
846If 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
847called. 1048called.
848 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
849=cut 1061=cut
850 1062
851sub register_extcmd { 1063sub register_extcmd {
852 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
853 1065
854 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
855} 1073}
856 1074
857cf::player->attach ( 1075cf::player->attach (
858 on_command => sub { 1076 on_command => sub {
859 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
868 cf::override; 1086 cf::override;
869 }, 1087 },
870 on_extcmd => sub { 1088 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1089 my ($pl, $buf) = @_;
872 1090
873 my $msg = eval { from_json $buf }; 1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1092
875 if (ref $msg) { 1093 if (ref $msg) {
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
877 if (my %reply = $cb->($pl, $msg)) { 1095 if (my %reply = $cb->($pl, $msg)) {
878 $pl->ext_reply ($msg->{msgid}, %reply); 1096 $pl->ext_reply ($msg->{msgid}, %reply);
884 1102
885 cf::override; 1103 cf::override;
886 }, 1104 },
887); 1105);
888 1106
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
924 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1112 next unless -r $path;
926 eval { 1113
927 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;
928 1 1171 }
929 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
930 } 1177 };
931} 1178}
932 1179
933############################################################################# 1180#############################################################################
934 1181
1182=back
1183
935=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
936 1185
937Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
938 1187
939=cut 1188=cut
951Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
952 1201
953=cut 1202=cut
954 1203
955sub playerdir($) { 1204sub playerdir($) {
956 cf::localdir 1205 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1207}
962 1208
963sub path($) { 1209sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1084while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1085 1331
1086=cut 1332=cut
1087 1333
1088sub list_logins { 1334sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1336 or return [];
1091 1337
1092 my @logins; 1338 my @logins;
1093 1339
1094 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1129 } 1375 }
1130 1376
1131 \@paths 1377 \@paths
1132} 1378}
1133 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<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 $_
1420}
1421
1422sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode}
1425}
1426
1134=item $player->ext_reply ($msgid, %msg) 1427=item $player->ext_reply ($msgid, %msg)
1135 1428
1136Sends an ext reply to the player. 1429Sends an ext reply to the player.
1137 1430
1138=cut 1431=cut
1139 1432
1140sub ext_reply($$%) { 1433sub ext_reply($$%) {
1141 my ($self, $id, %msg) = @_; 1434 my ($self, $id, %msg) = @_;
1142 1435
1143 $msg{msgid} = $id; 1436 $msg{msgid} = $id;
1144 1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1438}
1147 1439
1148=item $player->ext_event ($type, %msg) 1440=item $player->ext_event ($type, %msg)
1149 1441
1150Sends an ext event to the client. 1442Sends an ext event to the client.
1165 1457
1166package cf::region; 1458package cf::region;
1167 1459
1168=item cf::region::find_by_path $path 1460=item cf::region::find_by_path $path
1169 1461
1170Tries to decuce the probable region for a map knowing only its path. 1462Tries to decuce the likely region for a map knowing only its path.
1171 1463
1172=cut 1464=cut
1173 1465
1174sub find_by_path($) { 1466sub find_by_path($) {
1175 my ($path) = @_; 1467 my ($path) = @_;
1249 my ($self, $merge) = @_; 1541 my ($self, $merge) = @_;
1250 1542
1251 # we have to keep some variables in memory intact 1543 # we have to keep some variables in memory intact
1252 local $self->{path}; 1544 local $self->{path};
1253 local $self->{load_path}; 1545 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1546
1257 $self->SUPER::thawer_merge ($merge); 1547 $self->SUPER::thawer_merge ($merge);
1258} 1548}
1259 1549
1260sub normalise { 1550sub normalise {
1332 1622
1333# the original (read-only) location 1623# the original (read-only) location
1334sub load_path { 1624sub load_path {
1335 my ($self) = @_; 1625 my ($self) = @_;
1336 1626
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1627 "$MAPDIR/$self->{path}.map"
1338} 1628}
1339 1629
1340# the temporary/swap location 1630# the temporary/swap location
1341sub save_path { 1631sub save_path {
1342 my ($self) = @_; 1632 my ($self) = @_;
1343 1633
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1634 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1635 "$TMPDIR/$path.map"
1346} 1636}
1347 1637
1348# the unique path, undef == no special unique path 1638# the unique path, undef == no special unique path
1349sub uniq_path { 1639sub uniq_path {
1350 my ($self) = @_; 1640 my ($self) = @_;
1351 1641
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1642 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1643 "$UNIQUEDIR/$path"
1354} 1644}
1355 1645
1356# and all this just because we cannot iterate over 1646# and all this just because we cannot iterate over
1357# all maps in C++... 1647# all maps in C++...
1358sub change_all_map_light { 1648sub change_all_map_light {
1359 my ($change) = @_; 1649 my ($change) = @_;
1360 1650
1361 $_->change_map_light ($change) 1651 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1652 for grep $_->outdoor, values %cf::MAP;
1653}
1654
1655sub decay_objects {
1656 my ($self) = @_;
1657
1658 return if $self->{deny_reset};
1659
1660 $self->do_decay_objects;
1363} 1661}
1364 1662
1365sub unlink_save { 1663sub unlink_save {
1366 my ($self) = @_; 1664 my ($self) = @_;
1367 1665
1425 $self->load_header_orig 1723 $self->load_header_orig
1426 or return; 1724 or return;
1427 $self->prepare_orig; 1725 $self->prepare_orig;
1428 } 1726 }
1429 1727
1728 $self->{deny_reset} = 1
1729 if $self->no_reset;
1730
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1731 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1732 unless $self->default_region;
1432 1733
1433 1 1734 1
1434} 1735}
1449 $map->{last_save} = $cf::RUNTIME; 1750 $map->{last_save} = $cf::RUNTIME;
1450 1751
1451 $map->load_header 1752 $map->load_header
1452 or return; 1753 or return;
1453 1754
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1756 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1757 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1758 $map->reset;
1458 undef $guard; 1759 undef $guard;
1459 return find $path; 1760 return find $path;
1470 my ($self) = @_; 1771 my ($self) = @_;
1471 1772
1472 local $self->{deny_reset} = 1; # loading can take a long time 1773 local $self->{deny_reset} = 1; # loading can take a long time
1473 1774
1474 my $path = $self->{path}; 1775 my $path = $self->{path};
1776
1777 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1778 my $guard = cf::lock_acquire "map_load:$path";
1476 1779
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1780 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1781
1479 $self->in_memory (cf::MAP_LOADING); 1782 $self->in_memory (cf::MAP_LOADING);
1480 1783
1481 $self->alloc; 1784 $self->alloc;
1482 1785
1483 $self->pre_load; 1786 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1787 Coro::cede;
1510 $self->set_darkness_map; 1788
1789 $self->_load_objects ($self->{load_path}, 1)
1790 or return;
1791
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original};
1794
1795 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) {
1798 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0);
1800 }
1801 }
1802
1803 Coro::cede;
1804 # now do the right thing for maps
1805 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1806 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1807 unless $self->difficulty;
1513 Coro::cede; 1808 Coro::cede;
1809
1810 unless ($self->{deny_activate}) {
1811 $self->decay_objects;
1812 $self->fix_auto_apply;
1813 $self->update_buttons;
1814 Coro::cede;
1815 $self->set_darkness_map;
1816 Coro::cede;
1514 $self->activate; 1817 $self->activate;
1515 Coro::cede; 1818 }
1819
1820 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1821 }
1517 1822
1518 $self->post_load; 1823 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1824}
1523 1825
1524sub customise_for { 1826sub customise_for {
1525 my ($self, $ob) = @_; 1827 my ($self, $ob) = @_;
1526 1828
1527 return find "~" . $ob->name . "/" . $self->{path} 1829 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1830 if $self->per_player;
1831
1832# return find "?party/" . $ob->name . "/" . $self->{path}
1833# if $self->per_party;
1529 1834
1530 $self 1835 $self
1531} 1836}
1532 1837
1533# find and load all maps in the 3x3 area around a map 1838# find and load all maps in the 3x3 area around a map
1644 1949
1645sub reset_at { 1950sub reset_at {
1646 my ($self) = @_; 1951 my ($self) = @_;
1647 1952
1648 # TODO: safety, remove and allow resettable per-player maps 1953 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1954 return 1e99 if $self->{deny_reset};
1651 1955
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1956 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1957 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 1958
1665 my ($self) = @_; 1969 my ($self) = @_;
1666 1970
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1971 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1972
1669 return if $self->players; 1973 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1974
1672 warn "resetting map ", $self->path;#d# 1975 warn "resetting map ", $self->path;
1673 1976
1674 $self->in_memory (cf::MAP_SWAPPED); 1977 $self->in_memory (cf::MAP_SWAPPED);
1675 1978
1676 # need to save uniques path 1979 # need to save uniques path
1677 unless ($self->{deny_save}) { 1980 unless ($self->{deny_save}) {
1709 $cf::MAP{$self->path} = $self; 2012 $cf::MAP{$self->path} = $self;
1710 2013
1711 $self->reset; # polite request, might not happen 2014 $self->reset; # polite request, might not happen
1712} 2015}
1713 2016
2017=item $maps = cf::map::tmp_maps
2018
2019Returns an arrayref with all map paths of currently instantiated and saved
2020maps. May block.
2021
2022=cut
2023
2024sub tmp_maps() {
2025 [
2026 map {
2027 utf8::decode $_;
2028 /\.map$/
2029 ? normalise $_
2030 : ()
2031 } @{ aio_readdir $TMPDIR or [] }
2032 ]
2033}
2034
2035=item $maps = cf::map::random_maps
2036
2037Returns an arrayref with all map paths of currently instantiated and saved
2038random maps. May block.
2039
2040=cut
2041
2042sub random_maps() {
2043 [
2044 map {
2045 utf8::decode $_;
2046 /\.map$/
2047 ? normalise "?random/$_"
2048 : ()
2049 } @{ aio_readdir $RANDOMDIR or [] }
2050 ]
2051}
2052
1714=item cf::map::unique_maps 2053=item cf::map::unique_maps
1715 2054
1716Returns an arrayref of paths of all shared maps that have 2055Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2056instantiated unique items. May block.
1718 2057
1719=cut 2058=cut
1720 2059
1721sub unique_maps() { 2060sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2061 [
1723 or return; 2062 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2063 utf8::decode $_;
1729 next if /\.pst$/; 2064 /\.map$/
1730 next unless /^$PATH_SEP/o; 2065 ? normalise $_
1731 2066 : ()
1732 push @paths, cf::map::normalise $_; 2067 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2068 ]
1734
1735 \@paths
1736} 2069}
1737 2070
1738package cf; 2071package cf;
1739 2072
1740=back 2073=back
1786 2119
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2120 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2121
1789 if ($self->{record_replies}) { 2122 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2123 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2124
1791 } else { 2125 } else {
2126 my $pl = $self->contr;
2127
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply (
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136
2137 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2138 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2139 $self->message ($msg, $flags);
2140 }
1794 } 2141 }
1795} 2142}
1796 2143
1797=item $player_object->may ("access") 2144=item $player_object->may ("access")
1798 2145
1846 $self->deactivate_recursive; 2193 $self->deactivate_recursive;
1847 2194
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2195 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2196
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2197 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2198 if $self->map && $self->map->{path} ne "{link}";
1852 2199
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2200 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2201}
1855 2202
1856sub cf::object::player::leave_link { 2203sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2204 my ($self, $map, $x, $y) = @_;
2205
2206 return unless $self->contr->active;
1858 2207
1859 my $link_pos = delete $self->{_link_pos}; 2208 my $link_pos = delete $self->{_link_pos};
1860 2209
1861 unless ($map) { 2210 unless ($map) {
1862 # restore original map position 2211 # restore original map position
1885 2234
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2236 $self->enter_map ($map, $x, $y);
1888} 2237}
1889 2238
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 2239=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 2240
2241Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position.
2245
1924=cut 2246=cut
2247
2248our $GOTOGEN;
1925 2249
1926sub cf::object::player::goto { 2250sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2251 my ($self, $path, $x, $y, $check) = @_;
2252
2253 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2255
1929 $self->enter_link; 2256 $self->enter_link;
1930 2257
1931 (async { 2258 (async {
1932 my $map = eval { 2259 my $map = eval {
1933 my $map = cf::map::find $path; 2260 my $map = cf::map::find $path;
2261
2262 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2263 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map;
2265 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2267 }
2268
1935 $map 2269 $map
2270 };
2271
2272 if ($@) {
2273 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2274 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2275 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2276
2277 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2279 $self->leave_link ($map, $x, $y);
2280 }
1940 })->prio (1); 2281 })->prio (1);
1941} 2282}
1942 2283
1943=item $player_object->enter_exit ($exit_object) 2284=item $player_object->enter_exit ($exit_object)
1944 2285
1983 2324
1984 $rmp->{random_seed} ||= $exit->random_seed; 2325 $rmp->{random_seed} ||= $exit->random_seed;
1985 2326
1986 my $data = cf::to_json $rmp; 2327 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2328 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2329 my $meta = "$RANDOMDIR/$md5.meta";
1989 2330
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2332 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2333 undef $fh;
1993 aio_rename "$meta~", $meta; 2334 aio_rename "$meta~", $meta;
2049 2390
2050 utf8::encode $text; 2391 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2393}
2053 2394
2395=item $client->send_msg ($color, $type, $msg, [extra...])
2396
2397Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet.
2401
2402=cut
2403
2404sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_;
2406
2407 $msg = $self->pl->expand_cfpod ($msg);
2408
2409 if ($self->can_msg) {
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2411 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) {
2423 if (0 && $msg =~ /\[/) {
2424 $self->send_packet ("drawextinfo $color 4 0 $msg")
2425 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg")
2428 }
2429 }
2430 }
2431}
2432
2054=item $client->ext_event ($type, %msg) 2433=item $client->ext_event ($type, %msg)
2055 2434
2056Sends an exti event to the client. 2435Sends an ext event to the client.
2057 2436
2058=cut 2437=cut
2059 2438
2060sub cf::client::ext_event($$%) { 2439sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_; 2440 my ($self, $type, %msg) = @_;
2062 2441
2063 $msg{msgtype} = "event_$type"; 2442 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2065} 2444}
2066 2445
2067=item $success = $client->query ($flags, "text", \&cb) 2446=item $success = $client->query ($flags, "text", \&cb)
2068 2447
2069Queues a query to the client, calling the given callback with 2448Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2449the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2450C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2451
2073Queries can fail, so check the return code. Or don't, as queries will become 2452Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2453become reliable at some point in the future.
2075 2454
2076=cut 2455=cut
2077 2456
2078sub cf::client::query { 2457sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2458 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2466 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2467 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2468
2090 $self->send_packet ($self->{query_queue}[0][0]) 2469 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2470 if @{ $self->{query_queue} } == 1;
2471
2472 1
2092} 2473}
2093 2474
2094cf::client->attach ( 2475cf::client->attach (
2476 on_connect => sub {
2477 my ($ns) = @_;
2478
2479 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2480 },
2095 on_reply => sub { 2481 on_reply => sub {
2096 my ($ns, $msg) = @_; 2482 my ($ns, $msg) = @_;
2097 2483
2098 # this weird shuffling is so that direct followup queries 2484 # this weird shuffling is so that direct followup queries
2099 # get handled first 2485 # get handled first
2110 $ns->send_packet ($ns->{query_queue}[0][0]); 2496 $ns->send_packet ($ns->{query_queue}[0][0]);
2111 } else { 2497 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2498 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2499 }
2114 } 2500 }
2501 },
2502 on_exticmd => sub {
2503 my ($ns, $buf) = @_;
2504
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506
2507 if (ref $msg) {
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2509 if (my %reply = $cb->($ns, $msg)) {
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 }
2514 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 }
2517
2518 cf::override;
2115 }, 2519 },
2116); 2520);
2117 2521
2118=item $client->async (\&cb) 2522=item $client->async (\&cb)
2119 2523
2258=back 2662=back
2259 2663
2260=cut 2664=cut
2261 2665
2262############################################################################# 2666#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2667# the server's init and main functions
2336 2668
2337sub load_facedata($) { 2669sub load_facedata($) {
2338 my ($path) = @_; 2670 my ($path) = @_;
2339 2671
2384 } 2716 }
2385 2717
2386 1 2718 1
2387} 2719}
2388 2720
2721sub reload_regions {
2722 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n";
2724}
2725
2389sub reload_facedata { 2726sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 2727 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 2728 or die "unable to load facedata\n";
2392} 2729}
2393 2730
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 2731sub reload_archetypes {
2400 load_resource_file sprintf "%s/archetypes", cf::datadir 2732 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 2733 or die "unable to load archetypes\n";
2734 #d# NEED to laod twice to resolve forward references
2735 # this really needs to be done in an extra post-pass
2736 # (which needs to be synchronous, so solve it differently)
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2402} 2739}
2403 2740
2404sub reload_treasures { 2741sub reload_treasures {
2405 load_resource_file sprintf "%s/treasures", cf::datadir 2742 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 2743 or die "unable to load treasurelists\n";
2407} 2744}
2408 2745
2409sub reload_resources { 2746sub reload_resources {
2410 warn "reloading resource files...\n"; 2747 warn "reloading resource files...\n";
2411 2748
2412 reload_regions; 2749 reload_regions;
2413 reload_facedata; 2750 reload_facedata;
2751 #reload_archetypes;#d#
2414 reload_archetypes; 2752 reload_archetypes;
2415 reload_treasures; 2753 reload_treasures;
2416 2754
2417 warn "finished reloading resource files\n"; 2755 warn "finished reloading resource files\n";
2418} 2756}
2420sub init { 2758sub init {
2421 reload_resources; 2759 reload_resources;
2422} 2760}
2423 2761
2424sub cfg_load { 2762sub cfg_load {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 2763 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 2764 or return;
2427 2765
2428 local $/; 2766 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 2767 *CFG = YAML::Syck::Load <$fh>;
2430 2768
2475 }, 2813 },
2476 ); 2814 );
2477 } 2815 }
2478} 2816}
2479 2817
2818sub write_runtime {
2819 my $runtime = "$LOCALDIR/runtime";
2820
2821 # first touch the runtime file to show we are still running:
2822 # the fsync below can take a very very long time.
2823
2824 IO::AIO::aio_utime $runtime, undef, undef;
2825
2826 my $guard = cf::lock_acquire "write_runtime";
2827
2828 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2829 or return;
2830
2831 my $value = $cf::RUNTIME + 90 + 10;
2832 # 10 is the runtime save interval, for a monotonic clock
2833 # 60 allows for the watchdog to kill the server.
2834
2835 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2836 and return;
2837
2838 # always fsync - this file is important
2839 aio_fsync $fh
2840 and return;
2841
2842 # touch it again to show we are up-to-date
2843 aio_utime $fh, undef, undef;
2844
2845 close $fh
2846 or return;
2847
2848 aio_rename "$runtime~", $runtime
2849 and return;
2850
2851 warn "runtime file written.\n";
2852
2853 1
2854}
2855
2480sub emergency_save() { 2856sub emergency_save() {
2481 my $freeze_guard = cf::freeze_mainloop; 2857 my $freeze_guard = cf::freeze_mainloop;
2482 2858
2483 warn "enter emergency perl save\n"; 2859 warn "enter emergency perl save\n";
2484 2860
2559 %EXT_CORO = (); 2935 %EXT_CORO = ();
2560 2936
2561 warn "removing commands"; 2937 warn "removing commands";
2562 %COMMAND = (); 2938 %COMMAND = ();
2563 2939
2564 warn "removing ext commands"; 2940 warn "removing ext/exti commands";
2565 %EXTCMD = (); 2941 %EXTCMD = ();
2942 %EXTICMD = ();
2566 2943
2567 warn "unloading/nuking all extensions"; 2944 warn "unloading/nuking all extensions";
2568 for my $pkg (@EXTS) { 2945 for my $pkg (@EXTS) {
2569 warn "... unloading $pkg"; 2946 warn "... unloading $pkg";
2570 2947
2600 Symbol::delete_package "safe::$_" 2977 Symbol::delete_package "safe::$_"
2601 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2978 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2602 2979
2603 warn "unloading cf.pm \"a bit\""; 2980 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 2981 delete $INC{"cf.pm"};
2982 delete $INC{"cf/pod.pm"};
2605 2983
2606 # don't, removes xs symbols, too, 2984 # don't, removes xs symbols, too,
2607 # and global variables created in xs 2985 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 2986 #Symbol::delete_package __PACKAGE__;
2609 2987
2687 my $signal = new Coro::Signal; 3065 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal; 3066 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait; 3067 $signal->wait;
2690} 3068}
2691 3069
3070 my $min = 1e6;#d#
3071 my $avg = 10;
2692$TICK_WATCHER = Event->timer ( 3072$TICK_WATCHER = Event->timer (
2693 reentrant => 0, 3073 reentrant => 0,
2694 parked => 1, 3074 parked => 1,
2695 prio => 0, 3075 prio => 0,
2696 at => $NEXT_TICK || $TICK, 3076 at => $NEXT_TICK || $TICK,
2700 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2701 unless ++$bug_warning > 10; 3081 unless ++$bug_warning > 10;
2702 return; 3082 return;
2703 } 3083 }
2704 3084
2705 $NOW = Event::time; 3085 $NOW = $tick_start = Event::time;
2706 3086
2707 cf::server_tick; # one server iteration 3087 cf::server_tick; # one server iteration
3088
3089 0 && sync_job {#d#
3090 for(1..10) {
3091 my $t = Event::time;
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093 or die;
3094
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 };
2708 3111
2709 $RUNTIME += $TICK; 3112 $RUNTIME += $TICK;
2710 $NEXT_TICK += $TICK; 3113 $NEXT_TICK += $TICK;
2711 3114
2712 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2718 } 3121 }
2719 3122
2720# my $AFTER = Event::time; 3123# my $AFTER = Event::time;
2721# warn $AFTER - $NOW;#d# 3124# warn $AFTER - $NOW;#d#
2722 3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send;
3128 }
3129 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send;
3131 }
3132
3133 $NOW = Event::time;
3134
2723 # if we are delayed by four ticks or more, skip them all 3135 # if we are delayed by four ticks or more, skip them all
2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2725 3137
2726 $TICK_WATCHER->at ($NEXT_TICK); 3138 $TICK_WATCHER->at ($NEXT_TICK);
2727 $TICK_WATCHER->start; 3139 $TICK_WATCHER->start;
2728 3140
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3141 $LOAD = ($NOW - $tick_start) / $TICK;
2730 $sig->send; 3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735 3143
2736 _post_tick; 3144 _post_tick;
3145
3146
2737 }, 3147 },
2738); 3148);
2739 3149
2740{ 3150{
2741 BDB::max_poll_time $TICK * 0.1; 3151 BDB::max_poll_time $TICK * 0.1;
2769 3179
2770 cf::sync_job { 3180 cf::sync_job {
2771 eval { 3181 eval {
2772 BDB::db_env_open 3182 BDB::db_env_open
2773 $DB_ENV, 3183 $DB_ENV,
2774 $BDB_ENV_DIR, 3184 $BDBDIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 3187 0666;
2778 3188
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780 3190
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect; 3192 $DB_ENV->set_lk_detect;
2783 }; 3193 };
2784 3194
2800 prio => 6, 3210 prio => 6,
2801 cb => \&IO::AIO::poll_cb, 3211 cb => \&IO::AIO::poll_cb,
2802 ); 3212 );
2803} 3213}
2804 3214
3215my $_log_backtrace;
3216
3217sub _log_backtrace {
3218 my ($msg, @addr) = @_;
3219
3220 $msg =~ s/\n//;
3221
3222 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace;
3225 async {
3226 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!";
3231
3232 my @funcs;
3233 my @res = <$fh>;
3234 chomp for @res;
3235 while (@res) {
3236 my ($func, $line) = splice @res, 0, 2, ();
3237 push @funcs, "[$func] $line";
3238 }
3239
3240 @funcs
3241 };
3242
3243 LOG llevInfo, "[ABT] $msg\n";
3244 LOG llevInfo, "[ABT] $_\n" for @bt;
3245 --$_log_backtrace;
3246 };
3247 } else {
3248 LOG llevInfo, "[ABT] $msg\n";
3249 LOG llevInfo, "[ABT] [suppressed]\n";
3250 }
3251}
3252
3253# load additional modules
3254use cf::pod;
3255
2805END { cf::emergency_save } 3256END { cf::emergency_save }
2806 3257
28071 32581
2808 3259

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines