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.206 by root, Sun Feb 11 22:27:05 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 ();
20use BDB (); 26use BDB ();
21use Data::Dumper; 27use Data::Dumper;
22use Digest::MD5; 28use Digest::MD5;
23use Fcntl; 29use Fcntl;
30use YAML::Syck ();
24use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF;
27 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
28use 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
29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31 42
32# 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?
33$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
34 45
35$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
36 47
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49
37our %COMMAND = (); 50our %COMMAND = ();
38our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
39 52
40our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
41our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
42our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
43our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
44 58
59our $RELOAD; # number of reloads so far
45our @EVENT; 60our @EVENT;
46our $LIBDIR = datadir . "/ext";
47 61
48our $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(!)
49our $TICK_WATCHER; 75our $TICK_WATCHER;
50our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER; 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
52our $NEXT_TICK; 78our $NEXT_TICK;
53our $NOW; 79our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
55 81
56our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
62our $RUNTIME; 88our $RUNTIME;
63 89
64our %PLAYER; # all users 90our %PLAYER; # all users
65our %MAP; # all maps 91our %MAP; # all maps
66our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
67our $RANDOM_MAPS = cf::localdir . "/random";
68our $BDB_ENV_DIR = cf::localdir . "/db";
69
70our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
71our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
72 93
73# 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 ∕
74our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
75 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
76binmode STDOUT; 101binmode STDOUT;
77binmode STDERR; 102binmode STDERR;
78 103
79# read virtual server time, if available 104# read virtual server time, if available
80unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
81 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
82 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
83 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
84} 109}
85 110
86mkdir cf::localdir; 111mkdir $_
87mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
88mkdir cf::localdir . "/" . cf::tmpdir;
89mkdir cf::localdir . "/" . cf::uniquedir;
90mkdir $RANDOM_MAPS;
91mkdir $BDB_ENV_DIR;
92 113
93our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
94 115
95sub cf::map::normalise; 116sub cf::map::normalise;
96 117
107=item $cf::RUNTIME 128=item $cf::RUNTIME
108 129
109The 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
110every server tick. 131every server tick.
111 132
112=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
113 136
114The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
115be 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.
116 141
117=item $cf::NOW 142=item $cf::NOW
118 143
119The time of the last (current) server tick. 144The time of the last (current) server tick.
120 145
121=item $cf::TICK 146=item $cf::TICK
122 147
123The 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.
124 159
125=item %cf::CFG 160=item %cf::CFG
126 161
127Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
128from wherever your confdir points to. 163from wherever your confdir points to.
129 164
130=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
131 166
132These 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
133or 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
134processing 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.
135window of cpu time available, or simply to synchronise to the server tick.
136 170
137=back 171=back
138 172
139=cut 173=cut
140 174
141BEGIN { 175BEGIN {
142 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
143 my $msg = join "", @_; 177 my $msg = join "", @_;
144 utf8::encode $msg;
145 178
146 $msg .= "\n" 179 $msg .= "\n"
147 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
148 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
149 LOG llevError, $msg; 185 LOG llevError, $msg;
150 }; 186 };
151} 187}
152 188
153@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
154@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
156@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
157@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';
158@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)
159 196
160# 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
161# within the Safe compartment. 198# within the Safe compartment.
162for my $pkg (qw( 199for my $pkg (qw(
163 cf::global cf::attachable 200 cf::global cf::attachable
171} 208}
172 209
173$Event::DIED = sub { 210$Event::DIED = sub {
174 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
175}; 212};
213
214#############################################################################
176 215
177=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
178 217
179=over 4 218=over 4
180 219
199 $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;
200 $d 239 $d
201 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
202} 241}
203 242
204use JSON::Syck (); # TODO# replace by JSON::PC once working
205
206=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
207 244
208Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
209 246
210=cut
211
212sub from_json($) {
213 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
214 JSON::Syck::Load $_[0]
215}
216
217=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
218 248
219Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
220 250
221=cut 251=cut
222 252
223sub to_json($) { 253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
224 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
225 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
226} 256sub from_json ($) { $json_coder->decode ($_[0]) }
227 257
228=item cf::lock_wait $string 258=item cf::lock_wait $string
229 259
230Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
231 261
237returned. 267returned.
238 268
239Lock 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
240uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
241 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
242=cut 276=cut
243 277
244our %LOCK; 278our %LOCK;
245 279
246sub lock_wait($) { 280sub lock_wait($) {
265 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
266 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
267 } 301 }
268} 302}
269 303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
308}
309
270sub freeze_mainloop { 310sub freeze_mainloop {
271 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
272 312
273 my $guard = Coro::guard { 313 my $guard = Coro::guard {
274 $TICK_WATCHER->start; 314 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 }; 315 };
277 $WRITE_RUNTIME_WATCHER->stop;
278 $TICK_WATCHER->stop; 316 $TICK_WATCHER->stop;
279 $guard 317 $guard
280} 318}
281 319
282=item cf::async { BLOCK } 320=item cf::async { BLOCK }
289 327
290BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
291 329
292=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
293 331
294The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
295always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
296reentrant. 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.
297 336
298If 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
299the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
300server 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
301fast or be very important. 340fast or be very important.
304 343
305sub sync_job(&) { 344sub sync_job(&) {
306 my ($job) = @_; 345 my ($job) = @_;
307 346
308 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
309 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
310 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
311 352
312 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
313 # (but this is cancel-safe) 354 # (but this is cancel-safe)
324 365
325 while ($busy) { 366 while ($busy) {
326 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
327 } 368 }
328 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
329 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
330 } else { 378 } else {
331 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
332 380
333 $job->() 381 $job->()
352 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
353 401
354 $coro 402 $coro
355} 403}
356 404
357sub write_runtime { 405=item fork_call { }, $args
358 my $runtime = cf::localdir . "/runtime";
359 406
360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 407Executes the given code block with the given arguments in a seperate
361 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.
362 411
363 my $value = $cf::RUNTIME + 90 + 10; 412=cut
364 # 10 is the runtime save interval, for a monotonic clock
365 # 60 allows for the watchdog to kill the server.
366 413
367 (aio_write $fh, 0, (length $value), $value, 0) <= 0 414sub _store_scalar {
368 and return; 415 open my $fh, ">", \my $buf
369 416 or die "fork_call: cannot open fh-to-buf in child : $!";
370 # always fsync - this file is important 417 Storable::store_fd $_[0], $fh;
371 aio_fsync $fh
372 and return;
373
374 close $fh 418 close $fh;
375 or return;
376 419
377 aio_rename "$runtime~", $runtime 420 $buf
378 and return; 421}
379 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;
380 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 });
381} 592}
382 593
383=back 594=back
384 595
385=cut 596=cut
392attach callbacks/event handlers (a collection of which is called an "attachment") 603attach callbacks/event handlers (a collection of which is called an "attachment")
393to it. All such attachable objects support the following methods. 604to it. All such attachable objects support the following methods.
394 605
395In 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>
396C<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
397crossfire+). 608Crossfire TRT).
398 609
399=over 4 610=over 4
400 611
401=item $attachable->attach ($attachment, key => $value...) 612=item $attachable->attach ($attachment, key => $value...)
402 613
565 $registry = $CB_TYPE[$object_type] ||= []; 776 $registry = $CB_TYPE[$object_type] ||= [];
566 777
567 } elsif ($type eq "subtype") { 778 } elsif ($type eq "subtype") {
568 defined $object_type or Carp::croak "subtype specified without type"; 779 defined $object_type or Carp::croak "subtype specified without type";
569 my $object_subtype = shift @arg; 780 my $object_subtype = shift @arg;
570 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 781 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
571 782
572 } elsif ($type eq "package") { 783 } elsif ($type eq "package") {
573 my $pkg = shift @arg; 784 my $pkg = shift @arg;
574 785
575 while (my ($name, $id) = each %cb_id) { 786 while (my ($name, $id) = each %cb_id) {
604 _attach $registry, $klass, @attach; 815 _attach $registry, $klass, @attach;
605 } 816 }
606 817
607 $obj->{$name} = \%arg; 818 $obj->{$name} = \%arg;
608 } else { 819 } else {
609 warn "object uses attachment '$name' that is not available, postponing.\n"; 820 warn "object uses attachment '$name' which is not available, postponing.\n";
610 } 821 }
611 822
612 $obj->{_attachment}{$name} = undef; 823 $obj->{_attachment}{$name} = undef;
613} 824}
614 825
616 if (ref $_[0]) { 827 if (ref $_[0]) {
617 _object_attach @_; 828 _object_attach @_;
618 } else { 829 } else {
619 _attach shift->_attach_registry, @_; 830 _attach shift->_attach_registry, @_;
620 } 831 }
832 _recalc_want;
621}; 833};
622 834
623# all those should be optimised 835# all those should be optimised
624sub cf::attachable::detach { 836sub cf::attachable::detach {
625 my ($obj, $name) = @_; 837 my ($obj, $name) = @_;
628 delete $obj->{_attachment}{$name}; 840 delete $obj->{_attachment}{$name};
629 reattach ($obj); 841 reattach ($obj);
630 } else { 842 } else {
631 Carp::croak "cannot, currently, detach class attachments"; 843 Carp::croak "cannot, currently, detach class attachments";
632 } 844 }
845 _recalc_want;
633}; 846};
634 847
635sub cf::attachable::attached { 848sub cf::attachable::attached {
636 my ($obj, $name) = @_; 849 my ($obj, $name) = @_;
637 850
784 } 997 }
785 } else { 998 } else {
786 aio_unlink $filename; 999 aio_unlink $filename;
787 aio_unlink "$filename.pst"; 1000 aio_unlink "$filename.pst";
788 } 1001 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
795 } 1002 }
796} 1003}
797 1004
798sub object_freezer_as_string { 1005sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1006 my ($rdata, $objs) = @_;
805 1012
806sub object_thawer_load { 1013sub object_thawer_load {
807 my ($filename) = @_; 1014 my ($filename) = @_;
808 1015
809 my ($data, $av); 1016 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
813 1017
814 (aio_load $filename, $data) >= 0 1018 (aio_load $filename, $data) >= 0
815 or return; 1019 or return;
816 1020
817 unless (aio_stat "$filename.pst") { 1021 unless (aio_stat "$filename.pst") {
819 or return; 1023 or return;
820 $av = eval { (Storable::thaw $av)->{objs} }; 1024 $av = eval { (Storable::thaw $av)->{objs} };
821 } 1025 }
822 1026
823 warn sprintf "loading %s (%d)\n", 1027 warn sprintf "loading %s (%d)\n",
824 $filename, length $data, scalar @{$av || []};#d# 1028 $filename, length $data, scalar @{$av || []};
825 return ($data, $av); 1029 return ($data, $av);
826} 1030}
1031
1032=head2 COMMAND CALLBACKS
1033
1034=over 4
1035
1036=cut
827 1037
828############################################################################# 1038#############################################################################
829# command handling &c 1039# command handling &c
830 1040
831=item cf::register_command $name => \&callback($ob,$args); 1041=item cf::register_command $name => \&callback($ob,$args);
844 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
845} 1055}
846 1056
847=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
848 1058
849Register 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.
850 1064
851If 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
852called. 1066called.
853 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
854=cut 1079=cut
855 1080
856sub register_extcmd { 1081sub register_extcmd {
857 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
858 1083
859 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
860} 1091}
861 1092
862cf::player->attach ( 1093cf::player->attach (
863 on_command => sub { 1094 on_command => sub {
864 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
873 cf::override; 1104 cf::override;
874 }, 1105 },
875 on_extcmd => sub { 1106 on_extcmd => sub {
876 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
877 1108
878 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
879 1110
880 if (ref $msg) { 1111 if (ref $msg) {
881 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
882 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
883 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
889 1120
890 cf::override; 1121 cf::override;
891 }, 1122 },
892); 1123);
893 1124
894sub load_extension {
895 my ($path) = @_;
896
897 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
898 my $base = $1;
899 my $pkg = $1;
900 $pkg =~ s/[^[:word:]]/_/g;
901 $pkg = "ext::$pkg";
902
903 warn "... loading '$path' into '$pkg'\n";
904
905 open my $fh, "<:utf8", $path
906 or die "$path: $!";
907
908 my $source =
909 "package $pkg; use strict; use utf8;\n"
910 . "#line 1 \"$path\"\n{\n"
911 . (do { local $/; <$fh> })
912 . "\n};\n1";
913
914 unless (eval $source) {
915 my $msg = $@ ? "$path: $@\n"
916 : "extension disabled.\n";
917 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
918 warn $@;
919 warn "mandatory extension failed to load, exiting.\n";
920 exit 1;
921 }
922 die $@;
923 }
924
925 push @EXTS, $pkg;
926}
927
928sub load_extensions { 1125sub load_extensions {
1126 cf::sync_job {
1127 my %todo;
1128
929 for my $ext (<$LIBDIR/*.ext>) { 1129 for my $path (<$LIBDIR/*.ext>) {
930 next unless -r $ext; 1130 next unless -r $path;
931 eval { 1131
932 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;
933 1 1189 }
934 } or warn "$ext not loaded: $@"; 1190
1191 skip:
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1193 unless $progress;
1194 }
935 } 1195 };
936} 1196}
937 1197
938############################################################################# 1198#############################################################################
939 1199
1200=back
1201
940=head2 CORE EXTENSIONS 1202=head2 CORE EXTENSIONS
941 1203
942Functions and methods that extend core crossfire objects. 1204Functions and methods that extend core crossfire objects.
943 1205
944=cut 1206=cut
956Returns the given player object, loading it if necessary (might block). 1218Returns the given player object, loading it if necessary (might block).
957 1219
958=cut 1220=cut
959 1221
960sub playerdir($) { 1222sub playerdir($) {
961 cf::localdir 1223 "$PLAYERDIR/"
962 . "/"
963 . cf::playerdir
964 . "/"
965 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1224 . (ref $_[0] ? $_[0]->ob->name : $_[0])
966} 1225}
967 1226
968sub path($) { 1227sub path($) {
969 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1228 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
970 1229
971 (playerdir $login) . "/$login.pl" 1230 (playerdir $login) . "/playerdata"
972} 1231}
973 1232
974sub find_active($) { 1233sub find_active($) {
975 $cf::PLAYER{$_[0]} 1234 $cf::PLAYER{$_[0]}
976 and $cf::PLAYER{$_[0]}->active 1235 and $cf::PLAYER{$_[0]}->active
989 my $login = $_[0]; 1248 my $login = $_[0];
990 1249
991 my $guard = cf::lock_acquire "user_find:$login"; 1250 my $guard = cf::lock_acquire "user_find:$login";
992 1251
993 $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
994 my $pl = load_pl path $login 1260 my $pl = load_pl path $login
995 or return; 1261 or return;
996 $cf::PLAYER{$login} = $pl 1262 $cf::PLAYER{$login} = $pl
997 } 1263 }
998 } 1264 }
1035 1301
1036=cut 1302=cut
1037 1303
1038sub quit_character { 1304sub quit_character {
1039 my ($pl) = @_; 1305 my ($pl) = @_;
1306
1307 my $name = $pl->ob->name;
1040 1308
1041 $pl->{deny_save} = 1; 1309 $pl->{deny_save} = 1;
1042 $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
1043 1311
1044 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1049 my $path = playerdir $pl; 1317 my $path = playerdir $pl;
1050 my $temp = "$path~$cf::RUNTIME~deleting~"; 1318 my $temp = "$path~$cf::RUNTIME~deleting~";
1051 aio_rename $path, $temp; 1319 aio_rename $path, $temp;
1052 delete $cf::PLAYER{$pl->ob->name}; 1320 delete $cf::PLAYER{$pl->ob->name};
1053 $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
1054 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;
1055} 1343}
1056 1344
1057=item cf::player::list_logins 1345=item cf::player::list_logins
1058 1346
1059Returns 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
1060while and may block, so not sync_job-capable, ever. 1348while and may block, so not sync_job-capable, ever.
1061 1349
1062=cut 1350=cut
1063 1351
1064sub list_logins { 1352sub list_logins {
1065 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1353 my $dirs = aio_readdir $PLAYERDIR
1066 or return []; 1354 or return [];
1067 1355
1068 my @logins; 1356 my @logins;
1069 1357
1070 for my $login (@$dirs) { 1358 for my $login (@$dirs) {
1105 } 1393 }
1106 1394
1107 \@paths 1395 \@paths
1108} 1396}
1109 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
1110=item $player->ext_reply ($msgid, $msgtype, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1111 1450
1112Sends an ext reply to the player. 1451Sends an ext reply to the player.
1113 1452
1114=cut 1453=cut
1115 1454
1116sub ext_reply($$$%) { 1455sub ext_reply($$%) {
1117 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1118 1457
1119 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1120 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1121 $self->send ("ext " . cf::to_json \%msg);
1122} 1460}
1123 1461
1124package 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}
1125 1502
1126=back 1503=back
1127
1128 1504
1129=head3 cf::map 1505=head3 cf::map
1130 1506
1131=over 4 1507=over 4
1132 1508
1187 my ($self, $merge) = @_; 1563 my ($self, $merge) = @_;
1188 1564
1189 # we have to keep some variables in memory intact 1565 # we have to keep some variables in memory intact
1190 local $self->{path}; 1566 local $self->{path};
1191 local $self->{load_path}; 1567 local $self->{load_path};
1192 local $self->{deny_save};
1193 local $self->{deny_reset};
1194 1568
1195 $self->SUPER::thawer_merge ($merge); 1569 $self->SUPER::thawer_merge ($merge);
1196} 1570}
1197 1571
1198sub normalise { 1572sub normalise {
1270 1644
1271# the original (read-only) location 1645# the original (read-only) location
1272sub load_path { 1646sub load_path {
1273 my ($self) = @_; 1647 my ($self) = @_;
1274 1648
1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1649 "$MAPDIR/$self->{path}.map"
1276} 1650}
1277 1651
1278# the temporary/swap location 1652# the temporary/swap location
1279sub save_path { 1653sub save_path {
1280 my ($self) = @_; 1654 my ($self) = @_;
1281 1655
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1657 "$TMPDIR/$path.map"
1284} 1658}
1285 1659
1286# the unique path, undef == no special unique path 1660# the unique path, undef == no special unique path
1287sub uniq_path { 1661sub uniq_path {
1288 my ($self) = @_; 1662 my ($self) = @_;
1289 1663
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1665 "$UNIQUEDIR/$path"
1292} 1666}
1293 1667
1294# and all this just because we cannot iterate over 1668# and all this just because we cannot iterate over
1295# all maps in C++... 1669# all maps in C++...
1296sub change_all_map_light { 1670sub change_all_map_light {
1298 1672
1299 $_->change_map_light ($change) 1673 $_->change_map_light ($change)
1300 for grep $_->outdoor, values %cf::MAP; 1674 for grep $_->outdoor, values %cf::MAP;
1301} 1675}
1302 1676
1677sub decay_objects {
1678 my ($self) = @_;
1679
1680 return if $self->{deny_reset};
1681
1682 $self->do_decay_objects;
1683}
1684
1303sub unlink_save { 1685sub unlink_save {
1304 my ($self) = @_; 1686 my ($self) = @_;
1305 1687
1306 utf8::encode (my $save = $self->save_path); 1688 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1689 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1690 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1314} 1691}
1315 1692
1316sub load_header_from($) { 1693sub load_header_from($) {
1317 my ($self, $path) = @_; 1694 my ($self, $path) = @_;
1318 1695
1368 $self->load_header_orig 1745 $self->load_header_orig
1369 or return; 1746 or return;
1370 $self->prepare_orig; 1747 $self->prepare_orig;
1371 } 1748 }
1372 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
1373 1 1756 1
1374} 1757}
1375 1758
1376sub find; 1759sub find;
1377sub find { 1760sub find {
1389 $map->{last_save} = $cf::RUNTIME; 1772 $map->{last_save} = $cf::RUNTIME;
1390 1773
1391 $map->load_header 1774 $map->load_header
1392 or return; 1775 or return;
1393 1776
1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1395 # doing this can freeze the server in a sync job, obviously 1778 # doing this can freeze the server in a sync job, obviously
1396 #$cf::WAIT_FOR_TICK->wait; 1779 #$cf::WAIT_FOR_TICK->wait;
1397 $map->reset; 1780 $map->reset;
1398 undef $guard; 1781 undef $guard;
1399 return find $path; 1782 return find $path;
1410 my ($self) = @_; 1793 my ($self) = @_;
1411 1794
1412 local $self->{deny_reset} = 1; # loading can take a long time 1795 local $self->{deny_reset} = 1; # loading can take a long time
1413 1796
1414 my $path = $self->{path}; 1797 my $path = $self->{path};
1798
1799 {
1415 my $guard = cf::lock_acquire "map_load:$path"; 1800 my $guard = cf::lock_acquire "map_load:$path";
1416 1801
1417 return if $self->in_memory != cf::MAP_SWAPPED; 1802 return if $self->in_memory != cf::MAP_SWAPPED;
1418 1803
1419 $self->in_memory (cf::MAP_LOADING); 1804 $self->in_memory (cf::MAP_LOADING);
1420 1805
1421 $self->alloc; 1806 $self->alloc;
1422 1807
1423 $self->pre_load; 1808 $self->pre_load;
1424
1425 $self->_load_objects ($self->{load_path}, 1)
1426 or return;
1427
1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1429 if delete $self->{load_original};
1430
1431 if (my $uniq = $self->uniq_path) {
1432 utf8::encode $uniq;
1433 if (aio_open $uniq, O_RDONLY, 0) {
1434 $self->clear_unique_items;
1435 $self->_load_objects ($uniq, 0);
1436 }
1437 }
1438
1439 Coro::cede;
1440
1441 # now do the right thing for maps
1442 $self->link_multipart_objects;
1443
1444 unless ($self->{deny_activate}) {
1445 $self->decay_objects;
1446 $self->fix_auto_apply;
1447 $self->update_buttons;
1448 Coro::cede; 1809 Coro::cede;
1449 $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;
1450 $self->difficulty ($self->estimate_difficulty) 1828 $self->difficulty ($self->estimate_difficulty)
1451 unless $self->difficulty; 1829 unless $self->difficulty;
1452 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;
1453 $self->activate; 1839 $self->activate;
1840 }
1841
1842 $self->in_memory (cf::MAP_IN_MEMORY);
1454 } 1843 }
1455 1844
1456 $self->post_load; 1845 $self->post_load;
1457
1458 $self->in_memory (cf::MAP_IN_MEMORY);
1459} 1846}
1460 1847
1461sub customise_for { 1848sub customise_for {
1462 my ($self, $ob) = @_; 1849 my ($self, $ob) = @_;
1463 1850
1464 return find "~" . $ob->name . "/" . $self->{path} 1851 return find "~" . $ob->name . "/" . $self->{path}
1465 if $self->per_player; 1852 if $self->per_player;
1853
1854# return find "?party/" . $ob->name . "/" . $self->{path}
1855# if $self->per_party;
1466 1856
1467 $self 1857 $self
1468} 1858}
1469 1859
1470# 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
1581 1971
1582sub reset_at { 1972sub reset_at {
1583 my ($self) = @_; 1973 my ($self) = @_;
1584 1974
1585 # TODO: safety, remove and allow resettable per-player maps 1975 # TODO: safety, remove and allow resettable per-player maps
1586 return 1e99 if $self->isa ("ext::map_per_player");#d#
1587 return 1e99 if $self->{deny_reset}; 1976 return 1e99 if $self->{deny_reset};
1588 1977
1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1978 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1590 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;
1591 1980
1602 my ($self) = @_; 1991 my ($self) = @_;
1603 1992
1604 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1605 1994
1606 return if $self->players; 1995 return if $self->players;
1607 return if $self->isa ("ext::map_per_player");#d#
1608 1996
1609 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 }
1610 2008
1611 delete $cf::MAP{$self->path}; 2009 delete $cf::MAP{$self->path};
1612 2010
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear; 2011 $self->clear;
1615 2012
1616 $_->clear_links_to ($self) for values %cf::MAP; 2013 $_->clear_links_to ($self) for values %cf::MAP;
1617 2014
1618 $self->unlink_save; 2015 $self->unlink_save;
1637 $cf::MAP{$self->path} = $self; 2034 $cf::MAP{$self->path} = $self;
1638 2035
1639 $self->reset; # polite request, might not happen 2036 $self->reset; # polite request, might not happen
1640} 2037}
1641 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
1642=item cf::map::unique_maps 2075=item cf::map::unique_maps
1643 2076
1644Returns an arrayref of paths of all shared maps that have 2077Returns an arrayref of paths of all shared maps that have
1645instantiated unique items. May block. 2078instantiated unique items. May block.
1646 2079
1647=cut 2080=cut
1648 2081
1649sub unique_maps() { 2082sub unique_maps() {
1650 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2083 [
1651 or return; 2084 map {
1652
1653 my @paths;
1654
1655 for (@$files) {
1656 utf8::decode $_; 2085 utf8::decode $_;
1657 next if /\.pst$/; 2086 /\.map$/
1658 next unless /^$PATH_SEP/o; 2087 ? normalise $_
1659 2088 : ()
1660 push @paths, cf::map::normalise $_; 2089 } @{ aio_readdir $UNIQUEDIR or [] }
1661 } 2090 ]
1662
1663 \@paths
1664} 2091}
1665 2092
1666package cf; 2093package cf;
1667 2094
1668=back 2095=back
1714 2141
1715 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1716 2143
1717 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
1718 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
1719 } 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 {
1720 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
1721 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
1722 } 2163 }
1723} 2164}
1724 2165
1725=item $player_object->may ("access") 2166=item $player_object->may ("access")
1726 2167
1774 $self->deactivate_recursive; 2215 $self->deactivate_recursive;
1775 2216
1776 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2217 return if UNIVERSAL::isa $self->map, "ext::map_link";
1777 2218
1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1779 if $self->map; 2220 if $self->map && $self->map->{path} ne "{link}";
1780 2221
1781 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2222 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1782} 2223}
1783 2224
1784sub cf::object::player::leave_link { 2225sub cf::object::player::leave_link {
1785 my ($self, $map, $x, $y) = @_; 2226 my ($self, $map, $x, $y) = @_;
2227
2228 return unless $self->contr->active;
1786 2229
1787 my $link_pos = delete $self->{_link_pos}; 2230 my $link_pos = delete $self->{_link_pos};
1788 2231
1789 unless ($map) { 2232 unless ($map) {
1790 # restore original map position 2233 # restore original map position
1808 $map->load; 2251 $map->load;
1809 $map->load_diag; 2252 $map->load_diag;
1810 2253
1811 return unless $self->contr->active; 2254 return unless $self->contr->active;
1812 $self->activate_recursive; 2255 $self->activate_recursive;
2256
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
1814} 2259}
1815 2260
1816cf::player->attach (
1817 on_logout => sub {
1818 my ($pl) = @_;
1819
1820 # abort map switching before logout
1821 if ($pl->ob->{_link_pos}) {
1822 cf::sync_job {
1823 $pl->ob->leave_link
1824 };
1825 }
1826 },
1827 on_login => sub {
1828 my ($pl) = @_;
1829
1830 # try to abort aborted map switching on player login :)
1831 # should happen only on crashes
1832 if ($pl->ob->{_link_pos}) {
1833 $pl->ob->enter_link;
1834 (async {
1835 # we need this sleep as the login has a concurrent enter_exit running
1836 # and this sleep increases chances of the player not ending up in scorn
1837 $pl->ob->reply (undef,
1838 "There was an internal problem at your last logout, "
1839 . "the server will try to bring you to your intended destination in a second.",
1840 cf::NDI_RED);
1841 Coro::Timer::sleep 1;
1842 $pl->ob->leave_link;
1843 })->prio (2);
1844 }
1845 },
1846);
1847
1848=item $player_object->goto ($path, $x, $y) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)])
1849 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
1850=cut 2268=cut
2269
2270our $GOTOGEN;
1851 2271
1852sub cf::object::player::goto { 2272sub cf::object::player::goto {
1853 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;
1854 2277
1855 $self->enter_link; 2278 $self->enter_link;
1856 2279
1857 (async { 2280 (async {
1858 my $map = eval { 2281 my $map = eval {
1859 my $map = cf::map::find $path; 2282 my $map = cf::map::find $path;
2283
2284 if ($map) {
1860 $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
1861 $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 $@;
1862 } or 2297 }
1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1864 2298
2299 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation};
1865 $self->leave_link ($map, $x, $y); 2301 $self->leave_link ($map, $x, $y);
2302 }
1866 })->prio (1); 2303 })->prio (1);
1867} 2304}
1868 2305
1869=item $player_object->enter_exit ($exit_object) 2306=item $player_object->enter_exit ($exit_object)
1870 2307
1909 2346
1910 $rmp->{random_seed} ||= $exit->random_seed; 2347 $rmp->{random_seed} ||= $exit->random_seed;
1911 2348
1912 my $data = cf::to_json $rmp; 2349 my $data = cf::to_json $rmp;
1913 my $md5 = Digest::MD5::md5_hex $data; 2350 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2351 my $meta = "$RANDOMDIR/$md5.meta";
1915 2352
1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1917 aio_write $fh, 0, (length $data), $data, 0; 2354 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh; 2355 undef $fh;
1919 aio_rename "$meta~", $meta; 2356 aio_rename "$meta~", $meta;
1928 2365
1929 return unless $self->type == cf::PLAYER; 2366 return unless $self->type == cf::PLAYER;
1930 2367
1931 if ($exit->slaying eq "/!") { 2368 if ($exit->slaying eq "/!") {
1932 #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
1933 cf::sync_job { prepare_random_map $exit }; 2372 cf::sync_job { prepare_random_map $exit };
1934 } 2373 }
1935 2374
1936 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;
1937 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
1939 2378
1940 $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);
1941 2384
1942 (async { 2385 (async {
1943 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
1944 unless (eval { 2387 unless (eval {
1945 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
1946 2389
1947 1; 2390 1;
1948 }) { 2391 }) {
1949 $self->message ("Something went wrong deep within the crossfire server. " 2392 $self->message ("Something went wrong deep within the crossfire server. "
1950 . "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. "
1951 . "Please report this to the dungeon master!", 2394 . "Please report this to the dungeon master!",
1952 cf::NDI_UNIQUE | cf::NDI_RED); 2395 cf::NDI_UNIQUE | cf::NDI_RED);
1953 2396
1954 warn "ERROR in enter_exit: $@"; 2397 warn "ERROR in enter_exit: $@";
1955 $self->leave_link; 2398 $self->leave_link;
1956 } 2399 }
1957 })->prio (1); 2400 })->prio (1);
1970 2413
1971sub cf::client::send_drawinfo { 2414sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 2415 my ($self, $text, $flags) = @_;
1973 2416
1974 utf8::encode $text; 2417 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2419}
1977 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}
1978 2473
1979=item $success = $client->query ($flags, "text", \&cb) 2474=item $success = $client->query ($flags, "text", \&cb)
1980 2475
1981Queues a query to the client, calling the given callback with 2476Queues a query to the client, calling the given callback with
1982the 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>,
1983C<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>.
1984 2479
1985Queries 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
1986reliable at some point in the future. 2481become reliable at some point in the future.
1987 2482
1988=cut 2483=cut
1989 2484
1990sub cf::client::query { 2485sub cf::client::query {
1991 my ($self, $flags, $text, $cb) = @_; 2486 my ($self, $flags, $text, $cb) = @_;
1999 utf8::encode $text; 2494 utf8::encode $text;
2000 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2495 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2001 2496
2002 $self->send_packet ($self->{query_queue}[0][0]) 2497 $self->send_packet ($self->{query_queue}[0][0])
2003 if @{ $self->{query_queue} } == 1; 2498 if @{ $self->{query_queue} } == 1;
2499
2500 1
2004} 2501}
2005 2502
2006cf::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 },
2007 on_reply => sub { 2509 on_reply => sub {
2008 my ($ns, $msg) = @_; 2510 my ($ns, $msg) = @_;
2009 2511
2010 # this weird shuffling is so that direct followup queries 2512 # this weird shuffling is so that direct followup queries
2011 # get handled first 2513 # get handled first
2023 } else { 2525 } else {
2024 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2526 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2025 } 2527 }
2026 } 2528 }
2027 }, 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 },
2028); 2548);
2029 2549
2030=item $client->async (\&cb) 2550=item $client->async (\&cb)
2031 2551
2032Create a new coroutine, running the specified callback. The coroutine will 2552Create a new coroutine, running the specified callback. The coroutine will
2079 2599
2080# here we export the classes and methods available to script code 2600# here we export the classes and methods available to script code
2081 2601
2082=pod 2602=pod
2083 2603
2084The following fucntions and emthods are available within a safe environment: 2604The following functions and methods are available within a safe environment:
2085 2605
2086 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
2087 cf::object::player player 2610 cf::object::player
2088 cf::player peaceful 2611 player
2089 cf::map trigger 2612
2613 cf::player
2614 peaceful
2615
2616 cf::map
2617 trigger
2090 2618
2091=cut 2619=cut
2092 2620
2093for ( 2621for (
2094 ["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)],
2095 ["cf::object::player" => qw(player)], 2624 ["cf::object::player" => qw(player)],
2096 ["cf::player" => qw(peaceful)], 2625 ["cf::player" => qw(peaceful)],
2097 ["cf::map" => qw(trigger)], 2626 ["cf::map" => qw(trigger)],
2098) { 2627) {
2099 no strict 'refs'; 2628 no strict 'refs';
2170=back 2699=back
2171 2700
2172=cut 2701=cut
2173 2702
2174############################################################################# 2703#############################################################################
2175
2176=head2 EXTENSION DATABASE SUPPORT
2177
2178Crossfire maintains a very simple database for extension use. It can
2179currently store anything that can be serialised using Storable, which
2180excludes objects.
2181
2182The parameter C<$family> should best start with the name of the extension
2183using it, it should be unique.
2184
2185=over 4
2186
2187=item $hashref = cf::db_get $family
2188
2189Return a hashref for use by the extension C<$family>, which can be
2190modified. After modifications, you have to call C<cf::db_dirty> or
2191C<cf::db_sync>.
2192
2193=item $value = cf::db_get $family => $key
2194
2195Returns a single value from the database
2196
2197=item cf::db_put $family => $hashref
2198
2199Stores the given family hashref into the database. Updates are delayed, if
2200you want the data to be synced to disk immediately, use C<cf::db_sync>.
2201
2202=item cf::db_put $family => $key => $value
2203
2204Stores the given C<$value> in the family hash. Updates are delayed, if you
2205want the data to be synced to disk immediately, use C<cf::db_sync>.
2206
2207=item cf::db_dirty
2208
2209Marks the database as dirty, to be updated at a later time.
2210
2211=item cf::db_sync
2212
2213Immediately write the database to disk I<if it is dirty>.
2214
2215=cut
2216
2217our $DB;
2218
2219{
2220 my $path = cf::localdir . "/database.pst";
2221
2222 sub db_load() {
2223 $DB = stat $path ? Storable::retrieve $path : { };
2224 }
2225
2226 my $pid;
2227
2228 sub db_save() {
2229 waitpid $pid, 0 if $pid;
2230 if (0 == ($pid = fork)) {
2231 $DB->{_meta}{version} = 1;
2232 Storable::nstore $DB, "$path~";
2233 rename "$path~", $path;
2234 cf::_exit 0 if defined $pid;
2235 }
2236 }
2237
2238 my $dirty;
2239
2240 sub db_sync() {
2241 db_save if $dirty;
2242 undef $dirty;
2243 }
2244
2245 my $idle = Event->idle (
2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2252 );
2253
2254 sub db_dirty() {
2255 $dirty = 1;
2256 $idle->start;
2257 }
2258
2259 sub db_get($;$) {
2260 @_ >= 2
2261 ? $DB->{$_[0]}{$_[1]}
2262 : ($DB->{$_[0]} ||= { })
2263 }
2264
2265 sub db_put($$;$) {
2266 if (@_ >= 3) {
2267 $DB->{$_[0]}{$_[1]} = $_[2];
2268 } else {
2269 $DB->{$_[0]} = $_[1];
2270 }
2271 db_dirty;
2272 }
2273
2274 cf::global->attach (
2275 prio => 10000,
2276 on_cleanup => sub {
2277 db_sync;
2278 },
2279 );
2280}
2281
2282#############################################################################
2283# the server's init and main functions 2704# the server's init and main functions
2284 2705
2285sub load_resources { 2706sub load_facedata($) {
2286 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"
2287 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;
2288} 2797}
2289 2798
2290sub cfg_load { 2799sub cfg_load {
2291 open my $fh, "<:utf8", cf::confdir . "/config" 2800 open my $fh, "<:utf8", "$CONFDIR/config"
2292 or return; 2801 or return;
2293 2802
2294 local $/; 2803 local $/;
2295 *CFG = YAML::Syck::Load <$fh>; 2804 *CFG = YAML::Syck::Load <$fh>;
2296 2805
2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2813 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2305 and die "WARNING: m(un)lockall failed: $!\n"; 2814 and die "WARNING: m(un)lockall failed: $!\n";
2306 }; 2815 };
2307 warn $@ if $@; 2816 warn $@ if $@;
2308 } 2817 }
2309}
2310
2311sub init {
2312 load_resources;
2313} 2818}
2314 2819
2315sub main { 2820sub main {
2316 # we must not ever block the main coroutine 2821 # we must not ever block the main coroutine
2317 local $Coro::idle = sub { 2822 local $Coro::idle = sub {
2320 Event::one_event; 2825 Event::one_event;
2321 })->prio (Coro::PRIO_MAX); 2826 })->prio (Coro::PRIO_MAX);
2322 }; 2827 };
2323 2828
2324 cfg_load; 2829 cfg_load;
2325 db_load; 2830 db_init;
2326 load_extensions; 2831 load_extensions;
2327 2832
2328 $TICK_WATCHER->start; 2833 $TICK_WATCHER->start;
2329 Event::loop; 2834 Event::loop;
2330} 2835}
2345 }, 2850 },
2346 ); 2851 );
2347 } 2852 }
2348} 2853}
2349 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
2350sub emergency_save() { 2893sub emergency_save() {
2351 my $freeze_guard = cf::freeze_mainloop; 2894 my $freeze_guard = cf::freeze_mainloop;
2352 2895
2353 warn "enter emergency perl save\n"; 2896 warn "enter emergency perl save\n";
2354 2897
2369 my $map = $cf::MAP{$path} or next; 2912 my $map = $cf::MAP{$path} or next;
2370 $map->valid or next; 2913 $map->valid or next;
2371 $map->save; 2914 $map->save;
2372 } 2915 }
2373 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";
2374 }; 2921 };
2375 2922
2376 warn "leave emergency perl save\n"; 2923 warn "leave emergency perl save\n";
2377} 2924}
2378 2925
2926sub post_cleanup {
2927 my ($make_core) = @_;
2928
2929 warn Carp::longmess "post_cleanup backtrace"
2930 if $make_core;
2931}
2932
2379sub reload() { 2933sub do_reload_perl() {
2380 # can/must only be called in main 2934 # can/must only be called in main
2381 if ($Coro::current != $Coro::main) { 2935 if ($Coro::current != $Coro::main) {
2382 warn "can only reload from main coroutine"; 2936 warn "can only reload from main coroutine";
2383 return; 2937 return;
2384 } 2938 }
2385 2939
2386 warn "reloading..."; 2940 warn "reloading...";
2387 2941
2388 warn "cancelling server ticker"; 2942 warn "entering sync_job";
2389 $TICK_WATCHER->cancel;
2390 2943
2944 cf::sync_job {
2945 cf::write_runtime; # external watchdog should not bark
2391 cf::emergency_save; 2946 cf::emergency_save;
2947 cf::write_runtime; # external watchdog should not bark
2392 2948
2393 eval { 2949 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV;
2951
2394 # 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
2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398 2953
2399 warn "cancelling all WF_AUTOCANCEL watchers"; 2954 warn "cancelling all WF_AUTOCANCEL watchers";
2400 for (Event::all_watchers) { 2955 for (Event::all_watchers) {
2401 $_->cancel if $_->data & WF_AUTOCANCEL; 2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2402 } 2957 }
2403 2958
2404 warn "flushing outstanding aio requests"; 2959 warn "flushing outstanding aio requests";
2405 for (;;) { 2960 for (;;) {
2961 BDB::flush;
2406 IO::AIO::flush; 2962 IO::AIO::flush;
2407 Coro::cede; 2963 Coro::cede;
2408 last unless IO::AIO::nreqs; 2964 last unless IO::AIO::nreqs || BDB::nreqs;
2409 warn "iterate..."; 2965 warn "iterate...";
2410 } 2966 }
2967
2968 ++$RELOAD;
2411 2969
2412 warn "cancelling all extension coros"; 2970 warn "cancelling all extension coros";
2413 $_->cancel for values %EXT_CORO; 2971 $_->cancel for values %EXT_CORO;
2414 %EXT_CORO = (); 2972 %EXT_CORO = ();
2415 2973
2416 warn "removing commands"; 2974 warn "removing commands";
2417 %COMMAND = (); 2975 %COMMAND = ();
2418 2976
2419 warn "removing ext commands"; 2977 warn "removing ext/exti commands";
2420 %EXTCMD = (); 2978 %EXTCMD = ();
2979 %EXTICMD = ();
2421 2980
2422 warn "unloading/nuking all extensions"; 2981 warn "unloading/nuking all extensions";
2423 for my $pkg (@EXTS) { 2982 for my $pkg (@EXTS) {
2424 warn "... unloading $pkg"; 2983 warn "... unloading $pkg";
2425 2984
2455 Symbol::delete_package "safe::$_" 3014 Symbol::delete_package "safe::$_"
2456 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);
2457 3016
2458 warn "unloading cf.pm \"a bit\""; 3017 warn "unloading cf.pm \"a bit\"";
2459 delete $INC{"cf.pm"}; 3018 delete $INC{"cf.pm"};
3019 delete $INC{"cf/pod.pm"};
2460 3020
2461 # don't, removes xs symbols, too, 3021 # don't, removes xs symbols, too,
2462 # and global variables created in xs 3022 # and global variables created in xs
2463 #Symbol::delete_package __PACKAGE__; 3023 #Symbol::delete_package __PACKAGE__;
2464 3024
2468 require cf; 3028 require cf;
2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2470 3030
2471 warn "loading config and database again"; 3031 warn "loading config and database again";
2472 cf::cfg_load; 3032 cf::cfg_load;
2473 cf::db_load;
2474 3033
2475 warn "loading extensions"; 3034 warn "loading extensions";
2476 cf::load_extensions; 3035 cf::load_extensions;
2477 3036
2478 warn "reattaching attachments to objects/players"; 3037 warn "reattaching attachments to objects/players";
2479 _global_reattach; 3038 _global_reattach; # objects, sockets
2480 warn "reattaching attachments to maps"; 3039 warn "reattaching attachments to maps";
2481 reattach $_ for values %MAP; 3040 reattach $_ for values %MAP;
3041 warn "reattaching attachments to players";
3042 reattach $_ for values %PLAYER;
2482 3043
2483 warn "loading reloadable resources"; 3044 warn "leaving sync_job";
2484 load_resources;
2485 3045
2486 warn "restarting server ticker"; 3046 1
2487 3047 } or do {
2488 $TICK_WATCHER->start;
2489 };
2490
2491 if ($@) {
2492 warn $@; 3048 warn $@;
2493 warn "error while reloading, exiting."; 3049 warn "error while reloading, exiting.";
2494 exit 1; 3050 exit 1;
2495 } 3051 };
2496 3052
2497 warn "reloaded"; 3053 warn "reloaded";
2498}; 3054};
2499 3055
2500our $RELOAD_WATCHER; # used only during reload 3056our $RELOAD_WATCHER; # used only during reload
2501 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
2502register_command "reload" => sub { 3073register_command "reload" => sub {
2503 my ($who, $arg) = @_; 3074 my ($who, $arg) = @_;
2504 3075
2505 if ($who->flag (FLAG_WIZ)) { 3076 if ($who->flag (FLAG_WIZ)) {
2506 $who->message ("reloading server."); 3077 $who->message ("reloading server.");
2507 3078 async { reload_perl };
2508 # doing reload synchronously and two reloads happen back-to-back,
2509 # coro crashes during coro_state_free->destroy here.
2510
2511 $RELOAD_WATCHER ||= Event->timer (
2512 reentrant => 0,
2513 after => 0,
2514 data => WF_AUTOCANCEL,
2515 cb => sub {
2516 reload;
2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2520 } 3079 }
2521}; 3080};
2522 3081
2523unshift @INC, $LIBDIR; 3082unshift @INC, $LIBDIR;
2524 3083
2525my $bug_warning = 0; 3084my $bug_warning = 0;
2526 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;
2527$TICK_WATCHER = Event->timer ( 3109$TICK_WATCHER = Event->timer (
2528 reentrant => 0, 3110 reentrant => 0,
2529 parked => 1, 3111 parked => 1,
2530 prio => 0, 3112 prio => 0,
2531 at => $NEXT_TICK || $TICK, 3113 at => $NEXT_TICK || $TICK,
2535 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"
2536 unless ++$bug_warning > 10; 3118 unless ++$bug_warning > 10;
2537 return; 3119 return;
2538 } 3120 }
2539 3121
2540 $NOW = Event::time; 3122 $NOW = $tick_start = Event::time;
2541 3123
2542 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
2543 $RUNTIME += $TICK; 3149 $RUNTIME += $TICK;
2544 $NEXT_TICK += $TICK; 3150 $NEXT_TICK += $TICK;
2545 3151
2546 $WAIT_FOR_TICK->broadcast; 3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
2548 3154 Coro::async_pool {
2549 Event::sweep; 3155 write_runtime
2550 Coro::cede_notself; 3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
2551 3158 }
3159
2552# my $AFTER = Event::time; 3160# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d# 3161# warn $AFTER - $NOW;#d#
2554 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
2555 # 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
2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2557 3174
2558 $TICK_WATCHER->at ($NEXT_TICK); 3175 $TICK_WATCHER->at ($NEXT_TICK);
2559 $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
2560 }, 3184 },
2561); 3185);
2562 3186
2563{ 3187{
2564 BDB::max_poll_time $TICK * 0.1; 3188 BDB::max_poll_time $TICK * 0.1;
2589 3213
2590 unless ($DB_ENV) { 3214 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create; 3215 $DB_ENV = BDB::db_env_create;
2592 3216
2593 cf::sync_job { 3217 cf::sync_job {
3218 eval {
2594 BDB::db_env_open 3219 BDB::db_env_open
2595 $DB_ENV, 3220 $DB_ENV,
2596 $BDB_ENV_DIR, 3221 $BDBDIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666; 3224 0666;
2600 3225
2601 cf::cleanup "$!" if $!; 3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2602 3227
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 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 $@;
2604 }; 3233 };
2605 } 3234 }
2606} 3235}
2607 3236
2608{ 3237{
2610 3239
2611 undef $Coro::AIO::WATCHER; 3240 undef $Coro::AIO::WATCHER;
2612 IO::AIO::max_poll_time $TICK * 0.1; 3241 IO::AIO::max_poll_time $TICK * 0.1;
2613 $AIO_POLL_WATCHER = Event->io ( 3242 $AIO_POLL_WATCHER = Event->io (
2614 reentrant => 0, 3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
2615 fd => IO::AIO::poll_fileno, 3245 fd => IO::AIO::poll_fileno,
2616 poll => 'r', 3246 poll => 'r',
2617 prio => 6, 3247 prio => 6,
2618 data => WF_AUTOCANCEL,
2619 cb => \&IO::AIO::poll_cb, 3248 cb => \&IO::AIO::poll_cb,
2620 ); 3249 );
2621} 3250}
2622 3251
2623$WRITE_RUNTIME_WATCHER = Event->timer ( 3252my $_log_backtrace;
2624 reentrant => 0, 3253
2625 data => WF_AUTOCANCEL, 3254sub _log_backtrace {
2626 after => 1, 3255 my ($msg, @addr) = @_;
2627 interval => 10, 3256
2628 prio => 6, # keep it lowest so it acts like a watchdog 3257 $msg =~ s/\n//;
2629 cb => Coro::unblock_sub { 3258
2630 write_runtime 3259 # limit the # of concurrent backtraces
2631 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";
2632 }, 3287 }
2633); 3288}
3289
3290# load additional modules
3291use cf::pod;
2634 3292
2635END { cf::emergency_save } 3293END { cf::emergency_save }
2636 3294
26371 32951
2638 3296

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines