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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.376 by root, Mon Oct 1 00:44:44 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
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::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
320 my $guard = Coro::guard { 334 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
339}
340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
325} 397}
326 398
327=item cf::async { BLOCK } 399=item cf::async { BLOCK }
328 400
329Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
363 435
364 my $busy = 1; 436 my $busy = 1;
365 my @res; 437 my @res;
366 438
367 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 441 @res = eval { $job->() };
369 warn $@ if $@; 442 warn $@ if $@;
370 undef $busy; 443 undef $busy;
371 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
372 445
416Coro::Storable. May, of course, block. Note that the executed sub may 489Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 490never block itself or use any form of Event handling.
418 491
419=cut 492=cut
420 493
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 494sub fork_call(&@) {
431 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
432 496
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 497 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 498 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 499 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 500
438 if (my $pid = fork) { 501 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 502 reset_signals;
452 local $SIG{__WARN__}; 503 &$cb
453 local $SIG{__DIE__}; 504 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 505
460 eval { 506 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 507}
473 508
474=item $value = cf::db_get $family => $key 509=item $value = cf::db_get $family => $key
475 510
476Returns a single value from the environment database. 511Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
479 514
480Stores the given C<$value> in the family. It can currently store binary 515Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
483=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
484 541
485our $DB; 542our $DB;
486 543
487sub db_init { 544sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 545 cf::sync_job {
492 eval { 546 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 547 };
502} 548}
503 549
504sub db_get($$) { 550sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
506 552
556 if (1) { 602 if (1) {
557 $md5 = 603 $md5 =
558 join "\x00", 604 join "\x00",
559 $processversion, 605 $processversion,
560 map { 606 map {
561 Coro::cede; 607 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 609 } 0.. $#$src;
564 610
565 611
566 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
985sub object_freezer_save { 1031sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
987 1033
988 sync_job { 1034 sync_job {
989 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
992 1039
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
1015 } 1062 }
1016 } else { 1063 } else {
1017 aio_unlink $filename; 1064 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1019 } 1066 }
1020 } 1067 };
1021} 1068}
1022 1069
1023sub object_freezer_as_string { 1070sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1025 1072
1037 or return; 1084 or return;
1038 1085
1039 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1088 or return;
1089
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1043 } 1091 }
1044 1092
1093 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1047 return ($data, $av); 1097 ($data, $av)
1048} 1098}
1049 1099
1050=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1051 1101
1052=over 4 1102=over 4
1125 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
1126 1176
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1178
1129 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1135 } else { 1194 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1196 }
1138 1197
1139 cf::override; 1198 cf::override;
1229 1288
1230=head3 cf::player 1289=head3 cf::player
1231 1290
1232=over 4 1291=over 4
1233 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1234=item cf::player::find $login 1307=item cf::player::find $login
1235 1308
1236Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1237 1310
1238=cut 1311=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1350
1278 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1281 } 1359 }
1282 } 1360 }
1283} 1361}
1284 1362
1294 1372
1295 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1297 1375
1298 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1299 Coro::cede; 1377 cf::cede_to_tick;
1300} 1378}
1301 1379
1302sub new($) { 1380sub new($) {
1303 my ($login) = @_; 1381 my ($login) = @_;
1304 1382
1308 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1309 1387
1310 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1311 1389
1312 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1313} 1401}
1314 1402
1315=item $pl->quit_character 1403=item $pl->quit_character
1316 1404
1317Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1460 or return [];
1373 1461
1374 my @logins; 1462 my @logins;
1375 1463
1376 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1380 1473
1381 utf8::decode $login; 1474 utf8::decode $login;
1382 push @logins, $login; 1475 push @logins, $login;
1383 } 1476 }
1384 1477
1422sub expand_cfpod { 1515sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1424 1517
1425 # escape & and < 1518 # escape & and <
1426 s/&/&amp;/g; 1519 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1428 1521
1429 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1430 1523
1431 1 while 1524 1 while
1432 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1530 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1439 }ge 1533 }ge
1440 # replace H<hint text> 1534 # replace H<hint text>
1461sub hintmode { 1555sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1557 $_[0]{hintmode}
1464} 1558}
1465 1559
1466=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1467 1561
1468Sends an ext reply to the player. 1562Sends an ext reply to the player.
1469 1563
1470=cut 1564=cut
1471 1565
1472sub ext_reply($$%) { 1566sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1474 1568
1475 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1570}
1478 1571
1479=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1480 1573
1481Sends an ext event to the client. 1574Sends an ext event to the client.
1482 1575
1483=cut 1576=cut
1484 1577
1485sub ext_event($$%) { 1578sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1487 1580
1488 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1489} 1582}
1490 1583
1491=head3 cf::region 1584=head3 cf::region
1492 1585
1493=over 4 1586=over 4
1709 1802
1710sub load_header_from($) { 1803sub load_header_from($) {
1711 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1712 1805
1713 utf8::encode $path; 1806 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1719 1815
1720 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1721 1817
1722 1 1818 1
1723} 1819}
1777sub find { 1873sub find {
1778 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1779 1875
1780 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1781 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1783 1880
1784 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1786 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1787 or return; 1886 or return;
1788 1887
1789 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1790 1889
1792 or return; 1891 or return;
1793 1892
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1797 $map->reset; 1898 $map->reset;
1798 undef $guard;
1799 return find $path; 1899 return find $path;
1800 } 1900 }
1801 1901
1802 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1803 } 1903 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1813 1913
1814 my $path = $self->{path}; 1914 my $path = $self->{path};
1815 1915
1816 { 1916 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1818 1918
1919 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1921
1821 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1822 1923
1823 $self->alloc; 1924 $self->alloc;
1824 1925
1825 $self->pre_load; 1926 $self->pre_load;
1826 Coro::cede; 1927 cf::cede_to_tick;
1827 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1829 or return; 1932 or return;
1830 1933
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1833 1936
1834 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1938 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1941 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1839 } 1945 }
1840 } 1946 }
1841 1947
1842 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1843 # now do the right thing for maps 1951 # now do the right thing for maps
1844 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1954 unless $self->difficulty;
1847 Coro::cede; 1955 cf::cede_to_tick;
1848 1956
1849 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1958 $self->decay_objects;
1851 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1852 $self->update_buttons; 1960 $self->update_buttons;
1853 Coro::cede; 1961 cf::cede_to_tick;
1854 $self->set_darkness_map; 1962 $self->set_darkness_map;
1855 Coro::cede; 1963 cf::cede_to_tick;
1856 $self->activate; 1964 $self->activate;
1857 } 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1858 1969
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1971 }
1861 1972
1862 $self->post_load; 1973 $self->post_load;
1873 1984
1874 $self 1985 $self
1875} 1986}
1876 1987
1877# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1989sub load_neighbours {
1879 my ($map) = @_; 1990 my ($map) = @_;
1880 1991
1881 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1882 1993
1883 for (0 .. 3) { 1994 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1885 or next; 1996 or next;
1886 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1887 or next; 1998 or next;
1888 $neigh->load; 1999 $neigh->load;
1889 2000
2001 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2004 }
1893 2005
1894 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1896 or next; 2009 or next;
1897 $neigh->load; 2010 $neigh->load;
1898 } 2011 }
1899} 2012}
1900 2013
1905} 2018}
1906 2019
1907sub do_load_sync { 2020sub do_load_sync {
1908 my ($map) = @_; 2021 my ($map) = @_;
1909 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1910 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1911} 2027}
1912 2028
1913our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1915 2031
1916sub find_async { 2032sub find_async {
1917 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1918 2034
1919 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1920 2036
1921 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2039 }
1924 2040
1925 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1926 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1927 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2048 if (my $map = find $k) {
1930 $map->load; 2049 $map->load if $v;
1931 } 2050 }
1932 2051
1933 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1934 } 2053 }
1935 } 2054 }
1936 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1937 }; 2056 };
1938 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1941} 2060}
1942 2061
1943sub save { 2062sub save {
1944 my ($self) = @_; 2063 my ($self) = @_;
1945 2064
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2066
1948 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1949 2068
1950 return unless $self->dirty; 2069 return unless $self->dirty;
1951 2070
1957 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1958 2077
1959 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1960 2079
1961 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1963 }; 2083 };
1964 2084
1965 if ($uniq) { 2085 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2094 my ($self) = @_;
1975 2095
1976 # save first because save cedes 2096 # save first because save cedes
1977 $self->save; 2097 $self->save;
1978 2098
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2100
1981 return if $self->players; 2101 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1984 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2109 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2110}
1988 2111
1989sub reset_at { 2112sub reset_at {
1990 my ($self) = @_; 2113 my ($self) = @_;
1991 2114
2023 if $uniq; 2146 if $uniq;
2024 } 2147 }
2025 2148
2026 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2027 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2153 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2154
2032 $self->unlink_save; 2155 $self->unlink_save;
2033 $self->destroy; 2156 $self->destroy;
2034} 2157}
2035 2158
2036my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2037 2160
2038sub nuke { 2161sub nuke {
2039 my ($self) = @_; 2162 my ($self) = @_;
2040 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2041 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2042 2168
2043 $self->unlink_save; 2169 $self->unlink_save;
2044 2170
2045 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2176
2051 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2052 2179
2053 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2054} 2181}
2055 2182
2056=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
2132 2259
2133sub inv_recursive { 2260sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2135} 2262}
2136 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2137package cf; 2295package cf;
2138 2296
2139=back 2297=back
2140 2298
2141=head3 cf::object::player 2299=head3 cf::object::player
2163 2321
2164 } else { 2322 } else {
2165 my $pl = $self->contr; 2323 my $pl = $self->contr;
2166 2324
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2325 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2326 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2328
2176 } else { 2329 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2330 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2331 $self->message ($msg, $flags);
2179 } 2332 }
2180 } 2333 }
2334}
2335
2336=item $object->send_msg ($channel, $msg, $color, [extra...])
2337
2338=cut
2339
2340sub cf::object::send_msg {
2341 my $pl = shift->contr
2342 or return;
2343 $pl->send_msg (@_);
2181} 2344}
2182 2345
2183=item $player_object->may ("access") 2346=item $player_object->may ("access")
2184 2347
2185Returns wether the given player is authorized to access resource "access" 2348Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2427 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2428 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2429 if $x <=0 && $y <= 0;
2267 2430
2268 $map->load; 2431 $map->load;
2269 $map->load_diag; 2432 $map->load_neighbours;
2270 2433
2271 return unless $self->contr->active; 2434 return unless $self->contr->active;
2272 $self->activate_recursive; 2435 $self->activate_recursive;
2273 2436
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2458
2296 $self->enter_link; 2459 $self->enter_link;
2297 2460
2298 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2299 my $map = eval { 2483 my $map = eval {
2300 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2301 2485
2302 if ($map) { 2486 if ($map) {
2303 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2305 } else { 2489 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2491 }
2308 2492
2309 $map 2493 $map
2310 }; 2494 };
2311 2495
2401 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2404 2588
2405 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2406 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2593 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2409 2595
2410 1; 2596 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2631the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2447 2633
2448=cut 2634=cut
2449 2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "infobox",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "infobox",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2655);
2656
2450sub cf::client::send_msg { 2657sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2659
2453 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2454 2661
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2458 2663
2664 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2459 if (ref $channel) { 2673 } elsif (ref $channel) {
2460 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2677 $self->ext_msg (channel_info => $channel)
2678 if $self->can_msg;
2464 } 2679 }
2465 2680
2466 $channel = $channel->{id}; 2681 $channel = $channel->{id};
2467 } 2682 }
2468 2683
2684 return unless @extra || length $msg;
2685
2469 if ($self->can_msg) { 2686 if ($self->can_msg) {
2687 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF;
2690
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2691 $self->send_packet ("msg " . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2693 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704
2705 $color &= cf::NDI_COLOR_MASK;
2706
2707 utf8::encode $msg;
2708
2483 if (0 && $msg =~ /\[/) { 2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2712 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2714 $self->send_packet ("drawinfo $color $msg")
2488 } 2715 }
2489 } 2716 }
2490 } 2717 }
2491} 2718}
2492 2719
2493=item $client->ext_event ($type, %msg) 2720=item $client->ext_msg ($type, @msg)
2494 2721
2495Sends an ext event to the client. 2722Sends an ext event to the client.
2496 2723
2497=cut 2724=cut
2498 2725
2499sub cf::client::ext_event($$%) { 2726sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2727 my ($self, $type, @msg) = @_;
2501 2728
2502 return unless $self->extcmd; 2729 if ($self->extcmd == 2) {
2503 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2732 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 }
2735}
2736
2737=item $client->ext_reply ($msgid, @msg)
2738
2739Sends an ext reply to the client.
2740
2741=cut
2742
2743sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_;
2745
2746 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 }
2506} 2753}
2507 2754
2508=item $success = $client->query ($flags, "text", \&cb) 2755=item $success = $client->query ($flags, "text", \&cb)
2509 2756
2510Queues a query to the client, calling the given callback with 2757Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2812 my ($ns, $buf) = @_;
2566 2813
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2814 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2815
2569 if (ref $msg) { 2816 if (ref $msg) {
2817 my ($type, $reply, @payload) =
2818 "ARRAY" eq ref $msg
2819 ? @$msg
2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2821
2822 my @reply;
2823
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2824 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2825 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2826 }
2827
2828 $ns->ext_reply ($reply, @reply)
2829 if $reply;
2830
2576 } else { 2831 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2832 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2833 }
2579 2834
2580 cf::override; 2835 cf::override;
2627our $safe = new Safe "safe"; 2882our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2883our $safe_hole = new Safe::Hole;
2629 2884
2630$SIG{FPE} = 'IGNORE'; 2885$SIG{FPE} = 'IGNORE';
2631 2886
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2887$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math
2889 grepstart grepwhile mapstart mapwhile
2890 sort time
2891));
2633 2892
2634# here we export the classes and methods available to script code 2893# here we export the classes and methods available to script code
2635 2894
2636=pod 2895=pod
2637 2896
2638The following functions and methods are available within a safe environment: 2897The following functions and methods are available within a safe environment:
2639 2898
2640 cf::object 2899 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2900 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2901 insert remove name archname title slaying race decrease_ob_nr
2643 2902
2644 cf::object::player 2903 cf::object::player
2645 player 2904 player
2646 2905
2647 cf::player 2906 cf::player
2652 2911
2653=cut 2912=cut
2654 2913
2655for ( 2914for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race
2657 insert remove)], 2917 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2918 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2919 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2920 ["cf::map" => qw(trigger)],
2661) { 2921) {
2662 no strict 'refs'; 2922 no strict 'refs';
2738# the server's init and main functions 2998# the server's init and main functions
2739 2999
2740sub load_facedata($) { 3000sub load_facedata($) {
2741 my ($path) = @_; 3001 my ($path) = @_;
2742 3002
3003 # HACK to clear player env face cache, we need some signal framework
3004 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = ();
3006
3007 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3008
2743 warn "loading facedata from $path\n"; 3009 warn "loading facedata from $path\n";
2744 3010
2745 my $facedata; 3011 my $facedata;
2746 0 < aio_load $path, $facedata 3012 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3013 or die "$path: $!";
2748 3014
2749 $facedata = Coro::Storable::thaw $facedata; 3015 $facedata = Coro::Storable::thaw $facedata;
2750 3016
2751 $facedata->{version} == 2 3017 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3018 or cf::cleanup "$path: version mismatch, cannot proceed.";
3019
3020 # patch in the exptable
3021 $facedata->{resource}{"res/exp_table"} = {
3022 type => FT_RSRC,
3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3024 };
3025 cf::cede_to_tick;
2753 3026
2754 { 3027 {
2755 my $faces = $facedata->{faceinfo}; 3028 my $faces = $facedata->{faceinfo};
2756 3029
2757 while (my ($face, $info) = each %$faces) { 3030 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3031 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 3032 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3033 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3036
2764 cf::cede_to_tick; 3037 cf::cede_to_tick;
2765 } 3038 }
2766 3039
2767 while (my ($face, $info) = each %$faces) { 3040 while (my ($face, $info) = each %$faces) {
2792 3065
2793 { 3066 {
2794 # TODO: for gcfclient pleasure, we should give resources 3067 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3068 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3069 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3070
3071 my $soundconf = delete $res->{"res/sound.conf"};
2798 3072
2799 while (my ($name, $info) = each %$res) { 3073 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3074 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
2807 3076
2808 if ($name =~ /\.jpg$/) { 3077 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3078 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3079
3080 my $meta = $enc->encode ({
3081 name => $name,
3082 %{ $info->{meta} || {} },
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3086 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3087 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3088 }
2818 3089
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
2819 cf::cede_to_tick; 3093 cf::cede_to_tick;
2820 } 3094 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
2821 } 3113 }
2822 3114
2823 1 3115 1
2824} 3116}
2825 3117
3118register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_;
3120
3121 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v);
3123 }
3124};
3125
2826sub reload_regions { 3126sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = ();
3130
2827 load_resource_file "$MAPDIR/regions" 3131 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3132 or die "unable to load regions file\n";
2829 3133
2830 for (cf::region::list) { 3134 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3135 $_->{match} = qr/$_->{match}/
2867 3171
2868sub init { 3172sub init {
2869 reload_resources; 3173 reload_resources;
2870} 3174}
2871 3175
2872sub cfg_load { 3176sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3177 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3178 or return;
2875 3179
2876 local $/; 3180 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3181 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3197sub main {
2894 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
2898 Event::one_event; 3203 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
2900 }; 3205 };
2901 3206
2902 cfg_load; 3207 reload_config;
2903 db_init; 3208 db_init;
2904 load_extensions; 3209 load_extensions;
2905 3210
2906 $TICK_WATCHER->start; 3211 $TICK_WATCHER->start;
2907 Event::loop; 3212 Event::loop;
3100 warn "reloading cf.pm"; 3405 warn "reloading cf.pm";
3101 require cf; 3406 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3408
3104 warn "loading config and database again"; 3409 warn "loading config and database again";
3105 cf::cfg_load; 3410 cf::reload_config;
3106 3411
3107 warn "loading extensions"; 3412 warn "loading extensions";
3108 cf::load_extensions; 3413 cf::load_extensions;
3109 3414
3110 warn "reattaching attachments to objects/players"; 3415 warn "reattaching attachments to objects/players";
3146register_command "reload" => sub { 3451register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3148 3453
3149 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3458 reload_perl;
3459 };
3152 } 3460 }
3153}; 3461};
3154 3462
3155unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3156 3464
3175 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3485 $signal->wait;
3178} 3486}
3179 3487
3180 my $min = 1e6;#d#
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3183 reentrant => 0, 3489 reentrant => 0,
3184 parked => 1, 3490 parked => 1,
3185 prio => 0, 3491 prio => 0,
3186 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
3194 3500
3195 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3196 3502
3197 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3198 3504
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
3221
3222 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3224 3507
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3228 write_runtime 3512 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3230 }; 3514 };
3231 } 3515 }
3232 3516
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3518 $sig->send;
3238 } 3519 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3521 $sig->send;
3250 3531
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3534
3254 _post_tick; 3535 _post_tick;
3255
3256
3257 }, 3536 },
3258); 3537);
3259 3538
3260{ 3539{
3540 BDB::min_parallel 8;
3261 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3262 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3263 reentrant => 0, 3543 reentrant => 0,
3264 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3265 poll => 'r', 3545 poll => 'r',
3266 prio => 0, 3546 prio => 0,
3267 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3269 ); 3549 );
3270 BDB::min_parallel 8;
3271 3550
3272 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3273 my $status; 3552 my $status;
3274 my $current = $Coro::current; 3553 my $current = $Coro::current;
3275 ( 3554 (
3284 ) 3563 )
3285 }; 3564 };
3286 3565
3287 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3572
3290 cf::sync_job { 3573 cf::sync_job {
3291 eval { 3574 eval {
3292 BDB::db_env_open 3575 BDB::db_env_open
3293 $DB_ENV, 3576 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3580 0666;
3298 3581
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3583 };
3304 3584
3305 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3586 };
3307 } 3587 }
3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 );
3609 $BDB_TRICKLE_WATCHER = Event->timer (
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 );
3308} 3619}
3309 3620
3310{ 3621{
3311 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3312 3623
3315 $AIO_POLL_WATCHER = Event->io ( 3626 $AIO_POLL_WATCHER = Event->io (
3316 reentrant => 0, 3627 reentrant => 0,
3317 data => WF_AUTOCANCEL, 3628 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno, 3629 fd => IO::AIO::poll_fileno,
3319 poll => 'r', 3630 poll => 'r',
3320 prio => 6, 3631 prio => 0,
3321 cb => \&IO::AIO::poll_cb, 3632 cb => \&IO::AIO::poll_cb,
3322 ); 3633 );
3323} 3634}
3324 3635
3325my $_log_backtrace; 3636my $_log_backtrace;
3331 3642
3332 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3645 ++$_log_backtrace;
3335 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3336 my @bt = fork_call { 3649 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines