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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 2007 UTC

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';
285Return 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.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 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#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
481sub fork_call(&@) { 491sub fork_call(&@) {
482 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
483 493
484 # 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,
485 # otherwise perl prematurely frees the stuff :/ 495 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 496 # TODO: investigate and fix (likely this will be rather laborious)
487 497
488 my @res = Coro::Util::fork_eval { 498 my @res = Coro::Util::fork_eval {
489 reset_signals; 499 reset_signals;
490 &$cb 500 &$cb
491 }, @args; 501 }, @args;
500=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
501 511
502Stores 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
503data 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).
504 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
505=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}
506 538
507our $DB; 539our $DB;
508 540
509sub db_init { 541sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 542 cf::sync_job {
514 eval { 543 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 544 };
524} 545}
525 546
526sub db_get($$) { 547sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
528 549
1005); 1026);
1006 1027
1007sub object_freezer_save { 1028sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1009 1030
1031 my $guard = cf::lock_acquire "io";
1032
1010 sync_job { 1033 sync_job {
1011 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1014 1038
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
1037 } 1061 }
1038 } else { 1062 } else {
1039 aio_unlink $filename; 1063 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1041 } 1065 }
1042 } 1066 };
1067
1068 undef $guard;
1043} 1069}
1044 1070
1045sub object_freezer_as_string { 1071sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1047 1073
1052 1078
1053sub object_thawer_load { 1079sub object_thawer_load {
1054 my ($filename) = @_; 1080 my ($filename) = @_;
1055 1081
1056 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1057 1085
1058 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1059 or return; 1087 or return;
1060 1088
1061 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1091 or return;
1092
1093 undef $guard;
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1095 }
1066 1096
1097 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1069 return ($data, $av); 1101 ($data, $av)
1070} 1102}
1071 1103
1072=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1073 1105
1074=over 4 1106=over 4
1260 1292
1261=head3 cf::player 1293=head3 cf::player
1262 1294
1263=over 4 1295=over 4
1264 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
1265=item cf::player::find $login 1311=item cf::player::find $login
1266 1312
1267Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1268 1314
1269=cut 1315=cut
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1354
1309 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1310 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;
1311 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1312 } 1363 }
1313 } 1364 }
1314} 1365}
1315 1366
1413 or return []; 1464 or return [];
1414 1465
1415 my @logins; 1466 my @logins;
1416 1467
1417 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") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1421 1477
1422 utf8::decode $login; 1478 utf8::decode $login;
1423 push @logins, $login; 1479 push @logins, $login;
1424 } 1480 }
1425 1481
1750 1806
1751sub load_header_from($) { 1807sub load_header_from($) {
1752 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1753 1809
1754 utf8::encode $path; 1810 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 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;
1760 1819
1761 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1762 1821
1763 1 1822 1
1764} 1823}
1818sub find { 1877sub find {
1819 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1820 1879
1821 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1822 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1824 1884
1825 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1826 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
1827 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1828 or return; 1890 or return;
1829 1891
1830 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1831 1893
1833 or return; 1895 or return;
1834 1896
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1838 $map->reset; 1902 $map->reset;
1839 undef $guard;
1840 return find $path; 1903 return find $path;
1841 } 1904 }
1842 1905
1843 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1844 } 1907 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1854 1917
1855 my $path = $self->{path}; 1918 my $path = $self->{path};
1856 1919
1857 { 1920 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 1922
1923 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 1925
1863 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1864 1927
1865 $self->alloc; 1928 $self->alloc;
1866 1929
1867 $self->pre_load; 1930 $self->pre_load;
1868 cf::cede_to_tick; 1931 cf::cede_to_tick;
1869 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1871 or return; 1936 or return;
1872 1937
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1875 1940
1876 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 1942 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 1945 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1881 } 1949 }
1882 } 1950 }
1951
1952 $f->resolve_delayed_derefs;
1883 1953
1884 cf::cede_to_tick; 1954 cf::cede_to_tick;
1885 # now do the right thing for maps 1955 # now do the right thing for maps
1886 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
2031 2101
2032 return if $self->players; 2102 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2035 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2110 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2111}
2039 2112
2040sub reset_at { 2113sub reset_at {
2041 my ($self) = @_; 2114 my ($self) = @_;
2042 2115
2074 if $uniq; 2147 if $uniq;
2075 } 2148 }
2076 2149
2077 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2078 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2154 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2155
2083 $self->unlink_save; 2156 $self->unlink_save;
2084 $self->destroy; 2157 $self->destroy;
2085} 2158}
2086 2159
2187 2260
2188sub inv_recursive { 2261sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2190} 2263}
2191 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
2192package cf; 2296package cf;
2193 2297
2194=back 2298=back
2195 2299
2196=head3 cf::object::player 2300=head3 cf::object::player
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2459
2356 $self->enter_link; 2460 $self->enter_link;
2357 2461
2358 (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
2359 my $map = eval { 2482 my $map = eval {
2360 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2361 2484
2362 if ($map) { 2485 if ($map) {
2363 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2365 } else { 2488 } else {
2366 $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);
2367 } 2490 }
2368 2491
2369 $map 2492 $map
2370 }; 2493 };
2371 2494
3341 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait; 3466 $signal->wait;
3344} 3467}
3345 3468
3346 my $min = 1e6;#d#
3347 my $avg = 10;
3348$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3349 reentrant => 0, 3470 reentrant => 0,
3350 parked => 1, 3471 parked => 1,
3351 prio => 0, 3472 prio => 0,
3352 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
3360 3481
3361 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3362 3483
3363 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3364 3485
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
3388 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
3389 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3390 3488
3391 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3392 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
3394 write_runtime 3492 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3396 }; 3494 };
3397 } 3495 }
3398 3496
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send; 3498 $sig->send;
3404 } 3499 }
3405 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send; 3501 $sig->send;
3416 3511
3417 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419 3514
3420 _post_tick; 3515 _post_tick;
3421
3422
3423 }, 3516 },
3424); 3517);
3425 3518
3426{ 3519{
3520 BDB::min_parallel 8;
3427 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3428 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3429 reentrant => 0, 3523 reentrant => 0,
3430 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3431 poll => 'r', 3525 poll => 'r',
3432 prio => 0, 3526 prio => 0,
3433 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3435 ); 3529 );
3436 BDB::min_parallel 8;
3437 3530
3438 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3439 my $status; 3532 my $status;
3440 my $current = $Coro::current; 3533 my $current = $Coro::current;
3441 ( 3534 (
3450 ) 3543 )
3451 }; 3544 };
3452 3545
3453 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3454 $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);
3455 3552
3456 cf::sync_job { 3553 cf::sync_job {
3457 eval { 3554 eval {
3458 BDB::db_env_open 3555 BDB::db_env_open
3459 $DB_ENV, 3556 $DB_ENV,
3461 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
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666; 3560 0666;
3464 3561
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 }; 3563 };
3470 3564
3471 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3472 }; 3566 };
3473 } 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 );
3474} 3599}
3475 3600
3476{ 3601{
3477 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3478 3603

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines