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.212 by root, Tue Feb 13 19:25:44 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
… …
356 # 60 allows for the watchdog to kill the server. 368 # 60 allows for the watchdog to kill the server.
357 369
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 371 and return;
360 372
373 # always fsync - this file is important
361 aio_fsync $fh 374 aio_fsync $fh
362 and return; 375 and return;
363 376
364 close $fh 377 close $fh
365 or return; 378 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
751 764
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 769 close $fh;
757 770
758 if (@$objs) { 771 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 777 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
766 } 779 }
767 } else { 780 } else {
768 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
774 } 787 }
775 } else { 788 } else {
776 aio_unlink $filename; 789 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
778 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
779 } 798 }
780} 799}
781 800
782sub object_freezer_as_string { 801sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
789 808
790sub object_thawer_load { 809sub object_thawer_load {
791 my ($filename) = @_; 810 my ($filename) = @_;
792 811
793 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
794 816
795 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
796 or return; 818 or return;
797 819
798 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1068=cut 1090=cut
1069 1091
1070sub maps($) { 1092sub maps($) {
1071 my ($pl) = @_; 1093 my ($pl) = @_;
1072 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1073 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1074 or return; 1098 or return;
1075 1099
1076 my @paths; 1100 my @paths;
1077 1101
1078 for (@$files) { 1102 for (@$files) {
1079 utf8::decode $_; 1103 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1082 1106
1083 s/\.map$//; 1107 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1108 }
1086 1109
1087 \@paths 1110 \@paths
1088} 1111}
1089 1112
… …
1178sub normalise { 1201sub normalise {
1179 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1180 1203
1181 $path = "$path"; # make sure its a string 1204 $path = "$path"; # make sure its a string
1182 1205
1206 $path =~ s/\.map$//;
1207
1183 # map plan: 1208 # map plan:
1184 # 1209 #
1185 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1212 # ?xxx/... are special absolute paths
… …
1248 1273
1249# the original (read-only) location 1274# the original (read-only) location
1250sub load_path { 1275sub load_path {
1251 my ($self) = @_; 1276 my ($self) = @_;
1252 1277
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1279}
1255 1280
1256# the temporary/swap location 1281# the temporary/swap location
1257sub save_path { 1282sub save_path {
1258 my ($self) = @_; 1283 my ($self) = @_;
1259 1284
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1287}
1263 1288
1264# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1265sub uniq_path { 1290sub uniq_path {
1266 my ($self) = @_; 1291 my ($self) = @_;
… …
1282 my ($self) = @_; 1307 my ($self) = @_;
1283 1308
1284 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1317}
1288 1318
1289sub load_header_from($) { 1319sub load_header_from($) {
1290 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1291 1321
1292 utf8::encode $path; 1322 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1294 or return; 1324 # or return;
1295 1325
1296 $self->_load_header ($path) 1326 $self->_load_header ($path)
1297 or return; 1327 or return;
1298 1328
1299 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
… …
1579 return if $self->players; 1609 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1581 1611
1582 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1583 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1584 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1585 1625
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1626 $self->clear;
1588 1627
1589 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1590 1629
1591 $self->unlink_save; 1630 $self->unlink_save;
… …
1628 for (@$files) { 1667 for (@$files) {
1629 utf8::decode $_; 1668 utf8::decode $_;
1630 next if /\.pst$/; 1669 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1632 1671
1633 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1673 }
1636 1674
1637 \@paths 1675 \@paths
1638} 1676}
1639 1677
… …
1827 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1828 1866
1829 $self->enter_link; 1867 $self->enter_link;
1830 1868
1831 (async { 1869 (async {
1870 my $map = eval {
1832 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1833 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1834 1873 $map
1835# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1836# if $map;
1837
1838 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1839 1876
1840 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1841 })->prio (1); 1878 })->prio (1);
1842} 1879}
1843 1880
… …
1874 # that depends on the exit object 1911 # that depends on the exit object
1875 1912
1876 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1877 1914
1878 if ($exit->map) { 1915 if ($exit->map) {
1879 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1880 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1881 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1882 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1883 } 1920 }
1884 1921
… …
1986 # get handled first 2023 # get handled first
1987 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1988 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1989 2026
1990 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1991 2029
1992 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1993 2031
1994 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1995 if (@$queue) { 2033 if (@$queue) {
… …
2156The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2157using it, it should be unique. 2195using it, it should be unique.
2158 2196
2159=over 4 2197=over 4
2160 2198
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 2199=item $value = cf::db_get $family => $key
2168 2200
2169Returns a single value from the database 2201Returns 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 2202
2176=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2177 2204
2178Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores 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 2206
2189=cut 2207=cut
2190 2208
2191our $DB; 2209our $DB;
2192 2210
2193{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2194 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2195 2230
2196 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2197 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2198 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2199 2235
2200 my $pid; 2236 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 } 2237 };
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 }, 2238 }
2253 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2254} 2256}
2255 2257
2256############################################################################# 2258#############################################################################
2257# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2258 2265
2259sub cfg_load { 2266sub cfg_load {
2260 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2261 or return; 2268 or return;
2262 2269
… …
2273 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2274 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2275 }; 2282 };
2276 warn $@ if $@; 2283 warn $@ if $@;
2277 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2278} 2289}
2279 2290
2280sub main { 2291sub main {
2281 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2282 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2285 Event::one_event; 2296 Event::one_event;
2286 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2287 }; 2298 };
2288 2299
2289 cfg_load; 2300 cfg_load;
2290 db_load; 2301 db_init;
2291 load_extensions; 2302 load_extensions;
2292 2303
2293 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2294 Event::loop; 2305 Event::loop;
2295} 2306}
… …
2334 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2335 $map->valid or next; 2346 $map->valid or next;
2336 $map->save; 2347 $map->save;
2337 } 2348 }
2338 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2339 }; 2354 };
2340 2355
2341 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2342} 2364}
2343 2365
2344sub reload() { 2366sub reload() {
2345 # can/must only be called in main 2367 # can/must only be called in main
2346 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
… …
2348 return; 2370 return;
2349 } 2371 }
2350 2372
2351 warn "reloading..."; 2373 warn "reloading...";
2352 2374
2353 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2354 $TICK_WATCHER->cancel;
2355 2376
2377 sync_job {
2378 write_runtime;
2356 cf::emergency_save; 2379 cf::emergency_save;
2380 write_runtime;
2357 2381
2358 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2359 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2360
2361 warn "syncing database to disk";
2362 cf::db_sync;
2363 2386
2364 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2365 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2366 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2367 } 2390 }
2368 2391
2369 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2370 for (;;) { 2393 for (;;) {
2394 BDB::flush;
2371 IO::AIO::flush; 2395 IO::AIO::flush;
2372 Coro::cede; 2396 Coro::cede;
2373 last unless IO::AIO::nreqs; 2397 last unless IO::AIO::nreqs || BDB::nreqs;
2374 warn "iterate..."; 2398 warn "iterate...";
2375 } 2399 }
2376 2400
2377 warn "cancelling all extension coros"; 2401 warn "cancelling all extension coros";
2378 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
… …
2433 require cf; 2457 require cf;
2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2435 2459
2436 warn "loading config and database again"; 2460 warn "loading config and database again";
2437 cf::cfg_load; 2461 cf::cfg_load;
2438 cf::db_load;
2439 2462
2440 warn "loading extensions"; 2463 warn "loading extensions";
2441 cf::load_extensions; 2464 cf::load_extensions;
2442 2465
2443 warn "reattaching attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2444 _global_reattach; 2467 _global_reattach;
2445 warn "reattaching attachments to maps"; 2468 warn "reattaching attachments to maps";
2446 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2447 2470
2448 warn "restarting server ticker"; 2471 warn "loading reloadable resources";
2472 load_resources;
2449 2473
2450 $TICK_WATCHER->start; 2474 warn "leaving sync_job";
2451 };
2452 2475
2453 if ($@) { 2476 1
2477 } or do {
2454 warn $@; 2478 warn $@;
2455 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2456 exit 1; 2480 exit 1;
2457 } 2481 };
2458 2482
2459 warn "reloaded"; 2483 warn "reloaded";
2460}; 2484};
2461 2485
2462our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2506 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2507 2531
2508 $WAIT_FOR_TICK->broadcast; 2532 $WAIT_FOR_TICK->broadcast;
2509 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2510 2534
2511 Event::sweep;
2512 Coro::cede_notself;
2513
2514# my $AFTER = Event::time; 2535# my $AFTER = Event::time;
2515# warn $AFTER - $NOW;#d# 2536# warn $AFTER - $NOW;#d#
2516 2537
2517 # if we are delayed by four ticks or more, skip them all 2538 # if we are delayed by four ticks or more, skip them all
2518 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2520 $TICK_WATCHER->at ($NEXT_TICK); 2541 $TICK_WATCHER->at ($NEXT_TICK);
2521 $TICK_WATCHER->start; 2542 $TICK_WATCHER->start;
2522 }, 2543 },
2523); 2544);
2524 2545
2546{
2547 BDB::max_poll_time $TICK * 0.1;
2548 $BDB_POLL_WATCHER = Event->io (
2549 reentrant => 0,
2550 fd => BDB::poll_fileno,
2551 poll => 'r',
2552 prio => 0,
2553 data => WF_AUTOCANCEL,
2554 cb => \&BDB::poll_cb,
2555 );
2556 BDB::min_parallel 8;
2557
2558 BDB::set_sync_prepare {
2559 my $status;
2560 my $current = $Coro::current;
2561 (
2562 sub {
2563 $status = $!;
2564 $current->ready; undef $current;
2565 },
2566 sub {
2567 Coro::schedule while defined $current;
2568 $! = $status;
2569 },
2570 )
2571 };
2572
2573 unless ($DB_ENV) {
2574 $DB_ENV = BDB::db_env_create;
2575
2576 cf::sync_job {
2577 eval {
2578 BDB::db_env_open
2579 $DB_ENV,
2580 $BDB_ENV_DIR,
2581 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2582 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2583 0666;
2584
2585 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2586
2587 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2588 $DB_ENV->set_lk_detect;
2589 };
2590
2591 cf::cleanup "db_env_open(db): $@" if $@;
2592 };
2593 }
2594}
2595
2596{
2597 IO::AIO::min_parallel 8;
2598
2599 undef $Coro::AIO::WATCHER;
2525IO::AIO::max_poll_time $TICK * 0.1; 2600 IO::AIO::max_poll_time $TICK * 0.1;
2526
2527undef $Coro::AIO::WATCHER;
2528$AIO_POLL_WATCHER = Event->io ( 2601 $AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0, 2602 reentrant => 0,
2530 fd => IO::AIO::poll_fileno, 2603 fd => IO::AIO::poll_fileno,
2531 poll => 'r', 2604 poll => 'r',
2532 prio => 6, 2605 prio => 6,
2533 data => WF_AUTOCANCEL, 2606 data => WF_AUTOCANCEL,
2534 cb => \&IO::AIO::poll_cb, 2607 cb => \&IO::AIO::poll_cb,
2535); 2608 );
2609}
2536 2610
2537$WRITE_RUNTIME_WATCHER = Event->timer ( 2611$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0, 2612 reentrant => 0,
2539 data => WF_AUTOCANCEL, 2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2540 after => 1, 2615 after => 1,
2541 interval => 10, 2616 interval => 10,
2542 prio => 6, # keep it lowest so it acts like a watchdog 2617 prio => 6, # keep it lowest so it acts like a watchdog
2543 cb => Coro::unblock_sub { 2618 cb => sub {
2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620
2621 Coro::async_pool {
2544 write_runtime 2622 write_runtime
2545 or warn "ERROR: unable to write runtime file: $!"; 2623 or warn "ERROR: unable to write runtime file: $!";
2624 };
2546 }, 2625 },
2547); 2626);
2548 2627
2549END { cf::emergency_save } 2628END { cf::emergency_save }
2550 2629

Diff Legend

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