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.205 by root, Mon Feb 5 18:29:20 2007 UTC vs.
Revision 1.300 by root, Tue Jul 10 06:44:29 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;
53our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
54 81
82our $BDB_POLL_WATCHER;
83our $DB_ENV;
84
55our %CFG; 85our %CFG;
56 86
57our $UPTIME; $UPTIME ||= time; 87our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 88our $RUNTIME;
59 89
60our %PLAYER; # all users 90our %PLAYER; # all users
61our %MAP; # all maps 91our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random";
64
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 93
68# 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 ∕
69our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
70 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
71binmode STDOUT; 101binmode STDOUT;
72binmode STDERR; 102binmode STDERR;
73 103
74# read virtual server time, if available 104# read virtual server time, if available
75unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
76 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
77 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
78 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
79} 109}
80 110
81mkdir cf::localdir; 111mkdir $_
82mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
83mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS;
86 113
87our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
88 115
89sub cf::map::normalise; 116sub cf::map::normalise;
90 117
101=item $cf::RUNTIME 128=item $cf::RUNTIME
102 129
103The 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
104every server tick. 131every server tick.
105 132
106=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
107 136
108The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
109be 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.
110 141
111=item $cf::NOW 142=item $cf::NOW
112 143
113The time of the last (current) server tick. 144The time of the last (current) server tick.
114 145
115=item $cf::TICK 146=item $cf::TICK
116 147
117The 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.
118 159
119=item %cf::CFG 160=item %cf::CFG
120 161
121Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
122from wherever your confdir points to. 163from wherever your confdir points to.
123 164
124=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
125 166
126These 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
127or 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
128processing 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.
129window of cpu time available, or simply to synchronise to the server tick.
130 170
131=back 171=back
132 172
133=cut 173=cut
134 174
135BEGIN { 175BEGIN {
136 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
137 my $msg = join "", @_; 177 my $msg = join "", @_;
138 utf8::encode $msg;
139 178
140 $msg .= "\n" 179 $msg .= "\n"
141 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
142 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
143 LOG llevError, $msg; 185 LOG llevError, $msg;
144 }; 186 };
145} 187}
146 188
147@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
148@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
149@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
150@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
151@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';
152@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)
153 196
154# 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
155# within the Safe compartment. 198# within the Safe compartment.
156for my $pkg (qw( 199for my $pkg (qw(
157 cf::global cf::attachable 200 cf::global cf::attachable
165} 208}
166 209
167$Event::DIED = sub { 210$Event::DIED = sub {
168 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
169}; 212};
213
214#############################################################################
170 215
171=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
172 217
173=over 4 218=over 4
174 219
193 $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;
194 $d 239 $d
195 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
196} 241}
197 242
198use JSON::Syck (); # TODO# replace by JSON::PC once working
199
200=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
201 244
202Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
203 246
204=cut
205
206sub from_json($) {
207 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
208 JSON::Syck::Load $_[0]
209}
210
211=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
212 248
213Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
214 250
215=cut 251=cut
216 252
217sub to_json($) { 253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
218 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
219 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
220} 256sub from_json ($) { $json_coder->decode ($_[0]) }
221 257
222=item cf::lock_wait $string 258=item cf::lock_wait $string
223 259
224Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
225 261
231returned. 267returned.
232 268
233Lock 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
234uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
235 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
236=cut 276=cut
237 277
238our %LOCK; 278our %LOCK;
239 279
240sub lock_wait($) { 280sub lock_wait($) {
259 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
260 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
261 } 301 }
262} 302}
263 303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
308}
309
264sub freeze_mainloop { 310sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
266 312
267 my $guard = Coro::guard { 313 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 314 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 315 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 316 $TICK_WATCHER->stop;
273 $guard 317 $guard
274} 318}
275 319
276=item cf::async { BLOCK } 320=item cf::async { BLOCK }
283 327
284BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
285 329
286=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
287 331
288The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
289always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
290reentrant. 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.
291 336
292If 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
293the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
294server 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
295fast or be very important. 340fast or be very important.
298 343
299sub sync_job(&) { 344sub sync_job(&) {
300 my ($job) = @_; 345 my ($job) = @_;
301 346
302 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
303 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
304 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
305 352
306 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
307 # (but this is cancel-safe) 354 # (but this is cancel-safe)
318 365
319 while ($busy) { 366 while ($busy) {
320 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
321 } 368 }
322 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
323 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
324 } else { 378 } else {
325 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
326 380
327 $job->() 381 $job->()
346 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
347 401
348 $coro 402 $coro
349} 403}
350 404
351sub write_runtime { 405=item fork_call { }, $args
352 my $runtime = cf::localdir . "/runtime";
353 406
354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 407Executes the given code block with the given arguments in a seperate
355 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.
356 411
357 my $value = $cf::RUNTIME + 90 + 10; 412=cut
358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360 413
361 (aio_write $fh, 0, (length $value), $value, 0) <= 0 414sub _store_scalar {
362 and return; 415 open my $fh, ">", \my $buf
363 416 or die "fork_call: cannot open fh-to-buf in child : $!";
364 # always fsync - this file is important 417 Storable::store_fd $_[0], $fh;
365 aio_fsync $fh
366 and return;
367
368 close $fh 418 close $fh;
369 or return;
370 419
371 aio_rename "$runtime~", $runtime 420 $buf
372 and return; 421}
373 422
423sub fork_call(&@) {
424 my ($cb, @args) = @_;
425
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
427# or die "socketpair: $!";
428 pipe my $fh1, my $fh2
429 or die "pipe: $!";
430
431 if (my $pid = fork) {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals;
445 local $SIG{__WARN__};
446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
453 eval {
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
374 1 464 }
465}
466
467=item $value = cf::db_get $family => $key
468
469Returns a single value from the environment database.
470
471=item cf::db_put $family => $key => $value
472
473Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475
476=cut
477
478our $DB;
479
480sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job {
485 eval {
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 }
495}
496
497sub db_get($$) {
498 my $key = "$_[0]/$_[1]";
499
500 cf::sync_job {
501 BDB::db_get $DB, undef, $key, my $data;
502
503 $! ? ()
504 : $data
505 }
506}
507
508sub db_put($$$) {
509 BDB::dbreq_pri 4;
510 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
511}
512
513=item cf::cache $id => [$paths...], $processversion => $process
514
515Generic caching function that returns the value of the resource $id,
516caching and regenerating as required.
517
518This function can block.
519
520=cut
521
522sub cache {
523 my ($id, $src, $processversion, $process) = @_;
524
525 my $meta =
526 join "\x00",
527 $processversion,
528 map {
529 aio_stat $_
530 and Carp::croak "$_: $!";
531
532 ($_, (stat _)[7,9])
533 } @$src;
534
535 my $dbmeta = db_get cache => "$id/meta";
536 if ($dbmeta ne $meta) {
537 # changed, we may need to process
538
539 my @data;
540 my $md5;
541
542 for (0 .. $#$src) {
543 0 <= aio_load $src->[$_], $data[$_]
544 or Carp::croak "$src->[$_]: $!";
545 }
546
547 # if processing is expensive, check
548 # checksum first
549 if (1) {
550 $md5 =
551 join "\x00",
552 $processversion,
553 map {
554 Coro::cede;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src;
557
558
559 my $dbmd5 = db_get cache => "$id/md5";
560 if ($dbmd5 eq $md5) {
561 db_put cache => "$id/meta", $meta;
562
563 return db_get cache => "$id/data";
564 }
565 }
566
567 my $t1 = Time::HiRes::time;
568 my $data = $process->(\@data);
569 my $t2 = Time::HiRes::time;
570
571 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
572
573 db_put cache => "$id/data", $data;
574 db_put cache => "$id/md5" , $md5;
575 db_put cache => "$id/meta", $meta;
576
577 return $data;
578 }
579
580 db_get cache => "$id/data"
581}
582
583=item cf::datalog type => key => value, ...
584
585Log a datalog packet of the given type with the given key-value pairs.
586
587=cut
588
589sub datalog($@) {
590 my ($type, %kv) = @_;
591 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
375} 592}
376 593
377=back 594=back
378 595
379=cut 596=cut
386attach callbacks/event handlers (a collection of which is called an "attachment") 603attach callbacks/event handlers (a collection of which is called an "attachment")
387to it. All such attachable objects support the following methods. 604to it. All such attachable objects support the following methods.
388 605
389In the following description, CLASS can be any of C<global>, C<object> 606In the following description, CLASS can be any of C<global>, C<object>
390C<player>, C<client> or C<map> (i.e. the attachable objects in 607C<player>, C<client> or C<map> (i.e. the attachable objects in
391crossfire+). 608Crossfire TRT).
392 609
393=over 4 610=over 4
394 611
395=item $attachable->attach ($attachment, key => $value...) 612=item $attachable->attach ($attachment, key => $value...)
396 613
559 $registry = $CB_TYPE[$object_type] ||= []; 776 $registry = $CB_TYPE[$object_type] ||= [];
560 777
561 } elsif ($type eq "subtype") { 778 } elsif ($type eq "subtype") {
562 defined $object_type or Carp::croak "subtype specified without type"; 779 defined $object_type or Carp::croak "subtype specified without type";
563 my $object_subtype = shift @arg; 780 my $object_subtype = shift @arg;
564 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 781 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
565 782
566 } elsif ($type eq "package") { 783 } elsif ($type eq "package") {
567 my $pkg = shift @arg; 784 my $pkg = shift @arg;
568 785
569 while (my ($name, $id) = each %cb_id) { 786 while (my ($name, $id) = each %cb_id) {
598 _attach $registry, $klass, @attach; 815 _attach $registry, $klass, @attach;
599 } 816 }
600 817
601 $obj->{$name} = \%arg; 818 $obj->{$name} = \%arg;
602 } else { 819 } else {
603 warn "object uses attachment '$name' that is not available, postponing.\n"; 820 warn "object uses attachment '$name' which is not available, postponing.\n";
604 } 821 }
605 822
606 $obj->{_attachment}{$name} = undef; 823 $obj->{_attachment}{$name} = undef;
607} 824}
608 825
610 if (ref $_[0]) { 827 if (ref $_[0]) {
611 _object_attach @_; 828 _object_attach @_;
612 } else { 829 } else {
613 _attach shift->_attach_registry, @_; 830 _attach shift->_attach_registry, @_;
614 } 831 }
832 _recalc_want;
615}; 833};
616 834
617# all those should be optimised 835# all those should be optimised
618sub cf::attachable::detach { 836sub cf::attachable::detach {
619 my ($obj, $name) = @_; 837 my ($obj, $name) = @_;
622 delete $obj->{_attachment}{$name}; 840 delete $obj->{_attachment}{$name};
623 reattach ($obj); 841 reattach ($obj);
624 } else { 842 } else {
625 Carp::croak "cannot, currently, detach class attachments"; 843 Carp::croak "cannot, currently, detach class attachments";
626 } 844 }
845 _recalc_want;
627}; 846};
628 847
629sub cf::attachable::attached { 848sub cf::attachable::attached {
630 my ($obj, $name) = @_; 849 my ($obj, $name) = @_;
631 850
778 } 997 }
779 } else { 998 } else {
780 aio_unlink $filename; 999 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 1000 aio_unlink "$filename.pst";
782 } 1001 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 1002 }
790} 1003}
791 1004
792sub object_freezer_as_string { 1005sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 1006 my ($rdata, $objs) = @_;
799 1012
800sub object_thawer_load { 1013sub object_thawer_load {
801 my ($filename) = @_; 1014 my ($filename) = @_;
802 1015
803 my ($data, $av); 1016 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 1017
808 (aio_load $filename, $data) >= 0 1018 (aio_load $filename, $data) >= 0
809 or return; 1019 or return;
810 1020
811 unless (aio_stat "$filename.pst") { 1021 unless (aio_stat "$filename.pst") {
813 or return; 1023 or return;
814 $av = eval { (Storable::thaw $av)->{objs} }; 1024 $av = eval { (Storable::thaw $av)->{objs} };
815 } 1025 }
816 1026
817 warn sprintf "loading %s (%d)\n", 1027 warn sprintf "loading %s (%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 1028 $filename, length $data, scalar @{$av || []};
819 return ($data, $av); 1029 return ($data, $av);
820} 1030}
1031
1032=head2 COMMAND CALLBACKS
1033
1034=over 4
1035
1036=cut
821 1037
822############################################################################# 1038#############################################################################
823# command handling &c 1039# command handling &c
824 1040
825=item cf::register_command $name => \&callback($ob,$args); 1041=item cf::register_command $name => \&callback($ob,$args);
838 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
839} 1055}
840 1056
841=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
842 1058
843Register a callbackf ro execution when the client sends an extcmd packet. 1059Register a callback for execution when the client sends an (synchronous)
1060extcmd packet. Ext commands will be processed in the order they are
1061received by the server, like other user commands. The first argument is
1062the logged-in player. Ext commands can only be processed after a player
1063has logged in successfully.
844 1064
845If the callback returns something, it is sent back as if reply was being 1065If the callback returns something, it is sent back as if reply was being
846called. 1066called.
847 1067
1068=item cf::register_exticmd $name => \&callback($ns,$packet);
1069
1070Register a callback for execution when the client sends an (asynchronous)
1071exticmd packet. Exti commands are processed by the server as soon as they
1072are received, i.e. out of order w.r.t. other commands. The first argument
1073is a client socket. Exti commands can be received anytime, even before
1074log-in.
1075
1076If the callback returns something, it is sent back as if reply was being
1077called.
1078
848=cut 1079=cut
849 1080
850sub register_extcmd { 1081sub register_extcmd {
851 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
852 1083
853 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
854} 1091}
855 1092
856cf::player->attach ( 1093cf::player->attach (
857 on_command => sub { 1094 on_command => sub {
858 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
867 cf::override; 1104 cf::override;
868 }, 1105 },
869 on_extcmd => sub { 1106 on_extcmd => sub {
870 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
871 1108
872 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873 1110
874 if (ref $msg) { 1111 if (ref $msg) {
875 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
876 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
877 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
883 1120
884 cf::override; 1121 cf::override;
885 }, 1122 },
886); 1123);
887 1124
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 1125sub load_extensions {
1126 cf::sync_job {
1127 my %todo;
1128
923 for my $ext (<$LIBDIR/*.ext>) { 1129 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 1130 next unless -r $path;
925 eval { 1131
926 load_extension $ext; 1132 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1133 my $base = $1;
1134 my $pkg = $1;
1135 $pkg =~ s/[^[:word:]]/_/g;
1136 $pkg = "ext::$pkg";
1137
1138 open my $fh, "<:utf8", $path
1139 or die "$path: $!";
1140
1141 my $source = do { local $/; <$fh> };
1142
1143 my %ext = (
1144 path => $path,
1145 base => $base,
1146 pkg => $pkg,
1147 );
1148
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151
1152 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n"
1155 . $source
1156 . "\n};\n1";
1157
1158 $todo{$base} = \%ext;
1159 }
1160
1161 my %done;
1162 while (%todo) {
1163 my $progress;
1164
1165 while (my ($k, $v) = each %todo) {
1166 for (split /,\s*/, $v->{meta}{depends}) {
1167 goto skip
1168 unless exists $done{$_};
1169 }
1170
1171 warn "... loading '$k' into '$v->{pkg}'\n";
1172
1173 unless (eval $v->{source}) {
1174 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n";
1176
1177 if (exists $v->{meta}{mandatory}) {
1178 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n";
1180 exit 1;
1181 }
1182
1183 warn $msg;
1184 }
1185
1186 $done{$k} = delete $todo{$k};
1187 push @EXTS, $v->{pkg};
1188 $progress = 1;
927 1 1189 }
928 } or warn "$ext not loaded: $@"; 1190
1191 skip:
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1193 unless $progress;
1194 }
929 } 1195 };
930} 1196}
931 1197
932############################################################################# 1198#############################################################################
933 1199
1200=back
1201
934=head2 CORE EXTENSIONS 1202=head2 CORE EXTENSIONS
935 1203
936Functions and methods that extend core crossfire objects. 1204Functions and methods that extend core crossfire objects.
937 1205
938=cut 1206=cut
950Returns the given player object, loading it if necessary (might block). 1218Returns the given player object, loading it if necessary (might block).
951 1219
952=cut 1220=cut
953 1221
954sub playerdir($) { 1222sub playerdir($) {
955 cf::localdir 1223 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1224 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1225}
961 1226
962sub path($) { 1227sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1228 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1229
965 (playerdir $login) . "/$login.pl" 1230 (playerdir $login) . "/playerdata"
966} 1231}
967 1232
968sub find_active($) { 1233sub find_active($) {
969 $cf::PLAYER{$_[0]} 1234 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1235 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1248 my $login = $_[0];
984 1249
985 my $guard = cf::lock_acquire "user_find:$login"; 1250 my $guard = cf::lock_acquire "user_find:$login";
986 1251
987 $cf::PLAYER{$_[0]} || do { 1252 $cf::PLAYER{$_[0]} || do {
1253 # rename old playerfiles to new ones
1254 #TODO: remove when no longer required
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl";
1259
988 my $pl = load_pl path $login 1260 my $pl = load_pl path $login
989 or return; 1261 or return;
990 $cf::PLAYER{$login} = $pl 1262 $cf::PLAYER{$login} = $pl
991 } 1263 }
992 } 1264 }
1029 1301
1030=cut 1302=cut
1031 1303
1032sub quit_character { 1304sub quit_character {
1033 my ($pl) = @_; 1305 my ($pl) = @_;
1306
1307 my $name = $pl->ob->name;
1034 1308
1035 $pl->{deny_save} = 1; 1309 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1310 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1311
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1043 my $path = playerdir $pl; 1317 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1318 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1319 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1320 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1321 $pl->destroy;
1322
1323 my $prefix = qr<^~\Q$name\E/>;
1324
1325 # nuke player maps
1326 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1327
1048 IO::AIO::aio_rmtree $temp; 1328 IO::AIO::aio_rmtree $temp;
1329}
1330
1331=item $pl->kick
1332
1333Kicks a player out of the game. This destroys the connection.
1334
1335=cut
1336
1337sub kick {
1338 my ($pl, $kicker) = @_;
1339
1340 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1341 $pl->killer ("kicked");
1342 $pl->ns->destroy;
1049} 1343}
1050 1344
1051=item cf::player::list_logins 1345=item cf::player::list_logins
1052 1346
1053Returns am arrayref of all valid playernames in the system, can take a 1347Returns am arrayref of all valid playernames in the system, can take a
1054while and may block, so not sync_job-capable, ever. 1348while and may block, so not sync_job-capable, ever.
1055 1349
1056=cut 1350=cut
1057 1351
1058sub list_logins { 1352sub list_logins {
1059 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1353 my $dirs = aio_readdir $PLAYERDIR
1060 or return []; 1354 or return [];
1061 1355
1062 my @logins; 1356 my @logins;
1063 1357
1064 for my $login (@$dirs) { 1358 for my $login (@$dirs) {
1099 } 1393 }
1100 1394
1101 \@paths 1395 \@paths
1102} 1396}
1103 1397
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1399
1400Expand crossfire pod fragments into protocol xml.
1401
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 warn $_;#d#
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1104=item $player->ext_reply ($msgid, $msgtype, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1105 1450
1106Sends an ext reply to the player. 1451Sends an ext reply to the player.
1107 1452
1108=cut 1453=cut
1109 1454
1110sub ext_reply($$$%) { 1455sub ext_reply($$%) {
1111 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1112 1457
1113 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1114 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1115 $self->send ("ext " . cf::to_json \%msg);
1116} 1460}
1117 1461
1118package cf; 1462=item $player->ext_event ($type, %msg)
1463
1464Sends an ext event to the client.
1465
1466=cut
1467
1468sub ext_event($$%) {
1469 my ($self, $type, %msg) = @_;
1470
1471 $self->ns->ext_event ($type, %msg);
1472}
1473
1474=head3 cf::region
1475
1476=over 4
1477
1478=cut
1479
1480package cf::region;
1481
1482=item cf::region::find_by_path $path
1483
1484Tries to decuce the likely region for a map knowing only its path.
1485
1486=cut
1487
1488sub find_by_path($) {
1489 my ($path) = @_;
1490
1491 my ($match, $specificity);
1492
1493 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) {
1495 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity;
1497 }
1498 }
1499
1500 $match
1501}
1119 1502
1120=back 1503=back
1121
1122 1504
1123=head3 cf::map 1505=head3 cf::map
1124 1506
1125=over 4 1507=over 4
1126 1508
1181 my ($self, $merge) = @_; 1563 my ($self, $merge) = @_;
1182 1564
1183 # we have to keep some variables in memory intact 1565 # we have to keep some variables in memory intact
1184 local $self->{path}; 1566 local $self->{path};
1185 local $self->{load_path}; 1567 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188 1568
1189 $self->SUPER::thawer_merge ($merge); 1569 $self->SUPER::thawer_merge ($merge);
1190} 1570}
1191 1571
1192sub normalise { 1572sub normalise {
1264 1644
1265# the original (read-only) location 1645# the original (read-only) location
1266sub load_path { 1646sub load_path {
1267 my ($self) = @_; 1647 my ($self) = @_;
1268 1648
1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1649 "$MAPDIR/$self->{path}.map"
1270} 1650}
1271 1651
1272# the temporary/swap location 1652# the temporary/swap location
1273sub save_path { 1653sub save_path {
1274 my ($self) = @_; 1654 my ($self) = @_;
1275 1655
1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1657 "$TMPDIR/$path.map"
1278} 1658}
1279 1659
1280# the unique path, undef == no special unique path 1660# the unique path, undef == no special unique path
1281sub uniq_path { 1661sub uniq_path {
1282 my ($self) = @_; 1662 my ($self) = @_;
1283 1663
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1665 "$UNIQUEDIR/$path"
1286} 1666}
1287 1667
1288# and all this just because we cannot iterate over 1668# and all this just because we cannot iterate over
1289# all maps in C++... 1669# all maps in C++...
1290sub change_all_map_light { 1670sub change_all_map_light {
1292 1672
1293 $_->change_map_light ($change) 1673 $_->change_map_light ($change)
1294 for grep $_->outdoor, values %cf::MAP; 1674 for grep $_->outdoor, values %cf::MAP;
1295} 1675}
1296 1676
1677sub decay_objects {
1678 my ($self) = @_;
1679
1680 return if $self->{deny_reset};
1681
1682 $self->do_decay_objects;
1683}
1684
1297sub unlink_save { 1685sub unlink_save {
1298 my ($self) = @_; 1686 my ($self) = @_;
1299 1687
1300 utf8::encode (my $save = $self->save_path); 1688 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1689 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1690 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1691}
1309 1692
1310sub load_header_from($) { 1693sub load_header_from($) {
1311 my ($self, $path) = @_; 1694 my ($self, $path) = @_;
1312 1695
1362 $self->load_header_orig 1745 $self->load_header_orig
1363 or return; 1746 or return;
1364 $self->prepare_orig; 1747 $self->prepare_orig;
1365 } 1748 }
1366 1749
1750 $self->{deny_reset} = 1
1751 if $self->no_reset;
1752
1753 $self->default_region (cf::region::find_by_path $self->{path})
1754 unless $self->default_region;
1755
1367 1 1756 1
1368} 1757}
1369 1758
1370sub find; 1759sub find;
1371sub find { 1760sub find {
1383 $map->{last_save} = $cf::RUNTIME; 1772 $map->{last_save} = $cf::RUNTIME;
1384 1773
1385 $map->load_header 1774 $map->load_header
1386 or return; 1775 or return;
1387 1776
1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously 1778 # doing this can freeze the server in a sync job, obviously
1390 #$cf::WAIT_FOR_TICK->wait; 1779 #$cf::WAIT_FOR_TICK->wait;
1391 $map->reset; 1780 $map->reset;
1392 undef $guard; 1781 undef $guard;
1393 return find $path; 1782 return find $path;
1404 my ($self) = @_; 1793 my ($self) = @_;
1405 1794
1406 local $self->{deny_reset} = 1; # loading can take a long time 1795 local $self->{deny_reset} = 1; # loading can take a long time
1407 1796
1408 my $path = $self->{path}; 1797 my $path = $self->{path};
1798
1799 {
1409 my $guard = cf::lock_acquire "map_load:$path"; 1800 my $guard = cf::lock_acquire "map_load:$path";
1410 1801
1411 return if $self->in_memory != cf::MAP_SWAPPED; 1802 return if $self->in_memory != cf::MAP_SWAPPED;
1412 1803
1413 $self->in_memory (cf::MAP_LOADING); 1804 $self->in_memory (cf::MAP_LOADING);
1414 1805
1415 $self->alloc; 1806 $self->alloc;
1416 1807
1417 $self->pre_load; 1808 $self->pre_load;
1418
1419 $self->_load_objects ($self->{load_path}, 1)
1420 or return;
1421
1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1423 if delete $self->{load_original};
1424
1425 if (my $uniq = $self->uniq_path) {
1426 utf8::encode $uniq;
1427 if (aio_open $uniq, O_RDONLY, 0) {
1428 $self->clear_unique_items;
1429 $self->_load_objects ($uniq, 0);
1430 }
1431 }
1432
1433 Coro::cede;
1434
1435 # now do the right thing for maps
1436 $self->link_multipart_objects;
1437
1438 unless ($self->{deny_activate}) {
1439 $self->decay_objects;
1440 $self->fix_auto_apply;
1441 $self->update_buttons;
1442 Coro::cede; 1809 Coro::cede;
1443 $self->set_darkness_map; 1810
1811 $self->_load_objects ($self->{load_path}, 1)
1812 or return;
1813
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original};
1816
1817 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) {
1820 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0);
1822 }
1823 }
1824
1825 Coro::cede;
1826 # now do the right thing for maps
1827 $self->link_multipart_objects;
1444 $self->difficulty ($self->estimate_difficulty) 1828 $self->difficulty ($self->estimate_difficulty)
1445 unless $self->difficulty; 1829 unless $self->difficulty;
1446 Coro::cede; 1830 Coro::cede;
1831
1832 unless ($self->{deny_activate}) {
1833 $self->decay_objects;
1834 $self->fix_auto_apply;
1835 $self->update_buttons;
1836 Coro::cede;
1837 $self->set_darkness_map;
1838 Coro::cede;
1447 $self->activate; 1839 $self->activate;
1840 }
1841
1842 $self->in_memory (cf::MAP_IN_MEMORY);
1448 } 1843 }
1449 1844
1450 $self->post_load; 1845 $self->post_load;
1451
1452 $self->in_memory (cf::MAP_IN_MEMORY);
1453} 1846}
1454 1847
1455sub customise_for { 1848sub customise_for {
1456 my ($self, $ob) = @_; 1849 my ($self, $ob) = @_;
1457 1850
1458 return find "~" . $ob->name . "/" . $self->{path} 1851 return find "~" . $ob->name . "/" . $self->{path}
1459 if $self->per_player; 1852 if $self->per_player;
1853
1854# return find "?party/" . $ob->name . "/" . $self->{path}
1855# if $self->per_party;
1460 1856
1461 $self 1857 $self
1462} 1858}
1463 1859
1464# find and load all maps in the 3x3 area around a map 1860# find and load all maps in the 3x3 area around a map
1575 1971
1576sub reset_at { 1972sub reset_at {
1577 my ($self) = @_; 1973 my ($self) = @_;
1578 1974
1579 # TODO: safety, remove and allow resettable per-player maps 1975 # TODO: safety, remove and allow resettable per-player maps
1580 return 1e99 if $self->isa ("ext::map_per_player");#d#
1581 return 1e99 if $self->{deny_reset}; 1976 return 1e99 if $self->{deny_reset};
1582 1977
1583 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1978 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1584 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1979 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1585 1980
1596 my ($self) = @_; 1991 my ($self) = @_;
1597 1992
1598 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1599 1994
1600 return if $self->players; 1995 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d#
1602 1996
1603 warn "resetting map ", $self->path;#d# 1997 warn "resetting map ", $self->path;
1998
1999 $self->in_memory (cf::MAP_SWAPPED);
2000
2001 # need to save uniques path
2002 unless ($self->{deny_save}) {
2003 my $uniq = $self->uniq_path; utf8::encode $uniq;
2004
2005 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2006 if $uniq;
2007 }
1604 2008
1605 delete $cf::MAP{$self->path}; 2009 delete $cf::MAP{$self->path};
1606 2010
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 2011 $self->clear;
1609 2012
1610 $_->clear_links_to ($self) for values %cf::MAP; 2013 $_->clear_links_to ($self) for values %cf::MAP;
1611 2014
1612 $self->unlink_save; 2015 $self->unlink_save;
1631 $cf::MAP{$self->path} = $self; 2034 $cf::MAP{$self->path} = $self;
1632 2035
1633 $self->reset; # polite request, might not happen 2036 $self->reset; # polite request, might not happen
1634} 2037}
1635 2038
2039=item $maps = cf::map::tmp_maps
2040
2041Returns an arrayref with all map paths of currently instantiated and saved
2042maps. May block.
2043
2044=cut
2045
2046sub tmp_maps() {
2047 [
2048 map {
2049 utf8::decode $_;
2050 /\.map$/
2051 ? normalise $_
2052 : ()
2053 } @{ aio_readdir $TMPDIR or [] }
2054 ]
2055}
2056
2057=item $maps = cf::map::random_maps
2058
2059Returns an arrayref with all map paths of currently instantiated and saved
2060random maps. May block.
2061
2062=cut
2063
2064sub random_maps() {
2065 [
2066 map {
2067 utf8::decode $_;
2068 /\.map$/
2069 ? normalise "?random/$_"
2070 : ()
2071 } @{ aio_readdir $RANDOMDIR or [] }
2072 ]
2073}
2074
1636=item cf::map::unique_maps 2075=item cf::map::unique_maps
1637 2076
1638Returns an arrayref of paths of all shared maps that have 2077Returns an arrayref of paths of all shared maps that have
1639instantiated unique items. May block. 2078instantiated unique items. May block.
1640 2079
1641=cut 2080=cut
1642 2081
1643sub unique_maps() { 2082sub unique_maps() {
1644 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2083 [
1645 or return; 2084 map {
1646
1647 my @paths;
1648
1649 for (@$files) {
1650 utf8::decode $_; 2085 utf8::decode $_;
1651 next if /\.pst$/; 2086 /\.map$/
1652 next unless /^$PATH_SEP/o; 2087 ? normalise $_
1653 2088 : ()
1654 push @paths, cf::map::normalise $_; 2089 } @{ aio_readdir $UNIQUEDIR or [] }
1655 } 2090 ]
1656
1657 \@paths
1658} 2091}
1659 2092
1660package cf; 2093package cf;
1661 2094
1662=back 2095=back
1708 2141
1709 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1710 2143
1711 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
1712 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
1713 } else { 2147 } else {
2148 my $pl = $self->contr;
2149
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply (
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158
2159 } else {
1714 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
1715 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
1716 } 2163 }
1717} 2164}
1718 2165
1719=item $player_object->may ("access") 2166=item $player_object->may ("access")
1720 2167
1768 $self->deactivate_recursive; 2215 $self->deactivate_recursive;
1769 2216
1770 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2217 return if UNIVERSAL::isa $self->map, "ext::map_link";
1771 2218
1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1773 if $self->map; 2220 if $self->map && $self->map->{path} ne "{link}";
1774 2221
1775 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2222 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1776} 2223}
1777 2224
1778sub cf::object::player::leave_link { 2225sub cf::object::player::leave_link {
1779 my ($self, $map, $x, $y) = @_; 2226 my ($self, $map, $x, $y) = @_;
2227
2228 return unless $self->contr->active;
1780 2229
1781 my $link_pos = delete $self->{_link_pos}; 2230 my $link_pos = delete $self->{_link_pos};
1782 2231
1783 unless ($map) { 2232 unless ($map) {
1784 # restore original map position 2233 # restore original map position
1802 $map->load; 2251 $map->load;
1803 $map->load_diag; 2252 $map->load_diag;
1804 2253
1805 return unless $self->contr->active; 2254 return unless $self->contr->active;
1806 $self->activate_recursive; 2255 $self->activate_recursive;
2256
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
1808} 2259}
1809 2260
1810cf::player->attach (
1811 on_logout => sub {
1812 my ($pl) = @_;
1813
1814 # abort map switching before logout
1815 if ($pl->ob->{_link_pos}) {
1816 cf::sync_job {
1817 $pl->ob->leave_link
1818 };
1819 }
1820 },
1821 on_login => sub {
1822 my ($pl) = @_;
1823
1824 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link;
1828 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED);
1835 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link;
1837 })->prio (2);
1838 }
1839 },
1840);
1841
1842=item $player_object->goto ($path, $x, $y) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)])
1843 2262
2263Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position.
2267
1844=cut 2268=cut
2269
2270our $GOTOGEN;
1845 2271
1846sub cf::object::player::goto { 2272sub cf::object::player::goto {
1847 my ($self, $path, $x, $y) = @_; 2273 my ($self, $path, $x, $y, $check) = @_;
2274
2275 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1848 2277
1849 $self->enter_link; 2278 $self->enter_link;
1850 2279
1851 (async { 2280 (async {
1852 my $map = eval { 2281 my $map = eval {
1853 my $map = cf::map::find $path; 2282 my $map = cf::map::find $path;
2283
2284 if ($map) {
1854 $map = $map->customise_for ($self) if $map; 2285 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map;
2287 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2289 }
2290
1855 $map 2291 $map
2292 };
2293
2294 if ($@) {
2295 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2296 LOG llevError | logBacktrace, Carp::longmess $@;
1856 } or 2297 }
1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1858 2298
2299 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation};
1859 $self->leave_link ($map, $x, $y); 2301 $self->leave_link ($map, $x, $y);
2302 }
1860 })->prio (1); 2303 })->prio (1);
1861} 2304}
1862 2305
1863=item $player_object->enter_exit ($exit_object) 2306=item $player_object->enter_exit ($exit_object)
1864 2307
1903 2346
1904 $rmp->{random_seed} ||= $exit->random_seed; 2347 $rmp->{random_seed} ||= $exit->random_seed;
1905 2348
1906 my $data = cf::to_json $rmp; 2349 my $data = cf::to_json $rmp;
1907 my $md5 = Digest::MD5::md5_hex $data; 2350 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2351 my $meta = "$RANDOMDIR/$md5.meta";
1909 2352
1910 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1911 aio_write $fh, 0, (length $data), $data, 0; 2354 aio_write $fh, 0, (length $data), $data, 0;
1912 undef $fh; 2355 undef $fh;
1913 aio_rename "$meta~", $meta; 2356 aio_rename "$meta~", $meta;
1922 2365
1923 return unless $self->type == cf::PLAYER; 2366 return unless $self->type == cf::PLAYER;
1924 2367
1925 if ($exit->slaying eq "/!") { 2368 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job 2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
1927 cf::sync_job { prepare_random_map $exit }; 2372 cf::sync_job { prepare_random_map $exit };
1928 } 2373 }
1929 2374
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
1933 2378
1934 $self->enter_link; 2379 $self->enter_link;
2380
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
1935 2384
1936 (async { 2385 (async {
1937 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
1938 unless (eval { 2387 unless (eval {
1939 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
1940 2389
1941 1; 2390 1;
1942 }) { 2391 }) {
1943 $self->message ("Something went wrong deep within the crossfire server. " 2392 $self->message ("Something went wrong deep within the crossfire server. "
1944 . "I'll try to bring you back to the map you were before. " 2393 . "I'll try to bring you back to the map you were before. "
1945 . "Please report this to the dungeon master!", 2394 . "Please report this to the dungeon master!",
1946 cf::NDI_UNIQUE | cf::NDI_RED); 2395 cf::NDI_UNIQUE | cf::NDI_RED);
1947 2396
1948 warn "ERROR in enter_exit: $@"; 2397 warn "ERROR in enter_exit: $@";
1949 $self->leave_link; 2398 $self->leave_link;
1950 } 2399 }
1951 })->prio (1); 2400 })->prio (1);
1964 2413
1965sub cf::client::send_drawinfo { 2414sub cf::client::send_drawinfo {
1966 my ($self, $text, $flags) = @_; 2415 my ($self, $text, $flags) = @_;
1967 2416
1968 utf8::encode $text; 2417 utf8::encode $text;
1969 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970} 2419}
1971 2420
2421=item $client->send_msg ($color, $type, $msg, [extra...])
2422
2423Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet.
2427
2428=cut
2429
2430sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_;
2432
2433 $msg = $self->pl->expand_cfpod ($msg);
2434
2435 return unless @extra || length $msg;
2436
2437 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2439 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) {
2451 if (0 && $msg =~ /\[/) {
2452 $self->send_packet ("drawextinfo $color 4 0 $msg")
2453 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460
2461=item $client->ext_event ($type, %msg)
2462
2463Sends an ext event to the client.
2464
2465=cut
2466
2467sub cf::client::ext_event($$%) {
2468 my ($self, $type, %msg) = @_;
2469
2470 $msg{msgtype} = "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2472}
1972 2473
1973=item $success = $client->query ($flags, "text", \&cb) 2474=item $success = $client->query ($flags, "text", \&cb)
1974 2475
1975Queues a query to the client, calling the given callback with 2476Queues a query to the client, calling the given callback with
1976the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2477the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1977C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2478C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1978 2479
1979Queries can fail, so check the return code. Or don't, as queries will become 2480Queries can fail, so check the return code. Or don't, as queries will
1980reliable at some point in the future. 2481become reliable at some point in the future.
1981 2482
1982=cut 2483=cut
1983 2484
1984sub cf::client::query { 2485sub cf::client::query {
1985 my ($self, $flags, $text, $cb) = @_; 2486 my ($self, $flags, $text, $cb) = @_;
1993 utf8::encode $text; 2494 utf8::encode $text;
1994 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2495 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1995 2496
1996 $self->send_packet ($self->{query_queue}[0][0]) 2497 $self->send_packet ($self->{query_queue}[0][0])
1997 if @{ $self->{query_queue} } == 1; 2498 if @{ $self->{query_queue} } == 1;
2499
2500 1
1998} 2501}
1999 2502
2000cf::client->attach ( 2503cf::client->attach (
2504 on_connect => sub {
2505 my ($ns) = @_;
2506
2507 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2508 },
2001 on_reply => sub { 2509 on_reply => sub {
2002 my ($ns, $msg) = @_; 2510 my ($ns, $msg) = @_;
2003 2511
2004 # this weird shuffling is so that direct followup queries 2512 # this weird shuffling is so that direct followup queries
2005 # get handled first 2513 # get handled first
2017 } else { 2525 } else {
2018 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2526 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2019 } 2527 }
2020 } 2528 }
2021 }, 2529 },
2530 on_exticmd => sub {
2531 my ($ns, $buf) = @_;
2532
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534
2535 if (ref $msg) {
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2537 if (my %reply = $cb->($ns, $msg)) {
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 }
2542 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 }
2545
2546 cf::override;
2547 },
2022); 2548);
2023 2549
2024=item $client->async (\&cb) 2550=item $client->async (\&cb)
2025 2551
2026Create a new coroutine, running the specified callback. The coroutine will 2552Create a new coroutine, running the specified callback. The coroutine will
2073 2599
2074# here we export the classes and methods available to script code 2600# here we export the classes and methods available to script code
2075 2601
2076=pod 2602=pod
2077 2603
2078The following fucntions and emthods are available within a safe environment: 2604The following functions and methods are available within a safe environment:
2079 2605
2080 cf::object contr pay_amount pay_player map 2606 cf::object
2607 contr pay_amount pay_player map x y force_find force_add
2608 insert remove
2609
2081 cf::object::player player 2610 cf::object::player
2082 cf::player peaceful 2611 player
2083 cf::map trigger 2612
2613 cf::player
2614 peaceful
2615
2616 cf::map
2617 trigger
2084 2618
2085=cut 2619=cut
2086 2620
2087for ( 2621for (
2088 ["cf::object" => qw(contr pay_amount pay_player map)], 2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)],
2089 ["cf::object::player" => qw(player)], 2624 ["cf::object::player" => qw(player)],
2090 ["cf::player" => qw(peaceful)], 2625 ["cf::player" => qw(peaceful)],
2091 ["cf::map" => qw(trigger)], 2626 ["cf::map" => qw(trigger)],
2092) { 2627) {
2093 no strict 'refs'; 2628 no strict 'refs';
2164=back 2699=back
2165 2700
2166=cut 2701=cut
2167 2702
2168############################################################################# 2703#############################################################################
2169
2170=head2 EXTENSION DATABASE SUPPORT
2171
2172Crossfire maintains a very simple database for extension use. It can
2173currently store anything that can be serialised using Storable, which
2174excludes objects.
2175
2176The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique.
2178
2179=over 4
2180
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key
2188
2189Returns a single value from the database
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196=item cf::db_put $family => $key => $value
2197
2198Stores the given C<$value> in the family hash. Updates are delayed, if you
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208
2209=cut
2210
2211our $DB;
2212
2213{
2214 my $path = cf::localdir . "/database.pst";
2215
2216 sub db_load() {
2217 $DB = stat $path ? Storable::retrieve $path : { };
2218 }
2219
2220 my $pid;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 }
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 },
2273 );
2274}
2275
2276#############################################################################
2277# the server's init and main functions 2704# the server's init and main functions
2278 2705
2279sub load_resources { 2706sub load_facedata($) {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2707 my ($path) = @_;
2708
2709 warn "loading facedata from $path\n";
2710
2711 my $facedata;
2712 0 < aio_load $path, $facedata
2713 or die "$path: $!";
2714
2715 $facedata = Coro::Storable::thaw $facedata;
2716
2717 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719
2720 {
2721 my $faces = $facedata->{faceinfo};
2722
2723 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2728 Coro::cede;
2729 }
2730
2731 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth};
2733 my $idx = cf::face::find $face
2734 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) {
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2737 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 }
2740 Coro::cede;
2741 }
2742 }
2743
2744 {
2745 my $anims = $facedata->{animinfo};
2746
2747 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede;
2750 }
2751
2752 cf::anim::invalidate_all; # d'oh
2753 }
2754
2755 1
2756}
2757
2758sub reload_regions {
2759 load_resource_file "$MAPDIR/regions"
2281 or die "unable to load regions file\n";#d# 2760 or die "unable to load regions file\n";
2761}
2762
2763sub reload_facedata {
2764 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n";
2766}
2767
2768sub reload_archetypes {
2769 load_resource_file "$DATADIR/archetypes"
2770 or die "unable to load archetypes\n";
2771 #d# NEED to laod twice to resolve forward references
2772 # this really needs to be done in an extra post-pass
2773 # (which needs to be synchronous, so solve it differently)
2774 load_resource_file "$DATADIR/archetypes"
2775 or die "unable to load archetypes\n";
2776}
2777
2778sub reload_treasures {
2779 load_resource_file "$DATADIR/treasures"
2780 or die "unable to load treasurelists\n";
2781}
2782
2783sub reload_resources {
2784 warn "reloading resource files...\n";
2785
2786 reload_regions;
2787 reload_facedata;
2788 #reload_archetypes;#d#
2789 reload_archetypes;
2790 reload_treasures;
2791
2792 warn "finished reloading resource files\n";
2793}
2794
2795sub init {
2796 reload_resources;
2282} 2797}
2283 2798
2284sub cfg_load { 2799sub cfg_load {
2285 open my $fh, "<:utf8", cf::confdir . "/config" 2800 open my $fh, "<:utf8", "$CONFDIR/config"
2286 or return; 2801 or return;
2287 2802
2288 local $/; 2803 local $/;
2289 *CFG = YAML::Syck::Load <$fh>; 2804 *CFG = YAML::Syck::Load <$fh>;
2290 2805
2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2813 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299 and die "WARNING: m(un)lockall failed: $!\n"; 2814 and die "WARNING: m(un)lockall failed: $!\n";
2300 }; 2815 };
2301 warn $@ if $@; 2816 warn $@ if $@;
2302 } 2817 }
2303}
2304
2305sub init {
2306 load_resources;
2307} 2818}
2308 2819
2309sub main { 2820sub main {
2310 # we must not ever block the main coroutine 2821 # we must not ever block the main coroutine
2311 local $Coro::idle = sub { 2822 local $Coro::idle = sub {
2314 Event::one_event; 2825 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2826 })->prio (Coro::PRIO_MAX);
2316 }; 2827 };
2317 2828
2318 cfg_load; 2829 cfg_load;
2319 db_load; 2830 db_init;
2320 load_extensions; 2831 load_extensions;
2321 2832
2322 $TICK_WATCHER->start; 2833 $TICK_WATCHER->start;
2323 Event::loop; 2834 Event::loop;
2324} 2835}
2339 }, 2850 },
2340 ); 2851 );
2341 } 2852 }
2342} 2853}
2343 2854
2855sub write_runtime {
2856 my $runtime = "$LOCALDIR/runtime";
2857
2858 # first touch the runtime file to show we are still running:
2859 # the fsync below can take a very very long time.
2860
2861 IO::AIO::aio_utime $runtime, undef, undef;
2862
2863 my $guard = cf::lock_acquire "write_runtime";
2864
2865 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2866 or return;
2867
2868 my $value = $cf::RUNTIME + 90 + 10;
2869 # 10 is the runtime save interval, for a monotonic clock
2870 # 60 allows for the watchdog to kill the server.
2871
2872 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2873 and return;
2874
2875 # always fsync - this file is important
2876 aio_fsync $fh
2877 and return;
2878
2879 # touch it again to show we are up-to-date
2880 aio_utime $fh, undef, undef;
2881
2882 close $fh
2883 or return;
2884
2885 aio_rename "$runtime~", $runtime
2886 and return;
2887
2888 warn "runtime file written.\n";
2889
2890 1
2891}
2892
2344sub emergency_save() { 2893sub emergency_save() {
2345 my $freeze_guard = cf::freeze_mainloop; 2894 my $freeze_guard = cf::freeze_mainloop;
2346 2895
2347 warn "enter emergency perl save\n"; 2896 warn "enter emergency perl save\n";
2348 2897
2363 my $map = $cf::MAP{$path} or next; 2912 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2913 $map->valid or next;
2365 $map->save; 2914 $map->save;
2366 } 2915 }
2367 warn "end emergency map save\n"; 2916 warn "end emergency map save\n";
2917
2918 warn "begin emergency database checkpoint\n";
2919 BDB::db_env_txn_checkpoint $DB_ENV;
2920 warn "end emergency database checkpoint\n";
2368 }; 2921 };
2369 2922
2370 warn "leave emergency perl save\n"; 2923 warn "leave emergency perl save\n";
2371} 2924}
2372 2925
2926sub post_cleanup {
2927 my ($make_core) = @_;
2928
2929 warn Carp::longmess "post_cleanup backtrace"
2930 if $make_core;
2931}
2932
2373sub reload() { 2933sub do_reload_perl() {
2374 # can/must only be called in main 2934 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2935 if ($Coro::current != $Coro::main) {
2376 warn "can only reload from main coroutine"; 2936 warn "can only reload from main coroutine";
2377 return; 2937 return;
2378 } 2938 }
2379 2939
2380 warn "reloading..."; 2940 warn "reloading...";
2381 2941
2382 warn "cancelling server ticker"; 2942 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2943
2944 cf::sync_job {
2945 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2946 cf::emergency_save;
2947 cf::write_runtime; # external watchdog should not bark
2386 2948
2387 eval { 2949 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV;
2951
2388 # if anything goes wrong in here, we should simply crash as we already saved 2952 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2953
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2954 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2955 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2957 }
2397 2958
2398 warn "flushing outstanding aio requests"; 2959 warn "flushing outstanding aio requests";
2399 for (;;) { 2960 for (;;) {
2961 BDB::flush;
2400 IO::AIO::flush; 2962 IO::AIO::flush;
2401 Coro::cede; 2963 Coro::cede;
2402 last unless IO::AIO::nreqs; 2964 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2965 warn "iterate...";
2404 } 2966 }
2967
2968 ++$RELOAD;
2405 2969
2406 warn "cancelling all extension coros"; 2970 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2971 $_->cancel for values %EXT_CORO;
2408 %EXT_CORO = (); 2972 %EXT_CORO = ();
2409 2973
2410 warn "removing commands"; 2974 warn "removing commands";
2411 %COMMAND = (); 2975 %COMMAND = ();
2412 2976
2413 warn "removing ext commands"; 2977 warn "removing ext/exti commands";
2414 %EXTCMD = (); 2978 %EXTCMD = ();
2979 %EXTICMD = ();
2415 2980
2416 warn "unloading/nuking all extensions"; 2981 warn "unloading/nuking all extensions";
2417 for my $pkg (@EXTS) { 2982 for my $pkg (@EXTS) {
2418 warn "... unloading $pkg"; 2983 warn "... unloading $pkg";
2419 2984
2449 Symbol::delete_package "safe::$_" 3014 Symbol::delete_package "safe::$_"
2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3015 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2451 3016
2452 warn "unloading cf.pm \"a bit\""; 3017 warn "unloading cf.pm \"a bit\"";
2453 delete $INC{"cf.pm"}; 3018 delete $INC{"cf.pm"};
3019 delete $INC{"cf/pod.pm"};
2454 3020
2455 # don't, removes xs symbols, too, 3021 # don't, removes xs symbols, too,
2456 # and global variables created in xs 3022 # and global variables created in xs
2457 #Symbol::delete_package __PACKAGE__; 3023 #Symbol::delete_package __PACKAGE__;
2458 3024
2462 require cf; 3028 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 3030
2465 warn "loading config and database again"; 3031 warn "loading config and database again";
2466 cf::cfg_load; 3032 cf::cfg_load;
2467 cf::db_load;
2468 3033
2469 warn "loading extensions"; 3034 warn "loading extensions";
2470 cf::load_extensions; 3035 cf::load_extensions;
2471 3036
2472 warn "reattaching attachments to objects/players"; 3037 warn "reattaching attachments to objects/players";
2473 _global_reattach; 3038 _global_reattach; # objects, sockets
2474 warn "reattaching attachments to maps"; 3039 warn "reattaching attachments to maps";
2475 reattach $_ for values %MAP; 3040 reattach $_ for values %MAP;
3041 warn "reattaching attachments to players";
3042 reattach $_ for values %PLAYER;
2476 3043
2477 warn "loading reloadable resources"; 3044 warn "leaving sync_job";
2478 load_resources;
2479 3045
2480 warn "restarting server ticker"; 3046 1
2481 3047 } or do {
2482 $TICK_WATCHER->start;
2483 };
2484
2485 if ($@) {
2486 warn $@; 3048 warn $@;
2487 warn "error while reloading, exiting."; 3049 warn "error while reloading, exiting.";
2488 exit 1; 3050 exit 1;
2489 } 3051 };
2490 3052
2491 warn "reloaded"; 3053 warn "reloaded";
2492}; 3054};
2493 3055
2494our $RELOAD_WATCHER; # used only during reload 3056our $RELOAD_WATCHER; # used only during reload
2495 3057
3058sub reload_perl() {
3059 # doing reload synchronously and two reloads happen back-to-back,
3060 # coro crashes during coro_state_free->destroy here.
3061
3062 $RELOAD_WATCHER ||= Event->timer (
3063 reentrant => 0,
3064 after => 0,
3065 data => WF_AUTOCANCEL,
3066 cb => sub {
3067 do_reload_perl;
3068 undef $RELOAD_WATCHER;
3069 },
3070 );
3071}
3072
2496register_command "reload" => sub { 3073register_command "reload" => sub {
2497 my ($who, $arg) = @_; 3074 my ($who, $arg) = @_;
2498 3075
2499 if ($who->flag (FLAG_WIZ)) { 3076 if ($who->flag (FLAG_WIZ)) {
2500 $who->message ("reloading server."); 3077 $who->message ("reloading server.");
2501 3078 async { reload_perl };
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2510 reload;
2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2514 } 3079 }
2515}; 3080};
2516 3081
2517unshift @INC, $LIBDIR; 3082unshift @INC, $LIBDIR;
2518 3083
2519my $bug_warning = 0; 3084my $bug_warning = 0;
2520 3085
3086our @WAIT_FOR_TICK;
3087our @WAIT_FOR_TICK_BEGIN;
3088
3089sub wait_for_tick {
3090 return unless $TICK_WATCHER->is_active;
3091 return if $Coro::current == $Coro::main;
3092
3093 my $signal = new Coro::Signal;
3094 push @WAIT_FOR_TICK, $signal;
3095 $signal->wait;
3096}
3097
3098sub wait_for_tick_begin {
3099 return unless $TICK_WATCHER->is_active;
3100 return if $Coro::current == $Coro::main;
3101
3102 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait;
3105}
3106
3107 my $min = 1e6;#d#
3108 my $avg = 10;
2521$TICK_WATCHER = Event->timer ( 3109$TICK_WATCHER = Event->timer (
2522 reentrant => 0, 3110 reentrant => 0,
2523 parked => 1, 3111 parked => 1,
2524 prio => 0, 3112 prio => 0,
2525 at => $NEXT_TICK || $TICK, 3113 at => $NEXT_TICK || $TICK,
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10; 3118 unless ++$bug_warning > 10;
2531 return; 3119 return;
2532 } 3120 }
2533 3121
2534 $NOW = Event::time; 3122 $NOW = $tick_start = Event::time;
2535 3123
2536 cf::server_tick; # one server iteration 3124 cf::server_tick; # one server iteration
3125
3126 0 && sync_job {#d#
3127 for(1..10) {
3128 my $t = Event::time;
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130 or die;
3131
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 };
3148
2537 $RUNTIME += $TICK; 3149 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 3150 $NEXT_TICK += $TICK;
2539 3151
2540 $WAIT_FOR_TICK->broadcast; 3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
2542 3154 Coro::async_pool {
2543 Event::sweep; 3155 write_runtime
2544 Coro::cede_notself; 3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
2545 3158 }
3159
2546# my $AFTER = Event::time; 3160# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 3161# warn $AFTER - $NOW;#d#
2548 3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send;
3165 }
3166 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send;
3168 }
3169
3170 $NOW = Event::time;
3171
2549 # if we are delayed by four ticks or more, skip them all 3172 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2551 3174
2552 $TICK_WATCHER->at ($NEXT_TICK); 3175 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 3176 $TICK_WATCHER->start;
3177
3178 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180
3181 _post_tick;
3182
3183
2554 }, 3184 },
2555); 3185);
2556 3186
3187{
3188 BDB::max_poll_time $TICK * 0.1;
3189 $BDB_POLL_WATCHER = Event->io (
3190 reentrant => 0,
3191 fd => BDB::poll_fileno,
3192 poll => 'r',
3193 prio => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb,
3196 );
3197 BDB::min_parallel 8;
3198
3199 BDB::set_sync_prepare {
3200 my $status;
3201 my $current = $Coro::current;
3202 (
3203 sub {
3204 $status = $!;
3205 $current->ready; undef $current;
3206 },
3207 sub {
3208 Coro::schedule while defined $current;
3209 $! = $status;
3210 },
3211 )
3212 };
3213
3214 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create;
3216
3217 cf::sync_job {
3218 eval {
3219 BDB::db_env_open
3220 $DB_ENV,
3221 $BDBDIR,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666;
3225
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 };
3231
3232 cf::cleanup "db_env_open(db): $@" if $@;
3233 };
3234 }
3235}
3236
3237{
3238 IO::AIO::min_parallel 8;
3239
3240 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 3241 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 3242 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 3245 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 3246 poll => 'r',
2564 prio => 6, 3247 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 3248 cb => \&IO::AIO::poll_cb,
2567); 3249 );
3250}
2568 3251
2569$WRITE_RUNTIME_WATCHER = Event->timer ( 3252my $_log_backtrace;
2570 reentrant => 0, 3253
2571 data => WF_AUTOCANCEL, 3254sub _log_backtrace {
2572 after => 1, 3255 my ($msg, @addr) = @_;
2573 interval => 10, 3256
2574 prio => 6, # keep it lowest so it acts like a watchdog 3257 $msg =~ s/\n//;
2575 cb => Coro::unblock_sub { 3258
2576 write_runtime 3259 # limit the # of concurrent backtraces
2577 or warn "ERROR: unable to write runtime file: $!"; 3260 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace;
3262 async {
3263 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!";
3268
3269 my @funcs;
3270 my @res = <$fh>;
3271 chomp for @res;
3272 while (@res) {
3273 my ($func, $line) = splice @res, 0, 2, ();
3274 push @funcs, "[$func] $line";
3275 }
3276
3277 @funcs
3278 };
3279
3280 LOG llevInfo, "[ABT] $msg\n";
3281 LOG llevInfo, "[ABT] $_\n" for @bt;
3282 --$_log_backtrace;
3283 };
3284 } else {
3285 LOG llevInfo, "[ABT] $msg\n";
3286 LOG llevInfo, "[ABT] [suppressed]\n";
2578 }, 3287 }
2579); 3288}
3289
3290# load additional modules
3291use cf::pod;
2580 3292
2581END { cf::emergency_save } 3293END { cf::emergency_save }
2582 3294
25831 32951
2584 3296

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines