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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 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
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
332 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
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
337our @SLOT_QUEUE; 354our @SLOT_QUEUE;
338our $SLOT_QUEUE; 355our $SLOT_QUEUE;
339 356
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
342 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
343 362
344 while () { 363 while () {
345 next_job: 364 next_job:
346 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
363 Coro::schedule; 382 Coro::schedule;
364 } 383 }
365 } 384 }
366}; 385};
367 386
368sub get_slot($;$) { 387sub get_slot($;$$) {
369 my ($time, $pri) = @_; 388 my ($time, $pri, $name) = @_;
370 389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 395 $SLOT_QUEUE->ready;
374 $sig->wait; 396 $sig->wait;
375} 397}
376 398
405 my $time = Event::time; 427 my $time = Event::time;
406 428
407 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
409 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
410 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 435 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
413 437
414 my $busy = 1; 438 my $busy = 1;
415 my @res; 439 my @res;
416 440
417 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 443 @res = eval { $job->() };
419 warn $@ if $@; 444 warn $@ if $@;
420 undef $busy; 445 undef $busy;
421 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
422 447
466Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
468 493
469=cut 494=cut
470 495
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 496sub fork_call(&@) {
481 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
482 498
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 502
488 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 504 reset_signals;
502 local $SIG{__WARN__}; 505 &$cb
503 local $SIG{__DIE__}; 506 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 507
510 eval { 508 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 509}
523 510
524=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
525 512
526Returns a single value from the environment database. 513Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
529 516
530Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
533=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
534 543
535our $DB; 544our $DB;
536 545
537sub db_init { 546sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 547 cf::sync_job {
542 eval { 548 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 549 };
552} 550}
553 551
554sub db_get($$) { 552sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
556 554
606 if (1) { 604 if (1) {
607 $md5 = 605 $md5 =
608 join "\x00", 606 join "\x00",
609 $processversion, 607 $processversion,
610 map { 608 map {
611 Coro::cede; 609 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 611 } 0.. $#$src;
614 612
615 613
616 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
1035sub object_freezer_save { 1033sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1037 1035
1038 sync_job { 1036 sync_job {
1039 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1042 1041
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1065 } 1064 }
1066 } else { 1065 } else {
1067 aio_unlink $filename; 1066 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1069 } 1068 }
1070 } 1069 };
1071} 1070}
1072 1071
1073sub object_freezer_as_string { 1072sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1075 1074
1087 or return; 1086 or return;
1088 1087
1089 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1090 or return;
1091
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1093 } 1093 }
1094 1094
1095 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1097 $decname, length $data, scalar @{$av || []};
1098
1097 return ($data, $av); 1099 ($data, $av)
1098} 1100}
1099 1101
1100=head2 COMMAND CALLBACKS 1102=head2 COMMAND CALLBACKS
1101 1103
1102=over 4 1104=over 4
1175 my ($pl, $buf) = @_; 1177 my ($pl, $buf) = @_;
1176 1178
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1179 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1180
1179 if (ref $msg) { 1181 if (ref $msg) {
1182 my ($type, $reply, @payload) =
1183 "ARRAY" eq ref $msg
1184 ? @$msg
1185 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1186
1187 my @reply;
1188
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1189 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1190 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1191 }
1192
1193 $pl->ext_reply ($reply, @reply)
1194 if $reply;
1195
1185 } else { 1196 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1197 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1198 }
1188 1199
1189 cf::override; 1200 cf::override;
1279 1290
1280=head3 cf::player 1291=head3 cf::player
1281 1292
1282=over 4 1293=over 4
1283 1294
1295=item cf::player::num_playing
1296
1297Returns the official number of playing players, as per the Crossfire metaserver rules.
1298
1299=cut
1300
1301sub num_playing {
1302 scalar grep
1303 $_->ob->map
1304 && !$_->hidden
1305 && !$_->ob->flag (cf::FLAG_WIZ),
1306 cf::player::list
1307}
1308
1284=item cf::player::find $login 1309=item cf::player::find $login
1285 1310
1286Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1287 1312
1288=cut 1313=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1352
1328 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1354 or return;
1355
1356 my $pl = cf::player::load_pl $f
1357 or return;
1358 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1331 } 1361 }
1332 } 1362 }
1333} 1363}
1334 1364
1344 1374
1345 aio_mkdir playerdir $pl, 0770; 1375 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1376 $pl->{last_save} = $cf::RUNTIME;
1347 1377
1348 $pl->save_pl ($path); 1378 $pl->save_pl ($path);
1349 Coro::cede; 1379 cf::cede_to_tick;
1350} 1380}
1351 1381
1352sub new($) { 1382sub new($) {
1353 my ($login) = @_; 1383 my ($login) = @_;
1354 1384
1358 $self->{deny_save} = 1; 1388 $self->{deny_save} = 1;
1359 1389
1360 $cf::PLAYER{$login} = $self; 1390 $cf::PLAYER{$login} = $self;
1361 1391
1362 $self 1392 $self
1393}
1394
1395=item $player->send_msg ($channel, $msg, $color, [extra...])
1396
1397=cut
1398
1399sub send_msg {
1400 my $ns = shift->ns
1401 or return;
1402 $ns->send_msg (@_);
1363} 1403}
1364 1404
1365=item $pl->quit_character 1405=item $pl->quit_character
1366 1406
1367Nukes the player without looking back. If logged in, the connection will 1407Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1462 or return [];
1423 1463
1424 my @logins; 1464 my @logins;
1425 1465
1426 for my $login (@$dirs) { 1466 for my $login (@$dirs) {
1467 my $path = path $login;
1468
1469 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1430 1475
1431 utf8::decode $login; 1476 utf8::decode $login;
1432 push @logins, $login; 1477 push @logins, $login;
1433 } 1478 }
1434 1479
1472sub expand_cfpod { 1517sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1474 1519
1475 # escape & and < 1520 # escape & and <
1476 s/&/&amp;/g; 1521 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1478 1523
1479 # this is buggy, it needs to properly take care of nested <'s 1524 # this is buggy, it needs to properly take care of nested <'s
1480 1525
1481 1 while 1526 1 while
1482 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1532 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1489 }ge 1535 }ge
1490 # replace H<hint text> 1536 # replace H<hint text>
1511sub hintmode { 1557sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1559 $_[0]{hintmode}
1514} 1560}
1515 1561
1516=item $player->ext_reply ($msgid, %msg) 1562=item $player->ext_reply ($msgid, @msg)
1517 1563
1518Sends an ext reply to the player. 1564Sends an ext reply to the player.
1519 1565
1520=cut 1566=cut
1521 1567
1522sub ext_reply($$%) { 1568sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1569 my ($self, $id, @msg) = @_;
1524 1570
1525 $msg{msgid} = $id; 1571 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1572}
1528 1573
1529=item $player->ext_event ($type, %msg) 1574=item $player->ext_msg ($type, @msg)
1530 1575
1531Sends an ext event to the client. 1576Sends an ext event to the client.
1532 1577
1533=cut 1578=cut
1534 1579
1535sub ext_event($$%) { 1580sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1581 my ($self, $type, @msg) = @_;
1537 1582
1538 $self->ns->ext_event ($type, %msg); 1583 $self->ns->ext_msg ($type, @msg);
1539} 1584}
1540 1585
1541=head3 cf::region 1586=head3 cf::region
1542 1587
1543=over 4 1588=over 4
1759 1804
1760sub load_header_from($) { 1805sub load_header_from($) {
1761 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1762 1807
1763 utf8::encode $path; 1808 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1810 or return;
1811
1812 $self->_load_header ($f)
1813 or return;
1814
1815 local $MAP_LOADING{$self->{path}} = $self;
1816 $f->resolve_delayed_derefs;
1769 1817
1770 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1771 1819
1772 1 1820 1
1773} 1821}
1827sub find { 1875sub find {
1828 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1829 1877
1830 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1831 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1833 1882
1834 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1836 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1837 or return; 1888 or return;
1838 1889
1839 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1840 1891
1842 or return; 1893 or return;
1843 1894
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1847 $map->reset; 1900 $map->reset;
1848 undef $guard;
1849 return find $path; 1901 return find $path;
1850 } 1902 }
1851 1903
1852 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1853 } 1905 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1863 1915
1864 my $path = $self->{path}; 1916 my $path = $self->{path};
1865 1917
1866 { 1918 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1868 1920
1921 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1923
1871 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1872 1925
1873 $self->alloc; 1926 $self->alloc;
1874 1927
1875 $self->pre_load; 1928 $self->pre_load;
1876 Coro::cede; 1929 cf::cede_to_tick;
1877 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1879 or return; 1934 or return;
1880 1935
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1883 1938
1884 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1940 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1943 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1889 } 1947 }
1890 } 1948 }
1891 1949
1892 Coro::cede; 1950 $f->resolve_delayed_derefs;
1951
1952 cf::cede_to_tick;
1893 # now do the right thing for maps 1953 # now do the right thing for maps
1894 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1956 unless $self->difficulty;
1897 Coro::cede; 1957 cf::cede_to_tick;
1898 1958
1899 unless ($self->{deny_activate}) { 1959 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1960 $self->decay_objects;
1901 $self->fix_auto_apply; 1961 $self->fix_auto_apply;
1902 $self->update_buttons; 1962 $self->update_buttons;
1903 Coro::cede; 1963 cf::cede_to_tick;
1904 $self->set_darkness_map; 1964 $self->set_darkness_map;
1905 Coro::cede; 1965 cf::cede_to_tick;
1906 $self->activate; 1966 $self->activate;
1907 } 1967 }
1968
1969 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME);
1908 1971
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1972 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1973 }
1911 1974
1912 $self->post_load; 1975 $self->post_load;
1923 1986
1924 $self 1987 $self
1925} 1988}
1926 1989
1927# find and load all maps in the 3x3 area around a map 1990# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1991sub load_neighbours {
1929 my ($map) = @_; 1992 my ($map) = @_;
1930 1993
1931 my @diag; # diagonal neighbours 1994 my @neigh; # diagonal neighbours
1932 1995
1933 for (0 .. 3) { 1996 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1997 my $neigh = $map->tile_path ($_)
1935 or next; 1998 or next;
1936 $neigh = find $neigh, $map 1999 $neigh = find $neigh, $map
1937 or next; 2000 or next;
1938 $neigh->load; 2001 $neigh->load;
1939 2002
2003 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2004 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2005 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2006 }
1943 2007
1944 for (@diag) { 2008 for (grep defined $_->[0], @neigh) {
2009 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2010 my $neigh = find $path, $origin
1946 or next; 2011 or next;
1947 $neigh->load; 2012 $neigh->load;
1948 } 2013 }
1949} 2014}
1950 2015
1955} 2020}
1956 2021
1957sub do_load_sync { 2022sub do_load_sync {
1958 my ($map) = @_; 2023 my ($map) = @_;
1959 2024
2025 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2026 if $Coro::current == $Coro::main;
2027
1960 cf::sync_job { $map->load }; 2028 cf::sync_job { $map->load };
1961} 2029}
1962 2030
1963our %MAP_PREFETCH; 2031our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2032our $MAP_PREFETCHER = undef;
1965 2033
1966sub find_async { 2034sub find_async {
1967 my ($path, $origin) = @_; 2035 my ($path, $origin, $load) = @_;
1968 2036
1969 $path = normalise $path, $origin && $origin->{path}; 2037 $path = normalise $path, $origin && $origin->{path};
1970 2038
1971 if (my $map = $cf::MAP{$path}) { 2039 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2041 }
1974 2042
1975 undef $MAP_PREFETCH{$path}; 2043 $MAP_PREFETCH{$path} |= $load;
2044
1976 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
1977 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2050 if (my $map = find $k) {
1980 $map->load; 2051 $map->load if $v;
1981 } 2052 }
1982 2053
1983 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1984 } 2055 }
1985 } 2056 }
1986 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1987 }; 2058 };
1988 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1991} 2062}
1992 2063
1993sub save { 2064sub save {
1994 my ($self) = @_; 2065 my ($self) = @_;
1995 2066
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2068
1998 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1999 2070
2000 return unless $self->dirty; 2071 return unless $self->dirty;
2001 2072
2007 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2008 2079
2009 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2010 2081
2011 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2013 }; 2085 };
2014 2086
2015 if ($uniq) { 2087 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2096 my ($self) = @_;
2025 2097
2026 # save first because save cedes 2098 # save first because save cedes
2027 $self->save; 2099 $self->save;
2028 2100
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2102
2031 return if $self->players; 2103 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2034 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2111 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2112}
2038 2113
2039sub reset_at { 2114sub reset_at {
2040 my ($self) = @_; 2115 my ($self) = @_;
2041 2116
2073 if $uniq; 2148 if $uniq;
2074 } 2149 }
2075 2150
2076 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2077 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2155 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2156
2082 $self->unlink_save; 2157 $self->unlink_save;
2083 $self->destroy; 2158 $self->destroy;
2084} 2159}
2085 2160
2086my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2087 2162
2088sub nuke { 2163sub nuke {
2089 my ($self) = @_; 2164 my ($self) = @_;
2090 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2091 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2092 2170
2093 $self->unlink_save; 2171 $self->unlink_save;
2094 2172
2095 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2178
2101 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2102 2181
2103 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2104} 2183}
2105 2184
2106=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
2182 2261
2183sub inv_recursive { 2262sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2185} 2264}
2186 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2281 my ($uuid, $name) = ($1, $2);
2282 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2283 or return;
2284 $pl->ob->uuid eq $uuid
2285 or return;
2286
2287 $pl->ob
2288 } else {
2289 warn "$ref: cannot resolve object reference\n";
2290 undef
2291 }
2292}
2293
2187package cf; 2294package cf;
2188 2295
2189=back 2296=back
2190 2297
2191=head3 cf::object::player 2298=head3 cf::object::player
2213 2320
2214 } else { 2321 } else {
2215 my $pl = $self->contr; 2322 my $pl = $self->contr;
2216 2323
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2324 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2325 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2327
2226 } else { 2328 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2329 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2330 $self->message ($msg, $flags);
2229 } 2331 }
2230 } 2332 }
2333}
2334
2335=item $object->send_msg ($channel, $msg, $color, [extra...])
2336
2337=cut
2338
2339sub cf::object::send_msg {
2340 my $pl = shift->contr
2341 or return;
2342 $pl->send_msg (@_);
2231} 2343}
2232 2344
2233=item $player_object->may ("access") 2345=item $player_object->may ("access")
2234 2346
2235Returns wether the given player is authorized to access resource "access" 2347Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2426 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2427 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2428 if $x <=0 && $y <= 0;
2317 2429
2318 $map->load; 2430 $map->load;
2319 $map->load_diag; 2431 $map->load_neighbours;
2320 2432
2321 return unless $self->contr->active; 2433 return unless $self->contr->active;
2322 $self->activate_recursive; 2434 $self->activate_recursive;
2323 2435
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2457
2346 $self->enter_link; 2458 $self->enter_link;
2347 2459
2348 (async { 2460 (async {
2461 $Coro::current->{desc} = "player::goto $path $x $y";
2462
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2349 my $map = eval { 2482 my $map = eval {
2350 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2351 2484
2352 if ($map) { 2485 if ($map) {
2353 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2355 } else { 2488 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2490 }
2358 2491
2359 $map 2492 $map
2360 }; 2493 };
2361 2494
2451 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2454 2587
2455 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2456 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2592 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2459 2594
2460 1; 2595 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2630the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2631the message unless the client supports the msg packet.
2497 2632
2498=cut 2633=cut
2499 2634
2635our %CHANNEL = (
2636 "c/identify" => {
2637 id => "infobox",
2638 title => "Identify",
2639 reply => undef,
2640 tooltip => "Items recently identified",
2641 },
2642 "c/examine" => {
2643 id => "infobox",
2644 title => "Examine",
2645 reply => undef,
2646 tooltip => "Signs and other items you examined",
2647 },
2648 "c/lookat" => {
2649 id => "infobox",
2650 title => "Look",
2651 reply => undef,
2652 tooltip => "What you saw there",
2653 },
2654);
2655
2500sub cf::client::send_msg { 2656sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2658
2503 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2504 2660
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2662
2663 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2507 if (ref $channel) { 2672 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2512 } 2678 }
2513 2679
2514 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2515 } 2681 }
2516 2682
2517 return unless @extra || length $msg; 2683 return unless @extra || length $msg;
2518 2684
2519 if ($self->can_msg) { 2685 if ($self->can_msg) {
2686 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF;
2689
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2690 $self->send_packet ("msg " . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2692 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703
2704 $color &= cf::NDI_COLOR_MASK;
2705
2706 utf8::encode $msg;
2707
2533 if (0 && $msg =~ /\[/) { 2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2711 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2713 $self->send_packet ("drawinfo $color $msg")
2538 } 2714 }
2539 } 2715 }
2540 } 2716 }
2541} 2717}
2542 2718
2543=item $client->ext_event ($type, %msg) 2719=item $client->ext_msg ($type, @msg)
2544 2720
2545Sends an ext event to the client. 2721Sends an ext event to the client.
2546 2722
2547=cut 2723=cut
2548 2724
2549sub cf::client::ext_event($$%) { 2725sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2726 my ($self, $type, @msg) = @_;
2551 2727
2552 return unless $self->extcmd; 2728 if ($self->extcmd == 2) {
2553 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2731 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 }
2734}
2735
2736=item $client->ext_reply ($msgid, @msg)
2737
2738Sends an ext reply to the client.
2739
2740=cut
2741
2742sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_;
2744
2745 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 }
2556} 2752}
2557 2753
2558=item $success = $client->query ($flags, "text", \&cb) 2754=item $success = $client->query ($flags, "text", \&cb)
2559 2755
2560Queues a query to the client, calling the given callback with 2756Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2811 my ($ns, $buf) = @_;
2616 2812
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2813 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2814
2619 if (ref $msg) { 2815 if (ref $msg) {
2816 my ($type, $reply, @payload) =
2817 "ARRAY" eq ref $msg
2818 ? @$msg
2819 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2820
2821 my @reply;
2822
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2823 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2824 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2825 }
2826
2827 $ns->ext_reply ($reply, @reply)
2828 if $reply;
2829
2626 } else { 2830 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2831 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2832 }
2629 2833
2630 cf::override; 2834 cf::override;
2677our $safe = new Safe "safe"; 2881our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2882our $safe_hole = new Safe::Hole;
2679 2883
2680$SIG{FPE} = 'IGNORE'; 2884$SIG{FPE} = 'IGNORE';
2681 2885
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2886$safe->permit_only (Opcode::opset qw(
2887 :base_core :base_mem :base_orig :base_math
2888 grepstart grepwhile mapstart mapwhile
2889 sort time
2890));
2683 2891
2684# here we export the classes and methods available to script code 2892# here we export the classes and methods available to script code
2685 2893
2686=pod 2894=pod
2687 2895
2688The following functions and methods are available within a safe environment: 2896The following functions and methods are available within a safe environment:
2689 2897
2690 cf::object 2898 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2899 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2900 insert remove name archname title slaying race decrease_ob_nr
2693 2901
2694 cf::object::player 2902 cf::object::player
2695 player 2903 player
2696 2904
2697 cf::player 2905 cf::player
2702 2910
2703=cut 2911=cut
2704 2912
2705for ( 2913for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race
2707 insert remove)], 2916 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2917 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2918 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2919 ["cf::map" => qw(trigger)],
2711) { 2920) {
2712 no strict 'refs'; 2921 no strict 'refs';
2788# the server's init and main functions 2997# the server's init and main functions
2789 2998
2790sub load_facedata($) { 2999sub load_facedata($) {
2791 my ($path) = @_; 3000 my ($path) = @_;
2792 3001
3002 # HACK to clear player env face cache, we need some signal framework
3003 # for this (global event?)
3004 %ext::player_env::MUSIC_FACE_CACHE = ();
3005
3006 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3007
2793 warn "loading facedata from $path\n"; 3008 warn "loading facedata from $path\n";
2794 3009
2795 my $facedata; 3010 my $facedata;
2796 0 < aio_load $path, $facedata 3011 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3012 or die "$path: $!";
2798 3013
2799 $facedata = Coro::Storable::thaw $facedata; 3014 $facedata = Coro::Storable::thaw $facedata;
2800 3015
2801 $facedata->{version} == 2 3016 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3017 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018
3019 # patch in the exptable
3020 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3023 };
3024 cf::cede_to_tick;
2803 3025
2804 { 3026 {
2805 my $faces = $facedata->{faceinfo}; 3027 my $faces = $facedata->{faceinfo};
2806 3028
2807 while (my ($face, $info) = each %$faces) { 3029 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3030 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3031 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3032 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3035
2814 cf::cede_to_tick; 3036 cf::cede_to_tick;
2815 } 3037 }
2816 3038
2817 while (my ($face, $info) = each %$faces) { 3039 while (my ($face, $info) = each %$faces) {
2842 3064
2843 { 3065 {
2844 # TODO: for gcfclient pleasure, we should give resources 3066 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3067 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3068 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3069
3070 my $soundconf = delete $res->{"res/sound.conf"};
2848 3071
2849 while (my ($name, $info) = each %$res) { 3072 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3073 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
2857 3075
2858 if ($name =~ /\.jpg$/) { 3076 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3077 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
3084 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3085 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3086 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3087 }
2868 3088
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
2869 cf::cede_to_tick; 3092 cf::cede_to_tick;
2870 } 3093 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
2871 } 3112 }
2872 3113
2873 1 3114 1
2874} 3115}
2875 3116
3117register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_;
3119
3120 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v);
3122 }
3123};
3124
2876sub reload_regions { 3125sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
2877 load_resource_file "$MAPDIR/regions" 3130 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3131 or die "unable to load regions file\n";
2879 3132
2880 for (cf::region::list) { 3133 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3134 $_->{match} = qr/$_->{match}/
2917 3170
2918sub init { 3171sub init {
2919 reload_resources; 3172 reload_resources;
2920} 3173}
2921 3174
2922sub cfg_load { 3175sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3176 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3177 or return;
2925 3178
2926 local $/; 3179 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3180 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3196sub main {
2944 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3202 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
2950 }; 3204 };
2951 3205
2952 cfg_load; 3206 reload_config;
2953 db_init; 3207 db_init;
2954 load_extensions; 3208 load_extensions;
2955 3209
2956 $TICK_WATCHER->start; 3210 $TICK_WATCHER->start;
2957 Event::loop; 3211 Event::loop;
3150 warn "reloading cf.pm"; 3404 warn "reloading cf.pm";
3151 require cf; 3405 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3407
3154 warn "loading config and database again"; 3408 warn "loading config and database again";
3155 cf::cfg_load; 3409 cf::reload_config;
3156 3410
3157 warn "loading extensions"; 3411 warn "loading extensions";
3158 cf::load_extensions; 3412 cf::load_extensions;
3159 3413
3160 warn "reattaching attachments to objects/players"; 3414 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3450register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3198 3452
3199 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3457 reload_perl;
3458 };
3202 } 3459 }
3203}; 3460};
3204 3461
3205unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3206 3463
3225 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3484 $signal->wait;
3228} 3485}
3229 3486
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3488 reentrant => 0,
3234 parked => 1, 3489 parked => 1,
3235 prio => 0, 3490 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
3244 3499
3245 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3246 3501
3247 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3248 3503
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3504 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3274 3506
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3511 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3513 };
3281 } 3514 }
3282 3515
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3517 $sig->send;
3288 } 3518 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3520 $sig->send;
3300 3530
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3533
3304 _post_tick; 3534 _post_tick;
3305
3306
3307 }, 3535 },
3308); 3536);
3309 3537
3310{ 3538{
3539 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3542 reentrant => 0,
3314 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3315 poll => 'r', 3544 poll => 'r',
3316 prio => 0, 3545 prio => 0,
3317 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3319 ); 3548 );
3320 BDB::min_parallel 8;
3321 3549
3322 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3323 my $status; 3551 my $status;
3324 my $current = $Coro::current; 3552 my $current = $Coro::current;
3325 ( 3553 (
3334 ) 3562 )
3335 }; 3563 };
3336 3564
3337 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3566 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1);
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3571
3340 cf::sync_job { 3572 cf::sync_job {
3341 eval { 3573 eval {
3342 BDB::db_env_open 3574 BDB::db_env_open
3343 $DB_ENV, 3575 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3579 0666;
3348 3580
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3582 };
3354 3583
3355 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3585 };
3357 } 3586 }
3587
3588 $BDB_DEADLOCK_WATCHER = Event->timer (
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 );
3598 $BDB_CHECKPOINT_WATCHER = Event->timer (
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 );
3608 $BDB_TRICKLE_WATCHER = Event->timer (
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 );
3358} 3618}
3359 3619
3360{ 3620{
3361 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3362 3622
3365 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3626 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3629 poll => 'r',
3370 prio => 6, 3630 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3372 ); 3632 );
3373} 3633}
3374 3634
3375my $_log_backtrace; 3635my $_log_backtrace;
3381 3641
3382 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3644 ++$_log_backtrace;
3385 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3386 my @bt = fork_call { 3648 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3651 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines