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.197 by root, Sun Jan 28 00:20:02 2007 UTC vs.
Revision 1.220 by root, Sat Feb 17 23:54:35 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 }
… …
344 354
345 $coro 355 $coro
346} 356}
347 357
348sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
349 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
350 362
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 364 or return;
353 365
… …
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";
… …
1017=cut 1030=cut
1018 1031
1019sub quit_character { 1032sub quit_character {
1020 my ($pl) = @_; 1033 my ($pl) = @_;
1021 1034
1035 my $name = $pl->ob->name;
1036
1022 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1039
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1041 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1035 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1036} 1057}
1037 1058
1038=item cf::player::list_logins 1059=item cf::player::list_logins
1039 1060
… …
1068=cut 1089=cut
1069 1090
1070sub maps($) { 1091sub maps($) {
1071 my ($pl) = @_; 1092 my ($pl) = @_;
1072 1093
1094 $pl = ref $pl ? $pl->ob->name : $pl;
1095
1073 my $files = aio_readdir playerdir $pl 1096 my $files = aio_readdir playerdir $pl
1074 or return; 1097 or return;
1075 1098
1076 my @paths; 1099 my @paths;
1077 1100
1078 for (@$files) { 1101 for (@$files) {
1079 utf8::decode $_; 1102 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1103 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1104 next unless /^$PATH_SEP/o;
1082 1105
1083 s/\.map$//; 1106 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1107 }
1086 1108
1087 \@paths 1109 \@paths
1088} 1110}
1089 1111
… …
1178sub normalise { 1200sub normalise {
1179 my ($path, $base) = @_; 1201 my ($path, $base) = @_;
1180 1202
1181 $path = "$path"; # make sure its a string 1203 $path = "$path"; # make sure its a string
1182 1204
1205 $path =~ s/\.map$//;
1206
1183 # map plan: 1207 # map plan:
1184 # 1208 #
1185 # /! non-realised random map exit (special hack!) 1209 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1210 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1211 # ?xxx/... are special absolute paths
… …
1248 1272
1249# the original (read-only) location 1273# the original (read-only) location
1250sub load_path { 1274sub load_path {
1251 my ($self) = @_; 1275 my ($self) = @_;
1252 1276
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1278}
1255 1279
1256# the temporary/swap location 1280# the temporary/swap location
1257sub save_path { 1281sub save_path {
1258 my ($self) = @_; 1282 my ($self) = @_;
1259 1283
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1286}
1263 1287
1264# the unique path, undef == no special unique path 1288# the unique path, undef == no special unique path
1265sub uniq_path { 1289sub uniq_path {
1266 my ($self) = @_; 1290 my ($self) = @_;
… …
1288 1312
1289sub load_header_from($) { 1313sub load_header_from($) {
1290 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1291 1315
1292 utf8::encode $path; 1316 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1317 #aio_open $path, O_RDONLY, 0
1294 or return; 1318 # or return;
1295 1319
1296 $self->_load_header ($path) 1320 $self->_load_header ($path)
1297 or return; 1321 or return;
1298 1322
1299 $self->{load_path} = $path; 1323 $self->{load_path} = $path;
… …
1579 return if $self->players; 1603 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d# 1604 return if $self->isa ("ext::map_per_player");#d#
1581 1605
1582 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1583 1607
1608 $self->in_memory (cf::MAP_SWAPPED);
1609
1610 # need to save uniques path
1611 unless ($self->{deny_save}) {
1612 my $uniq = $self->uniq_path; utf8::encode $uniq;
1613
1614 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1615 if $uniq;
1616 }
1617
1584 delete $cf::MAP{$self->path}; 1618 delete $cf::MAP{$self->path};
1585 1619
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1620 $self->clear;
1588 1621
1589 $_->clear_links_to ($self) for values %cf::MAP; 1622 $_->clear_links_to ($self) for values %cf::MAP;
1590 1623
1591 $self->unlink_save; 1624 $self->unlink_save;
… …
1628 for (@$files) { 1661 for (@$files) {
1629 utf8::decode $_; 1662 utf8::decode $_;
1630 next if /\.pst$/; 1663 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1664 next unless /^$PATH_SEP/o;
1632 1665
1633 s/\.map$//; 1666 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1667 }
1636 1668
1637 \@paths 1669 \@paths
1638} 1670}
1639 1671
… …
1782 $map->load; 1814 $map->load;
1783 $map->load_diag; 1815 $map->load_diag;
1784 1816
1785 return unless $self->contr->active; 1817 return unless $self->contr->active;
1786 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1787 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1788} 1822}
1789 1823
1790cf::player->attach ( 1824cf::player->attach (
1791 on_logout => sub { 1825 on_logout => sub {
… …
1804 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1805 # should happen only on crashes 1839 # should happen only on crashes
1806 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1807 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1808 (async { 1842 (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, 1843 $pl->ob->reply (undef,
1812 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1813 . "the server will try to bring you to your intended destination in a second.", 1845 . "the server will try to bring you to your intended destination in a second.",
1814 cf::NDI_RED); 1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1815 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1816 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1817 })->prio (2); 1851 })->prio (2);
1818 } 1852 }
1819 }, 1853 },
… …
1873 # that depends on the exit object 1907 # that depends on the exit object
1874 1908
1875 my $rmp = parse_random_map_params $exit->msg; 1909 my $rmp = parse_random_map_params $exit->msg;
1876 1910
1877 if ($exit->map) { 1911 if ($exit->map) {
1878 $rmp->{region} = $exit->map->region_name; 1912 $rmp->{region} = $exit->region->name;
1879 $rmp->{origin_map} = $exit->map->path; 1913 $rmp->{origin_map} = $exit->map->path;
1880 $rmp->{origin_x} = $exit->x; 1914 $rmp->{origin_x} = $exit->x;
1881 $rmp->{origin_y} = $exit->y; 1915 $rmp->{origin_y} = $exit->y;
1882 } 1916 }
1883 1917
… …
1985 # get handled first 2019 # get handled first
1986 my $queue = delete $ns->{query_queue} 2020 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2021 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2022
1989 (shift @$queue)->[1]->($msg); 2023 (shift @$queue)->[1]->($msg);
2024 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2025
1991 push @{ $ns->{query_queue} }, @$queue; 2026 push @{ $ns->{query_queue} }, @$queue;
1992 2027
1993 if (@{ $ns->{query_queue} } == @$queue) { 2028 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2029 if (@$queue) {
… …
2155The parameter C<$family> should best start with the name of the extension 2190The parameter C<$family> should best start with the name of the extension
2156using it, it should be unique. 2191using it, it should be unique.
2157 2192
2158=over 4 2193=over 4
2159 2194
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 2195=item $value = cf::db_get $family => $key
2167 2196
2168Returns a single value from the database 2197Returns 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 2198
2175=item cf::db_put $family => $key => $value 2199=item cf::db_put $family => $key => $value
2176 2200
2177Stores the given C<$value> in the family hash. Updates are delayed, if you 2201Stores 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 2202
2188=cut 2203=cut
2189 2204
2190our $DB; 2205our $DB;
2191 2206
2192{ 2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2193 my $path = cf::localdir . "/database.pst"; 2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2194 2226
2195 sub db_load() { 2227 cf::db_put (board => data => $pst->{board});
2196 $DB = stat $path ? Storable::retrieve $path : { }; 2228 cf::db_put (guildrules => data => $pst->{guildrules});
2197 } 2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2198 2231
2199 my $pid; 2232 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 } 2233 };
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 }, 2234 }
2252 ); 2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2253} 2252}
2254 2253
2255############################################################################# 2254#############################################################################
2256# the server's main() 2255# the server's init and main functions
2256
2257sub init_resources {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2259 or die "unable to load regions file\n";#d#
2260}
2257 2261
2258sub cfg_load { 2262sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
2260 or return; 2264 or return;
2261 2265
… …
2272 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2276 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2273 and die "WARNING: m(un)lockall failed: $!\n"; 2277 and die "WARNING: m(un)lockall failed: $!\n";
2274 }; 2278 };
2275 warn $@ if $@; 2279 warn $@ if $@;
2276 } 2280 }
2281}
2282
2283sub init {
2284 init_resources;
2277} 2285}
2278 2286
2279sub main { 2287sub main {
2280 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
… …
2284 Event::one_event; 2292 Event::one_event;
2285 })->prio (Coro::PRIO_MAX); 2293 })->prio (Coro::PRIO_MAX);
2286 }; 2294 };
2287 2295
2288 cfg_load; 2296 cfg_load;
2289 db_load; 2297 db_init;
2290 load_extensions; 2298 load_extensions;
2291 2299
2292 $TICK_WATCHER->start; 2300 $TICK_WATCHER->start;
2293 Event::loop; 2301 Event::loop;
2294} 2302}
… …
2333 my $map = $cf::MAP{$path} or next; 2341 my $map = $cf::MAP{$path} or next;
2334 $map->valid or next; 2342 $map->valid or next;
2335 $map->save; 2343 $map->save;
2336 } 2344 }
2337 warn "end emergency map save\n"; 2345 warn "end emergency map save\n";
2346
2347 warn "begin emergency database checkpoint\n";
2348 BDB::db_env_txn_checkpoint $DB_ENV;
2349 warn "end emergency database checkpoint\n";
2338 }; 2350 };
2339 2351
2340 warn "leave emergency perl save\n"; 2352 warn "leave emergency perl save\n";
2353}
2354
2355sub post_cleanup {
2356 my ($make_core) = @_;
2357
2358 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core;
2341} 2360}
2342 2361
2343sub reload() { 2362sub reload() {
2344 # can/must only be called in main 2363 # can/must only be called in main
2345 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
… …
2347 return; 2366 return;
2348 } 2367 }
2349 2368
2350 warn "reloading..."; 2369 warn "reloading...";
2351 2370
2352 warn "cancelling server ticker"; 2371 warn "entering sync_job";
2353 $TICK_WATCHER->cancel;
2354 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2355 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2356 2377
2357 eval { 2378 warn "syncing database to disk";
2379 BDB::db_env_txn_checkpoint $DB_ENV;
2380
2358 # if anything goes wrong in here, we should simply crash as we already saved 2381 # 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 2382
2363 warn "cancelling all WF_AUTOCANCEL watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2364 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2365 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2366 } 2386 }
2367 2387
2368 warn "flushing outstanding aio requests"; 2388 warn "flushing outstanding aio requests";
2369 for (;;) { 2389 for (;;) {
2390 BDB::flush;
2370 IO::AIO::flush; 2391 IO::AIO::flush;
2371 Coro::cede; 2392 Coro::cede;
2372 last unless IO::AIO::nreqs; 2393 last unless IO::AIO::nreqs || BDB::nreqs;
2373 warn "iterate..."; 2394 warn "iterate...";
2374 } 2395 }
2375 2396
2376 warn "cancelling all extension coros"; 2397 warn "cancelling all extension coros";
2377 $_->cancel for values %EXT_CORO; 2398 $_->cancel for values %EXT_CORO;
… …
2432 require cf; 2453 require cf;
2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2434 2455
2435 warn "loading config and database again"; 2456 warn "loading config and database again";
2436 cf::cfg_load; 2457 cf::cfg_load;
2437 cf::db_load;
2438 2458
2439 warn "loading extensions"; 2459 warn "loading extensions";
2440 cf::load_extensions; 2460 cf::load_extensions;
2441 2461
2442 warn "reattaching attachments to objects/players"; 2462 warn "reattaching attachments to objects/players";
2443 _global_reattach; 2463 _global_reattach;
2444 warn "reattaching attachments to maps"; 2464 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2446 2466
2447 warn "restarting server ticker"; 2467 warn "loading reloadable resources";
2468 init_resources;
2448 2469
2449 $TICK_WATCHER->start; 2470 warn "leaving sync_job";
2450 };
2451 2471
2452 if ($@) { 2472 1
2473 } or do {
2453 warn $@; 2474 warn $@;
2454 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2455 exit 1; 2476 exit 1;
2456 } 2477 };
2457 2478
2458 warn "reloaded"; 2479 warn "reloaded";
2459}; 2480};
2460 2481
2461our $RELOAD_WATCHER; # used only during reload 2482our $RELOAD_WATCHER; # used only during reload
… …
2502 2523
2503 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2504 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2505 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2506 2527
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10;
2530 Coro::async_pool {
2531 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 }
2535
2507 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509 2538
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time; 2539# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d# 2540# warn $AFTER - $NOW;#d#
2515 2541
2516 # if we are delayed by four ticks or more, skip them all 2542 # if we are delayed by four ticks or more, skip them all
2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2519 $TICK_WATCHER->at ($NEXT_TICK); 2545 $TICK_WATCHER->at ($NEXT_TICK);
2520 $TICK_WATCHER->start; 2546 $TICK_WATCHER->start;
2521 }, 2547 },
2522); 2548);
2523 2549
2550{
2551 BDB::max_poll_time $TICK * 0.1;
2552 $BDB_POLL_WATCHER = Event->io (
2553 reentrant => 0,
2554 fd => BDB::poll_fileno,
2555 poll => 'r',
2556 prio => 0,
2557 data => WF_AUTOCANCEL,
2558 cb => \&BDB::poll_cb,
2559 );
2560 BDB::min_parallel 8;
2561
2562 BDB::set_sync_prepare {
2563 my $status;
2564 my $current = $Coro::current;
2565 (
2566 sub {
2567 $status = $!;
2568 $current->ready; undef $current;
2569 },
2570 sub {
2571 Coro::schedule while defined $current;
2572 $! = $status;
2573 },
2574 )
2575 };
2576
2577 unless ($DB_ENV) {
2578 $DB_ENV = BDB::db_env_create;
2579
2580 cf::sync_job {
2581 eval {
2582 BDB::db_env_open
2583 $DB_ENV,
2584 $BDB_ENV_DIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666;
2588
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2590
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect;
2593 };
2594
2595 cf::cleanup "db_env_open(db): $@" if $@;
2596 };
2597 }
2598}
2599
2600{
2601 IO::AIO::min_parallel 8;
2602
2603 undef $Coro::AIO::WATCHER;
2524IO::AIO::max_poll_time $TICK * 0.1; 2604 IO::AIO::max_poll_time $TICK * 0.1;
2525
2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io ( 2605 $AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0, 2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2529 fd => IO::AIO::poll_fileno, 2608 fd => IO::AIO::poll_fileno,
2530 poll => 'r', 2609 poll => 'r',
2531 prio => 6, 2610 prio => 6,
2532 data => WF_AUTOCANCEL,
2533 cb => \&IO::AIO::poll_cb, 2611 cb => \&IO::AIO::poll_cb,
2534); 2612 );
2535 2613}
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 2614
2548END { cf::emergency_save } 2615END { cf::emergency_save }
2549 2616
25501 26171
2551 2618

Diff Legend

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