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.191 by root, Tue Jan 23 01:05:18 2007 UTC vs.
Revision 1.287 by root, Mon Jun 25 05:43:45 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.4 (); 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 BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
54our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 55our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 56our %EXT_MAP = (); # pluggable maps
43 57
58our $RELOAD; # number of reloads so far
44our @EVENT; 59our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 60
47our $TICK = MAX_TIME * 1e-6; 61our $CONFDIR = confdir;
62our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir;
66our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db";
72
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 74our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 77our $NEXT_TICK;
52our $NOW; 78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off
80
81our $BDB_POLL_WATCHER;
82our $DB_ENV;
53 83
54our %CFG; 84our %CFG;
55 85
56our $UPTIME; $UPTIME ||= time; 86our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 87our $RUNTIME;
58 88
59our %PLAYER; # all users 89our %PLAYER; # all users
60our %MAP; # all maps 90our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 91our $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 92
67# used to convert map paths into valid unix filenames by replacing / by ∕ 93# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 95
96our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing
98our $tick_start; # for load detecting purposes
99
70binmode STDOUT; 100binmode STDOUT;
71binmode STDERR; 101binmode STDERR;
72 102
73# read virtual server time, if available 103# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 104unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 105 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 106 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 107 $RUNTIME = <$fh> + 0.;
78} 108}
79 109
80mkdir cf::localdir; 110mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 112
86our $EMERGENCY_POSITION; 113our $EMERGENCY_POSITION;
114
115sub cf::map::normalise;
87 116
88############################################################################# 117#############################################################################
89 118
90=head2 GLOBAL VARIABLES 119=head2 GLOBAL VARIABLES
91 120
98=item $cf::RUNTIME 127=item $cf::RUNTIME
99 128
100The time this server has run, starts at 0 and is increased by $cf::TICK on 129The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 130every server tick.
102 131
103=item $cf::LIBDIR 132=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
133$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
134$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 135
105The perl library directory, where extensions and cf-specific modules can 136Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 137directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
138unique-items directory, player file directory, random maps directory and
139database environment.
107 140
108=item $cf::NOW 141=item $cf::NOW
109 142
110The time of the last (current) server tick. 143The time of the last (current) server tick.
111 144
112=item $cf::TICK 145=item $cf::TICK
113 146
114The interval between server ticks, in seconds. 147The interval between server ticks, in seconds.
148
149=item $cf::LOADAVG
150
151The current CPU load on the server (alpha-smoothed), as a value between 0
152(none) and 1 (overloaded), indicating how much time is spent on processing
153objects per tick. Healthy values are < 0.5.
154
155=item $cf::LOAD
156
157The raw value load value from the last tick.
115 158
116=item %cf::CFG 159=item %cf::CFG
117 160
118Configuration for the server, loaded from C</etc/crossfire/config>, or 161Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 162from wherever your confdir points to.
120 163
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 164=item cf::wait_for_tick, cf::wait_for_tick_begin
122 165
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 167returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 168per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 169
128=back 170=back
129 171
130=cut 172=cut
131 173
132BEGIN { 174BEGIN {
133 *CORE::GLOBAL::warn = sub { 175 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 176 my $msg = join "", @_;
135 utf8::encode $msg;
136 177
137 $msg .= "\n" 178 $msg .= "\n"
138 unless $msg =~ /\n$/; 179 unless $msg =~ /\n$/;
139 180
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182
183 utf8::encode $msg;
140 LOG llevError, $msg; 184 LOG llevError, $msg;
141 }; 185 };
142} 186}
143 187
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 192@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
193@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 194@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 195
151# we bless all objects into (empty) derived classes to force a method lookup 196# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 197# within the Safe compartment.
153for my $pkg (qw( 198for my $pkg (qw(
154 cf::global cf::attachable 199 cf::global cf::attachable
162} 207}
163 208
164$Event::DIED = sub { 209$Event::DIED = sub {
165 warn "error in event callback: @_"; 210 warn "error in event callback: @_";
166}; 211};
212
213#############################################################################
167 214
168=head2 UTILITY FUNCTIONS 215=head2 UTILITY FUNCTIONS
169 216
170=over 4 217=over 4
171 218
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 238 $d
192 } || "[unable to dump $_[0]: '$@']"; 239 } || "[unable to dump $_[0]: '$@']";
193} 240}
194 241
195use JSON::Syck (); # TODO# replace by JSON::PC once working 242use JSON::XS ();
196 243
197=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
198 245
199Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
200 247
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 248=item $json = cf::to_json $ref
209 249
210Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
211 251
212=cut 252=cut
213 253
214sub to_json($) { 254our $json_coder = JSON::XS->new->convert_blessed->utf8;
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 255
216 JSON::Syck::Dump $_[0] 256sub to_json ($) { $json_coder->encode ($_[0]) }
217} 257sub from_json ($) { $json_coder->decode ($_[0]) }
218 258
219=item cf::lock_wait $string 259=item cf::lock_wait $string
220 260
221Wait until the given lock is available. See cf::lock_acquire. 261Wait until the given lock is available. See cf::lock_acquire.
222 262
228returned. 268returned.
229 269
230Lock names should begin with a unique identifier (for example, cf::map::find 270Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 271uses map_find and cf::map::load uses map_load).
232 272
273=item $locked = cf::lock_active $string
274
275Return true if the lock is currently active, i.e. somebody has locked it.
276
233=cut 277=cut
234 278
235our %LOCK; 279our %LOCK;
236 280
237sub lock_wait($) { 281sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 300 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 301 $_->ready for @{ delete $LOCK{$key} };
258 } 302 }
259} 303}
260 304
305sub lock_active($) {
306 my ($key) = @_;
307
308 ! ! $LOCK{$key}
309}
310
261sub freeze_mainloop { 311sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 312 return unless $TICK_WATCHER->is_active;
263 313
264 my $guard = Coro::guard { 314 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 315 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 316 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 317 $TICK_WATCHER->stop;
270 $guard 318 $guard
271} 319}
272 320
273=item cf::async { BLOCK } 321=item cf::async { BLOCK }
280 328
281BEGIN { *async = \&Coro::async_pool } 329BEGIN { *async = \&Coro::async_pool }
282 330
283=item cf::sync_job { BLOCK } 331=item cf::sync_job { BLOCK }
284 332
285The design of crossfire+ requires that the main coro ($Coro::main) is 333The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 334is 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. 335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable.
288 337
289If it must be done, put the blocking parts into C<sync_job>. This will run 338If 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 339the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 340server will be frozen during this time, so the block should either finish
292fast or be very important. 341fast or be very important.
295 344
296sub sync_job(&) { 345sub sync_job(&) {
297 my ($job) = @_; 346 my ($job) = @_;
298 347
299 if ($Coro::current == $Coro::main) { 348 if ($Coro::current == $Coro::main) {
349 my $time = Event::time;
350
300 # this is the main coro, too bad, we have to block 351 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 352 # till the operation succeeds, freezing the server :/
302 353
303 # TODO: use suspend/resume instead 354 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 355 # (but this is cancel-safe)
315 366
316 while ($busy) { 367 while ($busy) {
317 Coro::cede or Event::one_event; 368 Coro::cede or Event::one_event;
318 } 369 }
319 370
371 $time = Event::time - $time;
372
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load
377
320 wantarray ? @res : $res[0] 378 wantarray ? @res : $res[0]
321 } else { 379 } else {
322 # we are in another coroutine, how wonderful, everything just works 380 # we are in another coroutine, how wonderful, everything just works
323 381
324 $job->() 382 $job->()
343 $EXT_CORO{$coro+0} = $coro; 401 $EXT_CORO{$coro+0} = $coro;
344 402
345 $coro 403 $coro
346} 404}
347 405
348sub write_runtime { 406=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 407
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 408Executes the given code block with the given arguments in a seperate
352 or return; 409process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling.
353 412
354 my $value = $cf::RUNTIME + 90 + 10; 413=cut
355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357 414
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 415sub fork_call(&@) {
359 and return; 416 my ($cb, @args) = @_;
360 417
361 aio_fsync $fh 418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
362 and return; 419# or die "socketpair: $!";
420 pipe my $fh1, my $fh2
421 or die "pipe: $!";
363 422
423 if (my $pid = fork) {
364 close $fh 424 close $fh2;
365 or return;
366 425
367 aio_rename "$runtime~", $runtime 426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
368 and return; 427 $res = Coro::Storable::thaw $res;
369 428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals;
436 local $SIG{__WARN__};
437 local $SIG{__DIE__};
438 eval {
439 close $fh1;
440
441 my @res = eval { $cb->(@args) };
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
370 1 447 }
448}
449
450=item $value = cf::db_get $family => $key
451
452Returns a single value from the environment database.
453
454=item cf::db_put $family => $key => $value
455
456Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458
459=cut
460
461our $DB;
462
463sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job {
468 eval {
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 }
478}
479
480sub db_get($$) {
481 my $key = "$_[0]/$_[1]";
482
483 cf::sync_job {
484 BDB::db_get $DB, undef, $key, my $data;
485
486 $! ? ()
487 : $data
488 }
489}
490
491sub db_put($$$) {
492 BDB::dbreq_pri 4;
493 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
494}
495
496=item cf::cache $id => [$paths...], $processversion => $process
497
498Generic caching function that returns the value of the resource $id,
499caching and regenerating as required.
500
501This function can block.
502
503=cut
504
505sub cache {
506 my ($id, $src, $processversion, $process) = @_;
507
508 my $meta =
509 join "\x00",
510 $processversion,
511 map {
512 aio_stat $_
513 and Carp::croak "$_: $!";
514
515 ($_, (stat _)[7,9])
516 } @$src;
517
518 my $dbmeta = db_get cache => "$id/meta";
519 if ($dbmeta ne $meta) {
520 # changed, we may need to process
521
522 my @data;
523 my $md5;
524
525 for (0 .. $#$src) {
526 0 <= aio_load $src->[$_], $data[$_]
527 or Carp::croak "$src->[$_]: $!";
528 }
529
530 # if processing is expensive, check
531 # checksum first
532 if (1) {
533 $md5 =
534 join "\x00",
535 $processversion,
536 map {
537 Coro::cede;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src;
540
541
542 my $dbmd5 = db_get cache => "$id/md5";
543 if ($dbmd5 eq $md5) {
544 db_put cache => "$id/meta", $meta;
545
546 return db_get cache => "$id/data";
547 }
548 }
549
550 my $t1 = Time::HiRes::time;
551 my $data = $process->(\@data);
552 my $t2 = Time::HiRes::time;
553
554 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
555
556 db_put cache => "$id/data", $data;
557 db_put cache => "$id/md5" , $md5;
558 db_put cache => "$id/meta", $meta;
559
560 return $data;
561 }
562
563 db_get cache => "$id/data"
564}
565
566=item cf::datalog type => key => value, ...
567
568Log a datalog packet of the given type with the given key-value pairs.
569
570=cut
571
572sub datalog($@) {
573 my ($type, %kv) = @_;
574 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 575}
372 576
373=back 577=back
374 578
375=cut 579=cut
382attach callbacks/event handlers (a collection of which is called an "attachment") 586attach callbacks/event handlers (a collection of which is called an "attachment")
383to it. All such attachable objects support the following methods. 587to it. All such attachable objects support the following methods.
384 588
385In the following description, CLASS can be any of C<global>, C<object> 589In the following description, CLASS can be any of C<global>, C<object>
386C<player>, C<client> or C<map> (i.e. the attachable objects in 590C<player>, C<client> or C<map> (i.e. the attachable objects in
387crossfire+). 591Crossfire TRT).
388 592
389=over 4 593=over 4
390 594
391=item $attachable->attach ($attachment, key => $value...) 595=item $attachable->attach ($attachment, key => $value...)
392 596
555 $registry = $CB_TYPE[$object_type] ||= []; 759 $registry = $CB_TYPE[$object_type] ||= [];
556 760
557 } elsif ($type eq "subtype") { 761 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 762 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 763 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 764 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 765
562 } elsif ($type eq "package") { 766 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 767 my $pkg = shift @arg;
564 768
565 while (my ($name, $id) = each %cb_id) { 769 while (my ($name, $id) = each %cb_id) {
594 _attach $registry, $klass, @attach; 798 _attach $registry, $klass, @attach;
595 } 799 }
596 800
597 $obj->{$name} = \%arg; 801 $obj->{$name} = \%arg;
598 } else { 802 } else {
599 warn "object uses attachment '$name' that is not available, postponing.\n"; 803 warn "object uses attachment '$name' which is not available, postponing.\n";
600 } 804 }
601 805
602 $obj->{_attachment}{$name} = undef; 806 $obj->{_attachment}{$name} = undef;
603} 807}
604 808
606 if (ref $_[0]) { 810 if (ref $_[0]) {
607 _object_attach @_; 811 _object_attach @_;
608 } else { 812 } else {
609 _attach shift->_attach_registry, @_; 813 _attach shift->_attach_registry, @_;
610 } 814 }
815 _recalc_want;
611}; 816};
612 817
613# all those should be optimised 818# all those should be optimised
614sub cf::attachable::detach { 819sub cf::attachable::detach {
615 my ($obj, $name) = @_; 820 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 823 delete $obj->{_attachment}{$name};
619 reattach ($obj); 824 reattach ($obj);
620 } else { 825 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 826 Carp::croak "cannot, currently, detach class attachments";
622 } 827 }
828 _recalc_want;
623}; 829};
624 830
625sub cf::attachable::attached { 831sub cf::attachable::attached {
626 my ($obj, $name) = @_; 832 my ($obj, $name) = @_;
627 833
750 $filename, length $$rdata, scalar @$objs; 956 $filename, length $$rdata, scalar @$objs;
751 957
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 959 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 960 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 961 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 962 close $fh;
757 963
758 if (@$objs) { 964 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 966 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 967 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 968 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 969 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 970 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 971 aio_rename "$filename.pst~", "$filename.pst";
766 } 972 }
767 } else { 973 } else {
768 aio_unlink "$filename.pst"; 974 aio_unlink "$filename.pst";
800 or return; 1006 or return;
801 $av = eval { (Storable::thaw $av)->{objs} }; 1007 $av = eval { (Storable::thaw $av)->{objs} };
802 } 1008 }
803 1009
804 warn sprintf "loading %s (%d)\n", 1010 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 1011 $filename, length $data, scalar @{$av || []};
806 return ($data, $av); 1012 return ($data, $av);
807} 1013}
1014
1015=head2 COMMAND CALLBACKS
1016
1017=over 4
1018
1019=cut
808 1020
809############################################################################# 1021#############################################################################
810# command handling &c 1022# command handling &c
811 1023
812=item cf::register_command $name => \&callback($ob,$args); 1024=item cf::register_command $name => \&callback($ob,$args);
825 push @{ $COMMAND{$name} }, [$caller, $cb]; 1037 push @{ $COMMAND{$name} }, [$caller, $cb];
826} 1038}
827 1039
828=item cf::register_extcmd $name => \&callback($pl,$packet); 1040=item cf::register_extcmd $name => \&callback($pl,$packet);
829 1041
830Register a callbackf ro execution when the client sends an extcmd packet. 1042Register a callback for execution when the client sends an (synchronous)
1043extcmd packet. Ext commands will be processed in the order they are
1044received by the server, like other user commands. The first argument is
1045the logged-in player. Ext commands can only be processed after a player
1046has logged in successfully.
831 1047
832If the callback returns something, it is sent back as if reply was being 1048If the callback returns something, it is sent back as if reply was being
833called. 1049called.
834 1050
1051=item cf::register_exticmd $name => \&callback($ns,$packet);
1052
1053Register a callback for execution when the client sends an (asynchronous)
1054exticmd packet. Exti commands are processed by the server as soon as they
1055are received, i.e. out of order w.r.t. other commands. The first argument
1056is a client socket. Exti commands can be received anytime, even before
1057log-in.
1058
1059If the callback returns something, it is sent back as if reply was being
1060called.
1061
835=cut 1062=cut
836 1063
837sub register_extcmd { 1064sub register_extcmd {
838 my ($name, $cb) = @_; 1065 my ($name, $cb) = @_;
839 1066
840 $EXTCMD{$name} = $cb; 1067 $EXTCMD{$name} = $cb;
1068}
1069
1070sub register_exticmd {
1071 my ($name, $cb) = @_;
1072
1073 $EXTICMD{$name} = $cb;
841} 1074}
842 1075
843cf::player->attach ( 1076cf::player->attach (
844 on_command => sub { 1077 on_command => sub {
845 my ($pl, $name, $params) = @_; 1078 my ($pl, $name, $params) = @_;
870 1103
871 cf::override; 1104 cf::override;
872 }, 1105 },
873); 1106);
874 1107
875sub load_extension {
876 my ($path) = @_;
877
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
879 my $base = $1;
880 my $pkg = $1;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
905
906 push @EXTS, $pkg;
907}
908
909sub load_extensions { 1108sub load_extensions {
1109 cf::sync_job {
1110 my %todo;
1111
910 for my $ext (<$LIBDIR/*.ext>) { 1112 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 1113 next unless -r $path;
912 eval { 1114
913 load_extension $ext; 1115 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1116 my $base = $1;
1117 my $pkg = $1;
1118 $pkg =~ s/[^[:word:]]/_/g;
1119 $pkg = "ext::$pkg";
1120
1121 open my $fh, "<:utf8", $path
1122 or die "$path: $!";
1123
1124 my $source = do { local $/; <$fh> };
1125
1126 my %ext = (
1127 path => $path,
1128 base => $base,
1129 pkg => $pkg,
1130 );
1131
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134
1135 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n"
1137 . "#line 1 \"$path\"\n{\n"
1138 . $source
1139 . "\n};\n1";
1140
1141 $todo{$base} = \%ext;
1142 }
1143
1144 my %done;
1145 while (%todo) {
1146 my $progress;
1147
1148 while (my ($k, $v) = each %todo) {
1149 for (split /,\s*/, $v->{meta}{depends}) {
1150 goto skip
1151 unless exists $done{$_};
1152 }
1153
1154 warn "... loading '$k' into '$v->{pkg}'\n";
1155
1156 unless (eval $v->{source}) {
1157 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n";
1159
1160 if (exists $v->{meta}{mandatory}) {
1161 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n";
1163 exit 1;
1164 }
1165
1166 warn $msg;
1167 }
1168
1169 $done{$k} = delete $todo{$k};
1170 push @EXTS, $v->{pkg};
1171 $progress = 1;
914 1 1172 }
915 } or warn "$ext not loaded: $@"; 1173
1174 skip:
1175 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1176 unless $progress;
1177 }
916 } 1178 };
917} 1179}
918 1180
919############################################################################# 1181#############################################################################
920 1182
1183=back
1184
921=head2 CORE EXTENSIONS 1185=head2 CORE EXTENSIONS
922 1186
923Functions and methods that extend core crossfire objects. 1187Functions and methods that extend core crossfire objects.
924 1188
925=cut 1189=cut
937Returns the given player object, loading it if necessary (might block). 1201Returns the given player object, loading it if necessary (might block).
938 1202
939=cut 1203=cut
940 1204
941sub playerdir($) { 1205sub playerdir($) {
942 cf::localdir 1206 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1207 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1208}
948 1209
949sub path($) { 1210sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1211 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1212
952 (playerdir $login) . "/$login.pl" 1213 (playerdir $login) . "/playerdata"
953} 1214}
954 1215
955sub find_active($) { 1216sub find_active($) {
956 $cf::PLAYER{$_[0]} 1217 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1218 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1231 my $login = $_[0];
971 1232
972 my $guard = cf::lock_acquire "user_find:$login"; 1233 my $guard = cf::lock_acquire "user_find:$login";
973 1234
974 $cf::PLAYER{$_[0]} || do { 1235 $cf::PLAYER{$_[0]} || do {
1236 # rename old playerfiles to new ones
1237 #TODO: remove when no longer required
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl";
1242
975 my $pl = load_pl path $login 1243 my $pl = load_pl path $login
976 or return; 1244 or return;
977 $cf::PLAYER{$login} = $pl 1245 $cf::PLAYER{$login} = $pl
978 } 1246 }
979 } 1247 }
1016 1284
1017=cut 1285=cut
1018 1286
1019sub quit_character { 1287sub quit_character {
1020 my ($pl) = @_; 1288 my ($pl) = @_;
1289
1290 my $name = $pl->ob->name;
1021 1291
1022 $pl->{deny_save} = 1; 1292 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1293 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1294
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1300 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1301 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1302 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1303 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1304 $pl->destroy;
1305
1306 my $prefix = qr<^~\Q$name\E/>;
1307
1308 # nuke player maps
1309 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1310
1035 IO::AIO::aio_rmtree $temp; 1311 IO::AIO::aio_rmtree $temp;
1312}
1313
1314=item $pl->kick
1315
1316Kicks a player out of the game. This destroys the connection.
1317
1318=cut
1319
1320sub kick {
1321 my ($pl, $kicker) = @_;
1322
1323 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1324 $pl->killer ("kicked");
1325 $pl->ns->destroy;
1036} 1326}
1037 1327
1038=item cf::player::list_logins 1328=item cf::player::list_logins
1039 1329
1040Returns am arrayref of all valid playernames in the system, can take a 1330Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1331while and may block, so not sync_job-capable, ever.
1042 1332
1043=cut 1333=cut
1044 1334
1045sub list_logins { 1335sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1336 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1337 or return [];
1048 1338
1049 my @logins; 1339 my @logins;
1050 1340
1051 for my $login (@$dirs) { 1341 for my $login (@$dirs) {
1068=cut 1358=cut
1069 1359
1070sub maps($) { 1360sub maps($) {
1071 my ($pl) = @_; 1361 my ($pl) = @_;
1072 1362
1363 $pl = ref $pl ? $pl->ob->name : $pl;
1364
1073 my $files = aio_readdir playerdir $pl 1365 my $files = aio_readdir playerdir $pl
1074 or return; 1366 or return;
1075 1367
1076 my @paths; 1368 my @paths;
1077 1369
1078 for (@$files) { 1370 for (@$files) {
1079 utf8::decode $_; 1371 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1372 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1373 next unless /^$PATH_SEP/o;
1082 1374
1083 s/\.map$//; 1375 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1376 }
1086 1377
1087 \@paths 1378 \@paths
1088} 1379}
1089 1380
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1382
1383Expand crossfire pod fragments into protocol xml.
1384
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1414=item $player->ext_reply ($msgid, %msg)
1091 1415
1092Sends an ext reply to the player. 1416Sends an ext reply to the player.
1093 1417
1094=cut 1418=cut
1095 1419
1096sub ext_reply($$$%) { 1420sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1421 my ($self, $id, %msg) = @_;
1098 1422
1099 $msg{msgid} = $id; 1423 $msg{msgid} = $id;
1100
1101 $self->send ("ext " . cf::to_json \%msg); 1424 $self->send ("ext " . cf::to_json \%msg);
1102} 1425}
1103 1426
1104package cf; 1427=item $player->ext_event ($type, %msg)
1428
1429Sends an ext event to the client.
1430
1431=cut
1432
1433sub ext_event($$%) {
1434 my ($self, $type, %msg) = @_;
1435
1436 $self->ns->ext_event ($type, %msg);
1437}
1438
1439=head3 cf::region
1440
1441=over 4
1442
1443=cut
1444
1445package cf::region;
1446
1447=item cf::region::find_by_path $path
1448
1449Tries to decuce the likely region for a map knowing only its path.
1450
1451=cut
1452
1453sub find_by_path($) {
1454 my ($path) = @_;
1455
1456 my ($match, $specificity);
1457
1458 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) {
1460 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity;
1462 }
1463 }
1464
1465 $match
1466}
1105 1467
1106=back 1468=back
1107
1108 1469
1109=head3 cf::map 1470=head3 cf::map
1110 1471
1111=over 4 1472=over 4
1112 1473
1167 my ($self, $merge) = @_; 1528 my ($self, $merge) = @_;
1168 1529
1169 # we have to keep some variables in memory intact 1530 # we have to keep some variables in memory intact
1170 local $self->{path}; 1531 local $self->{path};
1171 local $self->{load_path}; 1532 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1533
1175 $self->SUPER::thawer_merge ($merge); 1534 $self->SUPER::thawer_merge ($merge);
1176} 1535}
1177 1536
1178sub normalise { 1537sub normalise {
1179 my ($path, $base) = @_; 1538 my ($path, $base) = @_;
1539
1540 $path = "$path"; # make sure its a string
1541
1542 $path =~ s/\.map$//;
1180 1543
1181 # map plan: 1544 # map plan:
1182 # 1545 #
1183 # /! non-realised random map exit (special hack!) 1546 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1547 # {... are special paths that are not being touched
1221 $self->init; # pass $1 etc. 1584 $self->init; # pass $1 etc.
1222 return $self; 1585 return $self;
1223 } 1586 }
1224 } 1587 }
1225 1588
1226 Carp::carp "unable to resolve path '$path'."; 1589 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1590 ()
1228} 1591}
1229 1592
1230sub init { 1593sub init {
1231 my ($self) = @_; 1594 my ($self) = @_;
1246 1609
1247# the original (read-only) location 1610# the original (read-only) location
1248sub load_path { 1611sub load_path {
1249 my ($self) = @_; 1612 my ($self) = @_;
1250 1613
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1614 "$MAPDIR/$self->{path}.map"
1252} 1615}
1253 1616
1254# the temporary/swap location 1617# the temporary/swap location
1255sub save_path { 1618sub save_path {
1256 my ($self) = @_; 1619 my ($self) = @_;
1257 1620
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1622 "$TMPDIR/$path.map"
1260} 1623}
1261 1624
1262# the unique path, undef == no special unique path 1625# the unique path, undef == no special unique path
1263sub uniq_path { 1626sub uniq_path {
1264 my ($self) = @_; 1627 my ($self) = @_;
1265 1628
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1630 "$UNIQUEDIR/$path"
1268} 1631}
1269 1632
1270# and all this just because we cannot iterate over 1633# and all this just because we cannot iterate over
1271# all maps in C++... 1634# all maps in C++...
1272sub change_all_map_light { 1635sub change_all_map_light {
1274 1637
1275 $_->change_map_light ($change) 1638 $_->change_map_light ($change)
1276 for grep $_->outdoor, values %cf::MAP; 1639 for grep $_->outdoor, values %cf::MAP;
1277} 1640}
1278 1641
1642sub decay_objects {
1643 my ($self) = @_;
1644
1645 return if $self->{deny_reset};
1646
1647 $self->do_decay_objects;
1648}
1649
1279sub unlink_save { 1650sub unlink_save {
1280 my ($self) = @_; 1651 my ($self) = @_;
1281 1652
1282 utf8::encode (my $save = $self->save_path); 1653 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1654 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 1657
1287sub load_header_from($) { 1658sub load_header_from($) {
1288 my ($self, $path) = @_; 1659 my ($self, $path) = @_;
1289 1660
1290 utf8::encode $path; 1661 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1662 #aio_open $path, O_RDONLY, 0
1292 or return; 1663 # or return;
1293 1664
1294 $self->_load_header ($path) 1665 $self->_load_header ($path)
1295 or return; 1666 or return;
1296 1667
1297 $self->{load_path} = $path; 1668 $self->{load_path} = $path;
1339 $self->load_header_orig 1710 $self->load_header_orig
1340 or return; 1711 or return;
1341 $self->prepare_orig; 1712 $self->prepare_orig;
1342 } 1713 }
1343 1714
1715 $self->{deny_reset} = 1
1716 if $self->no_reset;
1717
1718 $self->default_region (cf::region::find_by_path $self->{path})
1719 unless $self->default_region;
1720
1344 1 1721 1
1345} 1722}
1346 1723
1347sub find; 1724sub find;
1348sub find { 1725sub find {
1360 $map->{last_save} = $cf::RUNTIME; 1737 $map->{last_save} = $cf::RUNTIME;
1361 1738
1362 $map->load_header 1739 $map->load_header
1363 or return; 1740 or return;
1364 1741
1365 if ($map->should_reset) { 1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1743 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1744 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1745 $map->reset;
1369 undef $guard; 1746 undef $guard;
1370 $map = find $path 1747 return find $path;
1371 or return;
1372 } 1748 }
1373 1749
1374 $cf::MAP{$path} = $map 1750 $cf::MAP{$path} = $map
1375 } 1751 }
1376} 1752}
1379sub post_load { } 1755sub post_load { }
1380 1756
1381sub load { 1757sub load {
1382 my ($self) = @_; 1758 my ($self) = @_;
1383 1759
1760 local $self->{deny_reset} = 1; # loading can take a long time
1761
1384 my $path = $self->{path}; 1762 my $path = $self->{path};
1763
1764 {
1385 my $guard = cf::lock_acquire "map_load:$path"; 1765 my $guard = cf::lock_acquire "map_load:$path";
1386 1766
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1767 return if $self->in_memory != cf::MAP_SWAPPED;
1388 1768
1389 $self->in_memory (cf::MAP_LOADING); 1769 $self->in_memory (cf::MAP_LOADING);
1390 1770
1391 $self->alloc; 1771 $self->alloc;
1392 1772
1393 $self->pre_load; 1773 $self->pre_load;
1394
1395 $self->_load_objects ($self->{load_path}, 1)
1396 or return;
1397
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1399 if delete $self->{load_original};
1400
1401 if (my $uniq = $self->uniq_path) {
1402 utf8::encode $uniq;
1403 if (aio_open $uniq, O_RDONLY, 0) {
1404 $self->clear_unique_items;
1405 $self->_load_objects ($uniq, 0);
1406 }
1407 }
1408
1409 Coro::cede;
1410
1411 # now do the right thing for maps
1412 $self->link_multipart_objects;
1413
1414 unless ($self->{deny_activate}) {
1415 $self->decay_objects;
1416 $self->fix_auto_apply;
1417 $self->update_buttons;
1418 Coro::cede; 1774 Coro::cede;
1419 $self->set_darkness_map; 1775
1776 $self->_load_objects ($self->{load_path}, 1)
1777 or return;
1778
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original};
1781
1782 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) {
1785 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0);
1787 }
1788 }
1789
1790 Coro::cede;
1791 # now do the right thing for maps
1792 $self->link_multipart_objects;
1420 $self->difficulty ($self->estimate_difficulty) 1793 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 1794 unless $self->difficulty;
1422 Coro::cede; 1795 Coro::cede;
1796
1797 unless ($self->{deny_activate}) {
1798 $self->decay_objects;
1799 $self->fix_auto_apply;
1800 $self->update_buttons;
1801 Coro::cede;
1802 $self->set_darkness_map;
1803 Coro::cede;
1423 $self->activate; 1804 $self->activate;
1805 }
1806
1807 $self->in_memory (cf::MAP_IN_MEMORY);
1424 } 1808 }
1425 1809
1426 $self->post_load; 1810 $self->post_load;
1427
1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429} 1811}
1430 1812
1431sub customise_for { 1813sub customise_for {
1432 my ($self, $ob) = @_; 1814 my ($self, $ob) = @_;
1433 1815
1434 return find "~" . $ob->name . "/" . $self->{path} 1816 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player; 1817 if $self->per_player;
1818
1819# return find "?party/" . $ob->name . "/" . $self->{path}
1820# if $self->per_party;
1436 1821
1437 $self 1822 $self
1438} 1823}
1439 1824
1440# find and load all maps in the 3x3 area around a map 1825# find and load all maps in the 3x3 area around a map
1551 1936
1552sub reset_at { 1937sub reset_at {
1553 my ($self) = @_; 1938 my ($self) = @_;
1554 1939
1555 # TODO: safety, remove and allow resettable per-player maps 1940 # TODO: safety, remove and allow resettable per-player maps
1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1557 return 1e99 if $self->{deny_reset}; 1941 return 1e99 if $self->{deny_reset};
1558 1942
1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1943 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1944 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1561 1945
1572 my ($self) = @_; 1956 my ($self) = @_;
1573 1957
1574 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1958 my $lock = cf::lock_acquire "map_data:$self->{path}";
1575 1959
1576 return if $self->players; 1960 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d#
1578 1961
1579 warn "resetting map ", $self->path;#d# 1962 warn "resetting map ", $self->path;
1963
1964 $self->in_memory (cf::MAP_SWAPPED);
1965
1966 # need to save uniques path
1967 unless ($self->{deny_save}) {
1968 my $uniq = $self->uniq_path; utf8::encode $uniq;
1969
1970 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1971 if $uniq;
1972 }
1580 1973
1581 delete $cf::MAP{$self->path}; 1974 delete $cf::MAP{$self->path};
1582 1975
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1976 $self->clear;
1585 1977
1586 $_->clear_links_to ($self) for values %cf::MAP; 1978 $_->clear_links_to ($self) for values %cf::MAP;
1587 1979
1588 $self->unlink_save; 1980 $self->unlink_save;
1607 $cf::MAP{$self->path} = $self; 1999 $cf::MAP{$self->path} = $self;
1608 2000
1609 $self->reset; # polite request, might not happen 2001 $self->reset; # polite request, might not happen
1610} 2002}
1611 2003
2004=item $maps = cf::map::tmp_maps
2005
2006Returns an arrayref with all map paths of currently instantiated and saved
2007maps. May block.
2008
2009=cut
2010
2011sub tmp_maps() {
2012 [
2013 map {
2014 utf8::decode $_;
2015 /\.map$/
2016 ? normalise $_
2017 : ()
2018 } @{ aio_readdir $TMPDIR or [] }
2019 ]
2020}
2021
2022=item $maps = cf::map::random_maps
2023
2024Returns an arrayref with all map paths of currently instantiated and saved
2025random maps. May block.
2026
2027=cut
2028
2029sub random_maps() {
2030 [
2031 map {
2032 utf8::decode $_;
2033 /\.map$/
2034 ? normalise "?random/$_"
2035 : ()
2036 } @{ aio_readdir $RANDOMDIR or [] }
2037 ]
2038}
2039
1612=item cf::map::unique_maps 2040=item cf::map::unique_maps
1613 2041
1614Returns an arrayref of paths of all shared maps that have 2042Returns an arrayref of paths of all shared maps that have
1615instantiated unique items. May block. 2043instantiated unique items. May block.
1616 2044
1617=cut 2045=cut
1618 2046
1619sub unique_maps() { 2047sub unique_maps() {
1620 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2048 [
1621 or return; 2049 map {
1622
1623 my @paths;
1624
1625 for (@$files) {
1626 utf8::decode $_; 2050 utf8::decode $_;
1627 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o;
1629
1630 s/\.map$//; 2051 /\.map$/
1631 push @paths, $_; 2052 ? normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] }
1632 } 2055 ]
1633
1634 \@paths
1635} 2056}
1636 2057
1637package cf; 2058package cf;
1638 2059
1639=back 2060=back
1685 2106
1686 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2107 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1687 2108
1688 if ($self->{record_replies}) { 2109 if ($self->{record_replies}) {
1689 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2110 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2111
1690 } else { 2112 } else {
2113 my $pl = $self->contr;
2114
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply (
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123
2124 } else {
1691 $msg = $npc->name . " says: $msg" if $npc; 2125 $msg = $npc->name . " says: $msg" if $npc;
1692 $self->message ($msg, $flags); 2126 $self->message ($msg, $flags);
2127 }
1693 } 2128 }
1694} 2129}
1695 2130
1696=item $player_object->may ("access") 2131=item $player_object->may ("access")
1697 2132
1730=cut 2165=cut
1731 2166
1732sub link_map { 2167sub link_map {
1733 unless ($LINK_MAP) { 2168 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 2169 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2170 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 2171 $LINK_MAP->load;
1737 } 2172 }
1738 2173
1739 $LINK_MAP 2174 $LINK_MAP
1740} 2175}
1745 $self->deactivate_recursive; 2180 $self->deactivate_recursive;
1746 2181
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2182 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 2183
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2184 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 2185 if $self->map && $self->map->{path} ne "{link}";
1751 2186
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2187 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 2188}
1754 2189
1755sub cf::object::player::leave_link { 2190sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 2191 my ($self, $map, $x, $y) = @_;
2192
2193 return unless $self->contr->active;
1757 2194
1758 my $link_pos = delete $self->{_link_pos}; 2195 my $link_pos = delete $self->{_link_pos};
1759 2196
1760 unless ($map) { 2197 unless ($map) {
1761 # restore original map position 2198 # restore original map position
1779 $map->load; 2216 $map->load;
1780 $map->load_diag; 2217 $map->load_diag;
1781 2218
1782 return unless $self->contr->active; 2219 return unless $self->contr->active;
1783 $self->activate_recursive; 2220 $self->activate_recursive;
2221
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1784 $self->enter_map ($map, $x, $y); 2223 $self->enter_map ($map, $x, $y);
1785} 2224}
1786 2225
1787cf::player->attach (
1788 on_logout => sub {
1789 my ($pl) = @_;
1790
1791 # abort map switching before logout
1792 if ($pl->ob->{_link_pos}) {
1793 cf::sync_job {
1794 $pl->ob->leave_link
1795 };
1796 }
1797 },
1798 on_login => sub {
1799 my ($pl) = @_;
1800
1801 # try to abort aborted map switching on player login :)
1802 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link;
1805 (async {
1806 # we need this sleep as the login has a concurrent enter_exit running
1807 # and this sleep increases chances of the player not ending up in scorn
1808 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED);
1812 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link;
1814 })->prio (2);
1815 }
1816 },
1817);
1818
1819=item $player_object->goto ($path, $x, $y) 2226=item $player_object->goto ($path, $x, $y[, $check->($map)])
1820 2227
2228Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position.
2232
1821=cut 2233=cut
2234
2235our $GOTOGEN;
1822 2236
1823sub cf::object::player::goto { 2237sub cf::object::player::goto {
1824 my ($self, $path, $x, $y) = @_; 2238 my ($self, $path, $x, $y, $check) = @_;
2239
2240 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1825 2242
1826 $self->enter_link; 2243 $self->enter_link;
1827 2244
1828 (async { 2245 (async {
2246 my $map = eval {
1829 my $map = cf::map::find $path; 2247 my $map = cf::map::find $path;
2248
2249 if ($map) {
1830 $map = $map->customise_for ($self) if $map; 2250 $map = $map->customise_for ($self);
1831 2251 $map = $check->($map) if $check && $map;
1832# warn "entering ", $map->path, " at ($x, $y)\n" 2252 } else {
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2254 }
1836 2255
2256 $map
2257 };
2258
2259 if ($@) {
2260 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2261 LOG llevError | logBacktrace, Carp::longmess $@;
2262 }
2263
2264 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation};
1837 $self->leave_link ($map, $x, $y); 2266 $self->leave_link ($map, $x, $y);
2267 }
1838 })->prio (1); 2268 })->prio (1);
1839} 2269}
1840 2270
1841=item $player_object->enter_exit ($exit_object) 2271=item $player_object->enter_exit ($exit_object)
1842 2272
1871 # that depends on the exit object 2301 # that depends on the exit object
1872 2302
1873 my $rmp = parse_random_map_params $exit->msg; 2303 my $rmp = parse_random_map_params $exit->msg;
1874 2304
1875 if ($exit->map) { 2305 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 2306 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 2307 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 2308 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 2309 $rmp->{origin_y} = $exit->y;
1880 } 2310 }
1881 2311
1882 $rmp->{random_seed} ||= $exit->random_seed; 2312 $rmp->{random_seed} ||= $exit->random_seed;
1883 2313
1884 my $data = cf::to_json $rmp; 2314 my $data = cf::to_json $rmp;
1885 my $md5 = Digest::MD5::md5_hex $data; 2315 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2316 my $meta = "$RANDOMDIR/$md5.meta";
1887 2317
1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1889 aio_write $fh, 0, (length $data), $data, 0; 2319 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh; 2320 undef $fh;
1891 aio_rename "$meta~", $meta; 2321 aio_rename "$meta~", $meta;
1898sub cf::object::player::enter_exit { 2328sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 2329 my ($self, $exit) = @_;
1900 2330
1901 return unless $self->type == cf::PLAYER; 2331 return unless $self->type == cf::PLAYER;
1902 2332
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
1903 $self->enter_link; 2344 $self->enter_link;
1904 2345
1905 (async { 2346 (async {
1906 $self->deactivate_recursive; # just to be sure 2347 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 2348 unless (eval {
1908 prepare_random_map $exit 2349 $self->goto ($slaying, $hp, $sp);
1909 if $exit->slaying eq "/!";
1910
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1913 2350
1914 1; 2351 1;
1915 }) { 2352 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 2353 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 2354 . "I'll try to bring you back to the map you were before. "
1918 . "Please report this to the dungeon master!", 2355 . "Please report this to the dungeon master!",
1919 cf::NDI_UNIQUE | cf::NDI_RED); 2356 cf::NDI_UNIQUE | cf::NDI_RED);
1920 2357
1921 warn "ERROR in enter_exit: $@"; 2358 warn "ERROR in enter_exit: $@";
1922 $self->leave_link; 2359 $self->leave_link;
1923 } 2360 }
1924 })->prio (1); 2361 })->prio (1);
1937 2374
1938sub cf::client::send_drawinfo { 2375sub cf::client::send_drawinfo {
1939 my ($self, $text, $flags) = @_; 2376 my ($self, $text, $flags) = @_;
1940 2377
1941 utf8::encode $text; 2378 utf8::encode $text;
1942 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1943} 2380}
1944 2381
2382=item $client->send_msg ($color, $type, $msg, [extra...])
2383
2384Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet.
2388
2389=cut
2390
2391sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_;
2393
2394 $msg = $self->pl->expand_cfpod ($msg);
2395
2396 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2398 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) {
2410 if (0 && $msg =~ /\[/) {
2411 $self->send_packet ("drawextinfo $color 4 0 $msg")
2412 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg")
2415 }
2416 }
2417 }
2418}
2419
2420=item $client->ext_event ($type, %msg)
2421
2422Sends an ext event to the client.
2423
2424=cut
2425
2426sub cf::client::ext_event($$%) {
2427 my ($self, $type, %msg) = @_;
2428
2429 $msg{msgtype} = "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg);
2431}
1945 2432
1946=item $success = $client->query ($flags, "text", \&cb) 2433=item $success = $client->query ($flags, "text", \&cb)
1947 2434
1948Queues a query to the client, calling the given callback with 2435Queues a query to the client, calling the given callback with
1949the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2436the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1950C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2437C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1951 2438
1952Queries can fail, so check the return code. Or don't, as queries will become 2439Queries can fail, so check the return code. Or don't, as queries will
1953reliable at some point in the future. 2440become reliable at some point in the future.
1954 2441
1955=cut 2442=cut
1956 2443
1957sub cf::client::query { 2444sub cf::client::query {
1958 my ($self, $flags, $text, $cb) = @_; 2445 my ($self, $flags, $text, $cb) = @_;
1966 utf8::encode $text; 2453 utf8::encode $text;
1967 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2454 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1968 2455
1969 $self->send_packet ($self->{query_queue}[0][0]) 2456 $self->send_packet ($self->{query_queue}[0][0])
1970 if @{ $self->{query_queue} } == 1; 2457 if @{ $self->{query_queue} } == 1;
2458
2459 1
1971} 2460}
1972 2461
1973cf::client->attach ( 2462cf::client->attach (
1974 on_reply => sub { 2463 on_reply => sub {
1975 my ($ns, $msg) = @_; 2464 my ($ns, $msg) = @_;
1978 # get handled first 2467 # get handled first
1979 my $queue = delete $ns->{query_queue} 2468 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2469 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2470
1982 (shift @$queue)->[1]->($msg); 2471 (shift @$queue)->[1]->($msg);
2472 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2473
1984 push @{ $ns->{query_queue} }, @$queue; 2474 push @{ $ns->{query_queue} }, @$queue;
1985 2475
1986 if (@{ $ns->{query_queue} } == @$queue) { 2476 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2477 if (@$queue) {
1989 } else { 2479 } else {
1990 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2480 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1991 } 2481 }
1992 } 2482 }
1993 }, 2483 },
2484 on_exticmd => sub {
2485 my ($ns, $buf) = @_;
2486
2487 my $msg = eval { from_json $buf };
2488
2489 if (ref $msg) {
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2491 if (my %reply = $cb->($ns, $msg)) {
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 }
2496 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 }
2499
2500 cf::override;
2501 },
1994); 2502);
1995 2503
1996=item $client->async (\&cb) 2504=item $client->async (\&cb)
1997 2505
1998Create a new coroutine, running the specified callback. The coroutine will 2506Create a new coroutine, running the specified callback. The coroutine will
2045 2553
2046# here we export the classes and methods available to script code 2554# here we export the classes and methods available to script code
2047 2555
2048=pod 2556=pod
2049 2557
2050The following fucntions and emthods are available within a safe environment: 2558The following functions and methods are available within a safe environment:
2051 2559
2052 cf::object contr pay_amount pay_player map 2560 cf::object contr pay_amount pay_player map
2053 cf::object::player player 2561 cf::object::player player
2054 cf::player peaceful 2562 cf::player peaceful
2055 cf::map trigger 2563 cf::map trigger
2136=back 2644=back
2137 2645
2138=cut 2646=cut
2139 2647
2140############################################################################# 2648#############################################################################
2649# the server's init and main functions
2141 2650
2142=head2 EXTENSION DATABASE SUPPORT 2651sub load_facedata($) {
2652 my ($path) = @_;
2143 2653
2144Crossfire maintains a very simple database for extension use. It can 2654 warn "loading facedata from $path\n";
2145currently store anything that can be serialised using Storable, which
2146excludes objects.
2147 2655
2148The parameter C<$family> should best start with the name of the extension 2656 my $facedata;
2149using it, it should be unique. 2657 0 < aio_load $path, $facedata
2658 or die "$path: $!";
2150 2659
2151=over 4 2660 $facedata = Coro::Storable::thaw $facedata;
2152 2661
2153=item $hashref = cf::db_get $family 2662 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed.";
2154 2664
2155Return a hashref for use by the extension C<$family>, which can be
2156modified. After modifications, you have to call C<cf::db_dirty> or
2157C<cf::db_sync>.
2158
2159=item $value = cf::db_get $family => $key
2160
2161Returns a single value from the database
2162
2163=item cf::db_put $family => $hashref
2164
2165Stores the given family hashref into the database. Updates are delayed, if
2166you want the data to be synced to disk immediately, use C<cf::db_sync>.
2167
2168=item cf::db_put $family => $key => $value
2169
2170Stores the given C<$value> in the family hash. Updates are delayed, if you
2171want the data to be synced to disk immediately, use C<cf::db_sync>.
2172
2173=item cf::db_dirty
2174
2175Marks the database as dirty, to be updated at a later time.
2176
2177=item cf::db_sync
2178
2179Immediately write the database to disk I<if it is dirty>.
2180
2181=cut
2182
2183our $DB;
2184
2185{
2186 my $path = cf::localdir . "/database.pst";
2187
2188 sub db_load() {
2189 $DB = stat $path ? Storable::retrieve $path : { };
2190 } 2665 {
2666 my $faces = $facedata->{faceinfo};
2191 2667
2192 my $pid; 2668 while (my ($face, $info) = each %$faces) {
2193 2669 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2194 sub db_save() { 2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2195 waitpid $pid, 0 if $pid; 2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2196 if (0 == ($pid = fork)) { 2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2197 $DB->{_meta}{version} = 1; 2673 Coro::cede;
2198 Storable::nstore $DB, "$path~";
2199 rename "$path~", $path;
2200 cf::_exit 0 if defined $pid;
2201 }
2202 }
2203
2204 my $dirty;
2205
2206 sub db_sync() {
2207 db_save if $dirty;
2208 undef $dirty;
2209 }
2210
2211 my $idle = Event->idle (
2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2218 );
2219
2220 sub db_dirty() {
2221 $dirty = 1;
2222 $idle->start;
2223 }
2224
2225 sub db_get($;$) {
2226 @_ >= 2
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230
2231 sub db_put($$;$) {
2232 if (@_ >= 3) {
2233 $DB->{$_[0]}{$_[1]} = $_[2];
2234 } else {
2235 $DB->{$_[0]} = $_[1];
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 }, 2674 }
2245 );
2246}
2247 2675
2248############################################################################# 2676 while (my ($face, $info) = each %$faces) {
2249# the server's main() 2677 next unless $info->{smooth};
2678 my $idx = cf::face::find $face
2679 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) {
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2682 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 }
2685 Coro::cede;
2686 }
2687 }
2688
2689 {
2690 my $anims = $facedata->{animinfo};
2691
2692 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede;
2695 }
2696
2697 cf::anim::invalidate_all; # d'oh
2698 }
2699
2700 1
2701}
2702
2703sub reload_regions {
2704 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n";
2706}
2707
2708sub reload_facedata {
2709 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n";
2711}
2712
2713sub reload_archetypes {
2714 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n";
2716}
2717
2718sub reload_treasures {
2719 load_resource_file "$DATADIR/treasures"
2720 or die "unable to load treasurelists\n";
2721}
2722
2723sub reload_resources {
2724 warn "reloading resource files...\n";
2725
2726 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures;
2731
2732 warn "finished reloading resource files\n";
2733}
2734
2735sub init {
2736 reload_resources;
2737}
2250 2738
2251sub cfg_load { 2739sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2740 open my $fh, "<:utf8", "$CONFDIR/config"
2253 or return; 2741 or return;
2254 2742
2255 local $/; 2743 local $/;
2256 *CFG = YAML::Syck::Load <$fh>; 2744 *CFG = YAML::Syck::Load <$fh>;
2257 2745
2277 Event::one_event; 2765 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2766 })->prio (Coro::PRIO_MAX);
2279 }; 2767 };
2280 2768
2281 cfg_load; 2769 cfg_load;
2282 db_load; 2770 db_init;
2283 load_extensions; 2771 load_extensions;
2284 2772
2285 $TICK_WATCHER->start; 2773 $TICK_WATCHER->start;
2286 Event::loop; 2774 Event::loop;
2287} 2775}
2302 }, 2790 },
2303 ); 2791 );
2304 } 2792 }
2305} 2793}
2306 2794
2795sub write_runtime {
2796 my $runtime = "$LOCALDIR/runtime";
2797
2798 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time.
2800
2801 IO::AIO::aio_utime $runtime, undef, undef;
2802
2803 my $guard = cf::lock_acquire "write_runtime";
2804
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2806 or return;
2807
2808 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server.
2811
2812 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2813 and return;
2814
2815 # always fsync - this file is important
2816 aio_fsync $fh
2817 and return;
2818
2819 # touch it again to show we are up-to-date
2820 aio_utime $fh, undef, undef;
2821
2822 close $fh
2823 or return;
2824
2825 aio_rename "$runtime~", $runtime
2826 and return;
2827
2828 warn "runtime file written.\n";
2829
2830 1
2831}
2832
2307sub emergency_save() { 2833sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop; 2834 my $freeze_guard = cf::freeze_mainloop;
2309 2835
2310 warn "enter emergency perl save\n"; 2836 warn "enter emergency perl save\n";
2311 2837
2326 my $map = $cf::MAP{$path} or next; 2852 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next; 2853 $map->valid or next;
2328 $map->save; 2854 $map->save;
2329 } 2855 }
2330 warn "end emergency map save\n"; 2856 warn "end emergency map save\n";
2857
2858 warn "begin emergency database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n";
2331 }; 2861 };
2332 2862
2333 warn "leave emergency perl save\n"; 2863 warn "leave emergency perl save\n";
2334} 2864}
2335 2865
2866sub post_cleanup {
2867 my ($make_core) = @_;
2868
2869 warn Carp::longmess "post_cleanup backtrace"
2870 if $make_core;
2871}
2872
2336sub reload() { 2873sub do_reload_perl() {
2337 # can/must only be called in main 2874 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2875 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine"; 2876 warn "can only reload from main coroutine";
2340 return; 2877 return;
2341 } 2878 }
2342 2879
2343 warn "reloading..."; 2880 warn "reloading...";
2344 2881
2345 warn "cancelling server ticker"; 2882 warn "entering sync_job";
2346 $TICK_WATCHER->cancel;
2347 2883
2884 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark
2348 cf::emergency_save; 2886 cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark
2349 2888
2350 eval { 2889 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV;
2891
2351 # if anything goes wrong in here, we should simply crash as we already saved 2892 # if anything goes wrong in here, we should simply crash as we already saved
2352
2353 warn "syncing database to disk";
2354 cf::db_sync;
2355 2893
2356 warn "cancelling all WF_AUTOCANCEL watchers"; 2894 warn "cancelling all WF_AUTOCANCEL watchers";
2357 for (Event::all_watchers) { 2895 for (Event::all_watchers) {
2358 $_->cancel if $_->data & WF_AUTOCANCEL; 2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2359 } 2897 }
2360 2898
2361 warn "flushing outstanding aio requests"; 2899 warn "flushing outstanding aio requests";
2362 for (;;) { 2900 for (;;) {
2901 BDB::flush;
2363 IO::AIO::flush; 2902 IO::AIO::flush;
2364 Coro::cede; 2903 Coro::cede;
2365 last unless IO::AIO::nreqs; 2904 last unless IO::AIO::nreqs || BDB::nreqs;
2366 warn "iterate..."; 2905 warn "iterate...";
2367 } 2906 }
2907
2908 ++$RELOAD;
2368 2909
2369 warn "cancelling all extension coros"; 2910 warn "cancelling all extension coros";
2370 $_->cancel for values %EXT_CORO; 2911 $_->cancel for values %EXT_CORO;
2371 %EXT_CORO = (); 2912 %EXT_CORO = ();
2372 2913
2373 warn "removing commands"; 2914 warn "removing commands";
2374 %COMMAND = (); 2915 %COMMAND = ();
2375 2916
2376 warn "removing ext commands"; 2917 warn "removing ext/exti commands";
2377 %EXTCMD = (); 2918 %EXTCMD = ();
2919 %EXTICMD = ();
2378 2920
2379 warn "unloading/nuking all extensions"; 2921 warn "unloading/nuking all extensions";
2380 for my $pkg (@EXTS) { 2922 for my $pkg (@EXTS) {
2381 warn "... unloading $pkg"; 2923 warn "... unloading $pkg";
2382 2924
2412 Symbol::delete_package "safe::$_" 2954 Symbol::delete_package "safe::$_"
2413 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2414 2956
2415 warn "unloading cf.pm \"a bit\""; 2957 warn "unloading cf.pm \"a bit\"";
2416 delete $INC{"cf.pm"}; 2958 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"};
2417 2960
2418 # don't, removes xs symbols, too, 2961 # don't, removes xs symbols, too,
2419 # and global variables created in xs 2962 # and global variables created in xs
2420 #Symbol::delete_package __PACKAGE__; 2963 #Symbol::delete_package __PACKAGE__;
2421 2964
2425 require cf; 2968 require cf;
2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2427 2970
2428 warn "loading config and database again"; 2971 warn "loading config and database again";
2429 cf::cfg_load; 2972 cf::cfg_load;
2430 cf::db_load;
2431 2973
2432 warn "loading extensions"; 2974 warn "loading extensions";
2433 cf::load_extensions; 2975 cf::load_extensions;
2434 2976
2435 warn "reattaching attachments to objects/players"; 2977 warn "reattaching attachments to objects/players";
2436 _global_reattach; 2978 _global_reattach; # objects, sockets
2437 warn "reattaching attachments to maps"; 2979 warn "reattaching attachments to maps";
2438 reattach $_ for values %MAP; 2980 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players";
2982 reattach $_ for values %PLAYER;
2439 2983
2440 warn "restarting server ticker"; 2984 warn "leaving sync_job";
2441 2985
2442 $TICK_WATCHER->start; 2986 1
2443 }; 2987 } or do {
2444
2445 if ($@) {
2446 warn $@; 2988 warn $@;
2447 warn "error while reloading, exiting."; 2989 warn "error while reloading, exiting.";
2448 exit 1; 2990 exit 1;
2449 } 2991 };
2450 2992
2451 warn "reloaded"; 2993 warn "reloaded";
2452}; 2994};
2453 2995
2454our $RELOAD_WATCHER; # used only during reload 2996our $RELOAD_WATCHER; # used only during reload
2455 2997
2998sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here.
3001
3002 $RELOAD_WATCHER ||= Event->timer (
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl;
3008 undef $RELOAD_WATCHER;
3009 },
3010 );
3011}
3012
2456register_command "reload" => sub { 3013register_command "reload" => sub {
2457 my ($who, $arg) = @_; 3014 my ($who, $arg) = @_;
2458 3015
2459 if ($who->flag (FLAG_WIZ)) { 3016 if ($who->flag (FLAG_WIZ)) {
2460 $who->message ("reloading server."); 3017 $who->message ("reloading server.");
2461 3018 async { reload_perl };
2462 # doing reload synchronously and two reloads happen back-to-back,
2463 # coro crashes during coro_state_free->destroy here.
2464
2465 $RELOAD_WATCHER ||= Event->timer (
2466 reentrant => 0,
2467 after => 0,
2468 data => WF_AUTOCANCEL,
2469 cb => sub {
2470 reload;
2471 undef $RELOAD_WATCHER;
2472 },
2473 );
2474 } 3019 }
2475}; 3020};
2476 3021
2477unshift @INC, $LIBDIR; 3022unshift @INC, $LIBDIR;
2478 3023
2479my $bug_warning = 0; 3024my $bug_warning = 0;
2480 3025
3026our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN;
3028
3029sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main;
3032
3033 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait;
3036}
3037
3038sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main;
3041
3042 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait;
3045}
3046
3047 my $min = 1e6;#d#
3048 my $avg = 10;
2481$TICK_WATCHER = Event->timer ( 3049$TICK_WATCHER = Event->timer (
2482 reentrant => 0, 3050 reentrant => 0,
2483 parked => 1, 3051 parked => 1,
2484 prio => 0, 3052 prio => 0,
2485 at => $NEXT_TICK || $TICK, 3053 at => $NEXT_TICK || $TICK,
2489 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2490 unless ++$bug_warning > 10; 3058 unless ++$bug_warning > 10;
2491 return; 3059 return;
2492 } 3060 }
2493 3061
2494 $NOW = Event::time; 3062 $NOW = $tick_start = Event::time;
2495 3063
2496 cf::server_tick; # one server iteration 3064 cf::server_tick; # one server iteration
3065
3066 0 && sync_job {#d#
3067 for(1..10) {
3068 my $t = Event::time;
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070 or die;
3071
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 };
3088
2497 $RUNTIME += $TICK; 3089 $RUNTIME += $TICK;
2498 $NEXT_TICK += $TICK; 3090 $NEXT_TICK += $TICK;
2499 3091
2500 $WAIT_FOR_TICK->broadcast; 3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2501 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
2502 3094 Coro::async_pool {
2503 Event::sweep; 3095 write_runtime
2504 Coro::cede_notself; 3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
2505 3098 }
3099
2506# my $AFTER = Event::time; 3100# my $AFTER = Event::time;
2507# warn $AFTER - $NOW;#d# 3101# warn $AFTER - $NOW;#d#
2508 3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send;
3105 }
3106 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send;
3108 }
3109
3110 $NOW = Event::time;
3111
2509 # if we are delayed by four ticks or more, skip them all 3112 # if we are delayed by four ticks or more, skip them all
2510 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2511 3114
2512 $TICK_WATCHER->at ($NEXT_TICK); 3115 $TICK_WATCHER->at ($NEXT_TICK);
2513 $TICK_WATCHER->start; 3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120
3121 _post_tick;
3122
3123
2514 }, 3124 },
2515); 3125);
2516 3126
3127{
3128 BDB::max_poll_time $TICK * 0.1;
3129 $BDB_POLL_WATCHER = Event->io (
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8;
3138
3139 BDB::set_sync_prepare {
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153
3154 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create;
3156
3157 cf::sync_job {
3158 eval {
3159 BDB::db_env_open
3160 $DB_ENV,
3161 $BDBDIR,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666;
3165
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 };
3171
3172 cf::cleanup "db_env_open(db): $@" if $@;
3173 };
3174 }
3175}
3176
3177{
3178 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
2517IO::AIO::max_poll_time $TICK * 0.1; 3181 IO::AIO::max_poll_time $TICK * 0.1;
2518
2519undef $Coro::AIO::WATCHER;
2520$AIO_POLL_WATCHER = Event->io ( 3182 $AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0, 3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
2522 fd => IO::AIO::poll_fileno, 3185 fd => IO::AIO::poll_fileno,
2523 poll => 'r', 3186 poll => 'r',
2524 prio => 6, 3187 prio => 6,
2525 data => WF_AUTOCANCEL,
2526 cb => \&IO::AIO::poll_cb, 3188 cb => \&IO::AIO::poll_cb,
2527); 3189 );
3190}
2528 3191
2529$WRITE_RUNTIME_WATCHER = Event->timer ( 3192my $_log_backtrace;
2530 reentrant => 0, 3193
2531 data => WF_AUTOCANCEL, 3194sub _log_backtrace {
2532 after => 1, 3195 my ($msg, @addr) = @_;
2533 interval => 10, 3196
2534 prio => 6, # keep it lowest so it acts like a watchdog 3197 $msg =~ s/\n//;
2535 cb => Coro::unblock_sub { 3198
2536 write_runtime 3199 # limit the # of concurrent backtraces
2537 or warn "ERROR: unable to write runtime file: $!"; 3200 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace;
3202 async {
3203 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!";
3208
3209 my @funcs;
3210 my @res = <$fh>;
3211 chomp for @res;
3212 while (@res) {
3213 my ($func, $line) = splice @res, 0, 2, ();
3214 push @funcs, "[$func] $line";
3215 }
3216
3217 @funcs
3218 };
3219
3220 LOG llevInfo, "[ABT] $msg\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace;
3223 };
3224 } else {
3225 LOG llevInfo, "[ABT] $msg\n";
3226 LOG llevInfo, "[ABT] [suppressed]\n";
2538 }, 3227 }
2539); 3228}
3229
3230# load additional modules
3231use cf::pod;
2540 3232
2541END { cf::emergency_save } 3233END { cf::emergency_save }
2542 3234
25431 32351
2544 3236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines