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.334 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 92our $RUNTIME;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
… …
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
275returned. 276returned.
276 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
277Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
279 283
280=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
281 285
282Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
283 287
284=cut 288=cut
285 289
286our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
287 292
288sub lock_wait($) { 293sub lock_wait($) {
289 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
290 300
291 # wait for lock, if any 301 # wait for lock, if any
292 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 304 Coro::schedule;
… …
300 310
301 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
302 lock_wait $key; 312 lock_wait $key;
303 313
304 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
305 316
306 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
309 } 321 }
310} 322}
311 323
… …
478sub fork_call(&@) { 490sub fork_call(&@) {
479 my ($cb, @args) = @_; 491 my ($cb, @args) = @_;
480 492
481 # we seemingly have to make a local copy of the whole thing, 493 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 494 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 495 # TODO: investigate and fix (likely this will be rather laborious)
484 496
485 my @res = Coro::Util::fork_eval { 497 my @res = Coro::Util::fork_eval {
486 reset_signals; 498 reset_signals;
487 &$cb 499 &$cb
488 }, @args; 500 }, @args;
… …
497=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
498 510
499Stores the given C<$value> in the family. It can currently store binary 511Stores 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). 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
502=cut 519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
503 537
504our $DB; 538our $DB;
505 539
506sub db_init { 540sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 541 cf::sync_job {
511 eval { 542 $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 } 543 };
521} 544}
522 545
523sub db_get($$) { 546sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
525 548
… …
575 if (1) { 598 if (1) {
576 $md5 = 599 $md5 =
577 join "\x00", 600 join "\x00",
578 $processversion, 601 $processversion,
579 map { 602 map {
580 Coro::cede; 603 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 605 } 0.. $#$src;
583 606
584 607
585 my $dbmd5 = db_get cache => "$id/md5"; 608 my $dbmd5 = db_get cache => "$id/md5";
… …
1002); 1025);
1003 1026
1004sub object_freezer_save { 1027sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
1006 1029
1030 my $guard = cf::lock_acquire "io";
1031
1007 sync_job { 1032 sync_job {
1008 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
1011 1037
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1060 }
1035 } else { 1061 } else {
1036 aio_unlink $filename; 1062 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
1038 } 1064 }
1039 } 1065 };
1066
1067 undef $guard;
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1049 1077
1050sub object_thawer_load { 1078sub object_thawer_load {
1051 my ($filename) = @_; 1079 my ($filename) = @_;
1052 1080
1053 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1054 1084
1055 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
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
1092 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1094 }
1063 1095
1096 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1099
1066 return ($data, $av); 1100 ($data, $av)
1067} 1101}
1068 1102
1069=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
1070 1104
1071=over 4 1105=over 4
… …
1149 my ($type, $reply, @payload) = 1183 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1184 "ARRAY" eq ref $msg
1151 ? @$msg 1185 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1187
1188 my @reply;
1189
1154 if (my $cb = $EXTCMD{$type}) { 1190 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1191 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1160 } else { 1197 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1199 }
1163 1200
1164 cf::override; 1201 cf::override;
… …
1254 1291
1255=head3 cf::player 1292=head3 cf::player
1256 1293
1257=over 4 1294=over 4
1258 1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1309
1259=item cf::player::find $login 1310=item cf::player::find $login
1260 1311
1261Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1262 1313
1263=cut 1314=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1353
1303 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1355 or return;
1356
1357 $f->next;
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>
… …
1505=cut 1568=cut
1506 1569
1507sub ext_reply($$@) { 1570sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1509 1572
1510 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1574}
1518 1575
1519=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1520 1577
1521Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1749 1806
1750sub load_header_from($) { 1807sub load_header_from($) {
1751 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1752 1809
1753 utf8::encode $path; 1810 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1819
1760 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1761 1821
1762 1 1822 1
1763} 1823}
… …
1817sub find { 1877sub find {
1818 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1819 1879
1820 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1821 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1823 1884
1824 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1827 or return; 1890 or return;
1828 1891
1829 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1830 1893
… …
1832 or return; 1895 or return;
1833 1896
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1837 $map->reset; 1902 $map->reset;
1838 undef $guard;
1839 return find $path; 1903 return find $path;
1840 } 1904 }
1841 1905
1842 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1843 } 1907 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1853 1917
1854 my $path = $self->{path}; 1918 my $path = $self->{path};
1855 1919
1856 { 1920 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1858 1922
1923 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1925
1861 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1862 1927
1863 $self->alloc; 1928 $self->alloc;
1864 1929
1865 $self->pre_load; 1930 $self->pre_load;
1866 Coro::cede; 1931 cf::cede_to_tick;
1867 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1869 or return; 1936 or return;
1870 1937
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1873 1940
1874 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1942 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1945 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1879 } 1949 }
1880 } 1950 }
1881 1951
1882 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1883 # now do the right thing for maps 1955 # now do the right thing for maps
1884 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1958 unless $self->difficulty;
1887 Coro::cede; 1959 cf::cede_to_tick;
1888 1960
1889 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1962 $self->decay_objects;
1891 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1892 $self->update_buttons; 1964 $self->update_buttons;
1893 Coro::cede; 1965 cf::cede_to_tick;
1894 $self->set_darkness_map; 1966 $self->set_darkness_map;
1895 Coro::cede; 1967 cf::cede_to_tick;
1896 $self->activate; 1968 $self->activate;
1897 } 1969 }
1898 1970
1899 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1950} 2022}
1951 2023
1952sub do_load_sync { 2024sub do_load_sync {
1953 my ($map) = @_; 2025 my ($map) = @_;
1954 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1955 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1956} 2031}
1957 2032
1958our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1960 2035
1961sub find_async { 2036sub find_async {
1962 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1963 2038
1964 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1965 2040
1966 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 2043 }
1969 2044
1970 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1971 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1972 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2050 if (my $map = find $k) {
1975 $map->load; 2051 $map->load if $v;
1976 } 2052 }
1977 2053
1978 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1979 } 2055 }
1980 } 2056 }
1981 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1982 }; 2058 };
1983 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1986} 2062}
1987 2063
1988sub save { 2064sub save {
1989 my ($self) = @_; 2065 my ($self) = @_;
1990 2066
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 2068
1993 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1994 2070
1995 return unless $self->dirty; 2071 return unless $self->dirty;
1996 2072
… …
2019 my ($self) = @_; 2095 my ($self) = @_;
2020 2096
2021 # save first because save cedes 2097 # save first because save cedes
2022 $self->save; 2098 $self->save;
2023 2099
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2101
2026 return if $self->players; 2102 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2028 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2029 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2030 $self->clear; 2110 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2111}
2033 2112
2034sub reset_at { 2113sub reset_at {
2035 my ($self) = @_; 2114 my ($self) = @_;
2036 2115
… …
2068 if $uniq; 2147 if $uniq;
2069 } 2148 }
2070 2149
2071 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2072 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2154 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2155
2077 $self->unlink_save; 2156 $self->unlink_save;
2078 $self->destroy; 2157 $self->destroy;
2079} 2158}
2080 2159
2081my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2082 2161
2083sub nuke { 2162sub nuke {
2084 my ($self) = @_; 2163 my ($self) = @_;
2085 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2086 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2087 2169
2088 $self->unlink_save; 2170 $self->unlink_save;
2089 2171
2090 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2177
2096 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2097 2180
2098 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2099} 2182}
2100 2183
2101=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2177 2260
2178sub inv_recursive { 2261sub inv_recursive {
2179 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2180} 2263}
2181 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
2182package cf; 2296package cf;
2183 2297
2184=back 2298=back
2185 2299
2186=head3 cf::object::player 2300=head3 cf::object::player
… …
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2459
2346 $self->enter_link; 2460 $self->enter_link;
2347 2461
2348 (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 # todo: use ob_blocked to check all tiles of the destination "object"
2469 # for suitability.
2470
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2472 }
2473 }
2474
2349 my $map = eval { 2475 my $map = eval {
2350 my $map = cf::map::find $path; 2476 my $map = cf::map::find $path;
2351 2477
2352 if ($map) { 2478 if ($map) {
2353 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
… …
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2497 2623
2498=cut 2624=cut
2499 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2500sub cf::client::send_msg { 2641sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2643
2503 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2504 2645
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2650
2507 if (ref $channel) { 2651 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2512 } 2657 }
2513 2658
2514 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2515 } 2660 }
2516 2661
… …
2557=cut 2702=cut
2558 2703
2559sub cf::client::ext_msg($$@) { 2704sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2705 my ($self, $type, @msg) = @_;
2561 2706
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2707 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2709 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2710 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2730 }
2570} 2731}
2571 2732
2572=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
… …
2634 my ($type, $reply, @payload) = 2795 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2796 "ARRAY" eq ref $msg
2636 ? @$msg 2797 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2799
2800 my @reply;
2801
2639 if (my $cb = $EXTICMD{$type}) { 2802 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2803 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2645 } else { 2809 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 2811 }
2648 2812
2649 cf::override; 2813 cf::override;
… …
2710 2874
2711The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2712 2876
2713 cf::object 2877 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race 2879 insert remove name archname title slaying race decrease_ob_nr
2716 2880
2717 cf::object::player 2881 cf::object::player
2718 player 2882 player
2719 2883
2720 cf::player 2884 cf::player
… …
2725 2889
2726=cut 2890=cut
2727 2891
2728for ( 2892for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 2894 insert remove inv name archname title slaying race
2895 decrease_ob_nr)],
2731 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2734) { 2899) {
2735 no strict 'refs'; 2900 no strict 'refs';
… …
2811# the server's init and main functions 2976# the server's init and main functions
2812 2977
2813sub load_facedata($) { 2978sub load_facedata($) {
2814 my ($path) = @_; 2979 my ($path) = @_;
2815 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2816 my $enc = JSON::XS->new->utf8->canonical; 2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2817 2986
2818 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2819 2988
2820 my $facedata; 2989 my $facedata;
2821 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
… …
2825 2994
2826 $facedata->{version} == 2 2995 $facedata->{version} == 2
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 2997
2829 # patch in the exptable 2998 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = { 2999 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC, 3000 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2834 }; 3002 };
2835 cf::cede_to_tick; 3003 cf::cede_to_tick;
2836 3004
2837 { 3005 {
2838 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
… …
2891 name => $name, 3059 name => $name,
2892 %{ $info->{meta} || {} }, 3060 %{ $info->{meta} || {} },
2893 }); 3061 });
2894 3062
2895 $data = pack "(w/a*)*", $meta, $info->{data}; 3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else {
3065 $data = $info->{data};
2896 } 3066 }
2897 3067
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type}; 3069 cf::face::set_type $idx, $info->{type};
2900 3070
… …
2930 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2931 } 3101 }
2932}; 3102};
2933 3103
2934sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2935 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2937 3111
2938 for (cf::region::list) { 3112 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2975 3149
2976sub init { 3150sub init {
2977 reload_resources; 3151 reload_resources;
2978} 3152}
2979 3153
2980sub cfg_load { 3154sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3156 or return;
2983 3157
2984 local $/; 3158 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
3005 (async { 3179 (async {
3006 Event::one_event; 3180 Event::one_event;
3007 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3008 }; 3182 };
3009 3183
3010 cfg_load; 3184 reload_config;
3011 db_init; 3185 db_init;
3012 load_extensions; 3186 load_extensions;
3013 3187
3014 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3015 Event::loop; 3189 Event::loop;
… …
3208 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3209 require cf; 3383 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3385
3212 warn "loading config and database again"; 3386 warn "loading config and database again";
3213 cf::cfg_load; 3387 cf::reload_config;
3214 3388
3215 warn "loading extensions"; 3389 warn "loading extensions";
3216 cf::load_extensions; 3390 cf::load_extensions;
3217 3391
3218 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3283 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3459 $signal->wait;
3286} 3460}
3287 3461
3288 my $min = 1e6;#d# 3462our $stat_fh;
3289 my $avg = 10; 3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3290$TICK_WATCHER = Event->timer ( 3465$TICK_WATCHER = Event->timer (
3291 reentrant => 0, 3466 reentrant => 0,
3292 parked => 1, 3467 parked => 1,
3293 prio => 0, 3468 prio => 0,
3294 at => $NEXT_TICK || $TICK, 3469 at => $NEXT_TICK || $TICK,
… …
3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3299 unless ++$bug_warning > 10; 3474 unless ++$bug_warning > 10;
3300 return; 3475 return;
3301 } 3476 }
3302 3477
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3303 $NOW = $tick_start = Event::time; 3480 $NOW = $tick_start = Event::time;
3304 3481
3305 cf::server_tick; # one server iteration 3482 cf::server_tick; # one server iteration
3306
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
3329 3483
3330 $RUNTIME += $TICK; 3484 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK; 3485 $NEXT_TICK += $TICK;
3332 3486
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3487 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3359 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 3515
3362 _post_tick; 3516 _post_tick;
3363 3517
3364 3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3365 }, 3521 },
3366); 3522);
3367 3523
3368{ 3524{
3525 BDB::min_parallel 8;
3369 BDB::max_poll_time $TICK * 0.1; 3526 BDB::max_poll_time $TICK * 0.1;
3370 $BDB_POLL_WATCHER = Event->io ( 3527 $BDB_POLL_WATCHER = Event->io (
3371 reentrant => 0, 3528 reentrant => 0,
3372 fd => BDB::poll_fileno, 3529 fd => BDB::poll_fileno,
3373 poll => 'r', 3530 poll => 'r',
3374 prio => 0, 3531 prio => 0,
3375 data => WF_AUTOCANCEL, 3532 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb, 3533 cb => \&BDB::poll_cb,
3377 ); 3534 );
3378 BDB::min_parallel 8;
3379 3535
3380 BDB::set_sync_prepare { 3536 BDB::set_sync_prepare {
3381 my $status; 3537 my $status;
3382 my $current = $Coro::current; 3538 my $current = $Coro::current;
3383 ( 3539 (
… …
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 3561 0666;
3406 3562
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408 3564
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3410 $DB_ENV->set_lk_detect; 3567 $DB_ENV->set_lk_detect;
3411 }; 3568 };
3412 3569
3413 cf::cleanup "db_env_open(db): $@" if $@; 3570 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 3571 };
3415 } 3572 }
3573
3574 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11,
3576 interval => 60,
3577 hard => 1,
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 );
3584 $BDB_TRICKLE_WATCHER = Event->timer (
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 );
3416} 3594}
3417 3595
3418{ 3596{
3419 IO::AIO::min_parallel 8; 3597 IO::AIO::min_parallel 8;
3420 3598

Diff Legend

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