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.201 by root, Mon Jan 29 18:15:23 2007 UTC vs.
Revision 1.296 by root, Wed Jul 4 07:09:06 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use JSON::XS 1.4 ();
26use BDB ();
20use Data::Dumper; 27use Data::Dumper;
21use Digest::MD5; 28use Digest::MD5;
22use Fcntl; 29use Fcntl;
30use YAML::Syck ();
23use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF;
26 34
35# configure various modules to our taste
36#
37$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 41$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 42
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
33 45
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 47
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49
36our %COMMAND = (); 50our %COMMAND = ();
37our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
38 52
39our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
43 58
59our $RELOAD; # number of reloads so far
44our @EVENT; 60our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 61
47our $TICK = MAX_TIME * 1e-6; 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";
73
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 75our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 78our $NEXT_TICK;
52our $NOW; 79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off
81
82our $BDB_POLL_WATCHER;
83our $DB_ENV;
53 84
54our %CFG; 85our %CFG;
55 86
56our $UPTIME; $UPTIME ||= time; 87our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 88our $RUNTIME;
58 89
59our %PLAYER; # all users 90our %PLAYER; # all users
60our %MAP; # all maps 91our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 93
67# 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 ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 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
70binmode STDOUT; 101binmode STDOUT;
71binmode STDERR; 102binmode STDERR;
72 103
73# read virtual server time, if available 104# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
78} 109}
79 110
80mkdir cf::localdir; 111mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 113
86our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
87 115
88sub cf::map::normalise; 116sub cf::map::normalise;
89 117
100=item $cf::RUNTIME 128=item $cf::RUNTIME
101 129
102The 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
103every server tick. 131every server tick.
104 132
105=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
106 136
107The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
108be 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.
109 141
110=item $cf::NOW 142=item $cf::NOW
111 143
112The time of the last (current) server tick. 144The time of the last (current) server tick.
113 145
114=item $cf::TICK 146=item $cf::TICK
115 147
116The 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.
117 159
118=item %cf::CFG 160=item %cf::CFG
119 161
120Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
121from wherever your confdir points to. 163from wherever your confdir points to.
122 164
123=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
124 166
125These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
126or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 168returns directly I<after> the tick processing (and consequently, can only wake one process
127processing has been done. Call C<< ->wait >> on them to maximise the 169per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
128window of cpu time available, or simply to synchronise to the server tick.
129 170
130=back 171=back
131 172
132=cut 173=cut
133 174
134BEGIN { 175BEGIN {
135 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
136 my $msg = join "", @_; 177 my $msg = join "", @_;
137 utf8::encode $msg;
138 178
139 $msg .= "\n" 179 $msg .= "\n"
140 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
141 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
142 LOG llevError, $msg; 185 LOG llevError, $msg;
143 }; 186 };
144} 187}
145 188
146@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
147@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
148@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
149@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
150@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';
151@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)
152 196
153# 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
154# within the Safe compartment. 198# within the Safe compartment.
155for my $pkg (qw( 199for my $pkg (qw(
156 cf::global cf::attachable 200 cf::global cf::attachable
164} 208}
165 209
166$Event::DIED = sub { 210$Event::DIED = sub {
167 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
168}; 212};
213
214#############################################################################
169 215
170=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
171 217
172=over 4 218=over 4
173 219
192 $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;
193 $d 239 $d
194 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
195} 241}
196 242
197use JSON::Syck (); # TODO# replace by JSON::PC once working
198
199=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
200 244
201Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
202 246
203=cut
204
205sub from_json($) {
206 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
207 JSON::Syck::Load $_[0]
208}
209
210=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
211 248
212Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
213 250
214=cut 251=cut
215 252
216sub to_json($) { 253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
217 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
218 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
219} 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($) {
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 }
261} 302}
262 303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
308}
309
263sub freeze_mainloop { 310sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
265 312
266 my $guard = Coro::guard { 313 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 314 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 315 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 316 $TICK_WATCHER->stop;
272 $guard 317 $guard
273} 318}
274 319
275=item cf::async { BLOCK } 320=item cf::async { BLOCK }
282 327
283BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
284 329
285=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
286 331
287The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. 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.
290 336
291If 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
292the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
293server 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
294fast or be very important. 340fast or be very important.
297 343
298sub sync_job(&) { 344sub sync_job(&) {
299 my ($job) = @_; 345 my ($job) = @_;
300 346
301 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
302 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
304 352
305 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 354 # (but this is cancel-safe)
317 365
318 while ($busy) { 366 while ($busy) {
319 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
320 } 368 }
321 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
322 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
323 } else { 378 } else {
324 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
325 380
326 $job->() 381 $job->()
345 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
346 401
347 $coro 402 $coro
348} 403}
349 404
350sub write_runtime { 405=item fork_call { }, $args
351 my $runtime = cf::localdir . "/runtime";
352 406
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 407Executes the given code block with the given arguments in a seperate
354 or return; 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.
355 411
356 my $value = $cf::RUNTIME + 90 + 10; 412=cut
357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359 413
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 414sub fork_call(&@) {
361 and return; 415 my ($cb, @args) = @_;
362 416
363 aio_fsync $fh 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
364 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
365 421
422 if (my $pid = fork) {
366 close $fh 423 close $fh2;
367 or return;
368 424
369 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
370 and return; 426 $res = Coro::Storable::thaw $res;
371 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;
372 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"
563}
564
565=item cf::datalog type => key => value, ...
566
567Log a datalog packet of the given type with the given key-value pairs.
568
569=cut
570
571sub datalog($@) {
572 my ($type, %kv) = @_;
573 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
373} 574}
374 575
375=back 576=back
376 577
377=cut 578=cut
384attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
385to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
386 587
387In 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>
388C<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
389crossfire+). 590Crossfire TRT).
390 591
391=over 4 592=over 4
392 593
393=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
394 595
557 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
558 759
559 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
560 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
561 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
562 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
563 764
564 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
565 my $pkg = shift @arg; 766 my $pkg = shift @arg;
566 767
567 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
596 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
597 } 798 }
598 799
599 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
600 } else { 801 } else {
601 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
602 } 803 }
603 804
604 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
605} 806}
606 807
608 if (ref $_[0]) { 809 if (ref $_[0]) {
609 _object_attach @_; 810 _object_attach @_;
610 } else { 811 } else {
611 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
612 } 813 }
814 _recalc_want;
613}; 815};
614 816
615# all those should be optimised 817# all those should be optimised
616sub cf::attachable::detach { 818sub cf::attachable::detach {
617 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
620 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
621 reattach ($obj); 823 reattach ($obj);
622 } else { 824 } else {
623 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
624 } 826 }
827 _recalc_want;
625}; 828};
626 829
627sub cf::attachable::attached { 830sub cf::attachable::attached {
628 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
629 832
752 $filename, length $$rdata, scalar @$objs; 955 $filename, length $$rdata, scalar @$objs;
753 956
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 958 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 959 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 960 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 961 close $fh;
759 962
760 if (@$objs) { 963 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 965 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 966 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 967 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 968 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 969 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 970 aio_rename "$filename.pst~", "$filename.pst";
768 } 971 }
769 } else { 972 } else {
770 aio_unlink "$filename.pst"; 973 aio_unlink "$filename.pst";
776 } 979 }
777 } else { 980 } else {
778 aio_unlink $filename; 981 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 982 aio_unlink "$filename.pst";
780 } 983 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
787 } 984 }
788} 985}
789 986
790sub object_freezer_as_string { 987sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 988 my ($rdata, $objs) = @_;
797 994
798sub object_thawer_load { 995sub object_thawer_load {
799 my ($filename) = @_; 996 my ($filename) = @_;
800 997
801 my ($data, $av); 998 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 999
806 (aio_load $filename, $data) >= 0 1000 (aio_load $filename, $data) >= 0
807 or return; 1001 or return;
808 1002
809 unless (aio_stat "$filename.pst") { 1003 unless (aio_stat "$filename.pst") {
811 or return; 1005 or return;
812 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
813 } 1007 }
814 1008
815 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
816 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
817 return ($data, $av); 1011 return ($data, $av);
818} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
819 1019
820############################################################################# 1020#############################################################################
821# command handling &c 1021# command handling &c
822 1022
823=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
836 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
837} 1037}
838 1038
839=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
840 1040
841Register 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.
842 1046
843If 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
844called. 1048called.
845 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
846=cut 1061=cut
847 1062
848sub register_extcmd { 1063sub register_extcmd {
849 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
850 1065
851 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
852} 1073}
853 1074
854cf::player->attach ( 1075cf::player->attach (
855 on_command => sub { 1076 on_command => sub {
856 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
865 cf::override; 1086 cf::override;
866 }, 1087 },
867 on_extcmd => sub { 1088 on_extcmd => sub {
868 my ($pl, $buf) = @_; 1089 my ($pl, $buf) = @_;
869 1090
870 my $msg = eval { from_json $buf }; 1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
871 1092
872 if (ref $msg) { 1093 if (ref $msg) {
873 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
874 if (my %reply = $cb->($pl, $msg)) { 1095 if (my %reply = $cb->($pl, $msg)) {
875 $pl->ext_reply ($msg->{msgid}, %reply); 1096 $pl->ext_reply ($msg->{msgid}, %reply);
881 1102
882 cf::override; 1103 cf::override;
883 }, 1104 },
884); 1105);
885 1106
886sub load_extension {
887 my ($path) = @_;
888
889 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
890 my $base = $1;
891 my $pkg = $1;
892 $pkg =~ s/[^[:word:]]/_/g;
893 $pkg = "ext::$pkg";
894
895 warn "... loading '$path' into '$pkg'\n";
896
897 open my $fh, "<:utf8", $path
898 or die "$path: $!";
899
900 my $source =
901 "package $pkg; use strict; use utf8;\n"
902 . "#line 1 \"$path\"\n{\n"
903 . (do { local $/; <$fh> })
904 . "\n};\n1";
905
906 unless (eval $source) {
907 my $msg = $@ ? "$path: $@\n"
908 : "extension disabled.\n";
909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
910 warn $@;
911 warn "mandatory extension failed to load, exiting.\n";
912 exit 1;
913 }
914 die $@;
915 }
916
917 push @EXTS, $pkg;
918}
919
920sub load_extensions { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
921 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
922 next unless -r $ext; 1112 next unless -r $path;
923 eval { 1113
924 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;
925 1 1171 }
926 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
927 } 1177 };
928} 1178}
929 1179
930############################################################################# 1180#############################################################################
931 1181
1182=back
1183
932=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
933 1185
934Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
935 1187
936=cut 1188=cut
948Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
949 1201
950=cut 1202=cut
951 1203
952sub playerdir($) { 1204sub playerdir($) {
953 cf::localdir 1205 "$PLAYERDIR/"
954 . "/"
955 . cf::playerdir
956 . "/"
957 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
958} 1207}
959 1208
960sub path($) { 1209sub path($) {
961 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
962 1211
963 (playerdir $login) . "/$login.pl" 1212 (playerdir $login) . "/playerdata"
964} 1213}
965 1214
966sub find_active($) { 1215sub find_active($) {
967 $cf::PLAYER{$_[0]} 1216 $cf::PLAYER{$_[0]}
968 and $cf::PLAYER{$_[0]}->active 1217 and $cf::PLAYER{$_[0]}->active
981 my $login = $_[0]; 1230 my $login = $_[0];
982 1231
983 my $guard = cf::lock_acquire "user_find:$login"; 1232 my $guard = cf::lock_acquire "user_find:$login";
984 1233
985 $cf::PLAYER{$_[0]} || do { 1234 $cf::PLAYER{$_[0]} || do {
1235 # rename old playerfiles to new ones
1236 #TODO: remove when no longer required
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl";
1241
986 my $pl = load_pl path $login 1242 my $pl = load_pl path $login
987 or return; 1243 or return;
988 $cf::PLAYER{$login} = $pl 1244 $cf::PLAYER{$login} = $pl
989 } 1245 }
990 } 1246 }
1027 1283
1028=cut 1284=cut
1029 1285
1030sub quit_character { 1286sub quit_character {
1031 my ($pl) = @_; 1287 my ($pl) = @_;
1288
1289 my $name = $pl->ob->name;
1032 1290
1033 $pl->{deny_save} = 1; 1291 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1292 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1293
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1041 my $path = playerdir $pl; 1299 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1300 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1301 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1302 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1303 $pl->destroy;
1304
1305 my $prefix = qr<^~\Q$name\E/>;
1306
1307 # nuke player maps
1308 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1309
1046 IO::AIO::aio_rmtree $temp; 1310 IO::AIO::aio_rmtree $temp;
1311}
1312
1313=item $pl->kick
1314
1315Kicks a player out of the game. This destroys the connection.
1316
1317=cut
1318
1319sub kick {
1320 my ($pl, $kicker) = @_;
1321
1322 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1323 $pl->killer ("kicked");
1324 $pl->ns->destroy;
1047} 1325}
1048 1326
1049=item cf::player::list_logins 1327=item cf::player::list_logins
1050 1328
1051Returns am arrayref of all valid playernames in the system, can take a 1329Returns am arrayref of all valid playernames in the system, can take a
1052while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1053 1331
1054=cut 1332=cut
1055 1333
1056sub list_logins { 1334sub list_logins {
1057 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1058 or return []; 1336 or return [];
1059 1337
1060 my @logins; 1338 my @logins;
1061 1339
1062 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1097 } 1375 }
1098 1376
1099 \@paths 1377 \@paths
1100} 1378}
1101 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 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1102=item $player->ext_reply ($msgid, $msgtype, %msg) 1430=item $player->ext_reply ($msgid, %msg)
1103 1431
1104Sends an ext reply to the player. 1432Sends an ext reply to the player.
1105 1433
1106=cut 1434=cut
1107 1435
1108sub ext_reply($$$%) { 1436sub ext_reply($$%) {
1109 my ($self, $id, %msg) = @_; 1437 my ($self, $id, %msg) = @_;
1110 1438
1111 $msg{msgid} = $id; 1439 $msg{msgid} = $id;
1112 1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1113 $self->send ("ext " . cf::to_json \%msg);
1114} 1441}
1115 1442
1116package cf; 1443=item $player->ext_event ($type, %msg)
1444
1445Sends an ext event to the client.
1446
1447=cut
1448
1449sub ext_event($$%) {
1450 my ($self, $type, %msg) = @_;
1451
1452 $self->ns->ext_event ($type, %msg);
1453}
1454
1455=head3 cf::region
1456
1457=over 4
1458
1459=cut
1460
1461package cf::region;
1462
1463=item cf::region::find_by_path $path
1464
1465Tries to decuce the likely region for a map knowing only its path.
1466
1467=cut
1468
1469sub find_by_path($) {
1470 my ($path) = @_;
1471
1472 my ($match, $specificity);
1473
1474 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) {
1476 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity;
1478 }
1479 }
1480
1481 $match
1482}
1117 1483
1118=back 1484=back
1119
1120 1485
1121=head3 cf::map 1486=head3 cf::map
1122 1487
1123=over 4 1488=over 4
1124 1489
1179 my ($self, $merge) = @_; 1544 my ($self, $merge) = @_;
1180 1545
1181 # we have to keep some variables in memory intact 1546 # we have to keep some variables in memory intact
1182 local $self->{path}; 1547 local $self->{path};
1183 local $self->{load_path}; 1548 local $self->{load_path};
1184 local $self->{deny_save};
1185 local $self->{deny_reset};
1186 1549
1187 $self->SUPER::thawer_merge ($merge); 1550 $self->SUPER::thawer_merge ($merge);
1188} 1551}
1189 1552
1190sub normalise { 1553sub normalise {
1262 1625
1263# the original (read-only) location 1626# the original (read-only) location
1264sub load_path { 1627sub load_path {
1265 my ($self) = @_; 1628 my ($self) = @_;
1266 1629
1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1630 "$MAPDIR/$self->{path}.map"
1268} 1631}
1269 1632
1270# the temporary/swap location 1633# the temporary/swap location
1271sub save_path { 1634sub save_path {
1272 my ($self) = @_; 1635 my ($self) = @_;
1273 1636
1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1638 "$TMPDIR/$path.map"
1276} 1639}
1277 1640
1278# the unique path, undef == no special unique path 1641# the unique path, undef == no special unique path
1279sub uniq_path { 1642sub uniq_path {
1280 my ($self) = @_; 1643 my ($self) = @_;
1281 1644
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1646 "$UNIQUEDIR/$path"
1284} 1647}
1285 1648
1286# and all this just because we cannot iterate over 1649# and all this just because we cannot iterate over
1287# all maps in C++... 1650# all maps in C++...
1288sub change_all_map_light { 1651sub change_all_map_light {
1290 1653
1291 $_->change_map_light ($change) 1654 $_->change_map_light ($change)
1292 for grep $_->outdoor, values %cf::MAP; 1655 for grep $_->outdoor, values %cf::MAP;
1293} 1656}
1294 1657
1658sub decay_objects {
1659 my ($self) = @_;
1660
1661 return if $self->{deny_reset};
1662
1663 $self->do_decay_objects;
1664}
1665
1295sub unlink_save { 1666sub unlink_save {
1296 my ($self) = @_; 1667 my ($self) = @_;
1297 1668
1298 utf8::encode (my $save = $self->save_path); 1669 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1670 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1671 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306} 1672}
1307 1673
1308sub load_header_from($) { 1674sub load_header_from($) {
1309 my ($self, $path) = @_; 1675 my ($self, $path) = @_;
1310 1676
1360 $self->load_header_orig 1726 $self->load_header_orig
1361 or return; 1727 or return;
1362 $self->prepare_orig; 1728 $self->prepare_orig;
1363 } 1729 }
1364 1730
1731 $self->{deny_reset} = 1
1732 if $self->no_reset;
1733
1734 $self->default_region (cf::region::find_by_path $self->{path})
1735 unless $self->default_region;
1736
1365 1 1737 1
1366} 1738}
1367 1739
1368sub find; 1740sub find;
1369sub find { 1741sub find {
1381 $map->{last_save} = $cf::RUNTIME; 1753 $map->{last_save} = $cf::RUNTIME;
1382 1754
1383 $map->load_header 1755 $map->load_header
1384 or return; 1756 or return;
1385 1757
1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1387 # doing this can freeze the server in a sync job, obviously 1759 # doing this can freeze the server in a sync job, obviously
1388 #$cf::WAIT_FOR_TICK->wait; 1760 #$cf::WAIT_FOR_TICK->wait;
1389 $map->reset; 1761 $map->reset;
1390 undef $guard; 1762 undef $guard;
1391 return find $path; 1763 return find $path;
1402 my ($self) = @_; 1774 my ($self) = @_;
1403 1775
1404 local $self->{deny_reset} = 1; # loading can take a long time 1776 local $self->{deny_reset} = 1; # loading can take a long time
1405 1777
1406 my $path = $self->{path}; 1778 my $path = $self->{path};
1779
1780 {
1407 my $guard = cf::lock_acquire "map_load:$path"; 1781 my $guard = cf::lock_acquire "map_load:$path";
1408 1782
1409 return if $self->in_memory != cf::MAP_SWAPPED; 1783 return if $self->in_memory != cf::MAP_SWAPPED;
1410 1784
1411 $self->in_memory (cf::MAP_LOADING); 1785 $self->in_memory (cf::MAP_LOADING);
1412 1786
1413 $self->alloc; 1787 $self->alloc;
1414 1788
1415 $self->pre_load; 1789 $self->pre_load;
1416
1417 $self->_load_objects ($self->{load_path}, 1)
1418 or return;
1419
1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1421 if delete $self->{load_original};
1422
1423 if (my $uniq = $self->uniq_path) {
1424 utf8::encode $uniq;
1425 if (aio_open $uniq, O_RDONLY, 0) {
1426 $self->clear_unique_items;
1427 $self->_load_objects ($uniq, 0);
1428 }
1429 }
1430
1431 Coro::cede;
1432
1433 # now do the right thing for maps
1434 $self->link_multipart_objects;
1435
1436 unless ($self->{deny_activate}) {
1437 $self->decay_objects;
1438 $self->fix_auto_apply;
1439 $self->update_buttons;
1440 Coro::cede; 1790 Coro::cede;
1441 $self->set_darkness_map; 1791
1792 $self->_load_objects ($self->{load_path}, 1)
1793 or return;
1794
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original};
1797
1798 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) {
1801 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0);
1803 }
1804 }
1805
1806 Coro::cede;
1807 # now do the right thing for maps
1808 $self->link_multipart_objects;
1442 $self->difficulty ($self->estimate_difficulty) 1809 $self->difficulty ($self->estimate_difficulty)
1443 unless $self->difficulty; 1810 unless $self->difficulty;
1444 Coro::cede; 1811 Coro::cede;
1812
1813 unless ($self->{deny_activate}) {
1814 $self->decay_objects;
1815 $self->fix_auto_apply;
1816 $self->update_buttons;
1817 Coro::cede;
1818 $self->set_darkness_map;
1819 Coro::cede;
1445 $self->activate; 1820 $self->activate;
1821 }
1822
1823 $self->in_memory (cf::MAP_IN_MEMORY);
1446 } 1824 }
1447 1825
1448 $self->post_load; 1826 $self->post_load;
1449
1450 $self->in_memory (cf::MAP_IN_MEMORY);
1451} 1827}
1452 1828
1453sub customise_for { 1829sub customise_for {
1454 my ($self, $ob) = @_; 1830 my ($self, $ob) = @_;
1455 1831
1456 return find "~" . $ob->name . "/" . $self->{path} 1832 return find "~" . $ob->name . "/" . $self->{path}
1457 if $self->per_player; 1833 if $self->per_player;
1834
1835# return find "?party/" . $ob->name . "/" . $self->{path}
1836# if $self->per_party;
1458 1837
1459 $self 1838 $self
1460} 1839}
1461 1840
1462# find and load all maps in the 3x3 area around a map 1841# find and load all maps in the 3x3 area around a map
1573 1952
1574sub reset_at { 1953sub reset_at {
1575 my ($self) = @_; 1954 my ($self) = @_;
1576 1955
1577 # TODO: safety, remove and allow resettable per-player maps 1956 # TODO: safety, remove and allow resettable per-player maps
1578 return 1e99 if $self->isa ("ext::map_per_player");#d#
1579 return 1e99 if $self->{deny_reset}; 1957 return 1e99 if $self->{deny_reset};
1580 1958
1581 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1959 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1582 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1960 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1583 1961
1594 my ($self) = @_; 1972 my ($self) = @_;
1595 1973
1596 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1974 my $lock = cf::lock_acquire "map_data:$self->{path}";
1597 1975
1598 return if $self->players; 1976 return if $self->players;
1599 return if $self->isa ("ext::map_per_player");#d#
1600 1977
1601 warn "resetting map ", $self->path;#d# 1978 warn "resetting map ", $self->path;
1979
1980 $self->in_memory (cf::MAP_SWAPPED);
1981
1982 # need to save uniques path
1983 unless ($self->{deny_save}) {
1984 my $uniq = $self->uniq_path; utf8::encode $uniq;
1985
1986 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1987 if $uniq;
1988 }
1602 1989
1603 delete $cf::MAP{$self->path}; 1990 delete $cf::MAP{$self->path};
1604 1991
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear; 1992 $self->clear;
1607 1993
1608 $_->clear_links_to ($self) for values %cf::MAP; 1994 $_->clear_links_to ($self) for values %cf::MAP;
1609 1995
1610 $self->unlink_save; 1996 $self->unlink_save;
1629 $cf::MAP{$self->path} = $self; 2015 $cf::MAP{$self->path} = $self;
1630 2016
1631 $self->reset; # polite request, might not happen 2017 $self->reset; # polite request, might not happen
1632} 2018}
1633 2019
2020=item $maps = cf::map::tmp_maps
2021
2022Returns an arrayref with all map paths of currently instantiated and saved
2023maps. May block.
2024
2025=cut
2026
2027sub tmp_maps() {
2028 [
2029 map {
2030 utf8::decode $_;
2031 /\.map$/
2032 ? normalise $_
2033 : ()
2034 } @{ aio_readdir $TMPDIR or [] }
2035 ]
2036}
2037
2038=item $maps = cf::map::random_maps
2039
2040Returns an arrayref with all map paths of currently instantiated and saved
2041random maps. May block.
2042
2043=cut
2044
2045sub random_maps() {
2046 [
2047 map {
2048 utf8::decode $_;
2049 /\.map$/
2050 ? normalise "?random/$_"
2051 : ()
2052 } @{ aio_readdir $RANDOMDIR or [] }
2053 ]
2054}
2055
1634=item cf::map::unique_maps 2056=item cf::map::unique_maps
1635 2057
1636Returns an arrayref of paths of all shared maps that have 2058Returns an arrayref of paths of all shared maps that have
1637instantiated unique items. May block. 2059instantiated unique items. May block.
1638 2060
1639=cut 2061=cut
1640 2062
1641sub unique_maps() { 2063sub unique_maps() {
1642 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2064 [
1643 or return; 2065 map {
1644
1645 my @paths;
1646
1647 for (@$files) {
1648 utf8::decode $_; 2066 utf8::decode $_;
1649 next if /\.pst$/; 2067 /\.map$/
1650 next unless /^$PATH_SEP/o; 2068 ? normalise $_
1651 2069 : ()
1652 push @paths, cf::map::normalise $_; 2070 } @{ aio_readdir $UNIQUEDIR or [] }
1653 } 2071 ]
1654
1655 \@paths
1656} 2072}
1657 2073
1658package cf; 2074package cf;
1659 2075
1660=back 2076=back
1706 2122
1707 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2123 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1708 2124
1709 if ($self->{record_replies}) { 2125 if ($self->{record_replies}) {
1710 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2126 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2127
1711 } else { 2128 } else {
2129 my $pl = $self->contr;
2130
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply (
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139
2140 } else {
1712 $msg = $npc->name . " says: $msg" if $npc; 2141 $msg = $npc->name . " says: $msg" if $npc;
1713 $self->message ($msg, $flags); 2142 $self->message ($msg, $flags);
2143 }
1714 } 2144 }
1715} 2145}
1716 2146
1717=item $player_object->may ("access") 2147=item $player_object->may ("access")
1718 2148
1766 $self->deactivate_recursive; 2196 $self->deactivate_recursive;
1767 2197
1768 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2198 return if UNIVERSAL::isa $self->map, "ext::map_link";
1769 2199
1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2200 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1771 if $self->map; 2201 if $self->map && $self->map->{path} ne "{link}";
1772 2202
1773 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2203 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1774} 2204}
1775 2205
1776sub cf::object::player::leave_link { 2206sub cf::object::player::leave_link {
1777 my ($self, $map, $x, $y) = @_; 2207 my ($self, $map, $x, $y) = @_;
2208
2209 return unless $self->contr->active;
1778 2210
1779 my $link_pos = delete $self->{_link_pos}; 2211 my $link_pos = delete $self->{_link_pos};
1780 2212
1781 unless ($map) { 2213 unless ($map) {
1782 # restore original map position 2214 # restore original map position
1800 $map->load; 2232 $map->load;
1801 $map->load_diag; 2233 $map->load_diag;
1802 2234
1803 return unless $self->contr->active; 2235 return unless $self->contr->active;
1804 $self->activate_recursive; 2236 $self->activate_recursive;
2237
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1805 $self->enter_map ($map, $x, $y); 2239 $self->enter_map ($map, $x, $y);
1806} 2240}
1807 2241
1808cf::player->attach (
1809 on_logout => sub {
1810 my ($pl) = @_;
1811
1812 # abort map switching before logout
1813 if ($pl->ob->{_link_pos}) {
1814 cf::sync_job {
1815 $pl->ob->leave_link
1816 };
1817 }
1818 },
1819 on_login => sub {
1820 my ($pl) = @_;
1821
1822 # try to abort aborted map switching on player login :)
1823 # should happen only on crashes
1824 if ($pl->ob->{_link_pos}) {
1825 $pl->ob->enter_link;
1826 (async {
1827 # we need this sleep as the login has a concurrent enter_exit running
1828 # and this sleep increases chances of the player not ending up in scorn
1829 $pl->ob->reply (undef,
1830 "There was an internal problem at your last logout, "
1831 . "the server will try to bring you to your intended destination in a second.",
1832 cf::NDI_RED);
1833 Coro::Timer::sleep 1;
1834 $pl->ob->leave_link;
1835 })->prio (2);
1836 }
1837 },
1838);
1839
1840=item $player_object->goto ($path, $x, $y) 2242=item $player_object->goto ($path, $x, $y[, $check->($map)])
1841 2243
2244Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position.
2248
1842=cut 2249=cut
2250
2251our $GOTOGEN;
1843 2252
1844sub cf::object::player::goto { 2253sub cf::object::player::goto {
1845 my ($self, $path, $x, $y) = @_; 2254 my ($self, $path, $x, $y, $check) = @_;
2255
2256 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1846 2258
1847 $self->enter_link; 2259 $self->enter_link;
1848 2260
1849 (async { 2261 (async {
1850 my $map = eval { 2262 my $map = eval {
1851 my $map = cf::map::find $path; 2263 my $map = cf::map::find $path;
2264
2265 if ($map) {
1852 $map = $map->customise_for ($self) if $map; 2266 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map;
2268 } else {
2269 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2270 }
2271
1853 $map 2272 $map
2273 };
2274
2275 if ($@) {
2276 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2277 LOG llevError | logBacktrace, Carp::longmess $@;
1854 } or 2278 }
1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1856 2279
2280 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation};
1857 $self->leave_link ($map, $x, $y); 2282 $self->leave_link ($map, $x, $y);
2283 }
1858 })->prio (1); 2284 })->prio (1);
1859} 2285}
1860 2286
1861=item $player_object->enter_exit ($exit_object) 2287=item $player_object->enter_exit ($exit_object)
1862 2288
1901 2327
1902 $rmp->{random_seed} ||= $exit->random_seed; 2328 $rmp->{random_seed} ||= $exit->random_seed;
1903 2329
1904 my $data = cf::to_json $rmp; 2330 my $data = cf::to_json $rmp;
1905 my $md5 = Digest::MD5::md5_hex $data; 2331 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2332 my $meta = "$RANDOMDIR/$md5.meta";
1907 2333
1908 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1909 aio_write $fh, 0, (length $data), $data, 0; 2335 aio_write $fh, 0, (length $data), $data, 0;
1910 undef $fh; 2336 undef $fh;
1911 aio_rename "$meta~", $meta; 2337 aio_rename "$meta~", $meta;
1920 2346
1921 return unless $self->type == cf::PLAYER; 2347 return unless $self->type == cf::PLAYER;
1922 2348
1923 if ($exit->slaying eq "/!") { 2349 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job 2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
1925 cf::sync_job { prepare_random_map $exit }; 2353 cf::sync_job { prepare_random_map $exit };
1926 } 2354 }
1927 2355
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp; 2357 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp; 2358 my $sp = $exit->stats->sp;
1931 2359
1932 $self->enter_link; 2360 $self->enter_link;
2361
2362 # if exit is damned, update players death & WoR home-position
2363 $self->contr->savebed ($slaying, $hp, $sp)
2364 if $exit->flag (FLAG_DAMNED);
1933 2365
1934 (async { 2366 (async {
1935 $self->deactivate_recursive; # just to be sure 2367 $self->deactivate_recursive; # just to be sure
1936 unless (eval { 2368 unless (eval {
1937 $self->goto ($slaying, $hp, $sp); 2369 $self->goto ($slaying, $hp, $sp);
1938 2370
1939 1; 2371 1;
1940 }) { 2372 }) {
1941 $self->message ("Something went wrong deep within the crossfire server. " 2373 $self->message ("Something went wrong deep within the crossfire server. "
1942 . "I'll try to bring you back to the map you were before. " 2374 . "I'll try to bring you back to the map you were before. "
1943 . "Please report this to the dungeon master!", 2375 . "Please report this to the dungeon master!",
1944 cf::NDI_UNIQUE | cf::NDI_RED); 2376 cf::NDI_UNIQUE | cf::NDI_RED);
1945 2377
1946 warn "ERROR in enter_exit: $@"; 2378 warn "ERROR in enter_exit: $@";
1947 $self->leave_link; 2379 $self->leave_link;
1948 } 2380 }
1949 })->prio (1); 2381 })->prio (1);
1962 2394
1963sub cf::client::send_drawinfo { 2395sub cf::client::send_drawinfo {
1964 my ($self, $text, $flags) = @_; 2396 my ($self, $text, $flags) = @_;
1965 2397
1966 utf8::encode $text; 2398 utf8::encode $text;
1967 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1968} 2400}
1969 2401
2402=item $client->send_msg ($color, $type, $msg, [extra...])
2403
2404Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet.
2408
2409=cut
2410
2411sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_;
2413
2414 $msg = $self->pl->expand_cfpod ($msg);
2415
2416 return unless @extra || length $msg;
2417
2418 if ($self->can_msg) {
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2420 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) {
2432 if (0 && $msg =~ /\[/) {
2433 $self->send_packet ("drawextinfo $color 4 0 $msg")
2434 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg")
2437 }
2438 }
2439 }
2440}
2441
2442=item $client->ext_event ($type, %msg)
2443
2444Sends an ext event to the client.
2445
2446=cut
2447
2448sub cf::client::ext_event($$%) {
2449 my ($self, $type, %msg) = @_;
2450
2451 $msg{msgtype} = "event_$type";
2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2453}
1970 2454
1971=item $success = $client->query ($flags, "text", \&cb) 2455=item $success = $client->query ($flags, "text", \&cb)
1972 2456
1973Queues a query to the client, calling the given callback with 2457Queues a query to the client, calling the given callback with
1974the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2458the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1975C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2459C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1976 2460
1977Queries can fail, so check the return code. Or don't, as queries will become 2461Queries can fail, so check the return code. Or don't, as queries will
1978reliable at some point in the future. 2462become reliable at some point in the future.
1979 2463
1980=cut 2464=cut
1981 2465
1982sub cf::client::query { 2466sub cf::client::query {
1983 my ($self, $flags, $text, $cb) = @_; 2467 my ($self, $flags, $text, $cb) = @_;
1991 utf8::encode $text; 2475 utf8::encode $text;
1992 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2476 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1993 2477
1994 $self->send_packet ($self->{query_queue}[0][0]) 2478 $self->send_packet ($self->{query_queue}[0][0])
1995 if @{ $self->{query_queue} } == 1; 2479 if @{ $self->{query_queue} } == 1;
2480
2481 1
1996} 2482}
1997 2483
1998cf::client->attach ( 2484cf::client->attach (
2485 on_connect => sub {
2486 my ($ns) = @_;
2487
2488 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2489 },
1999 on_reply => sub { 2490 on_reply => sub {
2000 my ($ns, $msg) = @_; 2491 my ($ns, $msg) = @_;
2001 2492
2002 # this weird shuffling is so that direct followup queries 2493 # this weird shuffling is so that direct followup queries
2003 # get handled first 2494 # get handled first
2004 my $queue = delete $ns->{query_queue} 2495 my $queue = delete $ns->{query_queue}
2005 or return; # be conservative, not sure how that can happen, but we saw a crash here 2496 or return; # be conservative, not sure how that can happen, but we saw a crash here
2006 2497
2007 (shift @$queue)->[1]->($msg); 2498 (shift @$queue)->[1]->($msg);
2499 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
2008 2500
2009 push @{ $ns->{query_queue} }, @$queue; 2501 push @{ $ns->{query_queue} }, @$queue;
2010 2502
2011 if (@{ $ns->{query_queue} } == @$queue) { 2503 if (@{ $ns->{query_queue} } == @$queue) {
2012 if (@$queue) { 2504 if (@$queue) {
2014 } else { 2506 } else {
2015 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2507 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2016 } 2508 }
2017 } 2509 }
2018 }, 2510 },
2511 on_exticmd => sub {
2512 my ($ns, $buf) = @_;
2513
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515
2516 if (ref $msg) {
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2518 if (my %reply = $cb->($ns, $msg)) {
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 }
2523 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 }
2526
2527 cf::override;
2528 },
2019); 2529);
2020 2530
2021=item $client->async (\&cb) 2531=item $client->async (\&cb)
2022 2532
2023Create a new coroutine, running the specified callback. The coroutine will 2533Create a new coroutine, running the specified callback. The coroutine will
2070 2580
2071# here we export the classes and methods available to script code 2581# here we export the classes and methods available to script code
2072 2582
2073=pod 2583=pod
2074 2584
2075The following fucntions and emthods are available within a safe environment: 2585The following functions and methods are available within a safe environment:
2076 2586
2077 cf::object contr pay_amount pay_player map 2587 cf::object contr pay_amount pay_player map
2078 cf::object::player player 2588 cf::object::player player
2079 cf::player peaceful 2589 cf::player peaceful
2080 cf::map trigger 2590 cf::map trigger
2161=back 2671=back
2162 2672
2163=cut 2673=cut
2164 2674
2165############################################################################# 2675#############################################################################
2676# the server's init and main functions
2166 2677
2167=head2 EXTENSION DATABASE SUPPORT 2678sub load_facedata($) {
2679 my ($path) = @_;
2168 2680
2169Crossfire maintains a very simple database for extension use. It can 2681 warn "loading facedata from $path\n";
2170currently store anything that can be serialised using Storable, which
2171excludes objects.
2172 2682
2173The parameter C<$family> should best start with the name of the extension 2683 my $facedata;
2174using it, it should be unique. 2684 0 < aio_load $path, $facedata
2685 or die "$path: $!";
2175 2686
2176=over 4 2687 $facedata = Coro::Storable::thaw $facedata;
2177 2688
2178=item $hashref = cf::db_get $family 2689 $facedata->{version} == 2
2690 or cf::cleanup "$path: version mismatch, cannot proceed.";
2179 2691
2180Return a hashref for use by the extension C<$family>, which can be
2181modified. After modifications, you have to call C<cf::db_dirty> or
2182C<cf::db_sync>.
2183
2184=item $value = cf::db_get $family => $key
2185
2186Returns a single value from the database
2187
2188=item cf::db_put $family => $hashref
2189
2190Stores the given family hashref into the database. Updates are delayed, if
2191you want the data to be synced to disk immediately, use C<cf::db_sync>.
2192
2193=item cf::db_put $family => $key => $value
2194
2195Stores the given C<$value> in the family hash. Updates are delayed, if you
2196want the data to be synced to disk immediately, use C<cf::db_sync>.
2197
2198=item cf::db_dirty
2199
2200Marks the database as dirty, to be updated at a later time.
2201
2202=item cf::db_sync
2203
2204Immediately write the database to disk I<if it is dirty>.
2205
2206=cut
2207
2208our $DB;
2209
2210{
2211 my $path = cf::localdir . "/database.pst";
2212
2213 sub db_load() {
2214 $DB = stat $path ? Storable::retrieve $path : { };
2215 } 2692 {
2693 my $faces = $facedata->{faceinfo};
2216 2694
2217 my $pid; 2695 while (my ($face, $info) = each %$faces) {
2218 2696 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2219 sub db_save() { 2697 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2220 waitpid $pid, 0 if $pid; 2698 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2221 if (0 == ($pid = fork)) { 2699 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2222 $DB->{_meta}{version} = 1; 2700 Coro::cede;
2223 Storable::nstore $DB, "$path~";
2224 rename "$path~", $path;
2225 cf::_exit 0 if defined $pid;
2226 }
2227 }
2228
2229 my $dirty;
2230
2231 sub db_sync() {
2232 db_save if $dirty;
2233 undef $dirty;
2234 }
2235
2236 my $idle = Event->idle (
2237 reentrant => 0,
2238 min => 10,
2239 max => 20,
2240 repeat => 0,
2241 data => WF_AUTOCANCEL,
2242 cb => \&db_sync,
2243 );
2244
2245 sub db_dirty() {
2246 $dirty = 1;
2247 $idle->start;
2248 }
2249
2250 sub db_get($;$) {
2251 @_ >= 2
2252 ? $DB->{$_[0]}{$_[1]}
2253 : ($DB->{$_[0]} ||= { })
2254 }
2255
2256 sub db_put($$;$) {
2257 if (@_ >= 3) {
2258 $DB->{$_[0]}{$_[1]} = $_[2];
2259 } else {
2260 $DB->{$_[0]} = $_[1];
2261 }
2262 db_dirty;
2263 }
2264
2265 cf::global->attach (
2266 prio => 10000,
2267 on_cleanup => sub {
2268 db_sync;
2269 }, 2701 }
2270 );
2271}
2272 2702
2273############################################################################# 2703 while (my ($face, $info) = each %$faces) {
2274# the server's main() 2704 next unless $info->{smooth};
2705 my $idx = cf::face::find $face
2706 or next;
2707 if (my $smooth = cf::face::find $info->{smooth}) {
2708 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2709 } else {
2710 warn "smooth face '$info->{smooth}' not found for face '$face'";
2711 }
2712 Coro::cede;
2713 }
2714 }
2715
2716 {
2717 my $anims = $facedata->{animinfo};
2718
2719 while (my ($anim, $info) = each %$anims) {
2720 cf::anim::set $anim, $info->{frames}, $info->{facings};
2721 Coro::cede;
2722 }
2723
2724 cf::anim::invalidate_all; # d'oh
2725 }
2726
2727 1
2728}
2729
2730sub reload_regions {
2731 load_resource_file "$MAPDIR/regions"
2732 or die "unable to load regions file\n";
2733}
2734
2735sub reload_facedata {
2736 load_facedata "$DATADIR/facedata"
2737 or die "unable to load facedata\n";
2738}
2739
2740sub reload_archetypes {
2741 load_resource_file "$DATADIR/archetypes"
2742 or die "unable to load archetypes\n";
2743 #d# NEED to laod twice to resolve forward references
2744 # this really needs to be done in an extra post-pass
2745 # (which needs to be synchronous, so solve it differently)
2746 load_resource_file "$DATADIR/archetypes"
2747 or die "unable to load archetypes\n";
2748}
2749
2750sub reload_treasures {
2751 load_resource_file "$DATADIR/treasures"
2752 or die "unable to load treasurelists\n";
2753}
2754
2755sub reload_resources {
2756 warn "reloading resource files...\n";
2757
2758 reload_regions;
2759 reload_facedata;
2760 #reload_archetypes;#d#
2761 reload_archetypes;
2762 reload_treasures;
2763
2764 warn "finished reloading resource files\n";
2765}
2766
2767sub init {
2768 reload_resources;
2769}
2275 2770
2276sub cfg_load { 2771sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2772 open my $fh, "<:utf8", "$CONFDIR/config"
2278 or return; 2773 or return;
2279 2774
2280 local $/; 2775 local $/;
2281 *CFG = YAML::Syck::Load <$fh>; 2776 *CFG = YAML::Syck::Load <$fh>;
2282 2777
2302 Event::one_event; 2797 Event::one_event;
2303 })->prio (Coro::PRIO_MAX); 2798 })->prio (Coro::PRIO_MAX);
2304 }; 2799 };
2305 2800
2306 cfg_load; 2801 cfg_load;
2307 db_load; 2802 db_init;
2308 load_extensions; 2803 load_extensions;
2309 2804
2310 $TICK_WATCHER->start; 2805 $TICK_WATCHER->start;
2311 Event::loop; 2806 Event::loop;
2312} 2807}
2327 }, 2822 },
2328 ); 2823 );
2329 } 2824 }
2330} 2825}
2331 2826
2827sub write_runtime {
2828 my $runtime = "$LOCALDIR/runtime";
2829
2830 # first touch the runtime file to show we are still running:
2831 # the fsync below can take a very very long time.
2832
2833 IO::AIO::aio_utime $runtime, undef, undef;
2834
2835 my $guard = cf::lock_acquire "write_runtime";
2836
2837 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2838 or return;
2839
2840 my $value = $cf::RUNTIME + 90 + 10;
2841 # 10 is the runtime save interval, for a monotonic clock
2842 # 60 allows for the watchdog to kill the server.
2843
2844 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2845 and return;
2846
2847 # always fsync - this file is important
2848 aio_fsync $fh
2849 and return;
2850
2851 # touch it again to show we are up-to-date
2852 aio_utime $fh, undef, undef;
2853
2854 close $fh
2855 or return;
2856
2857 aio_rename "$runtime~", $runtime
2858 and return;
2859
2860 warn "runtime file written.\n";
2861
2862 1
2863}
2864
2332sub emergency_save() { 2865sub emergency_save() {
2333 my $freeze_guard = cf::freeze_mainloop; 2866 my $freeze_guard = cf::freeze_mainloop;
2334 2867
2335 warn "enter emergency perl save\n"; 2868 warn "enter emergency perl save\n";
2336 2869
2351 my $map = $cf::MAP{$path} or next; 2884 my $map = $cf::MAP{$path} or next;
2352 $map->valid or next; 2885 $map->valid or next;
2353 $map->save; 2886 $map->save;
2354 } 2887 }
2355 warn "end emergency map save\n"; 2888 warn "end emergency map save\n";
2889
2890 warn "begin emergency database checkpoint\n";
2891 BDB::db_env_txn_checkpoint $DB_ENV;
2892 warn "end emergency database checkpoint\n";
2356 }; 2893 };
2357 2894
2358 warn "leave emergency perl save\n"; 2895 warn "leave emergency perl save\n";
2359} 2896}
2360 2897
2898sub post_cleanup {
2899 my ($make_core) = @_;
2900
2901 warn Carp::longmess "post_cleanup backtrace"
2902 if $make_core;
2903}
2904
2361sub reload() { 2905sub do_reload_perl() {
2362 # can/must only be called in main 2906 # can/must only be called in main
2363 if ($Coro::current != $Coro::main) { 2907 if ($Coro::current != $Coro::main) {
2364 warn "can only reload from main coroutine"; 2908 warn "can only reload from main coroutine";
2365 return; 2909 return;
2366 } 2910 }
2367 2911
2368 warn "reloading..."; 2912 warn "reloading...";
2369 2913
2370 warn "cancelling server ticker"; 2914 warn "entering sync_job";
2371 $TICK_WATCHER->cancel;
2372 2915
2916 cf::sync_job {
2917 cf::write_runtime; # external watchdog should not bark
2373 cf::emergency_save; 2918 cf::emergency_save;
2919 cf::write_runtime; # external watchdog should not bark
2374 2920
2375 eval { 2921 warn "syncing database to disk";
2922 BDB::db_env_txn_checkpoint $DB_ENV;
2923
2376 # if anything goes wrong in here, we should simply crash as we already saved 2924 # if anything goes wrong in here, we should simply crash as we already saved
2377
2378 warn "syncing database to disk";
2379 cf::db_sync;
2380 2925
2381 warn "cancelling all WF_AUTOCANCEL watchers"; 2926 warn "cancelling all WF_AUTOCANCEL watchers";
2382 for (Event::all_watchers) { 2927 for (Event::all_watchers) {
2383 $_->cancel if $_->data & WF_AUTOCANCEL; 2928 $_->cancel if $_->data & WF_AUTOCANCEL;
2384 } 2929 }
2385 2930
2386 warn "flushing outstanding aio requests"; 2931 warn "flushing outstanding aio requests";
2387 for (;;) { 2932 for (;;) {
2933 BDB::flush;
2388 IO::AIO::flush; 2934 IO::AIO::flush;
2389 Coro::cede; 2935 Coro::cede;
2390 last unless IO::AIO::nreqs; 2936 last unless IO::AIO::nreqs || BDB::nreqs;
2391 warn "iterate..."; 2937 warn "iterate...";
2392 } 2938 }
2939
2940 ++$RELOAD;
2393 2941
2394 warn "cancelling all extension coros"; 2942 warn "cancelling all extension coros";
2395 $_->cancel for values %EXT_CORO; 2943 $_->cancel for values %EXT_CORO;
2396 %EXT_CORO = (); 2944 %EXT_CORO = ();
2397 2945
2398 warn "removing commands"; 2946 warn "removing commands";
2399 %COMMAND = (); 2947 %COMMAND = ();
2400 2948
2401 warn "removing ext commands"; 2949 warn "removing ext/exti commands";
2402 %EXTCMD = (); 2950 %EXTCMD = ();
2951 %EXTICMD = ();
2403 2952
2404 warn "unloading/nuking all extensions"; 2953 warn "unloading/nuking all extensions";
2405 for my $pkg (@EXTS) { 2954 for my $pkg (@EXTS) {
2406 warn "... unloading $pkg"; 2955 warn "... unloading $pkg";
2407 2956
2437 Symbol::delete_package "safe::$_" 2986 Symbol::delete_package "safe::$_"
2438 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2987 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2439 2988
2440 warn "unloading cf.pm \"a bit\""; 2989 warn "unloading cf.pm \"a bit\"";
2441 delete $INC{"cf.pm"}; 2990 delete $INC{"cf.pm"};
2991 delete $INC{"cf/pod.pm"};
2442 2992
2443 # don't, removes xs symbols, too, 2993 # don't, removes xs symbols, too,
2444 # and global variables created in xs 2994 # and global variables created in xs
2445 #Symbol::delete_package __PACKAGE__; 2995 #Symbol::delete_package __PACKAGE__;
2446 2996
2450 require cf; 3000 require cf;
2451 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3001 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2452 3002
2453 warn "loading config and database again"; 3003 warn "loading config and database again";
2454 cf::cfg_load; 3004 cf::cfg_load;
2455 cf::db_load;
2456 3005
2457 warn "loading extensions"; 3006 warn "loading extensions";
2458 cf::load_extensions; 3007 cf::load_extensions;
2459 3008
2460 warn "reattaching attachments to objects/players"; 3009 warn "reattaching attachments to objects/players";
2461 _global_reattach; 3010 _global_reattach; # objects, sockets
2462 warn "reattaching attachments to maps"; 3011 warn "reattaching attachments to maps";
2463 reattach $_ for values %MAP; 3012 reattach $_ for values %MAP;
3013 warn "reattaching attachments to players";
3014 reattach $_ for values %PLAYER;
2464 3015
2465 warn "restarting server ticker"; 3016 warn "leaving sync_job";
2466 3017
2467 $TICK_WATCHER->start; 3018 1
2468 }; 3019 } or do {
2469
2470 if ($@) {
2471 warn $@; 3020 warn $@;
2472 warn "error while reloading, exiting."; 3021 warn "error while reloading, exiting.";
2473 exit 1; 3022 exit 1;
2474 } 3023 };
2475 3024
2476 warn "reloaded"; 3025 warn "reloaded";
2477}; 3026};
2478 3027
2479our $RELOAD_WATCHER; # used only during reload 3028our $RELOAD_WATCHER; # used only during reload
2480 3029
3030sub reload_perl() {
3031 # doing reload synchronously and two reloads happen back-to-back,
3032 # coro crashes during coro_state_free->destroy here.
3033
3034 $RELOAD_WATCHER ||= Event->timer (
3035 reentrant => 0,
3036 after => 0,
3037 data => WF_AUTOCANCEL,
3038 cb => sub {
3039 do_reload_perl;
3040 undef $RELOAD_WATCHER;
3041 },
3042 );
3043}
3044
2481register_command "reload" => sub { 3045register_command "reload" => sub {
2482 my ($who, $arg) = @_; 3046 my ($who, $arg) = @_;
2483 3047
2484 if ($who->flag (FLAG_WIZ)) { 3048 if ($who->flag (FLAG_WIZ)) {
2485 $who->message ("reloading server."); 3049 $who->message ("reloading server.");
2486 3050 async { reload_perl };
2487 # doing reload synchronously and two reloads happen back-to-back,
2488 # coro crashes during coro_state_free->destroy here.
2489
2490 $RELOAD_WATCHER ||= Event->timer (
2491 reentrant => 0,
2492 after => 0,
2493 data => WF_AUTOCANCEL,
2494 cb => sub {
2495 reload;
2496 undef $RELOAD_WATCHER;
2497 },
2498 );
2499 } 3051 }
2500}; 3052};
2501 3053
2502unshift @INC, $LIBDIR; 3054unshift @INC, $LIBDIR;
2503 3055
2504my $bug_warning = 0; 3056my $bug_warning = 0;
2505 3057
3058our @WAIT_FOR_TICK;
3059our @WAIT_FOR_TICK_BEGIN;
3060
3061sub wait_for_tick {
3062 return unless $TICK_WATCHER->is_active;
3063 return if $Coro::current == $Coro::main;
3064
3065 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK, $signal;
3067 $signal->wait;
3068}
3069
3070sub wait_for_tick_begin {
3071 return unless $TICK_WATCHER->is_active;
3072 return if $Coro::current == $Coro::main;
3073
3074 my $signal = new Coro::Signal;
3075 push @WAIT_FOR_TICK_BEGIN, $signal;
3076 $signal->wait;
3077}
3078
3079 my $min = 1e6;#d#
3080 my $avg = 10;
2506$TICK_WATCHER = Event->timer ( 3081$TICK_WATCHER = Event->timer (
2507 reentrant => 0, 3082 reentrant => 0,
2508 parked => 1, 3083 parked => 1,
2509 prio => 0, 3084 prio => 0,
2510 at => $NEXT_TICK || $TICK, 3085 at => $NEXT_TICK || $TICK,
2514 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3089 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2515 unless ++$bug_warning > 10; 3090 unless ++$bug_warning > 10;
2516 return; 3091 return;
2517 } 3092 }
2518 3093
2519 $NOW = Event::time; 3094 $NOW = $tick_start = Event::time;
2520 3095
2521 cf::server_tick; # one server iteration 3096 cf::server_tick; # one server iteration
3097
3098 0 && sync_job {#d#
3099 for(1..10) {
3100 my $t = Event::time;
3101 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3102 or die;
3103
3104 $map->width (50);
3105 $map->height (50);
3106 $map->alloc;
3107 $map->_load_objects ("/tmp/x.map", 1);
3108 my $t = Event::time - $t;
3109
3110 #next unless $t < 0.0013;#d#
3111 if ($t < $min) {
3112 $min = $t;
3113 }
3114 $avg = $avg * 0.99 + $t * 0.01;
3115 }
3116 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3117 exit 0;
3118 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3119 };
3120
2522 $RUNTIME += $TICK; 3121 $RUNTIME += $TICK;
2523 $NEXT_TICK += $TICK; 3122 $NEXT_TICK += $TICK;
2524 3123
2525 $WAIT_FOR_TICK->broadcast; 3124 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2526 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3125 $NEXT_RUNTIME_WRITE = $NOW + 10;
2527 3126 Coro::async_pool {
2528 Event::sweep; 3127 write_runtime
2529 Coro::cede_notself; 3128 or warn "ERROR: unable to write runtime file: $!";
3129 };
2530 3130 }
3131
2531# my $AFTER = Event::time; 3132# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d# 3133# warn $AFTER - $NOW;#d#
2533 3134
3135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3136 $sig->send;
3137 }
3138 while (my $sig = shift @WAIT_FOR_TICK) {
3139 $sig->send;
3140 }
3141
3142 $NOW = Event::time;
3143
2534 # if we are delayed by four ticks or more, skip them all 3144 # if we are delayed by four ticks or more, skip them all
2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3145 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2536 3146
2537 $TICK_WATCHER->at ($NEXT_TICK); 3147 $TICK_WATCHER->at ($NEXT_TICK);
2538 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
3149
3150 $LOAD = ($NOW - $tick_start) / $TICK;
3151 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3152
3153 _post_tick;
3154
3155
2539 }, 3156 },
2540); 3157);
2541 3158
3159{
3160 BDB::max_poll_time $TICK * 0.1;
3161 $BDB_POLL_WATCHER = Event->io (
3162 reentrant => 0,
3163 fd => BDB::poll_fileno,
3164 poll => 'r',
3165 prio => 0,
3166 data => WF_AUTOCANCEL,
3167 cb => \&BDB::poll_cb,
3168 );
3169 BDB::min_parallel 8;
3170
3171 BDB::set_sync_prepare {
3172 my $status;
3173 my $current = $Coro::current;
3174 (
3175 sub {
3176 $status = $!;
3177 $current->ready; undef $current;
3178 },
3179 sub {
3180 Coro::schedule while defined $current;
3181 $! = $status;
3182 },
3183 )
3184 };
3185
3186 unless ($DB_ENV) {
3187 $DB_ENV = BDB::db_env_create;
3188
3189 cf::sync_job {
3190 eval {
3191 BDB::db_env_open
3192 $DB_ENV,
3193 $BDBDIR,
3194 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3195 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3196 0666;
3197
3198 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3199
3200 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3201 $DB_ENV->set_lk_detect;
3202 };
3203
3204 cf::cleanup "db_env_open(db): $@" if $@;
3205 };
3206 }
3207}
3208
3209{
3210 IO::AIO::min_parallel 8;
3211
3212 undef $Coro::AIO::WATCHER;
2542IO::AIO::max_poll_time $TICK * 0.1; 3213 IO::AIO::max_poll_time $TICK * 0.1;
2543
2544undef $Coro::AIO::WATCHER;
2545$AIO_POLL_WATCHER = Event->io ( 3214 $AIO_POLL_WATCHER = Event->io (
2546 reentrant => 0, 3215 reentrant => 0,
3216 data => WF_AUTOCANCEL,
2547 fd => IO::AIO::poll_fileno, 3217 fd => IO::AIO::poll_fileno,
2548 poll => 'r', 3218 poll => 'r',
2549 prio => 6, 3219 prio => 6,
2550 data => WF_AUTOCANCEL,
2551 cb => \&IO::AIO::poll_cb, 3220 cb => \&IO::AIO::poll_cb,
2552); 3221 );
3222}
2553 3223
2554$WRITE_RUNTIME_WATCHER = Event->timer ( 3224my $_log_backtrace;
2555 reentrant => 0, 3225
2556 data => WF_AUTOCANCEL, 3226sub _log_backtrace {
2557 after => 1, 3227 my ($msg, @addr) = @_;
2558 interval => 10, 3228
2559 prio => 6, # keep it lowest so it acts like a watchdog 3229 $msg =~ s/\n//;
2560 cb => Coro::unblock_sub { 3230
2561 write_runtime 3231 # limit the # of concurrent backtraces
2562 or warn "ERROR: unable to write runtime file: $!"; 3232 if ($_log_backtrace < 2) {
3233 ++$_log_backtrace;
3234 async {
3235 my @bt = fork_call {
3236 @addr = map { sprintf "%x", $_ } @addr;
3237 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3238 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3239 or die "addr2line: $!";
3240
3241 my @funcs;
3242 my @res = <$fh>;
3243 chomp for @res;
3244 while (@res) {
3245 my ($func, $line) = splice @res, 0, 2, ();
3246 push @funcs, "[$func] $line";
3247 }
3248
3249 @funcs
3250 };
3251
3252 LOG llevInfo, "[ABT] $msg\n";
3253 LOG llevInfo, "[ABT] $_\n" for @bt;
3254 --$_log_backtrace;
3255 };
3256 } else {
3257 LOG llevInfo, "[ABT] $msg\n";
3258 LOG llevInfo, "[ABT] [suppressed]\n";
2563 }, 3259 }
2564); 3260}
3261
3262# load additional modules
3263use cf::pod;
2565 3264
2566END { cf::emergency_save } 3265END { cf::emergency_save }
2567 3266
25681 32671
2569 3268

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines