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.298 by root, Sun Jul 8 14:50:07 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 fork_call(&@) {
368 and return; 415 my ($cb, @args) = @_;
369 416
370 # always fsync - this file is important 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
371 aio_fsync $fh 418# or die "socketpair: $!";
372 and return; 419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
373 421
422 if (my $pid = fork) {
374 close $fh 423 close $fh2;
375 or return;
376 424
377 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
378 and return; 426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
379 428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals;
436 local $SIG{__WARN__};
437 local $SIG{__DIE__};
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442
443 my @res = eval { $cb->(@args) };
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
380 1 459 }
460}
461
462=item $value = cf::db_get $family => $key
463
464Returns a single value from the environment database.
465
466=item cf::db_put $family => $key => $value
467
468Stores the given C<$value> in the family. It can currently store binary
469data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
470
471=cut
472
473our $DB;
474
475sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job {
480 eval {
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 }
490}
491
492sub db_get($$) {
493 my $key = "$_[0]/$_[1]";
494
495 cf::sync_job {
496 BDB::db_get $DB, undef, $key, my $data;
497
498 $! ? ()
499 : $data
500 }
501}
502
503sub db_put($$$) {
504 BDB::dbreq_pri 4;
505 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
506}
507
508=item cf::cache $id => [$paths...], $processversion => $process
509
510Generic caching function that returns the value of the resource $id,
511caching and regenerating as required.
512
513This function can block.
514
515=cut
516
517sub cache {
518 my ($id, $src, $processversion, $process) = @_;
519
520 my $meta =
521 join "\x00",
522 $processversion,
523 map {
524 aio_stat $_
525 and Carp::croak "$_: $!";
526
527 ($_, (stat _)[7,9])
528 } @$src;
529
530 my $dbmeta = db_get cache => "$id/meta";
531 if ($dbmeta ne $meta) {
532 # changed, we may need to process
533
534 my @data;
535 my $md5;
536
537 for (0 .. $#$src) {
538 0 <= aio_load $src->[$_], $data[$_]
539 or Carp::croak "$src->[$_]: $!";
540 }
541
542 # if processing is expensive, check
543 # checksum first
544 if (1) {
545 $md5 =
546 join "\x00",
547 $processversion,
548 map {
549 Coro::cede;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src;
552
553
554 my $dbmd5 = db_get cache => "$id/md5";
555 if ($dbmd5 eq $md5) {
556 db_put cache => "$id/meta", $meta;
557
558 return db_get cache => "$id/data";
559 }
560 }
561
562 my $t1 = Time::HiRes::time;
563 my $data = $process->(\@data);
564 my $t2 = Time::HiRes::time;
565
566 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
567
568 db_put cache => "$id/data", $data;
569 db_put cache => "$id/md5" , $md5;
570 db_put cache => "$id/meta", $meta;
571
572 return $data;
573 }
574
575 db_get cache => "$id/data"
576}
577
578=item cf::datalog type => key => value, ...
579
580Log a datalog packet of the given type with the given key-value pairs.
581
582=cut
583
584sub datalog($@) {
585 my ($type, %kv) = @_;
586 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
381} 587}
382 588
383=back 589=back
384 590
385=cut 591=cut
392attach callbacks/event handlers (a collection of which is called an "attachment") 598attach callbacks/event handlers (a collection of which is called an "attachment")
393to it. All such attachable objects support the following methods. 599to it. All such attachable objects support the following methods.
394 600
395In the following description, CLASS can be any of C<global>, C<object> 601In 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 602C<player>, C<client> or C<map> (i.e. the attachable objects in
397crossfire+). 603Crossfire TRT).
398 604
399=over 4 605=over 4
400 606
401=item $attachable->attach ($attachment, key => $value...) 607=item $attachable->attach ($attachment, key => $value...)
402 608
565 $registry = $CB_TYPE[$object_type] ||= []; 771 $registry = $CB_TYPE[$object_type] ||= [];
566 772
567 } elsif ($type eq "subtype") { 773 } elsif ($type eq "subtype") {
568 defined $object_type or Carp::croak "subtype specified without type"; 774 defined $object_type or Carp::croak "subtype specified without type";
569 my $object_subtype = shift @arg; 775 my $object_subtype = shift @arg;
570 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 776 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
571 777
572 } elsif ($type eq "package") { 778 } elsif ($type eq "package") {
573 my $pkg = shift @arg; 779 my $pkg = shift @arg;
574 780
575 while (my ($name, $id) = each %cb_id) { 781 while (my ($name, $id) = each %cb_id) {
604 _attach $registry, $klass, @attach; 810 _attach $registry, $klass, @attach;
605 } 811 }
606 812
607 $obj->{$name} = \%arg; 813 $obj->{$name} = \%arg;
608 } else { 814 } else {
609 warn "object uses attachment '$name' that is not available, postponing.\n"; 815 warn "object uses attachment '$name' which is not available, postponing.\n";
610 } 816 }
611 817
612 $obj->{_attachment}{$name} = undef; 818 $obj->{_attachment}{$name} = undef;
613} 819}
614 820
616 if (ref $_[0]) { 822 if (ref $_[0]) {
617 _object_attach @_; 823 _object_attach @_;
618 } else { 824 } else {
619 _attach shift->_attach_registry, @_; 825 _attach shift->_attach_registry, @_;
620 } 826 }
827 _recalc_want;
621}; 828};
622 829
623# all those should be optimised 830# all those should be optimised
624sub cf::attachable::detach { 831sub cf::attachable::detach {
625 my ($obj, $name) = @_; 832 my ($obj, $name) = @_;
628 delete $obj->{_attachment}{$name}; 835 delete $obj->{_attachment}{$name};
629 reattach ($obj); 836 reattach ($obj);
630 } else { 837 } else {
631 Carp::croak "cannot, currently, detach class attachments"; 838 Carp::croak "cannot, currently, detach class attachments";
632 } 839 }
840 _recalc_want;
633}; 841};
634 842
635sub cf::attachable::attached { 843sub cf::attachable::attached {
636 my ($obj, $name) = @_; 844 my ($obj, $name) = @_;
637 845
784 } 992 }
785 } else { 993 } else {
786 aio_unlink $filename; 994 aio_unlink $filename;
787 aio_unlink "$filename.pst"; 995 aio_unlink "$filename.pst";
788 } 996 }
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 } 997 }
796} 998}
797 999
798sub object_freezer_as_string { 1000sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1001 my ($rdata, $objs) = @_;
805 1007
806sub object_thawer_load { 1008sub object_thawer_load {
807 my ($filename) = @_; 1009 my ($filename) = @_;
808 1010
809 my ($data, $av); 1011 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
813 1012
814 (aio_load $filename, $data) >= 0 1013 (aio_load $filename, $data) >= 0
815 or return; 1014 or return;
816 1015
817 unless (aio_stat "$filename.pst") { 1016 unless (aio_stat "$filename.pst") {
819 or return; 1018 or return;
820 $av = eval { (Storable::thaw $av)->{objs} }; 1019 $av = eval { (Storable::thaw $av)->{objs} };
821 } 1020 }
822 1021
823 warn sprintf "loading %s (%d)\n", 1022 warn sprintf "loading %s (%d)\n",
824 $filename, length $data, scalar @{$av || []};#d# 1023 $filename, length $data, scalar @{$av || []};
825 return ($data, $av); 1024 return ($data, $av);
826} 1025}
1026
1027=head2 COMMAND CALLBACKS
1028
1029=over 4
1030
1031=cut
827 1032
828############################################################################# 1033#############################################################################
829# command handling &c 1034# command handling &c
830 1035
831=item cf::register_command $name => \&callback($ob,$args); 1036=item cf::register_command $name => \&callback($ob,$args);
844 push @{ $COMMAND{$name} }, [$caller, $cb]; 1049 push @{ $COMMAND{$name} }, [$caller, $cb];
845} 1050}
846 1051
847=item cf::register_extcmd $name => \&callback($pl,$packet); 1052=item cf::register_extcmd $name => \&callback($pl,$packet);
848 1053
849Register a callbackf ro execution when the client sends an extcmd packet. 1054Register a callback for execution when the client sends an (synchronous)
1055extcmd packet. Ext commands will be processed in the order they are
1056received by the server, like other user commands. The first argument is
1057the logged-in player. Ext commands can only be processed after a player
1058has logged in successfully.
850 1059
851If the callback returns something, it is sent back as if reply was being 1060If the callback returns something, it is sent back as if reply was being
852called. 1061called.
853 1062
1063=item cf::register_exticmd $name => \&callback($ns,$packet);
1064
1065Register a callback for execution when the client sends an (asynchronous)
1066exticmd packet. Exti commands are processed by the server as soon as they
1067are received, i.e. out of order w.r.t. other commands. The first argument
1068is a client socket. Exti commands can be received anytime, even before
1069log-in.
1070
1071If the callback returns something, it is sent back as if reply was being
1072called.
1073
854=cut 1074=cut
855 1075
856sub register_extcmd { 1076sub register_extcmd {
857 my ($name, $cb) = @_; 1077 my ($name, $cb) = @_;
858 1078
859 $EXTCMD{$name} = $cb; 1079 $EXTCMD{$name} = $cb;
1080}
1081
1082sub register_exticmd {
1083 my ($name, $cb) = @_;
1084
1085 $EXTICMD{$name} = $cb;
860} 1086}
861 1087
862cf::player->attach ( 1088cf::player->attach (
863 on_command => sub { 1089 on_command => sub {
864 my ($pl, $name, $params) = @_; 1090 my ($pl, $name, $params) = @_;
873 cf::override; 1099 cf::override;
874 }, 1100 },
875 on_extcmd => sub { 1101 on_extcmd => sub {
876 my ($pl, $buf) = @_; 1102 my ($pl, $buf) = @_;
877 1103
878 my $msg = eval { from_json $buf }; 1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
879 1105
880 if (ref $msg) { 1106 if (ref $msg) {
881 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
882 if (my %reply = $cb->($pl, $msg)) { 1108 if (my %reply = $cb->($pl, $msg)) {
883 $pl->ext_reply ($msg->{msgid}, %reply); 1109 $pl->ext_reply ($msg->{msgid}, %reply);
889 1115
890 cf::override; 1116 cf::override;
891 }, 1117 },
892); 1118);
893 1119
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 { 1120sub load_extensions {
1121 cf::sync_job {
1122 my %todo;
1123
929 for my $ext (<$LIBDIR/*.ext>) { 1124 for my $path (<$LIBDIR/*.ext>) {
930 next unless -r $ext; 1125 next unless -r $path;
931 eval { 1126
932 load_extension $ext; 1127 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1128 my $base = $1;
1129 my $pkg = $1;
1130 $pkg =~ s/[^[:word:]]/_/g;
1131 $pkg = "ext::$pkg";
1132
1133 open my $fh, "<:utf8", $path
1134 or die "$path: $!";
1135
1136 my $source = do { local $/; <$fh> };
1137
1138 my %ext = (
1139 path => $path,
1140 base => $base,
1141 pkg => $pkg,
1142 );
1143
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146
1147 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n"
1149 . "#line 1 \"$path\"\n{\n"
1150 . $source
1151 . "\n};\n1";
1152
1153 $todo{$base} = \%ext;
1154 }
1155
1156 my %done;
1157 while (%todo) {
1158 my $progress;
1159
1160 while (my ($k, $v) = each %todo) {
1161 for (split /,\s*/, $v->{meta}{depends}) {
1162 goto skip
1163 unless exists $done{$_};
1164 }
1165
1166 warn "... loading '$k' into '$v->{pkg}'\n";
1167
1168 unless (eval $v->{source}) {
1169 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n";
1171
1172 if (exists $v->{meta}{mandatory}) {
1173 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n";
1175 exit 1;
1176 }
1177
1178 warn $msg;
1179 }
1180
1181 $done{$k} = delete $todo{$k};
1182 push @EXTS, $v->{pkg};
1183 $progress = 1;
933 1 1184 }
934 } or warn "$ext not loaded: $@"; 1185
1186 skip:
1187 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1188 unless $progress;
1189 }
935 } 1190 };
936} 1191}
937 1192
938############################################################################# 1193#############################################################################
939 1194
1195=back
1196
940=head2 CORE EXTENSIONS 1197=head2 CORE EXTENSIONS
941 1198
942Functions and methods that extend core crossfire objects. 1199Functions and methods that extend core crossfire objects.
943 1200
944=cut 1201=cut
956Returns the given player object, loading it if necessary (might block). 1213Returns the given player object, loading it if necessary (might block).
957 1214
958=cut 1215=cut
959 1216
960sub playerdir($) { 1217sub playerdir($) {
961 cf::localdir 1218 "$PLAYERDIR/"
962 . "/"
963 . cf::playerdir
964 . "/"
965 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1219 . (ref $_[0] ? $_[0]->ob->name : $_[0])
966} 1220}
967 1221
968sub path($) { 1222sub path($) {
969 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1223 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
970 1224
971 (playerdir $login) . "/$login.pl" 1225 (playerdir $login) . "/playerdata"
972} 1226}
973 1227
974sub find_active($) { 1228sub find_active($) {
975 $cf::PLAYER{$_[0]} 1229 $cf::PLAYER{$_[0]}
976 and $cf::PLAYER{$_[0]}->active 1230 and $cf::PLAYER{$_[0]}->active
989 my $login = $_[0]; 1243 my $login = $_[0];
990 1244
991 my $guard = cf::lock_acquire "user_find:$login"; 1245 my $guard = cf::lock_acquire "user_find:$login";
992 1246
993 $cf::PLAYER{$_[0]} || do { 1247 $cf::PLAYER{$_[0]} || do {
1248 # rename old playerfiles to new ones
1249 #TODO: remove when no longer required
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl";
1254
994 my $pl = load_pl path $login 1255 my $pl = load_pl path $login
995 or return; 1256 or return;
996 $cf::PLAYER{$login} = $pl 1257 $cf::PLAYER{$login} = $pl
997 } 1258 }
998 } 1259 }
1035 1296
1036=cut 1297=cut
1037 1298
1038sub quit_character { 1299sub quit_character {
1039 my ($pl) = @_; 1300 my ($pl) = @_;
1301
1302 my $name = $pl->ob->name;
1040 1303
1041 $pl->{deny_save} = 1; 1304 $pl->{deny_save} = 1;
1042 $pl->password ("*"); # this should lock out the player until we nuked the dir 1305 $pl->password ("*"); # this should lock out the player until we nuked the dir
1043 1306
1044 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1049 my $path = playerdir $pl; 1312 my $path = playerdir $pl;
1050 my $temp = "$path~$cf::RUNTIME~deleting~"; 1313 my $temp = "$path~$cf::RUNTIME~deleting~";
1051 aio_rename $path, $temp; 1314 aio_rename $path, $temp;
1052 delete $cf::PLAYER{$pl->ob->name}; 1315 delete $cf::PLAYER{$pl->ob->name};
1053 $pl->destroy; 1316 $pl->destroy;
1317
1318 my $prefix = qr<^~\Q$name\E/>;
1319
1320 # nuke player maps
1321 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1322
1054 IO::AIO::aio_rmtree $temp; 1323 IO::AIO::aio_rmtree $temp;
1324}
1325
1326=item $pl->kick
1327
1328Kicks a player out of the game. This destroys the connection.
1329
1330=cut
1331
1332sub kick {
1333 my ($pl, $kicker) = @_;
1334
1335 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1336 $pl->killer ("kicked");
1337 $pl->ns->destroy;
1055} 1338}
1056 1339
1057=item cf::player::list_logins 1340=item cf::player::list_logins
1058 1341
1059Returns am arrayref of all valid playernames in the system, can take a 1342Returns am arrayref of all valid playernames in the system, can take a
1060while and may block, so not sync_job-capable, ever. 1343while and may block, so not sync_job-capable, ever.
1061 1344
1062=cut 1345=cut
1063 1346
1064sub list_logins { 1347sub list_logins {
1065 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1348 my $dirs = aio_readdir $PLAYERDIR
1066 or return []; 1349 or return [];
1067 1350
1068 my @logins; 1351 my @logins;
1069 1352
1070 for my $login (@$dirs) { 1353 for my $login (@$dirs) {
1105 } 1388 }
1106 1389
1107 \@paths 1390 \@paths
1108} 1391}
1109 1392
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1394
1395Expand crossfire pod fragments into protocol xml.
1396
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1110=item $player->ext_reply ($msgid, $msgtype, %msg) 1443=item $player->ext_reply ($msgid, %msg)
1111 1444
1112Sends an ext reply to the player. 1445Sends an ext reply to the player.
1113 1446
1114=cut 1447=cut
1115 1448
1116sub ext_reply($$$%) { 1449sub ext_reply($$%) {
1117 my ($self, $id, %msg) = @_; 1450 my ($self, $id, %msg) = @_;
1118 1451
1119 $msg{msgid} = $id; 1452 $msg{msgid} = $id;
1120 1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1121 $self->send ("ext " . cf::to_json \%msg);
1122} 1454}
1123 1455
1124package cf; 1456=item $player->ext_event ($type, %msg)
1457
1458Sends an ext event to the client.
1459
1460=cut
1461
1462sub ext_event($$%) {
1463 my ($self, $type, %msg) = @_;
1464
1465 $self->ns->ext_event ($type, %msg);
1466}
1467
1468=head3 cf::region
1469
1470=over 4
1471
1472=cut
1473
1474package cf::region;
1475
1476=item cf::region::find_by_path $path
1477
1478Tries to decuce the likely region for a map knowing only its path.
1479
1480=cut
1481
1482sub find_by_path($) {
1483 my ($path) = @_;
1484
1485 my ($match, $specificity);
1486
1487 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) {
1489 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity;
1491 }
1492 }
1493
1494 $match
1495}
1125 1496
1126=back 1497=back
1127
1128 1498
1129=head3 cf::map 1499=head3 cf::map
1130 1500
1131=over 4 1501=over 4
1132 1502
1187 my ($self, $merge) = @_; 1557 my ($self, $merge) = @_;
1188 1558
1189 # we have to keep some variables in memory intact 1559 # we have to keep some variables in memory intact
1190 local $self->{path}; 1560 local $self->{path};
1191 local $self->{load_path}; 1561 local $self->{load_path};
1192 local $self->{deny_save};
1193 local $self->{deny_reset};
1194 1562
1195 $self->SUPER::thawer_merge ($merge); 1563 $self->SUPER::thawer_merge ($merge);
1196} 1564}
1197 1565
1198sub normalise { 1566sub normalise {
1270 1638
1271# the original (read-only) location 1639# the original (read-only) location
1272sub load_path { 1640sub load_path {
1273 my ($self) = @_; 1641 my ($self) = @_;
1274 1642
1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1643 "$MAPDIR/$self->{path}.map"
1276} 1644}
1277 1645
1278# the temporary/swap location 1646# the temporary/swap location
1279sub save_path { 1647sub save_path {
1280 my ($self) = @_; 1648 my ($self) = @_;
1281 1649
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1651 "$TMPDIR/$path.map"
1284} 1652}
1285 1653
1286# the unique path, undef == no special unique path 1654# the unique path, undef == no special unique path
1287sub uniq_path { 1655sub uniq_path {
1288 my ($self) = @_; 1656 my ($self) = @_;
1289 1657
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1659 "$UNIQUEDIR/$path"
1292} 1660}
1293 1661
1294# and all this just because we cannot iterate over 1662# and all this just because we cannot iterate over
1295# all maps in C++... 1663# all maps in C++...
1296sub change_all_map_light { 1664sub change_all_map_light {
1298 1666
1299 $_->change_map_light ($change) 1667 $_->change_map_light ($change)
1300 for grep $_->outdoor, values %cf::MAP; 1668 for grep $_->outdoor, values %cf::MAP;
1301} 1669}
1302 1670
1671sub decay_objects {
1672 my ($self) = @_;
1673
1674 return if $self->{deny_reset};
1675
1676 $self->do_decay_objects;
1677}
1678
1303sub unlink_save { 1679sub unlink_save {
1304 my ($self) = @_; 1680 my ($self) = @_;
1305 1681
1306 utf8::encode (my $save = $self->save_path); 1682 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1683 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1684 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} 1685}
1315 1686
1316sub load_header_from($) { 1687sub load_header_from($) {
1317 my ($self, $path) = @_; 1688 my ($self, $path) = @_;
1318 1689
1368 $self->load_header_orig 1739 $self->load_header_orig
1369 or return; 1740 or return;
1370 $self->prepare_orig; 1741 $self->prepare_orig;
1371 } 1742 }
1372 1743
1744 $self->{deny_reset} = 1
1745 if $self->no_reset;
1746
1747 $self->default_region (cf::region::find_by_path $self->{path})
1748 unless $self->default_region;
1749
1373 1 1750 1
1374} 1751}
1375 1752
1376sub find; 1753sub find;
1377sub find { 1754sub find {
1389 $map->{last_save} = $cf::RUNTIME; 1766 $map->{last_save} = $cf::RUNTIME;
1390 1767
1391 $map->load_header 1768 $map->load_header
1392 or return; 1769 or return;
1393 1770
1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1395 # doing this can freeze the server in a sync job, obviously 1772 # doing this can freeze the server in a sync job, obviously
1396 #$cf::WAIT_FOR_TICK->wait; 1773 #$cf::WAIT_FOR_TICK->wait;
1397 $map->reset; 1774 $map->reset;
1398 undef $guard; 1775 undef $guard;
1399 return find $path; 1776 return find $path;
1410 my ($self) = @_; 1787 my ($self) = @_;
1411 1788
1412 local $self->{deny_reset} = 1; # loading can take a long time 1789 local $self->{deny_reset} = 1; # loading can take a long time
1413 1790
1414 my $path = $self->{path}; 1791 my $path = $self->{path};
1792
1793 {
1415 my $guard = cf::lock_acquire "map_load:$path"; 1794 my $guard = cf::lock_acquire "map_load:$path";
1416 1795
1417 return if $self->in_memory != cf::MAP_SWAPPED; 1796 return if $self->in_memory != cf::MAP_SWAPPED;
1418 1797
1419 $self->in_memory (cf::MAP_LOADING); 1798 $self->in_memory (cf::MAP_LOADING);
1420 1799
1421 $self->alloc; 1800 $self->alloc;
1422 1801
1423 $self->pre_load; 1802 $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; 1803 Coro::cede;
1449 $self->set_darkness_map; 1804
1805 $self->_load_objects ($self->{load_path}, 1)
1806 or return;
1807
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original};
1810
1811 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) {
1814 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0);
1816 }
1817 }
1818
1819 Coro::cede;
1820 # now do the right thing for maps
1821 $self->link_multipart_objects;
1450 $self->difficulty ($self->estimate_difficulty) 1822 $self->difficulty ($self->estimate_difficulty)
1451 unless $self->difficulty; 1823 unless $self->difficulty;
1452 Coro::cede; 1824 Coro::cede;
1825
1826 unless ($self->{deny_activate}) {
1827 $self->decay_objects;
1828 $self->fix_auto_apply;
1829 $self->update_buttons;
1830 Coro::cede;
1831 $self->set_darkness_map;
1832 Coro::cede;
1453 $self->activate; 1833 $self->activate;
1834 }
1835
1836 $self->in_memory (cf::MAP_IN_MEMORY);
1454 } 1837 }
1455 1838
1456 $self->post_load; 1839 $self->post_load;
1457
1458 $self->in_memory (cf::MAP_IN_MEMORY);
1459} 1840}
1460 1841
1461sub customise_for { 1842sub customise_for {
1462 my ($self, $ob) = @_; 1843 my ($self, $ob) = @_;
1463 1844
1464 return find "~" . $ob->name . "/" . $self->{path} 1845 return find "~" . $ob->name . "/" . $self->{path}
1465 if $self->per_player; 1846 if $self->per_player;
1847
1848# return find "?party/" . $ob->name . "/" . $self->{path}
1849# if $self->per_party;
1466 1850
1467 $self 1851 $self
1468} 1852}
1469 1853
1470# find and load all maps in the 3x3 area around a map 1854# find and load all maps in the 3x3 area around a map
1581 1965
1582sub reset_at { 1966sub reset_at {
1583 my ($self) = @_; 1967 my ($self) = @_;
1584 1968
1585 # TODO: safety, remove and allow resettable per-player maps 1969 # 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}; 1970 return 1e99 if $self->{deny_reset};
1588 1971
1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1972 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1590 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1973 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1591 1974
1602 my ($self) = @_; 1985 my ($self) = @_;
1603 1986
1604 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1987 my $lock = cf::lock_acquire "map_data:$self->{path}";
1605 1988
1606 return if $self->players; 1989 return if $self->players;
1607 return if $self->isa ("ext::map_per_player");#d#
1608 1990
1609 warn "resetting map ", $self->path;#d# 1991 warn "resetting map ", $self->path;
1992
1993 $self->in_memory (cf::MAP_SWAPPED);
1994
1995 # need to save uniques path
1996 unless ($self->{deny_save}) {
1997 my $uniq = $self->uniq_path; utf8::encode $uniq;
1998
1999 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2000 if $uniq;
2001 }
1610 2002
1611 delete $cf::MAP{$self->path}; 2003 delete $cf::MAP{$self->path};
1612 2004
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear; 2005 $self->clear;
1615 2006
1616 $_->clear_links_to ($self) for values %cf::MAP; 2007 $_->clear_links_to ($self) for values %cf::MAP;
1617 2008
1618 $self->unlink_save; 2009 $self->unlink_save;
1637 $cf::MAP{$self->path} = $self; 2028 $cf::MAP{$self->path} = $self;
1638 2029
1639 $self->reset; # polite request, might not happen 2030 $self->reset; # polite request, might not happen
1640} 2031}
1641 2032
2033=item $maps = cf::map::tmp_maps
2034
2035Returns an arrayref with all map paths of currently instantiated and saved
2036maps. May block.
2037
2038=cut
2039
2040sub tmp_maps() {
2041 [
2042 map {
2043 utf8::decode $_;
2044 /\.map$/
2045 ? normalise $_
2046 : ()
2047 } @{ aio_readdir $TMPDIR or [] }
2048 ]
2049}
2050
2051=item $maps = cf::map::random_maps
2052
2053Returns an arrayref with all map paths of currently instantiated and saved
2054random maps. May block.
2055
2056=cut
2057
2058sub random_maps() {
2059 [
2060 map {
2061 utf8::decode $_;
2062 /\.map$/
2063 ? normalise "?random/$_"
2064 : ()
2065 } @{ aio_readdir $RANDOMDIR or [] }
2066 ]
2067}
2068
1642=item cf::map::unique_maps 2069=item cf::map::unique_maps
1643 2070
1644Returns an arrayref of paths of all shared maps that have 2071Returns an arrayref of paths of all shared maps that have
1645instantiated unique items. May block. 2072instantiated unique items. May block.
1646 2073
1647=cut 2074=cut
1648 2075
1649sub unique_maps() { 2076sub unique_maps() {
1650 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2077 [
1651 or return; 2078 map {
1652
1653 my @paths;
1654
1655 for (@$files) {
1656 utf8::decode $_; 2079 utf8::decode $_;
1657 next if /\.pst$/; 2080 /\.map$/
1658 next unless /^$PATH_SEP/o; 2081 ? normalise $_
1659 2082 : ()
1660 push @paths, cf::map::normalise $_; 2083 } @{ aio_readdir $UNIQUEDIR or [] }
1661 } 2084 ]
1662
1663 \@paths
1664} 2085}
1665 2086
1666package cf; 2087package cf;
1667 2088
1668=back 2089=back
1714 2135
1715 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2136 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1716 2137
1717 if ($self->{record_replies}) { 2138 if ($self->{record_replies}) {
1718 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2139 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2140
1719 } else { 2141 } else {
2142 my $pl = $self->contr;
2143
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply (
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152
2153 } else {
1720 $msg = $npc->name . " says: $msg" if $npc; 2154 $msg = $npc->name . " says: $msg" if $npc;
1721 $self->message ($msg, $flags); 2155 $self->message ($msg, $flags);
2156 }
1722 } 2157 }
1723} 2158}
1724 2159
1725=item $player_object->may ("access") 2160=item $player_object->may ("access")
1726 2161
1774 $self->deactivate_recursive; 2209 $self->deactivate_recursive;
1775 2210
1776 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2211 return if UNIVERSAL::isa $self->map, "ext::map_link";
1777 2212
1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2213 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1779 if $self->map; 2214 if $self->map && $self->map->{path} ne "{link}";
1780 2215
1781 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2216 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1782} 2217}
1783 2218
1784sub cf::object::player::leave_link { 2219sub cf::object::player::leave_link {
1785 my ($self, $map, $x, $y) = @_; 2220 my ($self, $map, $x, $y) = @_;
2221
2222 return unless $self->contr->active;
1786 2223
1787 my $link_pos = delete $self->{_link_pos}; 2224 my $link_pos = delete $self->{_link_pos};
1788 2225
1789 unless ($map) { 2226 unless ($map) {
1790 # restore original map position 2227 # restore original map position
1808 $map->load; 2245 $map->load;
1809 $map->load_diag; 2246 $map->load_diag;
1810 2247
1811 return unless $self->contr->active; 2248 return unless $self->contr->active;
1812 $self->activate_recursive; 2249 $self->activate_recursive;
2250
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 2252 $self->enter_map ($map, $x, $y);
1814} 2253}
1815 2254
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) 2255=item $player_object->goto ($path, $x, $y[, $check->($map)])
1849 2256
2257Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position.
2261
1850=cut 2262=cut
2263
2264our $GOTOGEN;
1851 2265
1852sub cf::object::player::goto { 2266sub cf::object::player::goto {
1853 my ($self, $path, $x, $y) = @_; 2267 my ($self, $path, $x, $y, $check) = @_;
2268
2269 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1854 2271
1855 $self->enter_link; 2272 $self->enter_link;
1856 2273
1857 (async { 2274 (async {
1858 my $map = eval { 2275 my $map = eval {
1859 my $map = cf::map::find $path; 2276 my $map = cf::map::find $path;
2277
2278 if ($map) {
1860 $map = $map->customise_for ($self) if $map; 2279 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map;
2281 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2283 }
2284
1861 $map 2285 $map
2286 };
2287
2288 if ($@) {
2289 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2290 LOG llevError | logBacktrace, Carp::longmess $@;
1862 } or 2291 }
1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1864 2292
2293 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation};
1865 $self->leave_link ($map, $x, $y); 2295 $self->leave_link ($map, $x, $y);
2296 }
1866 })->prio (1); 2297 })->prio (1);
1867} 2298}
1868 2299
1869=item $player_object->enter_exit ($exit_object) 2300=item $player_object->enter_exit ($exit_object)
1870 2301
1909 2340
1910 $rmp->{random_seed} ||= $exit->random_seed; 2341 $rmp->{random_seed} ||= $exit->random_seed;
1911 2342
1912 my $data = cf::to_json $rmp; 2343 my $data = cf::to_json $rmp;
1913 my $md5 = Digest::MD5::md5_hex $data; 2344 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2345 my $meta = "$RANDOMDIR/$md5.meta";
1915 2346
1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1917 aio_write $fh, 0, (length $data), $data, 0; 2348 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh; 2349 undef $fh;
1919 aio_rename "$meta~", $meta; 2350 aio_rename "$meta~", $meta;
1928 2359
1929 return unless $self->type == cf::PLAYER; 2360 return unless $self->type == cf::PLAYER;
1930 2361
1931 if ($exit->slaying eq "/!") { 2362 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job 2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
1933 cf::sync_job { prepare_random_map $exit }; 2366 cf::sync_job { prepare_random_map $exit };
1934 } 2367 }
1935 2368
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp; 2370 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp; 2371 my $sp = $exit->stats->sp;
1939 2372
1940 $self->enter_link; 2373 $self->enter_link;
2374
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
1941 2378
1942 (async { 2379 (async {
1943 $self->deactivate_recursive; # just to be sure 2380 $self->deactivate_recursive; # just to be sure
1944 unless (eval { 2381 unless (eval {
1945 $self->goto ($slaying, $hp, $sp); 2382 $self->goto ($slaying, $hp, $sp);
1946 2383
1947 1; 2384 1;
1948 }) { 2385 }) {
1949 $self->message ("Something went wrong deep within the crossfire server. " 2386 $self->message ("Something went wrong deep within the crossfire server. "
1950 . "I'll try to bring you back to the map you were before. " 2387 . "I'll try to bring you back to the map you were before. "
1951 . "Please report this to the dungeon master!", 2388 . "Please report this to the dungeon master!",
1952 cf::NDI_UNIQUE | cf::NDI_RED); 2389 cf::NDI_UNIQUE | cf::NDI_RED);
1953 2390
1954 warn "ERROR in enter_exit: $@"; 2391 warn "ERROR in enter_exit: $@";
1955 $self->leave_link; 2392 $self->leave_link;
1956 } 2393 }
1957 })->prio (1); 2394 })->prio (1);
1970 2407
1971sub cf::client::send_drawinfo { 2408sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 2409 my ($self, $text, $flags) = @_;
1973 2410
1974 utf8::encode $text; 2411 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2413}
1977 2414
2415=item $client->send_msg ($color, $type, $msg, [extra...])
2416
2417Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet.
2421
2422=cut
2423
2424sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_;
2426
2427 $msg = $self->pl->expand_cfpod ($msg);
2428
2429 return unless @extra || length $msg;
2430
2431 if ($self->can_msg) {
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2433 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) {
2445 if (0 && $msg =~ /\[/) {
2446 $self->send_packet ("drawextinfo $color 4 0 $msg")
2447 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg")
2450 }
2451 }
2452 }
2453}
2454
2455=item $client->ext_event ($type, %msg)
2456
2457Sends an ext event to the client.
2458
2459=cut
2460
2461sub cf::client::ext_event($$%) {
2462 my ($self, $type, %msg) = @_;
2463
2464 $msg{msgtype} = "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2466}
1978 2467
1979=item $success = $client->query ($flags, "text", \&cb) 2468=item $success = $client->query ($flags, "text", \&cb)
1980 2469
1981Queues a query to the client, calling the given callback with 2470Queues a query to the client, calling the given callback with
1982the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2471the 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>. 2472C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1984 2473
1985Queries can fail, so check the return code. Or don't, as queries will become 2474Queries can fail, so check the return code. Or don't, as queries will
1986reliable at some point in the future. 2475become reliable at some point in the future.
1987 2476
1988=cut 2477=cut
1989 2478
1990sub cf::client::query { 2479sub cf::client::query {
1991 my ($self, $flags, $text, $cb) = @_; 2480 my ($self, $flags, $text, $cb) = @_;
1999 utf8::encode $text; 2488 utf8::encode $text;
2000 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2489 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2001 2490
2002 $self->send_packet ($self->{query_queue}[0][0]) 2491 $self->send_packet ($self->{query_queue}[0][0])
2003 if @{ $self->{query_queue} } == 1; 2492 if @{ $self->{query_queue} } == 1;
2493
2494 1
2004} 2495}
2005 2496
2006cf::client->attach ( 2497cf::client->attach (
2498 on_connect => sub {
2499 my ($ns) = @_;
2500
2501 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2502 },
2007 on_reply => sub { 2503 on_reply => sub {
2008 my ($ns, $msg) = @_; 2504 my ($ns, $msg) = @_;
2009 2505
2010 # this weird shuffling is so that direct followup queries 2506 # this weird shuffling is so that direct followup queries
2011 # get handled first 2507 # get handled first
2023 } else { 2519 } else {
2024 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2520 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2025 } 2521 }
2026 } 2522 }
2027 }, 2523 },
2524 on_exticmd => sub {
2525 my ($ns, $buf) = @_;
2526
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528
2529 if (ref $msg) {
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2531 if (my %reply = $cb->($ns, $msg)) {
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 }
2536 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 }
2539
2540 cf::override;
2541 },
2028); 2542);
2029 2543
2030=item $client->async (\&cb) 2544=item $client->async (\&cb)
2031 2545
2032Create a new coroutine, running the specified callback. The coroutine will 2546Create a new coroutine, running the specified callback. The coroutine will
2079 2593
2080# here we export the classes and methods available to script code 2594# here we export the classes and methods available to script code
2081 2595
2082=pod 2596=pod
2083 2597
2084The following fucntions and emthods are available within a safe environment: 2598The following functions and methods are available within a safe environment:
2085 2599
2086 cf::object contr pay_amount pay_player map 2600 cf::object
2601 contr pay_amount pay_player map x y force_find force_add
2602 insert remove
2603
2087 cf::object::player player 2604 cf::object::player
2088 cf::player peaceful 2605 player
2089 cf::map trigger 2606
2607 cf::player
2608 peaceful
2609
2610 cf::map
2611 trigger
2090 2612
2091=cut 2613=cut
2092 2614
2093for ( 2615for (
2094 ["cf::object" => qw(contr pay_amount pay_player map)], 2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)],
2095 ["cf::object::player" => qw(player)], 2618 ["cf::object::player" => qw(player)],
2096 ["cf::player" => qw(peaceful)], 2619 ["cf::player" => qw(peaceful)],
2097 ["cf::map" => qw(trigger)], 2620 ["cf::map" => qw(trigger)],
2098) { 2621) {
2099 no strict 'refs'; 2622 no strict 'refs';
2170=back 2693=back
2171 2694
2172=cut 2695=cut
2173 2696
2174############################################################################# 2697#############################################################################
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 2698# the server's init and main functions
2284 2699
2285sub load_resources { 2700sub load_facedata($) {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2701 my ($path) = @_;
2702
2703 warn "loading facedata from $path\n";
2704
2705 my $facedata;
2706 0 < aio_load $path, $facedata
2707 or die "$path: $!";
2708
2709 $facedata = Coro::Storable::thaw $facedata;
2710
2711 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713
2714 {
2715 my $faces = $facedata->{faceinfo};
2716
2717 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2722 Coro::cede;
2723 }
2724
2725 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth};
2727 my $idx = cf::face::find $face
2728 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) {
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2731 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 }
2734 Coro::cede;
2735 }
2736 }
2737
2738 {
2739 my $anims = $facedata->{animinfo};
2740
2741 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede;
2744 }
2745
2746 cf::anim::invalidate_all; # d'oh
2747 }
2748
2749 1
2750}
2751
2752sub reload_regions {
2753 load_resource_file "$MAPDIR/regions"
2287 or die "unable to load regions file\n";#d# 2754 or die "unable to load regions file\n";
2755}
2756
2757sub reload_facedata {
2758 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n";
2760}
2761
2762sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770}
2771
2772sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n";
2775}
2776
2777sub reload_resources {
2778 warn "reloading resource files...\n";
2779
2780 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures;
2785
2786 warn "finished reloading resource files\n";
2787}
2788
2789sub init {
2790 reload_resources;
2288} 2791}
2289 2792
2290sub cfg_load { 2793sub cfg_load {
2291 open my $fh, "<:utf8", cf::confdir . "/config" 2794 open my $fh, "<:utf8", "$CONFDIR/config"
2292 or return; 2795 or return;
2293 2796
2294 local $/; 2797 local $/;
2295 *CFG = YAML::Syck::Load <$fh>; 2798 *CFG = YAML::Syck::Load <$fh>;
2296 2799
2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2807 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2305 and die "WARNING: m(un)lockall failed: $!\n"; 2808 and die "WARNING: m(un)lockall failed: $!\n";
2306 }; 2809 };
2307 warn $@ if $@; 2810 warn $@ if $@;
2308 } 2811 }
2309}
2310
2311sub init {
2312 load_resources;
2313} 2812}
2314 2813
2315sub main { 2814sub main {
2316 # we must not ever block the main coroutine 2815 # we must not ever block the main coroutine
2317 local $Coro::idle = sub { 2816 local $Coro::idle = sub {
2320 Event::one_event; 2819 Event::one_event;
2321 })->prio (Coro::PRIO_MAX); 2820 })->prio (Coro::PRIO_MAX);
2322 }; 2821 };
2323 2822
2324 cfg_load; 2823 cfg_load;
2325 db_load; 2824 db_init;
2326 load_extensions; 2825 load_extensions;
2327 2826
2328 $TICK_WATCHER->start; 2827 $TICK_WATCHER->start;
2329 Event::loop; 2828 Event::loop;
2330} 2829}
2345 }, 2844 },
2346 ); 2845 );
2347 } 2846 }
2348} 2847}
2349 2848
2849sub write_runtime {
2850 my $runtime = "$LOCALDIR/runtime";
2851
2852 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time.
2854
2855 IO::AIO::aio_utime $runtime, undef, undef;
2856
2857 my $guard = cf::lock_acquire "write_runtime";
2858
2859 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2860 or return;
2861
2862 my $value = $cf::RUNTIME + 90 + 10;
2863 # 10 is the runtime save interval, for a monotonic clock
2864 # 60 allows for the watchdog to kill the server.
2865
2866 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2867 and return;
2868
2869 # always fsync - this file is important
2870 aio_fsync $fh
2871 and return;
2872
2873 # touch it again to show we are up-to-date
2874 aio_utime $fh, undef, undef;
2875
2876 close $fh
2877 or return;
2878
2879 aio_rename "$runtime~", $runtime
2880 and return;
2881
2882 warn "runtime file written.\n";
2883
2884 1
2885}
2886
2350sub emergency_save() { 2887sub emergency_save() {
2351 my $freeze_guard = cf::freeze_mainloop; 2888 my $freeze_guard = cf::freeze_mainloop;
2352 2889
2353 warn "enter emergency perl save\n"; 2890 warn "enter emergency perl save\n";
2354 2891
2369 my $map = $cf::MAP{$path} or next; 2906 my $map = $cf::MAP{$path} or next;
2370 $map->valid or next; 2907 $map->valid or next;
2371 $map->save; 2908 $map->save;
2372 } 2909 }
2373 warn "end emergency map save\n"; 2910 warn "end emergency map save\n";
2911
2912 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV;
2914 warn "end emergency database checkpoint\n";
2374 }; 2915 };
2375 2916
2376 warn "leave emergency perl save\n"; 2917 warn "leave emergency perl save\n";
2377} 2918}
2378 2919
2920sub post_cleanup {
2921 my ($make_core) = @_;
2922
2923 warn Carp::longmess "post_cleanup backtrace"
2924 if $make_core;
2925}
2926
2379sub reload() { 2927sub do_reload_perl() {
2380 # can/must only be called in main 2928 # can/must only be called in main
2381 if ($Coro::current != $Coro::main) { 2929 if ($Coro::current != $Coro::main) {
2382 warn "can only reload from main coroutine"; 2930 warn "can only reload from main coroutine";
2383 return; 2931 return;
2384 } 2932 }
2385 2933
2386 warn "reloading..."; 2934 warn "reloading...";
2387 2935
2388 warn "cancelling server ticker"; 2936 warn "entering sync_job";
2389 $TICK_WATCHER->cancel;
2390 2937
2938 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark
2391 cf::emergency_save; 2940 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark
2392 2942
2393 eval { 2943 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV;
2945
2394 # if anything goes wrong in here, we should simply crash as we already saved 2946 # 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 2947
2399 warn "cancelling all WF_AUTOCANCEL watchers"; 2948 warn "cancelling all WF_AUTOCANCEL watchers";
2400 for (Event::all_watchers) { 2949 for (Event::all_watchers) {
2401 $_->cancel if $_->data & WF_AUTOCANCEL; 2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2402 } 2951 }
2403 2952
2404 warn "flushing outstanding aio requests"; 2953 warn "flushing outstanding aio requests";
2405 for (;;) { 2954 for (;;) {
2955 BDB::flush;
2406 IO::AIO::flush; 2956 IO::AIO::flush;
2407 Coro::cede; 2957 Coro::cede;
2408 last unless IO::AIO::nreqs; 2958 last unless IO::AIO::nreqs || BDB::nreqs;
2409 warn "iterate..."; 2959 warn "iterate...";
2410 } 2960 }
2961
2962 ++$RELOAD;
2411 2963
2412 warn "cancelling all extension coros"; 2964 warn "cancelling all extension coros";
2413 $_->cancel for values %EXT_CORO; 2965 $_->cancel for values %EXT_CORO;
2414 %EXT_CORO = (); 2966 %EXT_CORO = ();
2415 2967
2416 warn "removing commands"; 2968 warn "removing commands";
2417 %COMMAND = (); 2969 %COMMAND = ();
2418 2970
2419 warn "removing ext commands"; 2971 warn "removing ext/exti commands";
2420 %EXTCMD = (); 2972 %EXTCMD = ();
2973 %EXTICMD = ();
2421 2974
2422 warn "unloading/nuking all extensions"; 2975 warn "unloading/nuking all extensions";
2423 for my $pkg (@EXTS) { 2976 for my $pkg (@EXTS) {
2424 warn "... unloading $pkg"; 2977 warn "... unloading $pkg";
2425 2978
2455 Symbol::delete_package "safe::$_" 3008 Symbol::delete_package "safe::$_"
2456 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3009 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2457 3010
2458 warn "unloading cf.pm \"a bit\""; 3011 warn "unloading cf.pm \"a bit\"";
2459 delete $INC{"cf.pm"}; 3012 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"};
2460 3014
2461 # don't, removes xs symbols, too, 3015 # don't, removes xs symbols, too,
2462 # and global variables created in xs 3016 # and global variables created in xs
2463 #Symbol::delete_package __PACKAGE__; 3017 #Symbol::delete_package __PACKAGE__;
2464 3018
2468 require cf; 3022 require cf;
2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2470 3024
2471 warn "loading config and database again"; 3025 warn "loading config and database again";
2472 cf::cfg_load; 3026 cf::cfg_load;
2473 cf::db_load;
2474 3027
2475 warn "loading extensions"; 3028 warn "loading extensions";
2476 cf::load_extensions; 3029 cf::load_extensions;
2477 3030
2478 warn "reattaching attachments to objects/players"; 3031 warn "reattaching attachments to objects/players";
2479 _global_reattach; 3032 _global_reattach; # objects, sockets
2480 warn "reattaching attachments to maps"; 3033 warn "reattaching attachments to maps";
2481 reattach $_ for values %MAP; 3034 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players";
3036 reattach $_ for values %PLAYER;
2482 3037
2483 warn "loading reloadable resources"; 3038 warn "leaving sync_job";
2484 load_resources;
2485 3039
2486 warn "restarting server ticker"; 3040 1
2487 3041 } or do {
2488 $TICK_WATCHER->start;
2489 };
2490
2491 if ($@) {
2492 warn $@; 3042 warn $@;
2493 warn "error while reloading, exiting."; 3043 warn "error while reloading, exiting.";
2494 exit 1; 3044 exit 1;
2495 } 3045 };
2496 3046
2497 warn "reloaded"; 3047 warn "reloaded";
2498}; 3048};
2499 3049
2500our $RELOAD_WATCHER; # used only during reload 3050our $RELOAD_WATCHER; # used only during reload
2501 3051
3052sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here.
3055
3056 $RELOAD_WATCHER ||= Event->timer (
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl;
3062 undef $RELOAD_WATCHER;
3063 },
3064 );
3065}
3066
2502register_command "reload" => sub { 3067register_command "reload" => sub {
2503 my ($who, $arg) = @_; 3068 my ($who, $arg) = @_;
2504 3069
2505 if ($who->flag (FLAG_WIZ)) { 3070 if ($who->flag (FLAG_WIZ)) {
2506 $who->message ("reloading server."); 3071 $who->message ("reloading server.");
2507 3072 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 } 3073 }
2521}; 3074};
2522 3075
2523unshift @INC, $LIBDIR; 3076unshift @INC, $LIBDIR;
2524 3077
2525my $bug_warning = 0; 3078my $bug_warning = 0;
2526 3079
3080our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN;
3082
3083sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main;
3086
3087 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait;
3090}
3091
3092sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main;
3095
3096 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait;
3099}
3100
3101 my $min = 1e6;#d#
3102 my $avg = 10;
2527$TICK_WATCHER = Event->timer ( 3103$TICK_WATCHER = Event->timer (
2528 reentrant => 0, 3104 reentrant => 0,
2529 parked => 1, 3105 parked => 1,
2530 prio => 0, 3106 prio => 0,
2531 at => $NEXT_TICK || $TICK, 3107 at => $NEXT_TICK || $TICK,
2535 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2536 unless ++$bug_warning > 10; 3112 unless ++$bug_warning > 10;
2537 return; 3113 return;
2538 } 3114 }
2539 3115
2540 $NOW = Event::time; 3116 $NOW = $tick_start = Event::time;
2541 3117
2542 cf::server_tick; # one server iteration 3118 cf::server_tick; # one server iteration
3119
3120 0 && sync_job {#d#
3121 for(1..10) {
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 };
3142
2543 $RUNTIME += $TICK; 3143 $RUNTIME += $TICK;
2544 $NEXT_TICK += $TICK; 3144 $NEXT_TICK += $TICK;
2545 3145
2546 $WAIT_FOR_TICK->broadcast; 3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
2548 3148 Coro::async_pool {
2549 Event::sweep; 3149 write_runtime
2550 Coro::cede_notself; 3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
2551 3152 }
3153
2552# my $AFTER = Event::time; 3154# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d# 3155# warn $AFTER - $NOW;#d#
2554 3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send;
3159 }
3160 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send;
3162 }
3163
3164 $NOW = Event::time;
3165
2555 # if we are delayed by four ticks or more, skip them all 3166 # if we are delayed by four ticks or more, skip them all
2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2557 3168
2558 $TICK_WATCHER->at ($NEXT_TICK); 3169 $TICK_WATCHER->at ($NEXT_TICK);
2559 $TICK_WATCHER->start; 3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174
3175 _post_tick;
3176
3177
2560 }, 3178 },
2561); 3179);
2562 3180
2563{ 3181{
2564 BDB::max_poll_time $TICK * 0.1; 3182 BDB::max_poll_time $TICK * 0.1;
2589 3207
2590 unless ($DB_ENV) { 3208 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create; 3209 $DB_ENV = BDB::db_env_create;
2592 3210
2593 cf::sync_job { 3211 cf::sync_job {
3212 eval {
2594 BDB::db_env_open 3213 BDB::db_env_open
2595 $DB_ENV, 3214 $DB_ENV,
2596 $BDB_ENV_DIR, 3215 $BDBDIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666; 3218 0666;
2600 3219
2601 cf::cleanup "$!" if $!; 3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2602 3221
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 };
3225
3226 cf::cleanup "db_env_open(db): $@" if $@;
2604 }; 3227 };
2605 } 3228 }
2606} 3229}
2607 3230
2608{ 3231{
2610 3233
2611 undef $Coro::AIO::WATCHER; 3234 undef $Coro::AIO::WATCHER;
2612 IO::AIO::max_poll_time $TICK * 0.1; 3235 IO::AIO::max_poll_time $TICK * 0.1;
2613 $AIO_POLL_WATCHER = Event->io ( 3236 $AIO_POLL_WATCHER = Event->io (
2614 reentrant => 0, 3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
2615 fd => IO::AIO::poll_fileno, 3239 fd => IO::AIO::poll_fileno,
2616 poll => 'r', 3240 poll => 'r',
2617 prio => 6, 3241 prio => 6,
2618 data => WF_AUTOCANCEL,
2619 cb => \&IO::AIO::poll_cb, 3242 cb => \&IO::AIO::poll_cb,
2620 ); 3243 );
2621} 3244}
2622 3245
2623$WRITE_RUNTIME_WATCHER = Event->timer ( 3246my $_log_backtrace;
2624 reentrant => 0, 3247
2625 data => WF_AUTOCANCEL, 3248sub _log_backtrace {
2626 after => 1, 3249 my ($msg, @addr) = @_;
2627 interval => 10, 3250
2628 prio => 6, # keep it lowest so it acts like a watchdog 3251 $msg =~ s/\n//;
2629 cb => Coro::unblock_sub { 3252
2630 write_runtime 3253 # limit the # of concurrent backtraces
2631 or warn "ERROR: unable to write runtime file: $!"; 3254 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace;
3256 async {
3257 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!";
3262
3263 my @funcs;
3264 my @res = <$fh>;
3265 chomp for @res;
3266 while (@res) {
3267 my ($func, $line) = splice @res, 0, 2, ();
3268 push @funcs, "[$func] $line";
3269 }
3270
3271 @funcs
3272 };
3273
3274 LOG llevInfo, "[ABT] $msg\n";
3275 LOG llevInfo, "[ABT] $_\n" for @bt;
3276 --$_log_backtrace;
3277 };
3278 } else {
3279 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] [suppressed]\n";
2632 }, 3281 }
2633); 3282}
3283
3284# load additional modules
3285use cf::pod;
2634 3286
2635END { cf::emergency_save } 3287END { cf::emergency_save }
2636 3288
26371 32891
2638 3290

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines