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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $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;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock 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
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return 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.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 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#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
… …
478sub fork_call(&@) { 496sub fork_call(&@) {
479 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
480 498
481 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
484 502
485 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
486 reset_signals; 504 reset_signals;
487 &$cb 505 &$cb
488 }, @args; 506 }, @args;
… …
497=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
498 516
499Stores 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
500data 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).
501 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
502=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}
503 543
504our $DB; 544our $DB;
505 545
506sub db_init { 546sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 547 cf::sync_job {
511 eval { 548 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 549 };
521} 550}
522 551
523sub db_get($$) { 552sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
525 554
… …
575 if (1) { 604 if (1) {
576 $md5 = 605 $md5 =
577 join "\x00", 606 join "\x00",
578 $processversion, 607 $processversion,
579 map { 608 map {
580 Coro::cede; 609 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 611 } 0.. $#$src;
583 612
584 613
585 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1033sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1006 1035
1007 sync_job { 1036 sync_job {
1008 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1011 1041
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1064 }
1035 } else { 1065 } else {
1036 aio_unlink $filename; 1066 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1038 } 1068 }
1039 } 1069 };
1040} 1070}
1041 1071
1042sub object_freezer_as_string { 1072sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1044 1074
… …
1056 or return; 1086 or return;
1057 1087
1058 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1090 or return;
1091
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1093 }
1063 1094
1095 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1097 $decname, length $data, scalar @{$av || []};
1098
1066 return ($data, $av); 1099 ($data, $av)
1067} 1100}
1068 1101
1069=head2 COMMAND CALLBACKS 1102=head2 COMMAND CALLBACKS
1070 1103
1071=over 4 1104=over 4
… …
1257 1290
1258=head3 cf::player 1291=head3 cf::player
1259 1292
1260=over 4 1293=over 4
1261 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
1262=item cf::player::find $login 1309=item cf::player::find $login
1263 1310
1264Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1265 1312
1266=cut 1313=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1352
1306 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1309 } 1361 }
1310 } 1362 }
1311} 1363}
1312 1364
… …
1322 1374
1323 aio_mkdir playerdir $pl, 0770; 1375 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1376 $pl->{last_save} = $cf::RUNTIME;
1325 1377
1326 $pl->save_pl ($path); 1378 $pl->save_pl ($path);
1327 Coro::cede; 1379 cf::cede_to_tick;
1328} 1380}
1329 1381
1330sub new($) { 1382sub new($) {
1331 my ($login) = @_; 1383 my ($login) = @_;
1332 1384
… …
1410 or return []; 1462 or return [];
1411 1463
1412 my @logins; 1464 my @logins;
1413 1465
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1418 1475
1419 utf8::decode $login; 1476 utf8::decode $login;
1420 push @logins, $login; 1477 push @logins, $login;
1421 } 1478 }
1422 1479
… …
1460sub expand_cfpod { 1517sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1462 1519
1463 # escape & and < 1520 # escape & and <
1464 s/&/&amp;/g; 1521 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1466 1523
1467 # 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
1468 1525
1469 1 while 1526 1 while
1470 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1532 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1477 }ge 1535 }ge
1478 # replace H<hint text> 1536 # replace H<hint text>
… …
1746 1804
1747sub load_header_from($) { 1805sub load_header_from($) {
1748 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1749 1807
1750 utf8::encode $path; 1808 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1817
1757 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1758 1819
1759 1 1820 1
1760} 1821}
… …
1814sub find { 1875sub find {
1815 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1816 1877
1817 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1818 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1820 1882
1821 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1824 or return; 1888 or return;
1825 1889
1826 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1827 1891
… …
1829 or return; 1893 or return;
1830 1894
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1834 $map->reset; 1900 $map->reset;
1835 undef $guard;
1836 return find $path; 1901 return find $path;
1837 } 1902 }
1838 1903
1839 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1840 } 1905 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1850 1915
1851 my $path = $self->{path}; 1916 my $path = $self->{path};
1852 1917
1853 { 1918 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1855 1920
1921 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1923
1858 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1859 1925
1860 $self->alloc; 1926 $self->alloc;
1861 1927
1862 $self->pre_load; 1928 $self->pre_load;
1863 Coro::cede; 1929 cf::cede_to_tick;
1864 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1866 or return; 1934 or return;
1867 1935
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1870 1938
1871 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1940 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1943 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1876 } 1947 }
1877 } 1948 }
1878 1949
1879 Coro::cede; 1950 $f->resolve_delayed_derefs;
1951
1952 cf::cede_to_tick;
1880 # now do the right thing for maps 1953 # now do the right thing for maps
1881 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1956 unless $self->difficulty;
1884 Coro::cede; 1957 cf::cede_to_tick;
1885 1958
1886 unless ($self->{deny_activate}) { 1959 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1960 $self->decay_objects;
1888 $self->fix_auto_apply; 1961 $self->fix_auto_apply;
1889 $self->update_buttons; 1962 $self->update_buttons;
1890 Coro::cede; 1963 cf::cede_to_tick;
1891 $self->set_darkness_map; 1964 $self->set_darkness_map;
1892 Coro::cede; 1965 cf::cede_to_tick;
1893 $self->activate; 1966 $self->activate;
1894 } 1967 }
1895 1968
1896 $self->{last_save} = $cf::RUNTIME; 1969 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1970 $self->last_access ($cf::RUNTIME);
… …
1968 } 2041 }
1969 2042
1970 $MAP_PREFETCH{$path} |= $load; 2043 $MAP_PREFETCH{$path} |= $load;
1971 2044
1972 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
1973 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2050 if (my $map = find $k) {
1976 $map->load if $v; 2051 $map->load if $v;
1977 } 2052 }
… …
1987} 2062}
1988 2063
1989sub save { 2064sub save {
1990 my ($self) = @_; 2065 my ($self) = @_;
1991 2066
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2068
1994 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1995 2070
1996 return unless $self->dirty; 2071 return unless $self->dirty;
1997 2072
… …
2003 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2004 2079
2005 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2006 2081
2007 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2009 }; 2085 };
2010 2086
2011 if ($uniq) { 2087 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2096 my ($self) = @_;
2021 2097
2022 # save first because save cedes 2098 # save first because save cedes
2023 $self->save; 2099 $self->save;
2024 2100
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2102
2027 return if $self->players; 2103 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2030 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2111 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2112}
2034 2113
2035sub reset_at { 2114sub reset_at {
2036 my ($self) = @_; 2115 my ($self) = @_;
2037 2116
… …
2069 if $uniq; 2148 if $uniq;
2070 } 2149 }
2071 2150
2072 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2073 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2155 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2156
2078 $self->unlink_save; 2157 $self->unlink_save;
2079 $self->destroy; 2158 $self->destroy;
2080} 2159}
2081 2160
2082my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2083 2162
2084sub nuke { 2163sub nuke {
2085 my ($self) = @_; 2164 my ($self) = @_;
2086 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2087 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2088 2170
2089 $self->unlink_save; 2171 $self->unlink_save;
2090 2172
2091 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2178
2097 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2098 2181
2099 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2100} 2183}
2101 2184
2102=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
… …
2178 2261
2179sub inv_recursive { 2262sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2181} 2264}
2182 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
2183package cf; 2294package cf;
2184 2295
2185=back 2296=back
2186 2297
2187=head3 cf::object::player 2298=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2457
2347 $self->enter_link; 2458 $self->enter_link;
2348 2459
2349 (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
2350 my $map = eval { 2482 my $map = eval {
2351 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2352 2484
2353 if ($map) { 2485 if ($map) {
2354 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2356 } else { 2488 } else {
2357 $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);
2358 } 2490 }
2359 2491
2360 $map 2492 $map
2361 }; 2493 };
2362 2494
… …
2452 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2455 2587
2456 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2457 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2592 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2460 2594
2461 1; 2595 1;
… …
2496the 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
2497the message unless the client supports the msg packet. 2631the message unless the client supports the msg packet.
2498 2632
2499=cut 2633=cut
2500 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
2501sub cf::client::send_msg { 2656sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2658
2504 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2505 2660
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 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
2508 if (ref $channel) { 2672 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2513 } 2678 }
2514 2679
2515 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2516 } 2681 }
2517 2682
… …
2558=cut 2723=cut
2559 2724
2560sub cf::client::ext_msg($$@) { 2725sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2726 my ($self, $type, @msg) = @_;
2562 2727
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2728 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2730 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2731 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2733 }
2571} 2734}
2572 2735
… …
2579sub cf::client::ext_reply($$@) { 2742sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2743 my ($self, $id, @msg) = @_;
2581 2744
2582 if ($self->extcmd == 2) { 2745 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2747 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2748 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2749 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2751 }
2589} 2752}
… …
2834# the server's init and main functions 2997# the server's init and main functions
2835 2998
2836sub load_facedata($) { 2999sub load_facedata($) {
2837 my ($path) = @_; 3000 my ($path) = @_;
2838 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
2839 my $enc = JSON::XS->new->utf8->canonical; 3006 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3007
2841 warn "loading facedata from $path\n"; 3008 warn "loading facedata from $path\n";
2842 3009
2843 my $facedata; 3010 my $facedata;
2844 0 < aio_load $path, $facedata 3011 0 < aio_load $path, $facedata
… …
2954 $ns->fx_want ($k, $v); 3121 $ns->fx_want ($k, $v);
2955 } 3122 }
2956}; 3123};
2957 3124
2958sub 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
2959 load_resource_file "$MAPDIR/regions" 3130 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3131 or die "unable to load regions file\n";
2961 3132
2962 for (cf::region::list) { 3133 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3134 $_->{match} = qr/$_->{match}/
… …
2999 3170
3000sub init { 3171sub init {
3001 reload_resources; 3172 reload_resources;
3002} 3173}
3003 3174
3004sub cfg_load { 3175sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3176 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3177 or return;
3007 3178
3008 local $/; 3179 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3180 *CFG = YAML::Syck::Load <$fh>;
… …
3025sub main { 3196sub main {
3026 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
3028 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#
3029 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
3030 Event::one_event; 3202 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
3032 }; 3204 };
3033 3205
3034 cfg_load; 3206 reload_config;
3035 db_init; 3207 db_init;
3036 load_extensions; 3208 load_extensions;
3037 3209
3038 $TICK_WATCHER->start; 3210 $TICK_WATCHER->start;
3039 Event::loop; 3211 Event::loop;
… …
3232 warn "reloading cf.pm"; 3404 warn "reloading cf.pm";
3233 require cf; 3405 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3407
3236 warn "loading config and database again"; 3408 warn "loading config and database again";
3237 cf::cfg_load; 3409 cf::reload_config;
3238 3410
3239 warn "loading extensions"; 3411 warn "loading extensions";
3240 cf::load_extensions; 3412 cf::load_extensions;
3241 3413
3242 warn "reattaching attachments to objects/players"; 3414 warn "reattaching attachments to objects/players";
… …
3278register_command "reload" => sub { 3450register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3280 3452
3281 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3457 reload_perl;
3458 };
3284 } 3459 }
3285}; 3460};
3286 3461
3287unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3288 3463
… …
3307 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3484 $signal->wait;
3310} 3485}
3311 3486
3312 my $min = 1e6;#d#
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3315 reentrant => 0, 3488 reentrant => 0,
3316 parked => 1, 3489 parked => 1,
3317 prio => 0, 3490 prio => 0,
3318 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
… …
3326 3499
3327 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3328 3501
3329 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3330 3503
3331 0 && sync_job {#d#
3332 for(1..10) {
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 };
3353
3354 $RUNTIME += $TICK; 3504 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3356 3506
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3360 write_runtime 3511 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3362 }; 3513 };
3363 } 3514 }
3364 3515
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3517 $sig->send;
3370 } 3518 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3520 $sig->send;
… …
3382 3530
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3533
3386 _post_tick; 3534 _post_tick;
3387
3388
3389 }, 3535 },
3390); 3536);
3391 3537
3392{ 3538{
3539 BDB::min_parallel 8;
3393 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3394 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3395 reentrant => 0, 3542 reentrant => 0,
3396 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3397 poll => 'r', 3544 poll => 'r',
3398 prio => 0, 3545 prio => 0,
3399 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3401 ); 3548 );
3402 BDB::min_parallel 8;
3403 3549
3404 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3405 my $status; 3551 my $status;
3406 my $current = $Coro::current; 3552 my $current = $Coro::current;
3407 ( 3553 (
… …
3416 ) 3562 )
3417 }; 3563 };
3418 3564
3419 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3420 $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);
3421 3571
3422 cf::sync_job { 3572 cf::sync_job {
3423 eval { 3573 eval {
3424 BDB::db_env_open 3574 BDB::db_env_open
3425 $DB_ENV, 3575 $DB_ENV,
… …
3427 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
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3579 0666;
3430 3580
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3582 };
3436 3583
3437 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3585 };
3439 } 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 );
3440} 3618}
3441 3619
3442{ 3620{
3443 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3444 3622
… …
3447 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3448 reentrant => 0, 3626 reentrant => 0,
3449 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3451 poll => 'r', 3629 poll => 'r',
3452 prio => 6, 3630 prio => 0,
3453 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3454 ); 3632 );
3455} 3633}
3456 3634
3457my $_log_backtrace; 3635my $_log_backtrace;
… …
3463 3641
3464 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3644 ++$_log_backtrace;
3467 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3468 my @bt = fork_call { 3648 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 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 |"
3472 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines