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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 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
… …
478sub fork_call(&@) { 491sub fork_call(&@) {
479 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
480 493
481 # we seemingly have to make a local copy of the whole thing, 494 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 495 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 496 # TODO: investigate and fix (likely this will be rather laborious)
484 497
485 my @res = Coro::Util::fork_eval { 498 my @res = Coro::Util::fork_eval {
486 reset_signals; 499 reset_signals;
487 &$cb 500 &$cb
488 }, @args; 501 }, @args;
… …
497=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
498 511
499Stores the given C<$value> in the family. It can currently store binary 512Stores 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). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
502=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
503 538
504our $DB; 539our $DB;
505 540
506sub db_init { 541sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 542 cf::sync_job {
511 eval { 543 $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 } 544 };
521} 545}
522 546
523sub db_get($$) { 547sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
525 549
… …
575 if (1) { 599 if (1) {
576 $md5 = 600 $md5 =
577 join "\x00", 601 join "\x00",
578 $processversion, 602 $processversion,
579 map { 603 map {
580 Coro::cede; 604 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 606 } 0.. $#$src;
583 607
584 608
585 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
… …
1002); 1026);
1003 1027
1004sub object_freezer_save { 1028sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1006 1030
1031 my $guard = cf::lock_acquire "io";
1032
1007 sync_job { 1033 sync_job {
1008 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1011 1038
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1061 }
1035 } else { 1062 } else {
1036 aio_unlink $filename; 1063 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1038 } 1065 }
1039 } 1066 };
1067
1068 undef $guard;
1040} 1069}
1041 1070
1042sub object_freezer_as_string { 1071sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1044 1073
… …
1049 1078
1050sub object_thawer_load { 1079sub object_thawer_load {
1051 my ($filename) = @_; 1080 my ($filename) = @_;
1052 1081
1053 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1054 1085
1055 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1056 or return; 1087 or return;
1057 1088
1058 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1091 or return;
1092
1093 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1095 }
1063 1096
1097 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1066 return ($data, $av); 1101 ($data, $av)
1067} 1102}
1068 1103
1069=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1070 1105
1071=over 4 1106=over 4
… …
1149 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1151 ? @$msg 1186 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1188
1189 my @reply;
1190
1154 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1160 } else { 1198 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1200 }
1163 1201
1164 cf::override; 1202 cf::override;
… …
1254 1292
1255=head3 cf::player 1293=head3 cf::player
1256 1294
1257=over 4 1295=over 4
1258 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
1259=item cf::player::find $login 1311=item cf::player::find $login
1260 1312
1261Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1262 1314
1263=cut 1315=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1354
1303 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1306 } 1363 }
1307 } 1364 }
1308} 1365}
1309 1366
… …
1319 1376
1320 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1322 1379
1323 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1324 Coro::cede; 1381 cf::cede_to_tick;
1325} 1382}
1326 1383
1327sub new($) { 1384sub new($) {
1328 my ($login) = @_; 1385 my ($login) = @_;
1329 1386
… …
1407 or return []; 1464 or return [];
1408 1465
1409 my @logins; 1466 my @logins;
1410 1467
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1415 1477
1416 utf8::decode $login; 1478 utf8::decode $login;
1417 push @logins, $login; 1479 push @logins, $login;
1418 } 1480 }
1419 1481
… …
1457sub expand_cfpod { 1519sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1459 1521
1460 # escape & and < 1522 # escape & and <
1461 s/&/&amp;/g; 1523 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1463 1525
1464 # 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
1465 1527
1466 1 while 1528 1 while
1467 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1534 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1474 }ge 1537 }ge
1475 # replace H<hint text> 1538 # replace H<hint text>
… …
1743 1806
1744sub load_header_from($) { 1807sub load_header_from($) {
1745 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1746 1809
1747 utf8::encode $path; 1810 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 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;
1753 1819
1754 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1755 1821
1756 1 1822 1
1757} 1823}
… …
1811sub find { 1877sub find {
1812 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1813 1879
1814 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1815 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1817 1884
1818 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1819 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
1820 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1821 or return; 1890 or return;
1822 1891
1823 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1824 1893
… …
1826 or return; 1895 or return;
1827 1896
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1831 $map->reset; 1902 $map->reset;
1832 undef $guard;
1833 return find $path; 1903 return find $path;
1834 } 1904 }
1835 1905
1836 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1837 } 1907 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1847 1917
1848 my $path = $self->{path}; 1918 my $path = $self->{path};
1849 1919
1850 { 1920 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1852 1922
1923 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1925
1855 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1856 1927
1857 $self->alloc; 1928 $self->alloc;
1858 1929
1859 $self->pre_load; 1930 $self->pre_load;
1860 Coro::cede; 1931 cf::cede_to_tick;
1861 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1863 or return; 1936 or return;
1864 1937
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1867 1940
1868 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1942 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1945 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1873 } 1949 }
1874 } 1950 }
1875 1951
1876 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1877 # now do the right thing for maps 1955 # now do the right thing for maps
1878 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1958 unless $self->difficulty;
1881 Coro::cede; 1959 cf::cede_to_tick;
1882 1960
1883 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1962 $self->decay_objects;
1885 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1886 $self->update_buttons; 1964 $self->update_buttons;
1887 Coro::cede; 1965 cf::cede_to_tick;
1888 $self->set_darkness_map; 1966 $self->set_darkness_map;
1889 Coro::cede; 1967 cf::cede_to_tick;
1890 $self->activate; 1968 $self->activate;
1891 } 1969 }
1892 1970
1893 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1944} 2022}
1945 2023
1946sub do_load_sync { 2024sub do_load_sync {
1947 my ($map) = @_; 2025 my ($map) = @_;
1948 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1949 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1950} 2031}
1951 2032
1952our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1954 2035
1955sub find_async { 2036sub find_async {
1956 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1957 2038
1958 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1959 2040
1960 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2043 }
1963 2044
1964 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1965 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2050 if (my $map = find $k) {
1969 $map->load; 2051 $map->load if $v;
1970 } 2052 }
1971 2053
1972 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1973 } 2055 }
1974 } 2056 }
1975 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1976 }; 2058 };
1977 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1980} 2062}
1981 2063
1982sub save { 2064sub save {
1983 my ($self) = @_; 2065 my ($self) = @_;
1984 2066
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2068
1987 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1988 2070
1989 return unless $self->dirty; 2071 return unless $self->dirty;
1990 2072
… …
2013 my ($self) = @_; 2095 my ($self) = @_;
2014 2096
2015 # save first because save cedes 2097 # save first because save cedes
2016 $self->save; 2098 $self->save;
2017 2099
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2101
2020 return if $self->players; 2102 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2023 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2110 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2111}
2027 2112
2028sub reset_at { 2113sub reset_at {
2029 my ($self) = @_; 2114 my ($self) = @_;
2030 2115
… …
2062 if $uniq; 2147 if $uniq;
2063 } 2148 }
2064 2149
2065 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2066 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2154 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2155
2071 $self->unlink_save; 2156 $self->unlink_save;
2072 $self->destroy; 2157 $self->destroy;
2073} 2158}
2074 2159
2075my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2076 2161
2077sub nuke { 2162sub nuke {
2078 my ($self) = @_; 2163 my ($self) = @_;
2079 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2080 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2081 2169
2082 $self->unlink_save; 2170 $self->unlink_save;
2083 2171
2084 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2177
2090 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2091 2180
2092 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2093} 2182}
2094 2183
2095=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2171 2260
2172sub inv_recursive { 2261sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2174} 2263}
2175 2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
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
2176package cf; 2296package cf;
2177 2297
2178=back 2298=back
2179 2299
2180=head3 cf::object::player 2300=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2459
2340 $self->enter_link; 2460 $self->enter_link;
2341 2461
2342 (async { 2462 (async {
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
2343 my $map = eval { 2482 my $map = eval {
2344 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2345 2484
2346 if ($map) { 2485 if ($map) {
2347 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2349 } else { 2488 } else {
2350 $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);
2351 } 2490 }
2352 2491
2353 $map 2492 $map
2354 }; 2493 };
2355 2494
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2628the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2491 2630
2492=cut 2631=cut
2493 2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "identify",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "examine",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646);
2647
2494sub cf::client::send_msg { 2648sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2649 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2650
2497 $msg = $self->pl->expand_cfpod ($msg); 2651 $msg = $self->pl->expand_cfpod ($msg);
2498 2652
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2653 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654
2655 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2500 2657
2501 if (ref $channel) { 2658 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2659 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2660 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2661 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2506 } 2664 }
2507 2665
2508 $channel = $channel->{id}; 2666 $channel = $channel->{id};
2509 } 2667 }
2510 2668
… …
2551=cut 2709=cut
2552 2710
2553sub cf::client::ext_msg($$@) { 2711sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2712 my ($self, $type, @msg) = @_;
2555 2713
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2714 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2716 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2717 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2719 }
2564} 2720}
2565 2721
… …
2572sub cf::client::ext_reply($$@) { 2728sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2729 my ($self, $id, @msg) = @_;
2574 2730
2575 if ($self->extcmd == 2) { 2731 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2733 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2734 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2735 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2737 }
2582} 2738}
… …
2646 my ($type, $reply, @payload) = 2802 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2803 "ARRAY" eq ref $msg
2648 ? @$msg 2804 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2805 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2806
2807 my @reply;
2808
2651 if (my $cb = $EXTICMD{$type}) { 2809 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2810 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2811 }
2812
2813 $ns->ext_reply ($reply, @reply)
2814 if $reply;
2815
2657 } else { 2816 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2818 }
2660 2819
2661 cf::override; 2820 cf::override;
… …
2722 2881
2723The following functions and methods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2724 2883
2725 cf::object 2884 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2885 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2886 insert remove name archname title slaying race decrease_ob_nr
2728 2887
2729 cf::object::player 2888 cf::object::player
2730 player 2889 player
2731 2890
2732 cf::player 2891 cf::player
… …
2737 2896
2738=cut 2897=cut
2739 2898
2740for ( 2899for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2746) { 2906) {
2747 no strict 'refs'; 2907 no strict 'refs';
… …
2823# the server's init and main functions 2983# the server's init and main functions
2824 2984
2825sub load_facedata($) { 2985sub load_facedata($) {
2826 my ($path) = @_; 2986 my ($path) = @_;
2827 2987
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2828 my $enc = JSON::XS->new->utf8->canonical; 2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2993
2830 warn "loading facedata from $path\n"; 2994 warn "loading facedata from $path\n";
2831 2995
2832 my $facedata; 2996 my $facedata;
2833 0 < aio_load $path, $facedata 2997 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3003 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3004
2841 # patch in the exptable 3005 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 3006 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3007 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 3009 };
2846 cf::cede_to_tick; 3010 cf::cede_to_tick;
2847 3011
2848 { 3012 {
2849 my $faces = $facedata->{faceinfo}; 3013 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3066 name => $name,
2903 %{ $info->{meta} || {} }, 3067 %{ $info->{meta} || {} },
2904 }); 3068 });
2905 3069
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else {
3072 $data = $info->{data};
2907 } 3073 }
2908 3074
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3076 cf::face::set_type $idx, $info->{type};
2911 3077
… …
2941 $ns->fx_want ($k, $v); 3107 $ns->fx_want ($k, $v);
2942 } 3108 }
2943}; 3109};
2944 3110
2945sub reload_regions { 3111sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = ();
3115
2946 load_resource_file "$MAPDIR/regions" 3116 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3117 or die "unable to load regions file\n";
2948 3118
2949 for (cf::region::list) { 3119 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3120 $_->{match} = qr/$_->{match}/
… …
2986 3156
2987sub init { 3157sub init {
2988 reload_resources; 3158 reload_resources;
2989} 3159}
2990 3160
2991sub cfg_load { 3161sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3163 or return;
2994 3164
2995 local $/; 3165 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
… …
3016 (async { 3186 (async {
3017 Event::one_event; 3187 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3188 })->prio (Coro::PRIO_MAX);
3019 }; 3189 };
3020 3190
3021 cfg_load; 3191 reload_config;
3022 db_init; 3192 db_init;
3023 load_extensions; 3193 load_extensions;
3024 3194
3025 $TICK_WATCHER->start; 3195 $TICK_WATCHER->start;
3026 Event::loop; 3196 Event::loop;
… …
3219 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
3220 require cf; 3390 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3392
3223 warn "loading config and database again"; 3393 warn "loading config and database again";
3224 cf::cfg_load; 3394 cf::reload_config;
3225 3395
3226 warn "loading extensions"; 3396 warn "loading extensions";
3227 cf::load_extensions; 3397 cf::load_extensions;
3228 3398
3229 warn "reattaching attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
… …
3294 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3466 $signal->wait;
3297} 3467}
3298 3468
3299 my $min = 1e6;#d#
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3302 reentrant => 0, 3470 reentrant => 0,
3303 parked => 1, 3471 parked => 1,
3304 prio => 0, 3472 prio => 0,
3305 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3313 3481
3314 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3315 3483
3316 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3317 3485
3318 0 && sync_job {#d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 };
3340
3341 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3343 3488
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3347 write_runtime 3492 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3349 }; 3494 };
3350 } 3495 }
3351 3496
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 3498 $sig->send;
3357 } 3499 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 3501 $sig->send;
… …
3369 3511
3370 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3514
3373 _post_tick; 3515 _post_tick;
3374
3375
3376 }, 3516 },
3377); 3517);
3378 3518
3379{ 3519{
3520 BDB::min_parallel 8;
3380 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3381 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3382 reentrant => 0, 3523 reentrant => 0,
3383 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3384 poll => 'r', 3525 poll => 'r',
3385 prio => 0, 3526 prio => 0,
3386 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3388 ); 3529 );
3389 BDB::min_parallel 8;
3390 3530
3391 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3392 my $status; 3532 my $status;
3393 my $current = $Coro::current; 3533 my $current = $Coro::current;
3394 ( 3534 (
… …
3403 ) 3543 )
3404 }; 3544 };
3405 3545
3406 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3407 $DB_ENV = BDB::db_env_create; 3547 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1);
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408 3552
3409 cf::sync_job { 3553 cf::sync_job {
3410 eval { 3554 eval {
3411 BDB::db_env_open 3555 BDB::db_env_open
3412 $DB_ENV, 3556 $DB_ENV,
… …
3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3558 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3560 0666;
3417 3561
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 3563 };
3423 3564
3424 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3566 };
3426 } 3567 }
3568
3569 $BDB_DEADLOCK_WATCHER = Event->timer (
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 );
3579 $BDB_CHECKPOINT_WATCHER = Event->timer (
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 );
3589 $BDB_TRICKLE_WATCHER = Event->timer (
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 );
3427} 3599}
3428 3600
3429{ 3601{
3430 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3431 3603

Diff Legend

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