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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
71 75
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 77our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
79 82
80our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
93our $NOW;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
155 162
156The raw value load value from the last tick. 163The raw value load value from the last tick.
157 164
158=item %cf::CFG 165=item %cf::CFG
159 166
160Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 168from wherever your confdir points to.
162 169
163=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
186 203
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 208@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
209@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 210@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 211
194# we bless all objects into (empty) derived classes to force a method lookup 212# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 213# within the Safe compartment.
196for my $pkg (qw( 214for my $pkg (qw(
197 cf::global cf::attachable 215 cf::global cf::attachable
202)) { 220)) {
203 no strict 'refs'; 221 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 223}
206 224
207$Event::DIED = sub { 225$EV::DIED = sub {
208 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
209}; 227};
228
229#############################################################################
210 230
211=head2 UTILITY FUNCTIONS 231=head2 UTILITY FUNCTIONS
212 232
213=over 4 233=over 4
214 234
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 253 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 254 $d
235 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
236} 256}
237 257
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
241 259
242Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
243 261
244=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
245 263
246Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
265
266=cut
267
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269
270sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) }
247 272
248=item cf::lock_wait $string 273=item cf::lock_wait $string
249 274
250Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
251 276
254Wait until the given lock is available and then acquires it and returns 279Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 280a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 281for example when the coroutine gets canceled), the lock is automatically
257returned. 282returned.
258 283
284Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro.
286
259Lock names should begin with a unique identifier (for example, cf::map::find 287Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 288uses map_find and cf::map::load uses map_load).
261 289
262=item $locked = cf::lock_active $string 290=item $locked = cf::lock_active $string
263 291
264Return true if the lock is currently active, i.e. somebody has locked it. 292Return true if the lock is currently active, i.e. somebody has locked it.
265 293
266=cut 294=cut
267 295
268our %LOCK; 296our %LOCK;
297our %LOCKER;#d#
269 298
270sub lock_wait($) { 299sub lock_wait($) {
271 my ($key) = @_; 300 my ($key) = @_;
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
272 306
273 # wait for lock, if any 307 # wait for lock, if any
274 while ($LOCK{$key}) { 308 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 309 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 310 Coro::schedule;
282 316
283 # wait, to be sure we are not locked 317 # wait, to be sure we are not locked
284 lock_wait $key; 318 lock_wait $key;
285 319
286 $LOCK{$key} = []; 320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
287 322
288 Coro::guard { 323 Coro::guard {
324 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 325 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 326 $_->ready for @{ delete $LOCK{$key} };
291 } 327 }
292} 328}
293 329
305 }; 341 };
306 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
307 $guard 343 $guard
308} 344}
309 345
346=item cf::periodic $interval, $cb
347
348Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer.
350
351=cut
352
353sub periodic($$) {
354 my ($interval, $cb) = @_;
355
356 my $start = rand List::Util::min 180, $interval;
357
358 EV::periodic $start, $interval, 0, $cb
359}
360
361=item cf::get_slot $time[, $priority[, $name]]
362
363Allocate $time seconds of blocking CPU time at priority C<$priority>:
364This call blocks and returns only when you have at least C<$time> seconds
365of cpu time till the next tick. The slot is only valid till the next cede.
366
367The optional C<$name> can be used to identify the job to run. It might be
368used for statistical purposes and should identify the same time-class.
369
370Useful for short background jobs.
371
372=cut
373
374our @SLOT_QUEUE;
375our $SLOT_QUEUE;
376
377$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager");
380
381 my $signal = new Coro::Signal;
382
383 while () {
384 next_job:
385 my $avail = cf::till_tick;
386 if ($avail > 0.01) {
387 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) {
389 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send;
391 Coro::cede;
392 goto next_job;
393 }
394 }
395 }
396
397 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait;
401 } else {
402 Coro::schedule;
403 }
404 }
405};
406
407sub get_slot($;$$) {
408 my ($time, $pri, $name) = @_;
409
410 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal;
412
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready;
416 $sig->wait;
417}
418
310=item cf::async { BLOCK } 419=item cf::async { BLOCK }
311 420
312Currently the same as Coro::async_pool, meaning you cannot use 421Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 422C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 423thing you are allowed to do is call C<prio> on it.
317 426
318BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
319 428
320=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
321 430
322The design of crossfire+ requires that the main coro ($Coro::main) is 431The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 432is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
434acceptable.
325 435
326If it must be done, put the blocking parts into C<sync_job>. This will run 436If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 437the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 438server will be frozen during this time, so the block should either finish
329fast or be very important. 439fast or be very important.
332 442
333sub sync_job(&) { 443sub sync_job(&) {
334 my ($job) = @_; 444 my ($job) = @_;
335 445
336 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 447 my $time = EV::time;
338 448
339 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
341 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
342 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
343 # (but this is cancel-safe) 455 # (but this is cancel-safe)
344 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
345 457
346 my $busy = 1; 458 my $busy = 1;
347 my @res; 459 my @res;
348 460
349 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 463 @res = eval { $job->() };
351 warn $@ if $@; 464 warn $@ if $@;
352 undef $busy; 465 undef $busy;
353 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
354 467
355 while ($busy) { 468 while ($busy) {
356 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
357 } 473 }
474 }
358 475
359 $time = Event::time - $time; 476 $time = EV::time - $time;
360 477
361 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363 480
364 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
389 $EXT_CORO{$coro+0} = $coro; 506 $EXT_CORO{$coro+0} = $coro;
390 507
391 $coro 508 $coro
392} 509}
393 510
394sub write_runtime { 511=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 512
397 # first touch the runtime file to show we are still running: 513Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 514process, returning the results. Everything must be serialisable with
515Coro::Storable. May, of course, block. Note that the executed sub may
516never block itself or use any form of event handling.
399 517
400 IO::AIO::aio_utime $runtime, undef, undef; 518=cut
401 519
402 my $guard = cf::lock_acquire "write_runtime"; 520sub fork_call(&@) {
521 my ($cb, @args) = @_;
403 522
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 523 # we seemingly have to make a local copy of the whole thing,
405 or return; 524 # otherwise perl prematurely frees the stuff :/
525 # TODO: investigate and fix (likely this will be rather laborious)
406 526
407 my $value = $cf::RUNTIME + 90 + 10; 527 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 528 reset_signals;
409 # 60 allows for the watchdog to kill the server. 529 &$cb
530 }, @args;
410 531
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 532 wantarray ? @res : $res[-1]
412 and return; 533}
413 534
414 # always fsync - this file is important 535=item $value = cf::db_get $family => $key
415 aio_fsync $fh
416 and return;
417 536
418 # touch it again to show we are up-to-date 537Returns a single value from the environment database.
419 aio_utime $fh, undef, undef;
420 538
421 close $fh 539=item cf::db_put $family => $key => $value
422 or return;
423 540
424 aio_rename "$runtime~", $runtime 541Stores the given C<$value> in the family. It can currently store binary
425 and return; 542data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
426 543
427 warn "runtime file written.\n";#d# 544=item $db = cf::db_table "name"
428 545
546Create and/or open a new database table. The string must not be "db" and must be unique
547within each server.
548
549=cut
550
551sub db_table($) {
552 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV;
554
555 eval {
556 $db->set_flags (BDB::CHKSUM);
557
558 utf8::encode $name;
559 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
560 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
561 cf::cleanup "db_open(db): $!" if $!;
562 };
563 cf::cleanup "db_open(db): $@" if $@;
564
565 $db
566}
567
568our $DB;
569
570sub db_init {
571 cf::sync_job {
572 $DB ||= db_table "db";
573 };
574}
575
576sub db_get($$) {
577 my $key = "$_[0]/$_[1]";
578
579 cf::sync_job {
580 BDB::db_get $DB, undef, $key, my $data;
581
582 $! ? ()
583 : $data
429 1 584 }
585}
586
587sub db_put($$$) {
588 BDB::dbreq_pri 4;
589 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
590}
591
592=item cf::cache $id => [$paths...], $processversion => $process
593
594Generic caching function that returns the value of the resource $id,
595caching and regenerating as required.
596
597This function can block.
598
599=cut
600
601sub cache {
602 my ($id, $src, $processversion, $process) = @_;
603
604 my $meta =
605 join "\x00",
606 $processversion,
607 map {
608 aio_stat $_
609 and Carp::croak "$_: $!";
610
611 ($_, (stat _)[7,9])
612 } @$src;
613
614 my $dbmeta = db_get cache => "$id/meta";
615 if ($dbmeta ne $meta) {
616 # changed, we may need to process
617
618 my @data;
619 my $md5;
620
621 for (0 .. $#$src) {
622 0 <= aio_load $src->[$_], $data[$_]
623 or Carp::croak "$src->[$_]: $!";
624 }
625
626 # if processing is expensive, check
627 # checksum first
628 if (1) {
629 $md5 =
630 join "\x00",
631 $processversion,
632 map {
633 cf::cede_to_tick;
634 ($src->[$_], Digest::MD5::md5_hex $data[$_])
635 } 0.. $#$src;
636
637
638 my $dbmd5 = db_get cache => "$id/md5";
639 if ($dbmd5 eq $md5) {
640 db_put cache => "$id/meta", $meta;
641
642 return db_get cache => "$id/data";
643 }
644 }
645
646 my $t1 = Time::HiRes::time;
647 my $data = $process->(\@data);
648 my $t2 = Time::HiRes::time;
649
650 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
651
652 db_put cache => "$id/data", $data;
653 db_put cache => "$id/md5" , $md5;
654 db_put cache => "$id/meta", $meta;
655
656 return $data;
657 }
658
659 db_get cache => "$id/data"
430} 660}
431 661
432=item cf::datalog type => key => value, ... 662=item cf::datalog type => key => value, ...
433 663
434Log a datalog packet of the given type with the given key-value pairs. 664Log a datalog packet of the given type with the given key-value pairs.
452attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
454 684
455In the following description, CLASS can be any of C<global>, C<object> 685In the following description, CLASS can be any of C<global>, C<object>
456C<player>, C<client> or C<map> (i.e. the attachable objects in 686C<player>, C<client> or C<map> (i.e. the attachable objects in
457crossfire+). 687Deliantra).
458 688
459=over 4 689=over 4
460 690
461=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
462 692
664 _attach $registry, $klass, @attach; 894 _attach $registry, $klass, @attach;
665 } 895 }
666 896
667 $obj->{$name} = \%arg; 897 $obj->{$name} = \%arg;
668 } else { 898 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 899 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 900 }
671 901
672 $obj->{_attachment}{$name} = undef; 902 $obj->{_attachment}{$name} = undef;
673} 903}
674 904
714 "; 944 ";
715 die if $@; 945 die if $@;
716} 946}
717 947
718our $override; 948our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 949our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 950
721sub override { 951sub override {
722 $override = 1; 952 $override = 1;
723 @invoke_results = (); 953 @INVOKE_RESULTS = (@_);
724} 954}
725 955
726sub do_invoke { 956sub do_invoke {
727 my $event = shift; 957 my $event = shift;
728 my $callbacks = shift; 958 my $callbacks = shift;
729 959
730 @invoke_results = (); 960 @INVOKE_RESULTS = ();
731 961
732 local $override; 962 local $override;
733 963
734 for (@$callbacks) { 964 for (@$callbacks) {
735 eval { &{$_->[1]} }; 965 eval { &{$_->[1]} };
744 } 974 }
745 975
746 0 976 0
747} 977}
748 978
749=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
750 980
751=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
752 982
753Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
754 984
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 985This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756removed in future versions), and there is no public API to access override 986removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 987results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 988
759=back 989=back
760 990
761=cut 991=cut
762 992
763############################################################################# 993#############################################################################
764# object support 994# object support
995
996sub _object_equal($$);
997sub _object_equal($$) {
998 my ($a, $b) = @_;
999
1000 return 0 unless (ref $a) eq (ref $b);
1001
1002 if ("HASH" eq ref $a) {
1003 my @ka = keys %$a;
1004 my @kb = keys %$b;
1005
1006 return 0 if @ka != @kb;
1007
1008 for (0 .. $#ka) {
1009 return 0 unless $ka[$_] eq $kb[$_];
1010 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1011 }
1012
1013 } elsif ("ARRAY" eq ref $a) {
1014
1015 return 0 if @$a != @$b;
1016
1017 for (0 .. $#$a) {
1018 return 0 unless _object_equal $a->[$_], $b->[$_];
1019 }
1020
1021 } elsif ($a ne $b) {
1022 return 0;
1023 }
1024
1025 1
1026}
1027
1028our $SLOW_MERGES;#d#
1029sub _can_merge {
1030 my ($ob1, $ob2) = @_;
1031
1032 ++$SLOW_MERGES;#d#
1033
1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
1036}
765 1037
766sub reattach { 1038sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1040 my ($obj) = @_;
769 1041
790cf::attachable->attach ( 1062cf::attachable->attach (
791 prio => -1000000, 1063 prio => -1000000,
792 on_instantiate => sub { 1064 on_instantiate => sub {
793 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
794 1066
795 $data = from_json $data; 1067 $data = decode_json $data;
796 1068
797 for (@$data) { 1069 for (@$data) {
798 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
799 1071
800 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
816sub object_freezer_save { 1088sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1089 my ($filename, $rdata, $objs) = @_;
818 1090
819 sync_job { 1091 sync_job {
820 if (length $$rdata) { 1092 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1094 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1095 $decname, length $$rdata, scalar @$objs;
823 1096
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1100 aio_fsync $fh if $cf::USE_FSYNC;
828 close $fh; 1101 close $fh;
829 1102
830 if (@$objs) { 1103 if (@$objs) {
831 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
832 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
835 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
836 close $fh; 1109 close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
838 } 1111 }
846 } 1119 }
847 } else { 1120 } else {
848 aio_unlink $filename; 1121 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1122 aio_unlink "$filename.pst";
850 } 1123 }
851 } 1124 };
852} 1125}
853 1126
854sub object_freezer_as_string { 1127sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1128 my ($rdata, $objs) = @_;
856 1129
868 or return; 1141 or return;
869 1142
870 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
872 or return; 1145 or return;
1146
873 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
874 } 1149 }
875 1150
1151 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1153 $decname, length $data, scalar @{$av || []};
1154
878 return ($data, $av); 1155 ($data, $av)
879} 1156}
1157
1158=head2 COMMAND CALLBACKS
1159
1160=over 4
1161
1162=cut
880 1163
881############################################################################# 1164#############################################################################
882# command handling &c 1165# command handling &c
883 1166
884=item cf::register_command $name => \&callback($ob,$args); 1167=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1180 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1181}
899 1182
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1183=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1184
902Register a callbackf ro execution when the client sends an extcmd packet. 1185Register a callback for execution when the client sends an (synchronous)
1186extcmd packet. Ext commands will be processed in the order they are
1187received by the server, like other user commands. The first argument is
1188the logged-in player. Ext commands can only be processed after a player
1189has logged in successfully.
903 1190
904If the callback returns something, it is sent back as if reply was being 1191If the callback returns something, it is sent back as if reply was being
905called. 1192called.
906 1193
1194=item cf::register_exticmd $name => \&callback($ns,$packet);
1195
1196Register a callback for execution when the client sends an (asynchronous)
1197exticmd packet. Exti commands are processed by the server as soon as they
1198are received, i.e. out of order w.r.t. other commands. The first argument
1199is a client socket. Exti commands can be received anytime, even before
1200log-in.
1201
1202If the callback returns something, it is sent back as if reply was being
1203called.
1204
907=cut 1205=cut
908 1206
909sub register_extcmd { 1207sub register_extcmd {
910 my ($name, $cb) = @_; 1208 my ($name, $cb) = @_;
911 1209
912 $EXTCMD{$name} = $cb; 1210 $EXTCMD{$name} = $cb;
1211}
1212
1213sub register_exticmd {
1214 my ($name, $cb) = @_;
1215
1216 $EXTICMD{$name} = $cb;
913} 1217}
914 1218
915cf::player->attach ( 1219cf::player->attach (
916 on_command => sub { 1220 on_command => sub {
917 my ($pl, $name, $params) = @_; 1221 my ($pl, $name, $params) = @_;
926 cf::override; 1230 cf::override;
927 }, 1231 },
928 on_extcmd => sub { 1232 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1233 my ($pl, $buf) = @_;
930 1234
931 my $msg = eval { from_json $buf }; 1235 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1236
933 if (ref $msg) { 1237 if (ref $msg) {
1238 my ($type, $reply, @payload) =
1239 "ARRAY" eq ref $msg
1240 ? @$msg
1241 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1242
1243 my @reply;
1244
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1245 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1246 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1247 }
1248
1249 $pl->ext_reply ($reply, @reply)
1250 if $reply;
1251
939 } else { 1252 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1254 }
942 1255
943 cf::override; 1256 cf::override;
944 }, 1257 },
945); 1258);
946 1259
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1260sub load_extensions {
1261 cf::sync_job {
1262 my %todo;
1263
982 for my $ext (<$LIBDIR/*.ext>) { 1264 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1265 next unless -r $path;
984 eval { 1266
985 load_extension $ext; 1267 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1268 my $base = $1;
1269 my $pkg = $1;
1270 $pkg =~ s/[^[:word:]]/_/g;
1271 $pkg = "ext::$pkg";
1272
1273 open my $fh, "<:utf8", $path
1274 or die "$path: $!";
1275
1276 my $source = do { local $/; <$fh> };
1277
1278 my %ext = (
1279 path => $path,
1280 base => $base,
1281 pkg => $pkg,
1282 );
1283
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286
1287 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n"
1290 . $source
1291 . "\n};\n1";
1292
1293 $todo{$base} = \%ext;
1294 }
1295
1296 my %done;
1297 while (%todo) {
1298 my $progress;
1299
1300 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip
1303 unless exists $done{$_};
1304 }
1305
1306 warn "... loading '$k' into '$v->{pkg}'\n";
1307
1308 unless (eval $v->{source}) {
1309 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n";
1311
1312 if (exists $v->{meta}{mandatory}) {
1313 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n";
1315 exit 1;
1316 }
1317
1318 warn $msg;
1319 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
986 1 1324 }
987 } or warn "$ext not loaded: $@"; 1325
1326 skip:
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1328 unless $progress;
1329 }
988 } 1330 };
989} 1331}
990 1332
991############################################################################# 1333#############################################################################
992 1334
1335=back
1336
993=head2 CORE EXTENSIONS 1337=head2 CORE EXTENSIONS
994 1338
995Functions and methods that extend core crossfire objects. 1339Functions and methods that extend core crossfire objects.
996 1340
997=cut 1341=cut
1001use Coro::AIO; 1345use Coro::AIO;
1002 1346
1003=head3 cf::player 1347=head3 cf::player
1004 1348
1005=over 4 1349=over 4
1350
1351=item cf::player::num_playing
1352
1353Returns the official number of playing players, as per the Crossfire metaserver rules.
1354
1355=cut
1356
1357sub num_playing {
1358 scalar grep
1359 $_->ob->map
1360 && !$_->hidden
1361 && !$_->ob->flag (cf::FLAG_WIZ),
1362 cf::player::list
1363}
1006 1364
1007=item cf::player::find $login 1365=item cf::player::find $login
1008 1366
1009Returns the given player object, loading it if necessary (might block). 1367Returns the given player object, loading it if necessary (might block).
1010 1368
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1404 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1405 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1406 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1407 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1408
1051 my $pl = load_pl path $login 1409 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1410 or return;
1411
1412 my $pl = cf::player::load_pl $f
1413 or return;
1414 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1416 $cf::PLAYER{$login} = $pl
1054 } 1417 }
1055 } 1418 }
1056} 1419}
1057 1420
1067 1430
1068 aio_mkdir playerdir $pl, 0770; 1431 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1432 $pl->{last_save} = $cf::RUNTIME;
1070 1433
1071 $pl->save_pl ($path); 1434 $pl->save_pl ($path);
1072 Coro::cede; 1435 cf::cede_to_tick;
1073} 1436}
1074 1437
1075sub new($) { 1438sub new($) {
1076 my ($login) = @_; 1439 my ($login) = @_;
1077 1440
1081 $self->{deny_save} = 1; 1444 $self->{deny_save} = 1;
1082 1445
1083 $cf::PLAYER{$login} = $self; 1446 $cf::PLAYER{$login} = $self;
1084 1447
1085 $self 1448 $self
1449}
1450
1451=item $player->send_msg ($channel, $msg, $color, [extra...])
1452
1453=cut
1454
1455sub send_msg {
1456 my $ns = shift->ns
1457 or return;
1458 $ns->send_msg (@_);
1086} 1459}
1087 1460
1088=item $pl->quit_character 1461=item $pl->quit_character
1089 1462
1090Nukes the player without looking back. If logged in, the connection will 1463Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1518 or return [];
1146 1519
1147 my @logins; 1520 my @logins;
1148 1521
1149 for my $login (@$dirs) { 1522 for my $login (@$dirs) {
1523 my $path = path $login;
1524
1525 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1528 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1529 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 }
1153 1531
1154 utf8::decode $login; 1532 utf8::decode $login;
1155 push @logins, $login; 1533 push @logins, $login;
1156 } 1534 }
1157 1535
1184 } 1562 }
1185 1563
1186 \@paths 1564 \@paths
1187} 1565}
1188 1566
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1568
1569Expand crossfire pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659
1189=item $player->ext_reply ($msgid, %msg) 1660=item $player->ext_reply ($msgid, @msg)
1190 1661
1191Sends an ext reply to the player. 1662Sends an ext reply to the player.
1192 1663
1193=cut 1664=cut
1194 1665
1195sub ext_reply($$%) { 1666sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1667 my ($self, $id, @msg) = @_;
1197 1668
1198 $msg{msgid} = $id; 1669 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1670}
1202 1671
1203=item $player->ext_event ($type, %msg) 1672=item $player->ext_msg ($type, @msg)
1204 1673
1205Sends an ext event to the client. 1674Sends an ext event to the client.
1206 1675
1207=cut 1676=cut
1208 1677
1209sub ext_event($$%) { 1678sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1679 my ($self, $type, @msg) = @_;
1211 1680
1212 $self->ns->ext_event ($type, %msg); 1681 $self->ns->ext_msg ($type, @msg);
1213} 1682}
1214 1683
1215=head3 cf::region 1684=head3 cf::region
1216 1685
1217=over 4 1686=over 4
1220 1689
1221package cf::region; 1690package cf::region;
1222 1691
1223=item cf::region::find_by_path $path 1692=item cf::region::find_by_path $path
1224 1693
1225Tries to decuce the probable region for a map knowing only its path. 1694Tries to decuce the likely region for a map knowing only its path.
1226 1695
1227=cut 1696=cut
1228 1697
1229sub find_by_path($) { 1698sub find_by_path($) {
1230 my ($path) = @_; 1699 my ($path) = @_;
1231 1700
1232 my ($match, $specificity); 1701 my ($match, $specificity);
1233 1702
1234 for my $region (list) { 1703 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1704 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1705 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1706 if $region->specificity > $specificity;
1238 } 1707 }
1239 } 1708 }
1240 1709
1304 my ($self, $merge) = @_; 1773 my ($self, $merge) = @_;
1305 1774
1306 # we have to keep some variables in memory intact 1775 # we have to keep some variables in memory intact
1307 local $self->{path}; 1776 local $self->{path};
1308 local $self->{load_path}; 1777 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1778
1312 $self->SUPER::thawer_merge ($merge); 1779 $self->SUPER::thawer_merge ($merge);
1313} 1780}
1314 1781
1315sub normalise { 1782sub normalise {
1362 $self->init; # pass $1 etc. 1829 $self->init; # pass $1 etc.
1363 return $self; 1830 return $self;
1364 } 1831 }
1365 } 1832 }
1366 1833
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1834 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1835 ()
1369} 1836}
1370 1837
1371sub init { 1838sub init {
1372 my ($self) = @_; 1839 my ($self) = @_;
1415 1882
1416 $_->change_map_light ($change) 1883 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1884 for grep $_->outdoor, values %cf::MAP;
1418} 1885}
1419 1886
1887sub decay_objects {
1888 my ($self) = @_;
1889
1890 return if $self->{deny_reset};
1891
1892 $self->do_decay_objects;
1893}
1894
1420sub unlink_save { 1895sub unlink_save {
1421 my ($self) = @_; 1896 my ($self) = @_;
1422 1897
1423 utf8::encode (my $save = $self->save_path); 1898 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1899 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1902
1428sub load_header_from($) { 1903sub load_header_from($) {
1429 my ($self, $path) = @_; 1904 my ($self, $path) = @_;
1430 1905
1431 utf8::encode $path; 1906 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1907 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1908 or return;
1909
1910 $self->_load_header ($f)
1911 or return;
1912
1913 local $MAP_LOADING{$self->{path}} = $self;
1914 $f->resolve_delayed_derefs;
1437 1915
1438 $self->{load_path} = $path; 1916 $self->{load_path} = $path;
1439 1917
1440 1 1918 1
1441} 1919}
1480 $self->load_header_orig 1958 $self->load_header_orig
1481 or return; 1959 or return;
1482 $self->prepare_orig; 1960 $self->prepare_orig;
1483 } 1961 }
1484 1962
1963 $self->{deny_reset} = 1
1964 if $self->no_reset;
1965
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1966 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1967 unless $self->default_region;
1487 1968
1488 1 1969 1
1489} 1970}
1492sub find { 1973sub find {
1493 my ($path, $origin) = @_; 1974 my ($path, $origin) = @_;
1494 1975
1495 $path = normalise $path, $origin && $origin->path; 1976 $path = normalise $path, $origin && $origin->path;
1496 1977
1978 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1979 cf::lock_wait "map_find:$path";
1498 1980
1499 $cf::MAP{$path} || do { 1981 $cf::MAP{$path} || do {
1500 my $guard = cf::lock_acquire "map_find:$path"; 1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1501 my $map = new_from_path cf::map $path 1985 my $map = new_from_path cf::map $path
1502 or return; 1986 or return;
1503 1987
1504 $map->{last_save} = $cf::RUNTIME; 1988 $map->{last_save} = $cf::RUNTIME;
1505 1989
1506 $map->load_header 1990 $map->load_header
1507 or return; 1991 or return;
1508 1992
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1994 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1995 #$cf::WAIT_FOR_TICK->wait;
1996 undef $guard1;
1997 undef $guard2;
1512 $map->reset; 1998 $map->reset;
1513 undef $guard;
1514 return find $path; 1999 return find $path;
1515 } 2000 }
1516 2001
1517 $cf::MAP{$path} = $map 2002 $cf::MAP{$path} = $map
1518 } 2003 }
1527 local $self->{deny_reset} = 1; # loading can take a long time 2012 local $self->{deny_reset} = 1; # loading can take a long time
1528 2013
1529 my $path = $self->{path}; 2014 my $path = $self->{path};
1530 2015
1531 { 2016 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 2017 my $guard = cf::lock_acquire "map_data:$path";
1533 2018
2019 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 2020 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 2021
1536 $self->in_memory (cf::MAP_LOADING); 2022 $self->in_memory (cf::MAP_LOADING);
1537 2023
1538 $self->alloc; 2024 $self->alloc;
1539 2025
1540 $self->pre_load; 2026 $self->pre_load;
1541 Coro::cede; 2027 cf::cede_to_tick;
1542 2028
2029 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 2031 $self->_load_objects ($f)
1544 or return; 2032 or return;
1545 2033
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 2035 if delete $self->{load_original};
1548 2036
1549 if (my $uniq = $self->uniq_path) { 2037 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 2038 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 2039 unless (aio_stat $uniq) {
2040 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 2041 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 2042 $self->_load_objects ($f);
2043 $f->resolve_delayed_derefs;
2044 }
1554 } 2045 }
1555 } 2046 }
1556 2047
1557 Coro::cede; 2048 $f->resolve_delayed_derefs;
2049
2050 cf::cede_to_tick;
1558 # now do the right thing for maps 2051 # now do the right thing for maps
1559 $self->link_multipart_objects; 2052 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 2053 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 2054 unless $self->difficulty;
1562 Coro::cede; 2055 cf::cede_to_tick;
1563 2056
1564 unless ($self->{deny_activate}) { 2057 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 2058 $self->decay_objects;
1566 $self->fix_auto_apply; 2059 $self->fix_auto_apply;
1567 $self->update_buttons; 2060 $self->update_buttons;
1568 Coro::cede; 2061 cf::cede_to_tick;
1569 $self->set_darkness_map; 2062 $self->set_darkness_map;
1570 Coro::cede; 2063 cf::cede_to_tick;
1571 $self->activate; 2064 $self->activate;
1572 } 2065 }
2066
2067 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME);
1573 2069
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2070 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 2071 }
1576 2072
1577 $self->post_load; 2073 $self->post_load;
1581 my ($self, $ob) = @_; 2077 my ($self, $ob) = @_;
1582 2078
1583 return find "~" . $ob->name . "/" . $self->{path} 2079 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2080 if $self->per_player;
1585 2081
2082# return find "?party/" . $ob->name . "/" . $self->{path}
2083# if $self->per_party;
2084
1586 $self 2085 $self
1587} 2086}
1588 2087
1589# find and load all maps in the 3x3 area around a map 2088# find and load all maps in the 3x3 area around a map
1590sub load_diag { 2089sub load_neighbours {
1591 my ($map) = @_; 2090 my ($map) = @_;
1592 2091
1593 my @diag; # diagonal neighbours 2092 my @neigh; # diagonal neighbours
1594 2093
1595 for (0 .. 3) { 2094 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2095 my $neigh = $map->tile_path ($_)
1597 or next; 2096 or next;
1598 $neigh = find $neigh, $map 2097 $neigh = find $neigh, $map
1599 or next; 2098 or next;
1600 $neigh->load; 2099 $neigh->load;
1601 2100
2101 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2102 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2103 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2104 }
1605 2105
1606 for (@diag) { 2106 for (grep defined $_->[0], @neigh) {
2107 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2108 my $neigh = find $path, $origin
1608 or next; 2109 or next;
1609 $neigh->load; 2110 $neigh->load;
1610 } 2111 }
1611} 2112}
1612 2113
1617} 2118}
1618 2119
1619sub do_load_sync { 2120sub do_load_sync {
1620 my ($map) = @_; 2121 my ($map) = @_;
1621 2122
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main;
2125
1622 cf::sync_job { $map->load }; 2126 cf::sync_job { $map->load };
1623} 2127}
1624 2128
1625our %MAP_PREFETCH; 2129our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2130our $MAP_PREFETCHER = undef;
1627 2131
1628sub find_async { 2132sub find_async {
1629 my ($path, $origin) = @_; 2133 my ($path, $origin, $load) = @_;
1630 2134
1631 $path = normalise $path, $origin && $origin->{path}; 2135 $path = normalise $path, $origin && $origin->{path};
1632 2136
1633 if (my $map = $cf::MAP{$path}) { 2137 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2139 }
1636 2140
1637 undef $MAP_PREFETCH{$path}; 2141 $MAP_PREFETCH{$path} |= $load;
2142
1638 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
1639 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2148 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2149 $map->load if $v;
2150 }
1644 2151
1645 delete $MAP_PREFETCH{$path}; 2152 delete $MAP_PREFETCH{$k};
1646 } 2153 }
1647 } 2154 }
1648 undef $MAP_PREFETCHER; 2155 undef $MAP_PREFETCHER;
1649 }; 2156 };
1650 $MAP_PREFETCHER->prio (6); 2157 $MAP_PREFETCHER->prio (6);
1653} 2160}
1654 2161
1655sub save { 2162sub save {
1656 my ($self) = @_; 2163 my ($self) = @_;
1657 2164
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2166
1660 $self->{last_save} = $cf::RUNTIME; 2167 $self->{last_save} = $cf::RUNTIME;
1661 2168
1662 return unless $self->dirty; 2169 return unless $self->dirty;
1663 2170
1669 return if $self->{deny_save}; 2176 return if $self->{deny_save};
1670 2177
1671 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
1672 2179
1673 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
1675 }; 2183 };
1676 2184
1677 if ($uniq) { 2185 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1686 my ($self) = @_; 2194 my ($self) = @_;
1687 2195
1688 # save first because save cedes 2196 # save first because save cedes
1689 $self->save; 2197 $self->save;
1690 2198
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2199 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2200
1693 return if $self->players; 2201 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2203 return if $self->{deny_save};
1696 2204
2205 $self->in_memory (cf::MAP_SWAPPED);
2206
2207 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2209 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2210}
1700 2211
1701sub reset_at { 2212sub reset_at {
1702 my ($self) = @_; 2213 my ($self) = @_;
1703 2214
1704 # TODO: safety, remove and allow resettable per-player maps 2215 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2216 return 1e99 if $self->{deny_reset};
1707 2217
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2220
1721 my ($self) = @_; 2231 my ($self) = @_;
1722 2232
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2234
1725 return if $self->players; 2235 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2236
1728 warn "resetting map ", $self->path;#d# 2237 warn "resetting map ", $self->path;
1729 2238
1730 $self->in_memory (cf::MAP_SWAPPED); 2239 $self->in_memory (cf::MAP_SWAPPED);
1731 2240
1732 # need to save uniques path 2241 # need to save uniques path
1733 unless ($self->{deny_save}) { 2242 unless ($self->{deny_save}) {
1737 if $uniq; 2246 if $uniq;
1738 } 2247 }
1739 2248
1740 delete $cf::MAP{$self->path}; 2249 delete $cf::MAP{$self->path};
1741 2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2253 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2254
1746 $self->unlink_save; 2255 $self->unlink_save;
1747 $self->destroy; 2256 $self->destroy;
1748} 2257}
1749 2258
1750my $nuke_counter = "aaaa"; 2259my $nuke_counter = "aaaa";
1751 2260
1752sub nuke { 2261sub nuke {
1753 my ($self) = @_; 2262 my ($self) = @_;
1754 2263
2264 {
2265 my $lock = cf::lock_acquire "map_data:$self->{path}";
2266
1755 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1756 2268
1757 $self->unlink_save; 2269 $self->unlink_save;
1758 2270
1759 bless $self, "cf::map"; 2271 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2272 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2273 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2274 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2276
1765 $cf::MAP{$self->path} = $self; 2277 $cf::MAP{$self->path} = $self;
2278 }
1766 2279
1767 $self->reset; # polite request, might not happen 2280 $self->reset; # polite request, might not happen
2281}
2282
2283=item $maps = cf::map::tmp_maps
2284
2285Returns an arrayref with all map paths of currently instantiated and saved
2286maps. May block.
2287
2288=cut
2289
2290sub tmp_maps() {
2291 [
2292 map {
2293 utf8::decode $_;
2294 /\.map$/
2295 ? normalise $_
2296 : ()
2297 } @{ aio_readdir $TMPDIR or [] }
2298 ]
2299}
2300
2301=item $maps = cf::map::random_maps
2302
2303Returns an arrayref with all map paths of currently instantiated and saved
2304random maps. May block.
2305
2306=cut
2307
2308sub random_maps() {
2309 [
2310 map {
2311 utf8::decode $_;
2312 /\.map$/
2313 ? normalise "?random/$_"
2314 : ()
2315 } @{ aio_readdir $RANDOMDIR or [] }
2316 ]
1768} 2317}
1769 2318
1770=item cf::map::unique_maps 2319=item cf::map::unique_maps
1771 2320
1772Returns an arrayref of paths of all shared maps that have 2321Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2322instantiated unique items. May block.
1774 2323
1775=cut 2324=cut
1776 2325
1777sub unique_maps() { 2326sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2327 [
1779 or return; 2328 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2329 utf8::decode $_;
1785 next if /\.pst$/; 2330 /\.map$/
1786 next unless /^$PATH_SEP/o; 2331 ? normalise $_
1787 2332 : ()
1788 push @paths, cf::map::normalise $_; 2333 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2334 ]
1790
1791 \@paths
1792} 2335}
1793 2336
1794package cf; 2337package cf;
1795 2338
1796=back 2339=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2357 map { $_, inv_recursive_ $_->inv } @_
1815} 2358}
1816 2359
1817sub inv_recursive { 2360sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2361 inv_recursive_ inv $_[0]
2362}
2363
2364=item $ref = $ob->ref
2365
2366creates and returns a persistent reference to an objetc that can be stored as a string.
2367
2368=item $ob = cf::object::deref ($refstring)
2369
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block.
2372
2373=cut
2374
2375sub deref {
2376 my ($ref) = @_;
2377
2378 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2379 my ($uuid, $name) = ($1, $2);
2380 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2381 or return;
2382 $pl->ob->uuid eq $uuid
2383 or return;
2384
2385 $pl->ob
2386 } else {
2387 warn "$ref: cannot resolve object reference\n";
2388 undef
2389 }
1819} 2390}
1820 2391
1821package cf; 2392package cf;
1822 2393
1823=back 2394=back
1842 2413
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2414 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2415
1845 if ($self->{record_replies}) { 2416 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2417 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2418
1847 } else { 2419 } else {
2420 my $pl = $self->contr;
2421
2422 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2423 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425
2426 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2427 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2428 $self->message ($msg, $flags);
2429 }
1850 } 2430 }
2431}
2432
2433=item $object->send_msg ($channel, $msg, $color, [extra...])
2434
2435=cut
2436
2437sub cf::object::send_msg {
2438 my $pl = shift->contr
2439 or return;
2440 $pl->send_msg (@_);
1851} 2441}
1852 2442
1853=item $player_object->may ("access") 2443=item $player_object->may ("access")
1854 2444
1855Returns wether the given player is authorized to access resource "access" 2445Returns wether the given player is authorized to access resource "access"
1934 # use -1 or undef as default coordinates, not 0, 0 2524 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2525 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2526 if $x <=0 && $y <= 0;
1937 2527
1938 $map->load; 2528 $map->load;
1939 $map->load_diag; 2529 $map->load_neighbours;
1940 2530
1941 return unless $self->contr->active; 2531 return unless $self->contr->active;
1942 $self->activate_recursive; 2532 $self->activate_recursive;
1943 2533
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2535 $self->enter_map ($map, $x, $y);
1946} 2536}
1947 2537
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2539
1950Moves the player to the given map-path and coordinates by first freezing 2540Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback 2541her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on 2542that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position. 2543the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process.
1954 2545
1955=cut 2546=cut
1956 2547
1957our $GOTOGEN; 2548our $GOTOGEN;
1958 2549
1959sub cf::object::player::goto { 2550sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2551 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2552
1962 # do generation counting so two concurrent goto's will be executed in-order 2553 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2555
1965 $self->enter_link; 2556 $self->enter_link;
1966 2557
1967 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2561 # *tag paths override both path and x|y
2562 if ($path =~ /^\*(.*)$/) {
2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2564 my $ob = $obs[rand @obs];
2565
2566 # see if we actually can go there
2567 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2568 $ob = $obs[rand @obs];
2569 } else {
2570 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2571 }
2572 # else put us there anyways for now #d#
2573
2574 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2575 } else {
2576 ($path, $x, $y) = (undef, undef, undef);
2577 }
2578 }
2579
1968 my $map = eval { 2580 my $map = eval {
1969 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
1970 2582
1971 if ($map) { 2583 if ($map) {
1972 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
1974 } else { 2586 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1976 } 2588 }
1977 2589
1978 $map 2590 $map
1979 }; 2591 };
1980 2592
1985 2597
1986 if ($gen == $self->{_goto_generation}) { 2598 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2599 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2600 $self->leave_link ($map, $x, $y);
1989 } 2601 }
2602
2603 $done->() if $done;
1990 })->prio (1); 2604 })->prio (1);
1991} 2605}
1992 2606
1993=item $player_object->enter_exit ($exit_object) 2607=item $player_object->enter_exit ($exit_object)
1994 2608
2031 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2032 } 2646 }
2033 2647
2034 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2035 2649
2036 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2037 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2038 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2039 2653
2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2041 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2063 my $hp = $exit->stats->hp; 2677 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2678 my $sp = $exit->stats->sp;
2065 2679
2066 $self->enter_link; 2680 $self->enter_link;
2067 2681
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2068 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2069 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2690 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2072 2692
2073 1; 2693 1;
2099 2719
2100 utf8::encode $text; 2720 utf8::encode $text;
2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102} 2722}
2103 2723
2724=item $client->send_msg ($channel, $msg, $color, [extra...])
2725
2726Send a drawinfo or msg packet to the client, formatting the msg for the
2727client if neccessary. C<$type> should be a string identifying the type of
2728the message, with C<log> being the default. If C<$color> is negative, suppress
2729the message unless the client supports the msg packet.
2730
2731=cut
2732
2733# non-persistent channels (usually the info channel)
2734our %CHANNEL = (
2735 "c/identify" => {
2736 id => "infobox",
2737 title => "Identify",
2738 reply => undef,
2739 tooltip => "Items recently identified",
2740 },
2741 "c/examine" => {
2742 id => "infobox",
2743 title => "Examine",
2744 reply => undef,
2745 tooltip => "Signs and other items you examined",
2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2753 "c/lookat" => {
2754 id => "infobox",
2755 title => "Look",
2756 reply => undef,
2757 tooltip => "What you saw there",
2758 },
2759 "c/who" => {
2760 id => "infobox",
2761 title => "Players",
2762 reply => undef,
2763 tooltip => "Shows players who are currently online",
2764 },
2765 "c/body" => {
2766 id => "infobox",
2767 title => "Body Parts",
2768 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available",
2770 },
2771 "c/uptime" => {
2772 id => "infobox",
2773 title => "Uptime",
2774 reply => undef,
2775 tooltip => "How long the server has been running since last restart",
2776 },
2777 "c/mapinfo" => {
2778 id => "infobox",
2779 title => "Map Info",
2780 reply => undef,
2781 tooltip => "Information related to the maps",
2782 },
2783);
2784
2785sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_;
2787
2788 $msg = $self->pl->expand_cfpod ($msg);
2789
2790 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791
2792 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel};
2795
2796 $self->ext_msg (channel_info => $channel)
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id};
2800
2801 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel)
2806 if $self->can_msg;
2807 }
2808
2809 $channel = $channel->{id};
2810 }
2811
2812 return unless @extra || length $msg;
2813
2814 if ($self->can_msg) {
2815 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF;
2818
2819 $self->send_packet ("msg " . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2821 } else {
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832
2833 $color &= cf::NDI_COLOR_MASK;
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846}
2847
2104=item $client->ext_event ($type, %msg) 2848=item $client->ext_msg ($type, @msg)
2105 2849
2106Sends an exti event to the client. 2850Sends an ext event to the client.
2107 2851
2108=cut 2852=cut
2109 2853
2110sub cf::client::ext_event($$%) { 2854sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2855 my ($self, $type, @msg) = @_;
2112 2856
2857 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2860 push @msg, msgtype => "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg); 2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 }
2863}
2864
2865=item $client->ext_reply ($msgid, @msg)
2866
2867Sends an ext reply to the client.
2868
2869=cut
2870
2871sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_;
2873
2874 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2115} 2881}
2116 2882
2117=item $success = $client->query ($flags, "text", \&cb) 2883=item $success = $client->query ($flags, "text", \&cb)
2118 2884
2119Queues a query to the client, calling the given callback with 2885Queues a query to the client, calling the given callback with
2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2886the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2121C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2887C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122 2888
2123Queries can fail, so check the return code. Or don't, as queries will become 2889Queries can fail, so check the return code. Or don't, as queries will
2124reliable at some point in the future. 2890become reliable at some point in the future.
2125 2891
2126=cut 2892=cut
2127 2893
2128sub cf::client::query { 2894sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2895 my ($self, $flags, $text, $cb) = @_;
2137 utf8::encode $text; 2903 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2904 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2905
2140 $self->send_packet ($self->{query_queue}[0][0]) 2906 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2907 if @{ $self->{query_queue} } == 1;
2908
2909 1
2142} 2910}
2143 2911
2144cf::client->attach ( 2912cf::client->attach (
2913 on_connect => sub {
2914 my ($ns) = @_;
2915
2916 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2917 },
2145 on_reply => sub { 2918 on_reply => sub {
2146 my ($ns, $msg) = @_; 2919 my ($ns, $msg) = @_;
2147 2920
2148 # this weird shuffling is so that direct followup queries 2921 # this weird shuffling is so that direct followup queries
2149 # get handled first 2922 # get handled first
2161 } else { 2934 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2935 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2936 }
2164 } 2937 }
2165 }, 2938 },
2939 on_exticmd => sub {
2940 my ($ns, $buf) = @_;
2941
2942 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2943
2944 if (ref $msg) {
2945 my ($type, $reply, @payload) =
2946 "ARRAY" eq ref $msg
2947 ? @$msg
2948 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2949
2950 my @reply;
2951
2952 if (my $cb = $EXTICMD{$type}) {
2953 @reply = $cb->($ns, @payload);
2954 }
2955
2956 $ns->ext_reply ($reply, @reply)
2957 if $reply;
2958
2959 } else {
2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2961 }
2962
2963 cf::override;
2964 },
2166); 2965);
2167 2966
2168=item $client->async (\&cb) 2967=item $client->async (\&cb)
2169 2968
2170Create a new coroutine, running the specified callback. The coroutine will 2969Create a new coroutine, running the specified callback. The coroutine will
2211our $safe = new Safe "safe"; 3010our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 3011our $safe_hole = new Safe::Hole;
2213 3012
2214$SIG{FPE} = 'IGNORE'; 3013$SIG{FPE} = 'IGNORE';
2215 3014
2216$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3015$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math
3017 grepstart grepwhile mapstart mapwhile
3018 sort time
3019));
2217 3020
2218# here we export the classes and methods available to script code 3021# here we export the classes and methods available to script code
2219 3022
2220=pod 3023=pod
2221 3024
2222The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2223 3026
2224 cf::object contr pay_amount pay_player map 3027 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr
3030
2225 cf::object::player player 3031 cf::object::player
2226 cf::player peaceful 3032 player
2227 cf::map trigger 3033
3034 cf::player
3035 peaceful
3036
3037 cf::map
3038 trigger
2228 3039
2229=cut 3040=cut
2230 3041
2231for ( 3042for (
2232 ["cf::object" => qw(contr pay_amount pay_player map)], 3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race
3045 decrease_ob_nr destroy)],
2233 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2236) { 3049) {
2237 no strict 'refs'; 3050 no strict 'refs';
2308=back 3121=back
2309 3122
2310=cut 3123=cut
2311 3124
2312############################################################################# 3125#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483
2484#############################################################################
2485# the server's init and main functions 3126# the server's init and main functions
2486 3127
2487sub load_facedata($) { 3128sub load_facedata($) {
2488 my ($path) = @_; 3129 my ($path) = @_;
3130
3131 # HACK to clear player env face cache, we need some signal framework
3132 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = ();
3134
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489 3136
2490 warn "loading facedata from $path\n"; 3137 warn "loading facedata from $path\n";
2491 3138
2492 my $facedata; 3139 my $facedata;
2493 0 < aio_load $path, $facedata 3140 0 < aio_load $path, $facedata
2496 $facedata = Coro::Storable::thaw $facedata; 3143 $facedata = Coro::Storable::thaw $facedata;
2497 3144
2498 $facedata->{version} == 2 3145 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3146 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 3147
3148 # patch in the exptable
3149 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3152 };
3153 cf::cede_to_tick;
3154
2501 { 3155 {
2502 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
2503 3157
2504 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3165
3166 cf::cede_to_tick;
2510 } 3167 }
2511 3168
2512 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
2514 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
2515 or next; 3173 or next;
3174
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3178 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3180 }
2521 Coro::cede; 3181
3182 cf::cede_to_tick;
2522 } 3183 }
2523 } 3184 }
2524 3185
2525 { 3186 {
2526 my $anims = $facedata->{animinfo}; 3187 my $anims = $facedata->{animinfo};
2527 3188
2528 while (my ($anim, $info) = each %$anims) { 3189 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3190 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3191 cf::cede_to_tick;
2531 } 3192 }
2532 3193
2533 cf::anim::invalidate_all; # d'oh 3194 cf::anim::invalidate_all; # d'oh
2534 } 3195 }
2535 3196
3197 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource};
3201
3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206
3207 if ($info->{type} & 1) {
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type};
3222 } else {
3223 $RESOURCE{$name} = $info;
3224 }
3225
3226 cf::cede_to_tick;
3227 }
3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231
2536 1 3232 1
2537} 3233}
2538 3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254
3255register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_;
3257
3258 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v);
3260 }
3261};
3262
2539sub reload_regions { 3263sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = ();
3267
2540 load_resource_file "$MAPDIR/regions" 3268 load_resource_file "$MAPDIR/regions"
2541 or die "unable to load regions file\n"; 3269 or die "unable to load regions file\n";
3270
3271 for (cf::region::list) {
3272 $_->{match} = qr/$_->{match}/
3273 if exists $_->{match};
3274 }
2542} 3275}
2543 3276
2544sub reload_facedata { 3277sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3278 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3279 or die "unable to load facedata\n";
2547} 3280}
2548 3281
2549sub reload_archetypes { 3282sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes" 3283 load_resource_file "$DATADIR/archetypes"
2551 or die "unable to load archetypes\n"; 3284 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
2552} 3290}
2553 3291
2554sub reload_treasures { 3292sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures" 3293 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n"; 3294 or die "unable to load treasurelists\n";
2559sub reload_resources { 3297sub reload_resources {
2560 warn "reloading resource files...\n"; 3298 warn "reloading resource files...\n";
2561 3299
2562 reload_regions; 3300 reload_regions;
2563 reload_facedata; 3301 reload_facedata;
3302 #reload_archetypes;#d#
2564 reload_archetypes; 3303 reload_archetypes;
2565 reload_treasures; 3304 reload_treasures;
2566 3305
2567 warn "finished reloading resource files\n"; 3306 warn "finished reloading resource files\n";
2568} 3307}
2569 3308
2570sub init { 3309sub init {
2571 reload_resources; 3310 reload_resources;
2572} 3311}
2573 3312
2574sub cfg_load { 3313sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3314 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3315 or return;
2577 3316
2578 local $/; 3317 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3318 *CFG = YAML::Syck::Load <$fh>;
2595sub main { 3334sub main {
2596 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
2597 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
2598 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2599 (async { 3338 (async {
2600 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
2601 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
2602 }; 3342 };
2603 3343
2604 cfg_load; 3344 reload_config;
2605 db_init; 3345 db_init;
2606 load_extensions; 3346 load_extensions;
2607 3347
2608 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2609 Event::loop; 3350 EV::loop;
2610} 3351}
2611 3352
2612############################################################################# 3353#############################################################################
2613# initialisation and cleanup 3354# initialisation and cleanup
2614 3355
2615# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
2616BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
2617 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
2618 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2619 reentrant => 0,
2620 data => WF_AUTOCANCEL,
2621 signal => $signal,
2622 prio => 0,
2623 cb => sub {
2624 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
2625 },
2626 ); 3362 };
3363 }
3364}
3365
3366sub write_runtime {
3367 my $runtime = "$LOCALDIR/runtime";
3368
3369 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time.
3371
3372 IO::AIO::aio_utime $runtime, undef, undef;
3373
3374 my $guard = cf::lock_acquire "write_runtime";
3375
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3377 or return;
3378
3379 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server.
3382
3383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3384 and return;
3385
3386 # always fsync - this file is important
3387 aio_fsync $fh
3388 and return;
3389
3390 # touch it again to show we are up-to-date
3391 aio_utime $fh, undef, undef;
3392
3393 close $fh
3394 or return;
3395
3396 aio_rename "$runtime~", $runtime
3397 and return;
3398
3399 warn "runtime file written.\n";
3400
2627 } 3401 1
2628} 3402}
2629 3403
2630sub emergency_save() { 3404sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3405 my $freeze_guard = cf::freeze_mainloop;
2632 3406
2638 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
2639 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
2640 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
2641 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
2642 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2643 $pl->save; 3418 $pl->save;
2644 } 3419 }
2645 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
2646 3421
2647 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
2686 warn "syncing database to disk"; 3461 warn "syncing database to disk";
2687 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
2688 3463
2689 # if anything goes wrong in here, we should simply crash as we already saved 3464 # if anything goes wrong in here, we should simply crash as we already saved
2690 3465
2691 warn "cancelling all WF_AUTOCANCEL watchers";
2692 for (Event::all_watchers) {
2693 $_->cancel if $_->data & WF_AUTOCANCEL;
2694 }
2695
2696 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
2697 for (;;) { 3467 for (;;) {
2698 BDB::flush; 3468 BDB::flush;
2699 IO::AIO::flush; 3469 IO::AIO::flush;
2700 Coro::cede; 3470 Coro::cede_notself;
2701 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
2702 warn "iterate..."; 3472 warn "iterate...";
2703 } 3473 }
2704 3474
2705 ++$RELOAD; 3475 ++$RELOAD;
2709 %EXT_CORO = (); 3479 %EXT_CORO = ();
2710 3480
2711 warn "removing commands"; 3481 warn "removing commands";
2712 %COMMAND = (); 3482 %COMMAND = ();
2713 3483
2714 warn "removing ext commands"; 3484 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3485 %EXTCMD = ();
3486 %EXTICMD = ();
2716 3487
2717 warn "unloading/nuking all extensions"; 3488 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3489 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3490 warn "... unloading $pkg";
2720 3491
2763 warn "reloading cf.pm"; 3534 warn "reloading cf.pm";
2764 require cf; 3535 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3537
2767 warn "loading config and database again"; 3538 warn "loading config and database again";
2768 cf::cfg_load; 3539 cf::reload_config;
2769 3540
2770 warn "loading extensions"; 3541 warn "loading extensions";
2771 cf::load_extensions; 3542 cf::load_extensions;
2772 3543
2773 warn "reattaching attachments to objects/players"; 3544 warn "reattaching attachments to objects/players";
2793 3564
2794sub reload_perl() { 3565sub reload_perl() {
2795 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
2796 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
2797 3568
2798 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2799 reentrant => 0,
2800 after => 0,
2801 data => WF_AUTOCANCEL,
2802 cb => sub {
2803 do_reload_perl;
2804 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
2805 }, 3571 do_reload_perl;
2806 ); 3572 };
2807} 3573}
2808 3574
2809register_command "reload" => sub { 3575register_command "reload" => sub {
2810 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
2811 3577
2812 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
2813 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
2814 async { reload_perl }; 3582 reload_perl;
3583 };
2815 } 3584 }
2816}; 3585};
2817 3586
2818unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
2819 3588
2838 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3609 $signal->wait;
2841} 3610}
2842 3611
2843 my $min = 1e6;#d# 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer (
2846 reentrant => 0,
2847 parked => 1,
2848 prio => 0,
2849 at => $NEXT_TICK || $TICK,
2850 data => WF_AUTOCANCEL,
2851 cb => sub {
2852 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2854 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
2855 return; 3616 return;
2856 } 3617 }
2857 3618
2858 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
2859 3620
2860 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
2861 3622
2862 0 && sync_job {#d# 3623 $RUNTIME += $TICK;
2863 for(1..10) { 3624 $NEXT_TICK = $_[0]->at;
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867 3625
2868 $map->width (50); 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2869 $map->height (50); 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2870 $map->alloc; 3628 Coro::async_pool {
2871 $map->_load_objects ("/tmp/x.map", 1); 3629 $Coro::current->{desc} = "runtime saver";
2872 my $t = Event::time - $t; 3630 write_runtime
2873 3631 or warn "ERROR: unable to write runtime file: $!";
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 }; 3632 };
3633 }
2884 3634
2885 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK;
2887
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10;
2890 Coro::async_pool {
2891 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!";
2893 };
2894 }
2895
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3636 $sig->send;
2901 } 3637 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3639 $sig->send;
2904 } 3640 }
2905 3641
2906 $NOW = Event::time;
2907
2908 # if we are delayed by four ticks or more, skip them all
2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2910
2911 $TICK_WATCHER->at ($NEXT_TICK);
2912 $TICK_WATCHER->start;
2913
2914 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3644
2917 _post_tick; 3645 _post_tick;
2918 3646};
2919 3647$TICK_WATCHER->priority (EV::MAXPRI);
2920 },
2921);
2922 3648
2923{ 3649{
2924 BDB::max_poll_time $TICK * 0.1; 3650 # configure BDB
2925 $BDB_POLL_WATCHER = Event->io ( 3651
2926 reentrant => 0,
2927 fd => BDB::poll_fileno,
2928 poll => 'r',
2929 prio => 0,
2930 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb,
2932 );
2933 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
2934 3653 BDB::max_poll_reqs $TICK * 0.1;
2935 BDB::set_sync_prepare { 3654 $Coro::BDB::WATCHER->priority (1);
2936 my $status;
2937 my $current = $Coro::current;
2938 (
2939 sub {
2940 $status = $!;
2941 $current->ready; undef $current;
2942 },
2943 sub {
2944 Coro::schedule while defined $current;
2945 $! = $status;
2946 },
2947 )
2948 };
2949 3655
2950 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
2951 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3659 | BDB::LOG_AUTOREMOVE, 1);
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2952 3662
2953 cf::sync_job { 3663 cf::sync_job {
2954 eval { 3664 eval {
2955 BDB::db_env_open 3665 BDB::db_env_open
2956 $DB_ENV, 3666 $DB_ENV,
2958 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3668 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3669 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3670 0666;
2961 3671
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3672 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3673 };
2967 3674
2968 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3676 };
2970 } 3677 }
3678
3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3680 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3681 };
3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3684 };
3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3687 };
2971} 3688}
2972 3689
2973{ 3690{
3691 # configure IO::AIO
3692
2974 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
2975
2976 undef $Coro::AIO::WATCHER;
2977 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
2978 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
2979 reentrant => 0,
2980 data => WF_AUTOCANCEL,
2981 fd => IO::AIO::poll_fileno,
2982 poll => 'r',
2983 prio => 6,
2984 cb => \&IO::AIO::poll_cb,
2985 );
2986} 3696}
2987 3697
2988my $_log_backtrace; 3698my $_log_backtrace;
2989 3699
2990sub _log_backtrace { 3700sub _log_backtrace {
2994 3704
2995 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace; 3707 ++$_log_backtrace;
2998 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
2999 my @bt = fork_call { 3711 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3714 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3003 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines