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.217 by root, Thu Feb 15 21:07:49 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";
… …
1068=cut 1079=cut
1069 1080
1070sub maps($) { 1081sub maps($) {
1071 my ($pl) = @_; 1082 my ($pl) = @_;
1072 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1073 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1074 or return; 1087 or return;
1075 1088
1076 my @paths; 1089 my @paths;
1077 1090
1078 for (@$files) { 1091 for (@$files) {
1079 utf8::decode $_; 1092 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1082 1095
1083 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1097 }
1086 1098
1087 \@paths 1099 \@paths
1088} 1100}
1089 1101
… …
1178sub normalise { 1190sub normalise {
1179 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1180 1192
1181 $path = "$path"; # make sure its a string 1193 $path = "$path"; # make sure its a string
1182 1194
1195 $path =~ s/\.map$//;
1196
1183 # map plan: 1197 # map plan:
1184 # 1198 #
1185 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1201 # ?xxx/... are special absolute paths
… …
1248 1262
1249# the original (read-only) location 1263# the original (read-only) location
1250sub load_path { 1264sub load_path {
1251 my ($self) = @_; 1265 my ($self) = @_;
1252 1266
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1268}
1255 1269
1256# the temporary/swap location 1270# the temporary/swap location
1257sub save_path { 1271sub save_path {
1258 my ($self) = @_; 1272 my ($self) = @_;
1259 1273
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1276}
1263 1277
1264# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1265sub uniq_path { 1279sub uniq_path {
1266 my ($self) = @_; 1280 my ($self) = @_;
… …
1288 1302
1289sub load_header_from($) { 1303sub load_header_from($) {
1290 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1291 1305
1292 utf8::encode $path; 1306 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1307 #aio_open $path, O_RDONLY, 0
1294 or return; 1308 # or return;
1295 1309
1296 $self->_load_header ($path) 1310 $self->_load_header ($path)
1297 or return; 1311 or return;
1298 1312
1299 $self->{load_path} = $path; 1313 $self->{load_path} = $path;
… …
1579 return if $self->players; 1593 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1581 1595
1582 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1583 1597
1598 $self->in_memory (cf::MAP_SWAPPED);
1599
1600 # need to save uniques path
1601 unless ($self->{deny_save}) {
1602 my $uniq = $self->uniq_path; utf8::encode $uniq;
1603
1604 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1605 if $uniq;
1606 }
1607
1584 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1585 1609
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1610 $self->clear;
1588 1611
1589 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1590 1613
1591 $self->unlink_save; 1614 $self->unlink_save;
… …
1628 for (@$files) { 1651 for (@$files) {
1629 utf8::decode $_; 1652 utf8::decode $_;
1630 next if /\.pst$/; 1653 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1654 next unless /^$PATH_SEP/o;
1632 1655
1633 s/\.map$//; 1656 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1657 }
1636 1658
1637 \@paths 1659 \@paths
1638} 1660}
1639 1661
… …
1782 $map->load; 1804 $map->load;
1783 $map->load_diag; 1805 $map->load_diag;
1784 1806
1785 return unless $self->contr->active; 1807 return unless $self->contr->active;
1786 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1787 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1788} 1812}
1789 1813
1790cf::player->attach ( 1814cf::player->attach (
1791 on_logout => sub { 1815 on_logout => sub {
… …
1804 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1805 # should happen only on crashes 1829 # should happen only on crashes
1806 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1807 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1808 (async { 1832 (async {
1809 # we need this sleep as the login has a concurrent enter_exit running
1810 # and this sleep increases chances of the player not ending up in scorn
1811 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1812 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1813 . "the server will try to bring you to your intended destination in a second.", 1835 . "the server will try to bring you to your intended destination in a second.",
1814 cf::NDI_RED); 1836 cf::NDI_RED);
1837 # we need this sleep as the login has a concurrent enter_exit running
1838 # and this sleep increases chances of the player not ending up in scorn
1815 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1816 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1817 })->prio (2); 1841 })->prio (2);
1818 } 1842 }
1819 }, 1843 },
… …
1985 # get handled first 2009 # get handled first
1986 my $queue = delete $ns->{query_queue} 2010 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2011 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2012
1989 (shift @$queue)->[1]->($msg); 2013 (shift @$queue)->[1]->($msg);
2014 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2015
1991 push @{ $ns->{query_queue} }, @$queue; 2016 push @{ $ns->{query_queue} }, @$queue;
1992 2017
1993 if (@{ $ns->{query_queue} } == @$queue) { 2018 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2019 if (@$queue) {
… …
2155The parameter C<$family> should best start with the name of the extension 2180The parameter C<$family> should best start with the name of the extension
2156using it, it should be unique. 2181using it, it should be unique.
2157 2182
2158=over 4 2183=over 4
2159 2184
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 2185=item $value = cf::db_get $family => $key
2167 2186
2168Returns a single value from the database 2187Returns 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 2188
2175=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2176 2190
2177Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores 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 2192
2188=cut 2193=cut
2189 2194
2190our $DB; 2195our $DB;
2191 2196
2192{ 2197sub db_init {
2198 unless ($DB) {
2199 $DB = BDB::db_create $DB_ENV;
2200
2201 cf::sync_job {
2202 eval {
2203 $DB->set_flags (BDB::CHKSUM);
2204
2205 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2206 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2207 cf::cleanup "db_open(db): $!" if $!;
2208 };
2209 cf::cleanup "db_open(db): $@" if $@;
2210 };
2211
2193 my $path = cf::localdir . "/database.pst"; 2212 my $path = cf::localdir . "/database.pst";
2213 if (stat $path) {
2214 cf::sync_job {
2215 my $pst = Storable::retrieve $path;
2194 2216
2195 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2196 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2197 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2198 2221
2199 my $pid; 2222 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 } 2223 };
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 }, 2224 }
2252 ); 2225 }
2226}
2227
2228sub db_get($$) {
2229 my $key = "$_[0]/$_[1]";
2230
2231 cf::sync_job {
2232 BDB::db_get $DB, undef, $key, my $data;
2233
2234 $! ? ()
2235 : Compress::LZF::sthaw $data
2236 }
2237}
2238
2239sub db_put($$$) {
2240 BDB::dbreq_pri 4;
2241 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2253} 2242}
2254 2243
2255############################################################################# 2244#############################################################################
2256# the server's main() 2245# the server's init and main functions
2246
2247sub init_resources {
2248 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2249 or die "unable to load regions file\n";#d#
2250}
2257 2251
2258sub cfg_load { 2252sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
2260 or return; 2254 or return;
2261 2255
… …
2272 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2266 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2273 and die "WARNING: m(un)lockall failed: $!\n"; 2267 and die "WARNING: m(un)lockall failed: $!\n";
2274 }; 2268 };
2275 warn $@ if $@; 2269 warn $@ if $@;
2276 } 2270 }
2271}
2272
2273sub init {
2274 init_resources;
2277} 2275}
2278 2276
2279sub main { 2277sub main {
2280 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
… …
2284 Event::one_event; 2282 Event::one_event;
2285 })->prio (Coro::PRIO_MAX); 2283 })->prio (Coro::PRIO_MAX);
2286 }; 2284 };
2287 2285
2288 cfg_load; 2286 cfg_load;
2289 db_load; 2287 db_init;
2290 load_extensions; 2288 load_extensions;
2291 2289
2292 $TICK_WATCHER->start; 2290 $TICK_WATCHER->start;
2293 Event::loop; 2291 Event::loop;
2294} 2292}
… …
2333 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2334 $map->valid or next; 2332 $map->valid or next;
2335 $map->save; 2333 $map->save;
2336 } 2334 }
2337 warn "end emergency map save\n"; 2335 warn "end emergency map save\n";
2336
2337 warn "begin emergency database checkpoint\n";
2338 BDB::db_env_txn_checkpoint $DB_ENV;
2339 warn "end emergency database checkpoint\n";
2338 }; 2340 };
2339 2341
2340 warn "leave emergency perl save\n"; 2342 warn "leave emergency perl save\n";
2343}
2344
2345sub post_cleanup {
2346 my ($make_core) = @_;
2347
2348 warn Carp::longmess "post_cleanup backtrace"
2349 if $make_core;
2341} 2350}
2342 2351
2343sub reload() { 2352sub reload() {
2344 # can/must only be called in main 2353 # can/must only be called in main
2345 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
… …
2347 return; 2356 return;
2348 } 2357 }
2349 2358
2350 warn "reloading..."; 2359 warn "reloading...";
2351 2360
2352 warn "cancelling server ticker"; 2361 warn "entering sync_job";
2353 $TICK_WATCHER->cancel;
2354 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2355 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2356 2367
2357 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2358 # if anything goes wrong in here, we should simply crash as we already saved 2371 # 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 2372
2363 warn "cancelling all WF_AUTOCANCEL watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2364 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2365 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2366 } 2376 }
2367 2377
2368 warn "flushing outstanding aio requests"; 2378 warn "flushing outstanding aio requests";
2369 for (;;) { 2379 for (;;) {
2380 BDB::flush;
2370 IO::AIO::flush; 2381 IO::AIO::flush;
2371 Coro::cede; 2382 Coro::cede;
2372 last unless IO::AIO::nreqs; 2383 last unless IO::AIO::nreqs || BDB::nreqs;
2373 warn "iterate..."; 2384 warn "iterate...";
2374 } 2385 }
2375 2386
2376 warn "cancelling all extension coros"; 2387 warn "cancelling all extension coros";
2377 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
… …
2432 require cf; 2443 require cf;
2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2434 2445
2435 warn "loading config and database again"; 2446 warn "loading config and database again";
2436 cf::cfg_load; 2447 cf::cfg_load;
2437 cf::db_load;
2438 2448
2439 warn "loading extensions"; 2449 warn "loading extensions";
2440 cf::load_extensions; 2450 cf::load_extensions;
2441 2451
2442 warn "reattaching attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
2443 _global_reattach; 2453 _global_reattach;
2444 warn "reattaching attachments to maps"; 2454 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2446 2456
2447 warn "restarting server ticker"; 2457 warn "loading reloadable resources";
2458 init_resources;
2448 2459
2449 $TICK_WATCHER->start; 2460 warn "leaving sync_job";
2450 };
2451 2461
2452 if ($@) { 2462 1
2463 } or do {
2453 warn $@; 2464 warn $@;
2454 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2455 exit 1; 2466 exit 1;
2456 } 2467 };
2457 2468
2458 warn "reloaded"; 2469 warn "reloaded";
2459}; 2470};
2460 2471
2461our $RELOAD_WATCHER; # used only during reload 2472our $RELOAD_WATCHER; # used only during reload
… …
2502 2513
2503 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2504 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2505 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2506 2517
2518 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2519 $NEXT_RUNTIME_WRITE = $NOW + 10;
2520 Coro::async_pool {
2521 write_runtime
2522 or warn "ERROR: unable to write runtime file: $!";
2523 };
2524 }
2525
2526
2507 $WAIT_FOR_TICK->broadcast; 2527 $WAIT_FOR_TICK->broadcast;
2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2528 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509 2529
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time; 2530# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d# 2531# warn $AFTER - $NOW;#d#
2515 2532
2516 # if we are delayed by four ticks or more, skip them all 2533 # if we are delayed by four ticks or more, skip them all
2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2534 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2519 $TICK_WATCHER->at ($NEXT_TICK); 2536 $TICK_WATCHER->at ($NEXT_TICK);
2520 $TICK_WATCHER->start; 2537 $TICK_WATCHER->start;
2521 }, 2538 },
2522); 2539);
2523 2540
2541{
2542 BDB::max_poll_time $TICK * 0.1;
2543 $BDB_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2545 fd => BDB::poll_fileno,
2546 poll => 'r',
2547 prio => 0,
2548 data => WF_AUTOCANCEL,
2549 cb => \&BDB::poll_cb,
2550 );
2551 BDB::min_parallel 8;
2552
2553 BDB::set_sync_prepare {
2554 my $status;
2555 my $current = $Coro::current;
2556 (
2557 sub {
2558 $status = $!;
2559 $current->ready; undef $current;
2560 },
2561 sub {
2562 Coro::schedule while defined $current;
2563 $! = $status;
2564 },
2565 )
2566 };
2567
2568 unless ($DB_ENV) {
2569 $DB_ENV = BDB::db_env_create;
2570
2571 cf::sync_job {
2572 eval {
2573 BDB::db_env_open
2574 $DB_ENV,
2575 $BDB_ENV_DIR,
2576 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2577 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2578 0666;
2579
2580 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2581
2582 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2583 $DB_ENV->set_lk_detect;
2584 };
2585
2586 cf::cleanup "db_env_open(db): $@" if $@;
2587 };
2588 }
2589}
2590
2591{
2592 IO::AIO::min_parallel 8;
2593
2594 undef $Coro::AIO::WATCHER;
2524IO::AIO::max_poll_time $TICK * 0.1; 2595 IO::AIO::max_poll_time $TICK * 0.1;
2525
2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io ( 2596 $AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0, 2597 reentrant => 0,
2598 data => WF_AUTOCANCEL,
2529 fd => IO::AIO::poll_fileno, 2599 fd => IO::AIO::poll_fileno,
2530 poll => 'r', 2600 poll => 'r',
2531 prio => 6, 2601 prio => 6,
2532 data => WF_AUTOCANCEL,
2533 cb => \&IO::AIO::poll_cb, 2602 cb => \&IO::AIO::poll_cb,
2534); 2603 );
2535 2604}
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 2605
2548END { cf::emergency_save } 2606END { cf::emergency_save }
2549 2607
25501 26081
2551 2609

Diff Legend

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