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.196 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.211 by root, Tue Feb 13 16:23:32 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
344 356
345 $coro 357 $coro
346} 358}
347 359
348sub write_runtime { 360sub write_runtime {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362
349 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
350 364
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 366 or return;
353 367
… …
356 # 60 allows for the watchdog to kill the server. 370 # 60 allows for the watchdog to kill the server.
357 371
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 373 and return;
360 374
375 # always fsync - this file is important
361 aio_fsync $fh 376 aio_fsync $fh
362 and return; 377 and return;
363 378
364 close $fh 379 close $fh
365 or return; 380 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
751 766
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 771 close $fh;
757 772
758 if (@$objs) { 773 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 774 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 779 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
766 } 781 }
767 } else { 782 } else {
768 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
774 } 789 }
775 } else { 790 } else {
776 aio_unlink $filename; 791 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
778 } 793 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
779 } 800 }
780} 801}
781 802
782sub object_freezer_as_string { 803sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
789 810
790sub object_thawer_load { 811sub object_thawer_load {
791 my ($filename) = @_; 812 my ($filename) = @_;
792 813
793 my ($data, $av); 814 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
794 818
795 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
796 or return; 820 or return;
797 821
798 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
1068=cut 1092=cut
1069 1093
1070sub maps($) { 1094sub maps($) {
1071 my ($pl) = @_; 1095 my ($pl) = @_;
1072 1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1098
1073 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1074 or return; 1100 or return;
1075 1101
1076 my @paths; 1102 my @paths;
1077 1103
1078 for (@$files) { 1104 for (@$files) {
1079 utf8::decode $_; 1105 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1082 1108
1083 s/\.map$//; 1109 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1110 }
1086 1111
1087 \@paths 1112 \@paths
1088} 1113}
1089 1114
… …
1178sub normalise { 1203sub normalise {
1179 my ($path, $base) = @_; 1204 my ($path, $base) = @_;
1180 1205
1181 $path = "$path"; # make sure its a string 1206 $path = "$path"; # make sure its a string
1182 1207
1208 $path =~ s/\.map$//;
1209
1183 # map plan: 1210 # map plan:
1184 # 1211 #
1185 # /! non-realised random map exit (special hack!) 1212 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1213 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1214 # ?xxx/... are special absolute paths
… …
1248 1275
1249# the original (read-only) location 1276# the original (read-only) location
1250sub load_path { 1277sub load_path {
1251 my ($self) = @_; 1278 my ($self) = @_;
1252 1279
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1281}
1255 1282
1256# the temporary/swap location 1283# the temporary/swap location
1257sub save_path { 1284sub save_path {
1258 my ($self) = @_; 1285 my ($self) = @_;
1259 1286
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1289}
1263 1290
1264# the unique path, undef == no special unique path 1291# the unique path, undef == no special unique path
1265sub uniq_path { 1292sub uniq_path {
1266 my ($self) = @_; 1293 my ($self) = @_;
… …
1282 my ($self) = @_; 1309 my ($self) = @_;
1283 1310
1284 utf8::encode (my $save = $self->save_path); 1311 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1319}
1288 1320
1289sub load_header_from($) { 1321sub load_header_from($) {
1290 my ($self, $path) = @_; 1322 my ($self, $path) = @_;
1291 1323
1292 utf8::encode $path; 1324 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1294 or return; 1326 # or return;
1295 1327
1296 $self->_load_header ($path) 1328 $self->_load_header ($path)
1297 or return; 1329 or return;
1298 1330
1299 $self->{load_path} = $path; 1331 $self->{load_path} = $path;
… …
1579 return if $self->players; 1611 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1581 1613
1582 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1583 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617
1618 # need to save uniques path
1619 unless ($self->{deny_save}) {
1620 my $uniq = $self->uniq_path; utf8::encode $uniq;
1621
1622 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1623 if $uniq;
1624 }
1625
1584 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1585 1627
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1628 $self->clear;
1588 1629
1589 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1590 1631
1591 $self->unlink_save; 1632 $self->unlink_save;
… …
1628 for (@$files) { 1669 for (@$files) {
1629 utf8::decode $_; 1670 utf8::decode $_;
1630 next if /\.pst$/; 1671 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1632 1673
1633 s/\.map$//; 1674 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1675 }
1636 1676
1637 \@paths 1677 \@paths
1638} 1678}
1639 1679
… …
1827 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1828 1868
1829 $self->enter_link; 1869 $self->enter_link;
1830 1870
1831 (async { 1871 (async {
1872 my $map = eval {
1832 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1833 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1834 1875 $map
1835# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1836# if $map;
1837
1838 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1839 1878
1840 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1841 })->prio (1); 1880 })->prio (1);
1842} 1881}
1843 1882
… …
1874 # that depends on the exit object 1913 # that depends on the exit object
1875 1914
1876 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1877 1916
1878 if ($exit->map) { 1917 if ($exit->map) {
1879 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1880 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1881 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1882 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1883 } 1922 }
1884 1923
… …
1986 # get handled first 2025 # get handled first
1987 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1988 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1989 2028
1990 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1991 2031
1992 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1993 2033
1994 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1995 if (@$queue) { 2035 if (@$queue) {
… …
2156The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2157using it, it should be unique. 2197using it, it should be unique.
2158 2198
2159=over 4 2199=over 4
2160 2200
2161=item $hashref = cf::db_get $family
2162
2163Return a hashref for use by the extension C<$family>, which can be
2164modified. After modifications, you have to call C<cf::db_dirty> or
2165C<cf::db_sync>.
2166
2167=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2168 2202
2169Returns a single value from the database 2203Returns a single value from the database.
2170
2171=item cf::db_put $family => $hashref
2172
2173Stores the given family hashref into the database. Updates are delayed, if
2174you want the data to be synced to disk immediately, use C<cf::db_sync>.
2175 2204
2176=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2177 2206
2178Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2179want the data to be synced to disk immediately, use C<cf::db_sync>.
2180
2181=item cf::db_dirty
2182
2183Marks the database as dirty, to be updated at a later time.
2184
2185=item cf::db_sync
2186
2187Immediately write the database to disk I<if it is dirty>.
2188 2208
2189=cut 2209=cut
2190 2210
2191our $DB; 2211our $DB;
2192 2212
2193{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2194 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2195 2232
2196 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2197 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2198 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2199 2237
2200 my $pid; 2238 unlink $path;
2201
2202 sub db_save() {
2203 waitpid $pid, 0 if $pid;
2204 if (0 == ($pid = fork)) {
2205 $DB->{_meta}{version} = 1;
2206 Storable::nstore $DB, "$path~";
2207 rename "$path~", $path;
2208 cf::_exit 0 if defined $pid;
2209 } 2239 };
2210 }
2211
2212 my $dirty;
2213
2214 sub db_sync() {
2215 db_save if $dirty;
2216 undef $dirty;
2217 }
2218
2219 my $idle = Event->idle (
2220 reentrant => 0,
2221 min => 10,
2222 max => 20,
2223 repeat => 0,
2224 data => WF_AUTOCANCEL,
2225 cb => \&db_sync,
2226 );
2227
2228 sub db_dirty() {
2229 $dirty = 1;
2230 $idle->start;
2231 }
2232
2233 sub db_get($;$) {
2234 @_ >= 2
2235 ? $DB->{$_[0]}{$_[1]}
2236 : ($DB->{$_[0]} ||= { })
2237 }
2238
2239 sub db_put($$;$) {
2240 if (@_ >= 3) {
2241 $DB->{$_[0]}{$_[1]} = $_[2];
2242 } else {
2243 $DB->{$_[0]} = $_[1];
2244 }
2245 db_dirty;
2246 }
2247
2248 cf::global->attach (
2249 prio => 10000,
2250 on_cleanup => sub {
2251 db_sync;
2252 }, 2240 }
2253 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2254} 2258}
2255 2259
2256############################################################################# 2260#############################################################################
2257# the server's main() 2261# the server's init and main functions
2262
2263sub load_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d#
2266}
2258 2267
2259sub cfg_load { 2268sub cfg_load {
2260 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2261 or return; 2270 or return;
2262 2271
… …
2273 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2274 and die "WARNING: m(un)lockall failed: $!\n"; 2283 and die "WARNING: m(un)lockall failed: $!\n";
2275 }; 2284 };
2276 warn $@ if $@; 2285 warn $@ if $@;
2277 } 2286 }
2287}
2288
2289sub init {
2290 load_resources;
2278} 2291}
2279 2292
2280sub main { 2293sub main {
2281 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2282 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
… …
2285 Event::one_event; 2298 Event::one_event;
2286 })->prio (Coro::PRIO_MAX); 2299 })->prio (Coro::PRIO_MAX);
2287 }; 2300 };
2288 2301
2289 cfg_load; 2302 cfg_load;
2290 db_load; 2303 db_init;
2291 load_extensions; 2304 load_extensions;
2292 2305
2293 $TICK_WATCHER->start; 2306 $TICK_WATCHER->start;
2294 Event::loop; 2307 Event::loop;
2295} 2308}
… …
2334 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2335 $map->valid or next; 2348 $map->valid or next;
2336 $map->save; 2349 $map->save;
2337 } 2350 }
2338 warn "end emergency map save\n"; 2351 warn "end emergency map save\n";
2352
2353 warn "begin emergency database checkpoint\n";
2354 BDB::db_env_txn_checkpoint $DB_ENV;
2355 warn "end emergency database checkpoint\n";
2339 }; 2356 };
2340 2357
2341 warn "leave emergency perl save\n"; 2358 warn "leave emergency perl save\n";
2359}
2360
2361sub post_cleanup {
2362 my ($make_core) = @_;
2363
2364 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core;
2342} 2366}
2343 2367
2344sub reload() { 2368sub reload() {
2345 # can/must only be called in main 2369 # can/must only be called in main
2346 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
… …
2356 cf::emergency_save; 2380 cf::emergency_save;
2357 2381
2358 eval { 2382 eval {
2359 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2360 2384
2361 warn "syncing database to disk";
2362 cf::db_sync;
2363
2364 warn "cancelling all WF_AUTOCANCEL watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2365 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2366 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2367 } 2388 }
2368 2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392
2369 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2370 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2371 IO::AIO::flush; 2396 IO::AIO::flush;
2372 Coro::cede; 2397 Coro::cede;
2373 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2374 warn "iterate..."; 2399 warn "iterate...";
2375 } 2400 }
2376 2401
2377 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2378 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2433 require cf; 2458 require cf;
2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2435 2460
2436 warn "loading config and database again"; 2461 warn "loading config and database again";
2437 cf::cfg_load; 2462 cf::cfg_load;
2438 cf::db_load;
2439 2463
2440 warn "loading extensions"; 2464 warn "loading extensions";
2441 cf::load_extensions; 2465 cf::load_extensions;
2442 2466
2443 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2444 _global_reattach; 2468 _global_reattach;
2445 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2446 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2471
2472 warn "loading reloadable resources";
2473 load_resources;
2447 2474
2448 warn "restarting server ticker"; 2475 warn "restarting server ticker";
2449 2476
2450 $TICK_WATCHER->start; 2477 $TICK_WATCHER->start;
2451 }; 2478 };
… …
2520 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2521 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2522 }, 2549 },
2523); 2550);
2524 2551
2552{
2553 BDB::max_poll_time $TICK * 0.1;
2554 $BDB_POLL_WATCHER = Event->io (
2555 reentrant => 0,
2556 fd => BDB::poll_fileno,
2557 poll => 'r',
2558 prio => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => \&BDB::poll_cb,
2561 );
2562 BDB::min_parallel 8;
2563
2564 BDB::set_sync_prepare {
2565 my $status;
2566 my $current = $Coro::current;
2567 (
2568 sub {
2569 $status = $!;
2570 $current->ready; undef $current;
2571 },
2572 sub {
2573 Coro::schedule while defined $current;
2574 $! = $status;
2575 },
2576 )
2577 };
2578
2579 unless ($DB_ENV) {
2580 $DB_ENV = BDB::db_env_create;
2581
2582 cf::sync_job {
2583 eval {
2584 BDB::db_env_open
2585 $DB_ENV,
2586 $BDB_ENV_DIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666;
2590
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2592
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect;
2595 };
2596
2597 cf::cleanup "db_env_open(db): $@" if $@;
2598 };
2599 }
2600}
2601
2602{
2603 IO::AIO::min_parallel 8;
2604
2605 undef $Coro::AIO::WATCHER;
2525IO::AIO::max_poll_time $TICK * 0.1; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2526
2527undef $Coro::AIO::WATCHER;
2528$AIO_POLL_WATCHER = Event->io ( 2607 $AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0, 2608 reentrant => 0,
2530 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2531 poll => 'r', 2610 poll => 'r',
2532 prio => 6, 2611 prio => 6,
2533 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2534 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2535); 2614 );
2615}
2536 2616
2537$WRITE_RUNTIME_WATCHER = Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0, 2618 reentrant => 0,
2539 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2540 after => 1, 2620 after => 1,

Diff Legend

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