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.339 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 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;
… …
420 435
421 my $busy = 1; 436 my $busy = 1;
422 my @res; 437 my @res;
423 438
424 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 441 @res = eval { $job->() };
426 warn $@ if $@; 442 warn $@ if $@;
427 undef $busy; 443 undef $busy;
428 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
429 445
… …
478sub fork_call(&@) { 494sub fork_call(&@) {
479 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
480 496
481 # we seemingly have to make a local copy of the whole thing, 497 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 498 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 499 # TODO: investigate and fix (likely this will be rather laborious)
484 500
485 my @res = Coro::Util::fork_eval { 501 my @res = Coro::Util::fork_eval {
486 reset_signals; 502 reset_signals;
487 &$cb 503 &$cb
488 }, @args; 504 }, @args;
… …
497=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
498 514
499Stores the given C<$value> in the family. It can currently store binary 515Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
502=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
503 541
504our $DB; 542our $DB;
505 543
506sub db_init { 544sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 545 cf::sync_job {
511 eval { 546 $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 } 547 };
521} 548}
522 549
523sub db_get($$) { 550sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
525 552
… …
575 if (1) { 602 if (1) {
576 $md5 = 603 $md5 =
577 join "\x00", 604 join "\x00",
578 $processversion, 605 $processversion,
579 map { 606 map {
580 Coro::cede; 607 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 609 } 0.. $#$src;
583 610
584 611
585 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1031sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1006 1033
1007 sync_job { 1034 sync_job {
1008 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1011 1039
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1062 }
1035 } else { 1063 } else {
1036 aio_unlink $filename; 1064 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1038 } 1066 }
1039 } 1067 };
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1056 or return; 1084 or return;
1057 1085
1058 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1088 or return;
1089
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1091 }
1063 1092
1093 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1066 return ($data, $av); 1097 ($data, $av)
1067} 1098}
1068 1099
1069=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1070 1101
1071=over 4 1102=over 4
… …
1257 1288
1258=head3 cf::player 1289=head3 cf::player
1259 1290
1260=over 4 1291=over 4
1261 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1262=item cf::player::find $login 1307=item cf::player::find $login
1263 1308
1264Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1265 1310
1266=cut 1311=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1350
1306 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1309 } 1359 }
1310 } 1360 }
1311} 1361}
1312 1362
… …
1322 1372
1323 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1325 1375
1326 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1327 Coro::cede; 1377 cf::cede_to_tick;
1328} 1378}
1329 1379
1330sub new($) { 1380sub new($) {
1331 my ($login) = @_; 1381 my ($login) = @_;
1332 1382
… …
1410 or return []; 1460 or return [];
1411 1461
1412 my @logins; 1462 my @logins;
1413 1463
1414 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1418 1473
1419 utf8::decode $login; 1474 utf8::decode $login;
1420 push @logins, $login; 1475 push @logins, $login;
1421 } 1476 }
1422 1477
… …
1460sub expand_cfpod { 1515sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1462 1517
1463 # escape & and < 1518 # escape & and <
1464 s/&/&amp;/g; 1519 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1466 1521
1467 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1468 1523
1469 1 while 1524 1 while
1470 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1530 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1477 }ge 1533 }ge
1478 # replace H<hint text> 1534 # replace H<hint text>
… …
1746 1802
1747sub load_header_from($) { 1803sub load_header_from($) {
1748 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1749 1805
1750 utf8::encode $path; 1806 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1756 1815
1757 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1758 1817
1759 1 1818 1
1760} 1819}
… …
1814sub find { 1873sub find {
1815 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1816 1875
1817 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1818 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1820 1880
1821 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1823 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1824 or return; 1886 or return;
1825 1887
1826 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1827 1889
… …
1829 or return; 1891 or return;
1830 1892
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1834 $map->reset; 1898 $map->reset;
1835 undef $guard;
1836 return find $path; 1899 return find $path;
1837 } 1900 }
1838 1901
1839 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1840 } 1903 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1850 1913
1851 my $path = $self->{path}; 1914 my $path = $self->{path};
1852 1915
1853 { 1916 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1855 1918
1919 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1921
1858 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1859 1923
1860 $self->alloc; 1924 $self->alloc;
1861 1925
1862 $self->pre_load; 1926 $self->pre_load;
1863 Coro::cede; 1927 cf::cede_to_tick;
1864 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1866 or return; 1932 or return;
1867 1933
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1870 1936
1871 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1938 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1941 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1876 } 1945 }
1877 } 1946 }
1878 1947
1879 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1880 # now do the right thing for maps 1951 # now do the right thing for maps
1881 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1954 unless $self->difficulty;
1884 Coro::cede; 1955 cf::cede_to_tick;
1885 1956
1886 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1958 $self->decay_objects;
1888 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1889 $self->update_buttons; 1960 $self->update_buttons;
1890 Coro::cede; 1961 cf::cede_to_tick;
1891 $self->set_darkness_map; 1962 $self->set_darkness_map;
1892 Coro::cede; 1963 cf::cede_to_tick;
1893 $self->activate; 1964 $self->activate;
1894 } 1965 }
1895 1966
1896 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1948 2019
1949sub do_load_sync { 2020sub do_load_sync {
1950 my ($map) = @_; 2021 my ($map) = @_;
1951 2022
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2024 if $Coro::current == $Coro::main;
1954 2025
1955 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1956} 2027}
1957 2028
1958our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
… …
1962 my ($path, $origin, $load) = @_; 2033 my ($path, $origin, $load) = @_;
1963 2034
1964 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1965 2036
1966 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 2039 }
1969 2040
1970 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
1971 2042
1972 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1973 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2048 if (my $map = find $k) {
1976 $map->load if $v; 2049 $map->load if $v;
1977 } 2050 }
… …
1987} 2060}
1988 2061
1989sub save { 2062sub save {
1990 my ($self) = @_; 2063 my ($self) = @_;
1991 2064
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2066
1994 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1995 2068
1996 return unless $self->dirty; 2069 return unless $self->dirty;
1997 2070
… …
2003 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2004 2077
2005 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2006 2079
2007 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2009 }; 2083 };
2010 2084
2011 if ($uniq) { 2085 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2094 my ($self) = @_;
2021 2095
2022 # save first because save cedes 2096 # save first because save cedes
2023 $self->save; 2097 $self->save;
2024 2098
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2100
2027 return if $self->players; 2101 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2030 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2109 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2110}
2034 2111
2035sub reset_at { 2112sub reset_at {
2036 my ($self) = @_; 2113 my ($self) = @_;
2037 2114
… …
2069 if $uniq; 2146 if $uniq;
2070 } 2147 }
2071 2148
2072 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2073 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2153 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2154
2078 $self->unlink_save; 2155 $self->unlink_save;
2079 $self->destroy; 2156 $self->destroy;
2080} 2157}
2081 2158
2082my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2083 2160
2084sub nuke { 2161sub nuke {
2085 my ($self) = @_; 2162 my ($self) = @_;
2086 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2087 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2088 2168
2089 $self->unlink_save; 2169 $self->unlink_save;
2090 2170
2091 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2176
2097 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2098 2179
2099 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2100} 2181}
2101 2182
2102=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2178 2259
2179sub inv_recursive { 2260sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2181} 2262}
2182 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2183package cf; 2295package cf;
2184 2296
2185=back 2297=back
2186 2298
2187=head3 cf::object::player 2299=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2458
2347 $self->enter_link; 2459 $self->enter_link;
2348 2460
2349 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2350 my $map = eval { 2483 my $map = eval {
2351 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2352 2485
2353 if ($map) { 2486 if ($map) {
2354 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2356 } else { 2489 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2491 }
2359 2492
2360 $map 2493 $map
2361 }; 2494 };
2362 2495
… …
2452 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2455 2588
2456 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2457 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2593 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2460 2595
2461 1; 2596 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2631the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2498 2633
2499=cut 2634=cut
2500 2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "identify",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "examine",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649);
2650
2501sub cf::client::send_msg { 2651sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2652 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2653
2504 $msg = $self->pl->expand_cfpod ($msg); 2654 $msg = $self->pl->expand_cfpod ($msg);
2505 2655
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2656 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657
2658 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2507 2660
2508 if (ref $channel) { 2661 if (ref $channel) {
2509 # send meta info to client, if not yet sent 2662 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2663 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2664 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2513 } 2667 }
2514 2668
2515 $channel = $channel->{id}; 2669 $channel = $channel->{id};
2516 } 2670 }
2517 2671
… …
2558=cut 2712=cut
2559 2713
2560sub cf::client::ext_msg($$@) { 2714sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2715 my ($self, $type, @msg) = @_;
2562 2716
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2717 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2718 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2719 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2720 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2721 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2722 }
2571} 2723}
2572 2724
… …
2579sub cf::client::ext_reply($$@) { 2731sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2732 my ($self, $id, @msg) = @_;
2581 2733
2582 if ($self->extcmd == 2) { 2734 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2735 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2736 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2737 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2738 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2740 }
2589} 2741}
… …
2732 2884
2733The following functions and methods are available within a safe environment: 2885The following functions and methods are available within a safe environment:
2734 2886
2735 cf::object 2887 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 2888 contr pay_amount pay_player map x y force_find force_add
2737 insert remove name archname title slaying race 2889 insert remove name archname title slaying race decrease_ob_nr
2738 2890
2739 cf::object::player 2891 cf::object::player
2740 player 2892 player
2741 2893
2742 cf::player 2894 cf::player
… …
2747 2899
2748=cut 2900=cut
2749 2901
2750for ( 2902for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 2904 insert remove inv name archname title slaying race
2905 decrease_ob_nr)],
2753 ["cf::object::player" => qw(player)], 2906 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 2907 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 2908 ["cf::map" => qw(trigger)],
2756) { 2909) {
2757 no strict 'refs'; 2910 no strict 'refs';
… …
2833# the server's init and main functions 2986# the server's init and main functions
2834 2987
2835sub load_facedata($) { 2988sub load_facedata($) {
2836 my ($path) = @_; 2989 my ($path) = @_;
2837 2990
2991 # HACK to clear player env face cache, we need some signal framework
2992 # for this (global event?)
2993 %ext::player_env::MUSIC_FACE_CACHE = ();
2994
2838 my $enc = JSON::XS->new->utf8->canonical; 2995 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2996
2840 warn "loading facedata from $path\n"; 2997 warn "loading facedata from $path\n";
2841 2998
2842 my $facedata; 2999 my $facedata;
2843 0 < aio_load $path, $facedata 3000 0 < aio_load $path, $facedata
… …
2953 $ns->fx_want ($k, $v); 3110 $ns->fx_want ($k, $v);
2954 } 3111 }
2955}; 3112};
2956 3113
2957sub reload_regions { 3114sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = ();
3118
2958 load_resource_file "$MAPDIR/regions" 3119 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3120 or die "unable to load regions file\n";
2960 3121
2961 for (cf::region::list) { 3122 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3123 $_->{match} = qr/$_->{match}/
… …
2998 3159
2999sub init { 3160sub init {
3000 reload_resources; 3161 reload_resources;
3001} 3162}
3002 3163
3003sub cfg_load { 3164sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3165 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3166 or return;
3006 3167
3007 local $/; 3168 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3169 *CFG = YAML::Syck::Load <$fh>;
… …
3024sub main { 3185sub main {
3025 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
3026 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
3027 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3028 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
3029 Event::one_event; 3191 Event::one_event;
3030 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
3031 }; 3193 };
3032 3194
3033 cfg_load; 3195 reload_config;
3034 db_init; 3196 db_init;
3035 load_extensions; 3197 load_extensions;
3036 3198
3037 $TICK_WATCHER->start; 3199 $TICK_WATCHER->start;
3038 Event::loop; 3200 Event::loop;
… …
3231 warn "reloading cf.pm"; 3393 warn "reloading cf.pm";
3232 require cf; 3394 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3396
3235 warn "loading config and database again"; 3397 warn "loading config and database again";
3236 cf::cfg_load; 3398 cf::reload_config;
3237 3399
3238 warn "loading extensions"; 3400 warn "loading extensions";
3239 cf::load_extensions; 3401 cf::load_extensions;
3240 3402
3241 warn "reattaching attachments to objects/players"; 3403 warn "reattaching attachments to objects/players";
… …
3277register_command "reload" => sub { 3439register_command "reload" => sub {
3278 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
3279 3441
3280 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
3281 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
3444 async {
3445 $Coro::current->{desc} = "perl_reload";
3282 async { reload_perl }; 3446 reload_perl;
3447 };
3283 } 3448 }
3284}; 3449};
3285 3450
3286unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
3287 3452
… …
3306 my $signal = new Coro::Signal; 3471 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 3472 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 3473 $signal->wait;
3309} 3474}
3310 3475
3311 my $min = 1e6;#d#
3312 my $avg = 10;
3313$TICK_WATCHER = Event->timer ( 3476$TICK_WATCHER = Event->timer (
3314 reentrant => 0, 3477 reentrant => 0,
3315 parked => 1, 3478 parked => 1,
3316 prio => 0, 3479 prio => 0,
3317 at => $NEXT_TICK || $TICK, 3480 at => $NEXT_TICK || $TICK,
… …
3325 3488
3326 $NOW = $tick_start = Event::time; 3489 $NOW = $tick_start = Event::time;
3327 3490
3328 cf::server_tick; # one server iteration 3491 cf::server_tick; # one server iteration
3329 3492
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
3352
3353 $RUNTIME += $TICK; 3493 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
3355 3495
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3357 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
3358 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
3359 write_runtime 3500 write_runtime
3360 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
3361 }; 3502 };
3362 } 3503 }
3363 3504
3364# my $AFTER = Event::time;
3365# warn $AFTER - $NOW;#d#
3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send; 3506 $sig->send;
3369 } 3507 }
3370 while (my $sig = shift @WAIT_FOR_TICK) { 3508 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send; 3509 $sig->send;
… …
3381 3519
3382 $LOAD = ($NOW - $tick_start) / $TICK; 3520 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 3522
3385 _post_tick; 3523 _post_tick;
3386
3387
3388 }, 3524 },
3389); 3525);
3390 3526
3391{ 3527{
3528 BDB::min_parallel 8;
3392 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
3393 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
3394 reentrant => 0, 3531 reentrant => 0,
3395 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
3396 poll => 'r', 3533 poll => 'r',
3397 prio => 0, 3534 prio => 0,
3398 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
3400 ); 3537 );
3401 BDB::min_parallel 8;
3402 3538
3403 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
3404 my $status; 3540 my $status;
3405 my $current = $Coro::current; 3541 my $current = $Coro::current;
3406 ( 3542 (
… …
3415 ) 3551 )
3416 }; 3552 };
3417 3553
3418 unless ($DB_ENV) { 3554 unless ($DB_ENV) {
3419 $DB_ENV = BDB::db_env_create; 3555 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3557 | BDB::LOG_AUTOREMOVE, 1);
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3420 3560
3421 cf::sync_job { 3561 cf::sync_job {
3422 eval { 3562 eval {
3423 BDB::db_env_open 3563 BDB::db_env_open
3424 $DB_ENV, 3564 $DB_ENV,
… …
3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3568 0666;
3429 3569
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3433 $DB_ENV->set_lk_detect;
3434 }; 3571 };
3435 3572
3436 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3574 };
3438 } 3575 }
3576
3577 $BDB_DEADLOCK_WATCHER = Event->timer (
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 );
3587 $BDB_CHECKPOINT_WATCHER = Event->timer (
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 );
3597 $BDB_TRICKLE_WATCHER = Event->timer (
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 );
3439} 3607}
3440 3608
3441{ 3609{
3442 IO::AIO::min_parallel 8; 3610 IO::AIO::min_parallel 8;
3443 3611
… …
3462 3630
3463 # limit the # of concurrent backtraces 3631 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) { 3632 if ($_log_backtrace < 2) {
3465 ++$_log_backtrace; 3633 ++$_log_backtrace;
3466 async { 3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
3467 my @bt = fork_call { 3637 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr; 3638 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!"; 3641 or die "addr2line: $!";

Diff Legend

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