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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines