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.195 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.210 by root, Mon Feb 12 01:32: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
… …
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;
… …
1379sub pre_load { } 1409sub pre_load { }
1380sub post_load { } 1410sub post_load { }
1381 1411
1382sub load { 1412sub load {
1383 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1384 1416
1385 my $path = $self->{path}; 1417 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1387 1419
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1577 return if $self->players; 1609 return if $self->players;
1578 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1579 1611
1580 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1581 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
1582 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1583 1625
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear; 1626 $self->clear;
1586 1627
1587 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1588 1629
1589 $self->unlink_save; 1630 $self->unlink_save;
… …
1626 for (@$files) { 1667 for (@$files) {
1627 utf8::decode $_; 1668 utf8::decode $_;
1628 next if /\.pst$/; 1669 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1630 1671
1631 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1673 }
1634 1674
1635 \@paths 1675 \@paths
1636} 1676}
1637 1677
… …
1731=cut 1771=cut
1732 1772
1733sub link_map { 1773sub link_map {
1734 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1777 $LINK_MAP->load;
1738 } 1778 }
1739 1779
1740 $LINK_MAP 1780 $LINK_MAP
1741} 1781}
… …
1825 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1826 1866
1827 $self->enter_link; 1867 $self->enter_link;
1828 1868
1829 (async { 1869 (async {
1870 my $map = eval {
1830 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1832 1873 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1834# if $map;
1835
1836 $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);
1837 1876
1838 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1878 })->prio (1);
1840} 1879}
1841 1880
… …
1872 # that depends on the exit object 1911 # that depends on the exit object
1873 1912
1874 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1875 1914
1876 if ($exit->map) { 1915 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1881 } 1920 }
1882 1921
… …
1984 # get handled first 2023 # get handled first
1985 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1986 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
1987 2026
1988 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1989 2029
1990 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1991 2031
1992 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1993 if (@$queue) { 2033 if (@$queue) {
… …
2154The 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
2155using it, it should be unique. 2195using it, it should be unique.
2156 2196
2157=over 4 2197=over 4
2158 2198
2159=item $hashref = cf::db_get $family
2160
2161Return a hashref for use by the extension C<$family>, which can be
2162modified. After modifications, you have to call C<cf::db_dirty> or
2163C<cf::db_sync>.
2164
2165=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2166 2200
2167Returns a single value from the database 2201Returns a single value from the database.
2168
2169=item cf::db_put $family => $hashref
2170
2171Stores the given family hashref into the database. Updates are delayed, if
2172you want the data to be synced to disk immediately, use C<cf::db_sync>.
2173 2202
2174=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2175 2204
2176Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2177want the data to be synced to disk immediately, use C<cf::db_sync>.
2178
2179=item cf::db_dirty
2180
2181Marks the database as dirty, to be updated at a later time.
2182
2183=item cf::db_sync
2184
2185Immediately write the database to disk I<if it is dirty>.
2186 2206
2187=cut 2207=cut
2188 2208
2189our $DB; 2209our $DB;
2190 2210
2191{ 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
2192 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;
2193 2230
2194 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2195 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2196 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2197 2235
2198 my $pid; 2236 unlink $path;
2199
2200 sub db_save() {
2201 waitpid $pid, 0 if $pid;
2202 if (0 == ($pid = fork)) {
2203 $DB->{_meta}{version} = 1;
2204 Storable::nstore $DB, "$path~";
2205 rename "$path~", $path;
2206 cf::_exit 0 if defined $pid;
2207 } 2237 };
2208 }
2209
2210 my $dirty;
2211
2212 sub db_sync() {
2213 db_save if $dirty;
2214 undef $dirty;
2215 }
2216
2217 my $idle = Event->idle (
2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2224 );
2225
2226 sub db_dirty() {
2227 $dirty = 1;
2228 $idle->start;
2229 }
2230
2231 sub db_get($;$) {
2232 @_ >= 2
2233 ? $DB->{$_[0]}{$_[1]}
2234 : ($DB->{$_[0]} ||= { })
2235 }
2236
2237 sub db_put($$;$) {
2238 if (@_ >= 3) {
2239 $DB->{$_[0]}{$_[1]} = $_[2];
2240 } else {
2241 $DB->{$_[0]} = $_[1];
2242 }
2243 db_dirty;
2244 }
2245
2246 cf::global->attach (
2247 prio => 10000,
2248 on_cleanup => sub {
2249 db_sync;
2250 }, 2238 }
2251 ); 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 { };
2252} 2256}
2253 2257
2254############################################################################# 2258#############################################################################
2255# 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}
2256 2265
2257sub cfg_load { 2266sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2268 or return;
2260 2269
… …
2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2272 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2273 }; 2282 };
2274 warn $@ if $@; 2283 warn $@ if $@;
2275 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2276} 2289}
2277 2290
2278sub main { 2291sub main {
2279 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2283 Event::one_event; 2296 Event::one_event;
2284 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2285 }; 2298 };
2286 2299
2287 cfg_load; 2300 cfg_load;
2288 db_load; 2301 db_init;
2289 load_extensions; 2302 load_extensions;
2290 2303
2291 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2292 Event::loop; 2305 Event::loop;
2293} 2306}
… …
2332 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2333 $map->valid or next; 2346 $map->valid or next;
2334 $map->save; 2347 $map->save;
2335 } 2348 }
2336 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";
2337 }; 2354 };
2338 2355
2339 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2340} 2357}
2341 2358
… …
2354 cf::emergency_save; 2371 cf::emergency_save;
2355 2372
2356 eval { 2373 eval {
2357 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2358 2375
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361
2362 warn "cancelling all WF_AUTOCANCEL watchers"; 2376 warn "cancelling all WF_AUTOCANCEL watchers";
2363 for (Event::all_watchers) { 2377 for (Event::all_watchers) {
2364 $_->cancel if $_->data & WF_AUTOCANCEL; 2378 $_->cancel if $_->data & WF_AUTOCANCEL;
2365 } 2379 }
2366 2380
2381 warn "syncing database to disk";
2382 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2383
2367 warn "flushing outstanding aio requests"; 2384 warn "flushing outstanding aio requests";
2368 for (;;) { 2385 for (;;) {
2386 BDB::flush;
2369 IO::AIO::flush; 2387 IO::AIO::flush;
2370 Coro::cede; 2388 Coro::cede;
2371 last unless IO::AIO::nreqs; 2389 last unless IO::AIO::nreqs || BDB::nreqs;
2372 warn "iterate..."; 2390 warn "iterate...";
2373 } 2391 }
2374 2392
2375 warn "cancelling all extension coros"; 2393 warn "cancelling all extension coros";
2376 $_->cancel for values %EXT_CORO; 2394 $_->cancel for values %EXT_CORO;
… …
2431 require cf; 2449 require cf;
2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2450 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2433 2451
2434 warn "loading config and database again"; 2452 warn "loading config and database again";
2435 cf::cfg_load; 2453 cf::cfg_load;
2436 cf::db_load;
2437 2454
2438 warn "loading extensions"; 2455 warn "loading extensions";
2439 cf::load_extensions; 2456 cf::load_extensions;
2440 2457
2441 warn "reattaching attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2442 _global_reattach; 2459 _global_reattach;
2443 warn "reattaching attachments to maps"; 2460 warn "reattaching attachments to maps";
2444 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "loading reloadable resources";
2464 load_resources;
2445 2465
2446 warn "restarting server ticker"; 2466 warn "restarting server ticker";
2447 2467
2448 $TICK_WATCHER->start; 2468 $TICK_WATCHER->start;
2449 }; 2469 };
… …
2518 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2519 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2520 }, 2540 },
2521); 2541);
2522 2542
2543{
2544 BDB::max_poll_time $TICK * 0.1;
2545 $BDB_POLL_WATCHER = Event->io (
2546 reentrant => 0,
2547 fd => BDB::poll_fileno,
2548 poll => 'r',
2549 prio => 0,
2550 data => WF_AUTOCANCEL,
2551 cb => \&BDB::poll_cb,
2552 );
2553 BDB::min_parallel 8;
2554
2555 BDB::set_sync_prepare {
2556 my $status;
2557 my $current = $Coro::current;
2558 (
2559 sub {
2560 $status = $!;
2561 $current->ready; undef $current;
2562 },
2563 sub {
2564 Coro::schedule while defined $current;
2565 $! = $status;
2566 },
2567 )
2568 };
2569
2570 unless ($DB_ENV) {
2571 $DB_ENV = BDB::db_env_create;
2572
2573 cf::sync_job {
2574 eval {
2575 BDB::db_env_open
2576 $DB_ENV,
2577 $BDB_ENV_DIR,
2578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2580 0666;
2581
2582 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2583
2584 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2585 $DB_ENV->set_lk_detect;
2586 };
2587
2588 cf::cleanup "db_env_open(db): $@" if $@;
2589 };
2590 }
2591}
2592
2593{
2594 IO::AIO::min_parallel 8;
2595
2596 undef $Coro::AIO::WATCHER;
2523IO::AIO::max_poll_time $TICK * 0.1; 2597 IO::AIO::max_poll_time $TICK * 0.1;
2524
2525undef $Coro::AIO::WATCHER;
2526$AIO_POLL_WATCHER = Event->io ( 2598 $AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0, 2599 reentrant => 0,
2528 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2529 poll => 'r', 2601 poll => 'r',
2530 prio => 6, 2602 prio => 6,
2531 data => WF_AUTOCANCEL, 2603 data => WF_AUTOCANCEL,
2532 cb => \&IO::AIO::poll_cb, 2604 cb => \&IO::AIO::poll_cb,
2533); 2605 );
2606}
2534 2607
2535$WRITE_RUNTIME_WATCHER = Event->timer ( 2608$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0, 2609 reentrant => 0,
2537 data => WF_AUTOCANCEL, 2610 data => WF_AUTOCANCEL,
2538 after => 1, 2611 after => 1,

Diff Legend

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