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.198 by root, Sun Jan 28 01:58:37 2007 UTC vs.
Revision 1.214 by root, Wed Feb 14 00:40:05 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
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
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
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
356 # 60 allows for the watchdog to kill the server. 366 # 60 allows for the watchdog to kill the server.
357 367
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 369 and return;
360 370
371 # always fsync - this file is important
361 aio_fsync $fh 372 aio_fsync $fh
362 and return; 373 and return;
363 374
364 close $fh 375 close $fh
365 or return; 376 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
751 762
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 767 close $fh;
757 768
758 if (@$objs) { 769 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 775 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
766 } 777 }
767 } else { 778 } else {
768 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
774 } 785 }
775 } else { 786 } else {
776 aio_unlink $filename; 787 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
778 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
779 } 796 }
780} 797}
781 798
782sub object_freezer_as_string { 799sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
789 806
790sub object_thawer_load { 807sub object_thawer_load {
791 my ($filename) = @_; 808 my ($filename) = @_;
792 809
793 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
794 814
795 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
796 or return; 816 or return;
797 817
798 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
1068=cut 1088=cut
1069 1089
1070sub maps($) { 1090sub maps($) {
1071 my ($pl) = @_; 1091 my ($pl) = @_;
1072 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1073 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1074 or return; 1096 or return;
1075 1097
1076 my @paths; 1098 my @paths;
1077 1099
1078 for (@$files) { 1100 for (@$files) {
1079 utf8::decode $_; 1101 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1082 1104
1083 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1106 }
1086 1107
1087 \@paths 1108 \@paths
1088} 1109}
1089 1110
… …
1178sub normalise { 1199sub normalise {
1179 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1180 1201
1181 $path = "$path"; # make sure its a string 1202 $path = "$path"; # make sure its a string
1182 1203
1204 $path =~ s/\.map$//;
1205
1183 # map plan: 1206 # map plan:
1184 # 1207 #
1185 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1210 # ?xxx/... are special absolute paths
… …
1248 1271
1249# the original (read-only) location 1272# the original (read-only) location
1250sub load_path { 1273sub load_path {
1251 my ($self) = @_; 1274 my ($self) = @_;
1252 1275
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1277}
1255 1278
1256# the temporary/swap location 1279# the temporary/swap location
1257sub save_path { 1280sub save_path {
1258 my ($self) = @_; 1281 my ($self) = @_;
1259 1282
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1285}
1263 1286
1264# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1265sub uniq_path { 1288sub uniq_path {
1266 my ($self) = @_; 1289 my ($self) = @_;
… …
1282 my ($self) = @_; 1305 my ($self) = @_;
1283 1306
1284 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1315}
1288 1316
1289sub load_header_from($) { 1317sub load_header_from($) {
1290 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1291 1319
1292 utf8::encode $path; 1320 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1294 or return; 1322 # or return;
1295 1323
1296 $self->_load_header ($path) 1324 $self->_load_header ($path)
1297 or return; 1325 or return;
1298 1326
1299 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
… …
1579 return if $self->players; 1607 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1581 1609
1582 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1583 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1584 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1585 1623
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1624 $self->clear;
1588 1625
1589 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1590 1627
1591 $self->unlink_save; 1628 $self->unlink_save;
… …
1628 for (@$files) { 1665 for (@$files) {
1629 utf8::decode $_; 1666 utf8::decode $_;
1630 next if /\.pst$/; 1667 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1632 1669
1633 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1671 }
1636 1672
1637 \@paths 1673 \@paths
1638} 1674}
1639 1675
… …
1985 # get handled first 2021 # get handled first
1986 my $queue = delete $ns->{query_queue} 2022 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2023 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2024
1989 (shift @$queue)->[1]->($msg); 2025 (shift @$queue)->[1]->($msg);
2026 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2027
1991 push @{ $ns->{query_queue} }, @$queue; 2028 push @{ $ns->{query_queue} }, @$queue;
1992 2029
1993 if (@{ $ns->{query_queue} } == @$queue) { 2030 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2031 if (@$queue) {
… …
2155The parameter C<$family> should best start with the name of the extension 2192The parameter C<$family> should best start with the name of the extension
2156using it, it should be unique. 2193using it, it should be unique.
2157 2194
2158=over 4 2195=over 4
2159 2196
2160=item $hashref = cf::db_get $family
2161
2162Return a hashref for use by the extension C<$family>, which can be
2163modified. After modifications, you have to call C<cf::db_dirty> or
2164C<cf::db_sync>.
2165
2166=item $value = cf::db_get $family => $key 2197=item $value = cf::db_get $family => $key
2167 2198
2168Returns a single value from the database 2199Returns a single value from the database.
2169
2170=item cf::db_put $family => $hashref
2171
2172Stores the given family hashref into the database. Updates are delayed, if
2173you want the data to be synced to disk immediately, use C<cf::db_sync>.
2174 2200
2175=item cf::db_put $family => $key => $value 2201=item cf::db_put $family => $key => $value
2176 2202
2177Stores the given C<$value> in the family hash. Updates are delayed, if you 2203Stores the given C<$value> in the family.
2178want the data to be synced to disk immediately, use C<cf::db_sync>.
2179
2180=item cf::db_dirty
2181
2182Marks the database as dirty, to be updated at a later time.
2183
2184=item cf::db_sync
2185
2186Immediately write the database to disk I<if it is dirty>.
2187 2204
2188=cut 2205=cut
2189 2206
2190our $DB; 2207our $DB;
2191 2208
2192{ 2209sub db_init {
2210 unless ($DB) {
2211 $DB = BDB::db_create $DB_ENV;
2212
2213 cf::sync_job {
2214 eval {
2215 $DB->set_flags (BDB::CHKSUM);
2216
2217 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!;
2220 };
2221 cf::cleanup "db_open(db): $@" if $@;
2222 };
2223
2193 my $path = cf::localdir . "/database.pst"; 2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2194 2228
2195 sub db_load() { 2229 cf::db_put (board => data => $pst->{board});
2196 $DB = stat $path ? Storable::retrieve $path : { }; 2230 cf::db_put (guildrules => data => $pst->{guildrules});
2197 } 2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2198 2233
2199 my $pid; 2234 unlink $path;
2200
2201 sub db_save() {
2202 waitpid $pid, 0 if $pid;
2203 if (0 == ($pid = fork)) {
2204 $DB->{_meta}{version} = 1;
2205 Storable::nstore $DB, "$path~";
2206 rename "$path~", $path;
2207 cf::_exit 0 if defined $pid;
2208 } 2235 };
2209 }
2210
2211 my $dirty;
2212
2213 sub db_sync() {
2214 db_save if $dirty;
2215 undef $dirty;
2216 }
2217
2218 my $idle = Event->idle (
2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2225 );
2226
2227 sub db_dirty() {
2228 $dirty = 1;
2229 $idle->start;
2230 }
2231
2232 sub db_get($;$) {
2233 @_ >= 2
2234 ? $DB->{$_[0]}{$_[1]}
2235 : ($DB->{$_[0]} ||= { })
2236 }
2237
2238 sub db_put($$;$) {
2239 if (@_ >= 3) {
2240 $DB->{$_[0]}{$_[1]} = $_[2];
2241 } else {
2242 $DB->{$_[0]} = $_[1];
2243 }
2244 db_dirty;
2245 }
2246
2247 cf::global->attach (
2248 prio => 10000,
2249 on_cleanup => sub {
2250 db_sync;
2251 }, 2236 }
2252 ); 2237 }
2238}
2239
2240sub db_get($$) {
2241 my $key = "$_[0]/$_[1]";
2242
2243 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data;
2245
2246 $! ? ()
2247 : Compress::LZF::sthaw $data
2248 }
2249}
2250
2251sub db_put($$$) {
2252 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2253} 2254}
2254 2255
2255############################################################################# 2256#############################################################################
2256# the server's main() 2257# the server's init and main functions
2258
2259sub load_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d#
2262}
2257 2263
2258sub cfg_load { 2264sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2265 open my $fh, "<:utf8", cf::confdir . "/config"
2260 or return; 2266 or return;
2261 2267
… …
2272 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2273 and die "WARNING: m(un)lockall failed: $!\n"; 2279 and die "WARNING: m(un)lockall failed: $!\n";
2274 }; 2280 };
2275 warn $@ if $@; 2281 warn $@ if $@;
2276 } 2282 }
2283}
2284
2285sub init {
2286 load_resources;
2277} 2287}
2278 2288
2279sub main { 2289sub main {
2280 # we must not ever block the main coroutine 2290 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2291 local $Coro::idle = sub {
… …
2284 Event::one_event; 2294 Event::one_event;
2285 })->prio (Coro::PRIO_MAX); 2295 })->prio (Coro::PRIO_MAX);
2286 }; 2296 };
2287 2297
2288 cfg_load; 2298 cfg_load;
2289 db_load; 2299 db_init;
2290 load_extensions; 2300 load_extensions;
2291 2301
2292 $TICK_WATCHER->start; 2302 $TICK_WATCHER->start;
2293 Event::loop; 2303 Event::loop;
2294} 2304}
… …
2333 my $map = $cf::MAP{$path} or next; 2343 my $map = $cf::MAP{$path} or next;
2334 $map->valid or next; 2344 $map->valid or next;
2335 $map->save; 2345 $map->save;
2336 } 2346 }
2337 warn "end emergency map save\n"; 2347 warn "end emergency map save\n";
2348
2349 warn "begin emergency database checkpoint\n";
2350 BDB::db_env_txn_checkpoint $DB_ENV;
2351 warn "end emergency database checkpoint\n";
2338 }; 2352 };
2339 2353
2340 warn "leave emergency perl save\n"; 2354 warn "leave emergency perl save\n";
2355}
2356
2357sub post_cleanup {
2358 my ($make_core) = @_;
2359
2360 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core;
2341} 2362}
2342 2363
2343sub reload() { 2364sub reload() {
2344 # can/must only be called in main 2365 # can/must only be called in main
2345 if ($Coro::current != $Coro::main) { 2366 if ($Coro::current != $Coro::main) {
… …
2347 return; 2368 return;
2348 } 2369 }
2349 2370
2350 warn "reloading..."; 2371 warn "reloading...";
2351 2372
2352 warn "cancelling server ticker"; 2373 warn "entering sync_job";
2353 $TICK_WATCHER->cancel;
2354 2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2355 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2356 2379
2357 eval { 2380 warn "syncing database to disk";
2381 BDB::db_env_txn_checkpoint $DB_ENV;
2382
2358 # 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
2359
2360 warn "syncing database to disk";
2361 cf::db_sync;
2362 2384
2363 warn "cancelling all WF_AUTOCANCEL watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2364 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2365 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2366 } 2388 }
2367 2389
2368 warn "flushing outstanding aio requests"; 2390 warn "flushing outstanding aio requests";
2369 for (;;) { 2391 for (;;) {
2392 BDB::flush;
2370 IO::AIO::flush; 2393 IO::AIO::flush;
2371 Coro::cede; 2394 Coro::cede;
2372 last unless IO::AIO::nreqs; 2395 last unless IO::AIO::nreqs || BDB::nreqs;
2373 warn "iterate..."; 2396 warn "iterate...";
2374 } 2397 }
2375 2398
2376 warn "cancelling all extension coros"; 2399 warn "cancelling all extension coros";
2377 $_->cancel for values %EXT_CORO; 2400 $_->cancel for values %EXT_CORO;
… …
2432 require cf; 2455 require cf;
2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2434 2457
2435 warn "loading config and database again"; 2458 warn "loading config and database again";
2436 cf::cfg_load; 2459 cf::cfg_load;
2437 cf::db_load;
2438 2460
2439 warn "loading extensions"; 2461 warn "loading extensions";
2440 cf::load_extensions; 2462 cf::load_extensions;
2441 2463
2442 warn "reattaching attachments to objects/players"; 2464 warn "reattaching attachments to objects/players";
2443 _global_reattach; 2465 _global_reattach;
2444 warn "reattaching attachments to maps"; 2466 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2446 2468
2447 warn "restarting server ticker"; 2469 warn "loading reloadable resources";
2470 load_resources;
2448 2471
2449 $TICK_WATCHER->start; 2472 warn "leaving sync_job";
2450 };
2451 2473
2452 if ($@) { 2474 1
2475 } or do {
2453 warn $@; 2476 warn $@;
2454 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2455 exit 1; 2478 exit 1;
2456 } 2479 };
2457 2480
2458 warn "reloaded"; 2481 warn "reloaded";
2459}; 2482};
2460 2483
2461our $RELOAD_WATCHER; # used only during reload 2484our $RELOAD_WATCHER; # used only during reload
… …
2502 2525
2503 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2504 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2505 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2506 2529
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10;
2532 Coro::async_pool {
2533 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!";
2535 };
2536 }
2537
2538
2507 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509 2541
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time; 2542# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d# 2543# warn $AFTER - $NOW;#d#
2515 2544
2516 # if we are delayed by four ticks or more, skip them all 2545 # if we are delayed by four ticks or more, skip them all
2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2519 $TICK_WATCHER->at ($NEXT_TICK); 2548 $TICK_WATCHER->at ($NEXT_TICK);
2520 $TICK_WATCHER->start; 2549 $TICK_WATCHER->start;
2521 }, 2550 },
2522); 2551);
2523 2552
2553{
2554 BDB::max_poll_time $TICK * 0.1;
2555 $BDB_POLL_WATCHER = Event->io (
2556 reentrant => 0,
2557 fd => BDB::poll_fileno,
2558 poll => 'r',
2559 prio => 0,
2560 data => WF_AUTOCANCEL,
2561 cb => \&BDB::poll_cb,
2562 );
2563 BDB::min_parallel 8;
2564
2565 BDB::set_sync_prepare {
2566 my $status;
2567 my $current = $Coro::current;
2568 (
2569 sub {
2570 $status = $!;
2571 $current->ready; undef $current;
2572 },
2573 sub {
2574 Coro::schedule while defined $current;
2575 $! = $status;
2576 },
2577 )
2578 };
2579
2580 unless ($DB_ENV) {
2581 $DB_ENV = BDB::db_env_create;
2582
2583 cf::sync_job {
2584 eval {
2585 BDB::db_env_open
2586 $DB_ENV,
2587 $BDB_ENV_DIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666;
2591
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2593
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect;
2596 };
2597
2598 cf::cleanup "db_env_open(db): $@" if $@;
2599 };
2600 }
2601}
2602
2603{
2604 IO::AIO::min_parallel 8;
2605
2606 undef $Coro::AIO::WATCHER;
2524IO::AIO::max_poll_time $TICK * 0.1; 2607 IO::AIO::max_poll_time $TICK * 0.1;
2525
2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io ( 2608 $AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0, 2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2529 fd => IO::AIO::poll_fileno, 2611 fd => IO::AIO::poll_fileno,
2530 poll => 'r', 2612 poll => 'r',
2531 prio => 6, 2613 prio => 6,
2532 data => WF_AUTOCANCEL,
2533 cb => \&IO::AIO::poll_cb, 2614 cb => \&IO::AIO::poll_cb,
2534); 2615 );
2535 2616}
2536$WRITE_RUNTIME_WATCHER = Event->timer (
2537 reentrant => 0,
2538 data => WF_AUTOCANCEL,
2539 after => 1,
2540 interval => 10,
2541 prio => 6, # keep it lowest so it acts like a watchdog
2542 cb => Coro::unblock_sub {
2543 write_runtime
2544 or warn "ERROR: unable to write runtime file: $!";
2545 },
2546);
2547 2617
2548END { cf::emergency_save } 2618END { cf::emergency_save }
2549 2619
25501 26201
2551 2621

Diff Legend

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