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.194 by root, Wed Jan 24 22:42:49 2007 UTC vs.
Revision 1.208 by root, Mon Feb 12 00:27:20 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;
… …
1362 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1363 1393
1364 $map->load_header 1394 $map->load_header
1365 or return; 1395 or return;
1366 1396
1367 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1400 $map->reset;
1371 undef $guard; 1401 undef $guard;
1372 return find $path; 1402 return find $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;
… …
1626 for (@$files) { 1658 for (@$files) {
1627 utf8::decode $_; 1659 utf8::decode $_;
1628 next if /\.pst$/; 1660 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1630 1662
1631 s/\.map$//; 1663 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1664 }
1634 1665
1635 \@paths 1666 \@paths
1636} 1667}
1637 1668
… …
1731=cut 1762=cut
1732 1763
1733sub link_map { 1764sub link_map {
1734 unless ($LINK_MAP) { 1765 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1766 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1768 $LINK_MAP->load;
1738 } 1769 }
1739 1770
1740 $LINK_MAP 1771 $LINK_MAP
1741} 1772}
… …
1825 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1826 1857
1827 $self->enter_link; 1858 $self->enter_link;
1828 1859
1829 (async { 1860 (async {
1861 my $map = eval {
1830 my $map = cf::map::find $path; 1862 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1832 1864 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1866 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1837 1867
1838 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1869 })->prio (1);
1840} 1870}
1841 1871
… …
1872 # that depends on the exit object 1902 # that depends on the exit object
1873 1903
1874 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1875 1905
1876 if ($exit->map) { 1906 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1881 } 1911 }
1882 1912
… …
1899sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1900 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1901 1931
1902 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1903 1933
1934 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job
1936 cf::sync_job { prepare_random_map $exit };
1937 }
1938
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp;
1941 my $sp = $exit->stats->sp;
1942
1904 $self->enter_link; 1943 $self->enter_link;
1905 1944
1906 (async { 1945 (async {
1907 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1908 unless (eval { 1947 unless (eval {
1909 prepare_random_map $exit 1948 $self->goto ($slaying, $hp, $sp);
1910 if $exit->slaying eq "/!";
1911
1912 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1913 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1914 1949
1915 1; 1950 1;
1916 }) { 1951 }) {
1917 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1918 . "I'll try to bring you back to the map you were before. " 1953 . "I'll try to bring you back to the map you were before. "
… …
1979 # get handled first 2014 # get handled first
1980 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1981 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1982 2017
1983 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1984 2020
1985 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1986 2022
1987 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1988 if (@$queue) { 2024 if (@$queue) {
… …
2149The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2150using it, it should be unique. 2186using it, it should be unique.
2151 2187
2152=over 4 2188=over 4
2153 2189
2154=item $hashref = cf::db_get $family
2155
2156Return a hashref for use by the extension C<$family>, which can be
2157modified. After modifications, you have to call C<cf::db_dirty> or
2158C<cf::db_sync>.
2159
2160=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2161 2191
2162Returns a single value from the database 2192Returns a single value from the database.
2163
2164=item cf::db_put $family => $hashref
2165
2166Stores the given family hashref into the database. Updates are delayed, if
2167you want the data to be synced to disk immediately, use C<cf::db_sync>.
2168 2193
2169=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2170 2195
2171Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2172want the data to be synced to disk immediately, use C<cf::db_sync>.
2173
2174=item cf::db_dirty
2175
2176Marks the database as dirty, to be updated at a later time.
2177
2178=item cf::db_sync
2179
2180Immediately write the database to disk I<if it is dirty>.
2181 2197
2182=cut 2198=cut
2183 2199
2184our $DB; 2200our $DB;
2185 2201
2186{ 2202sub db_load() {
2203 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV;
2205
2206 cf::sync_job {
2207 eval {
2208 $DB->set_flags (BDB::CHKSUM);
2209
2210 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2211 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2212 cf::cleanup "db_open(db): $!" if $!;
2213 };
2214 cf::cleanup "db_open(db): $@" if $@;
2215 };
2216
2187 my $path = cf::localdir . "/database.pst"; 2217 my $path = cf::localdir . "/database.pst";
2218 if (stat $path) {
2219 cf::sync_job {
2220 my $pst = Storable::retrieve $path;
2188 2221
2189 sub db_load() { 2222 cf::db_put (board => data => $pst->{board});
2190 $DB = stat $path ? Storable::retrieve $path : { }; 2223 cf::db_put (guildrules => data => $pst->{guildrules});
2191 } 2224 cf::db_put (rent => balance => $pst->{rent}{balance});
2225 BDB::db_env_txn_checkpoint $DB_ENV;
2192 2226
2193 my $pid; 2227 unlink $path;
2194
2195 sub db_save() {
2196 waitpid $pid, 0 if $pid;
2197 if (0 == ($pid = fork)) {
2198 $DB->{_meta}{version} = 1;
2199 Storable::nstore $DB, "$path~";
2200 rename "$path~", $path;
2201 cf::_exit 0 if defined $pid;
2202 } 2228 };
2203 }
2204
2205 my $dirty;
2206
2207 sub db_sync() {
2208 db_save if $dirty;
2209 undef $dirty;
2210 }
2211
2212 my $idle = Event->idle (
2213 reentrant => 0,
2214 min => 10,
2215 max => 20,
2216 repeat => 0,
2217 data => WF_AUTOCANCEL,
2218 cb => \&db_sync,
2219 );
2220
2221 sub db_dirty() {
2222 $dirty = 1;
2223 $idle->start;
2224 }
2225
2226 sub db_get($;$) {
2227 @_ >= 2
2228 ? $DB->{$_[0]}{$_[1]}
2229 : ($DB->{$_[0]} ||= { })
2230 }
2231
2232 sub db_put($$;$) {
2233 if (@_ >= 3) {
2234 $DB->{$_[0]}{$_[1]} = $_[2];
2235 } else {
2236 $DB->{$_[0]} = $_[1];
2237 }
2238 db_dirty;
2239 }
2240
2241 cf::global->attach (
2242 prio => 10000,
2243 on_cleanup => sub {
2244 db_sync;
2245 }, 2229 }
2246 ); 2230 }
2231}
2232
2233sub db_get($$) {
2234 my $key = "$_[0]/$_[1]";
2235
2236 cf::sync_job {
2237 BDB::db_get $DB, undef, $key, my $data;
2238
2239 $! ? ()
2240 : Compress::LZF::sthaw $data
2241 }
2242}
2243
2244sub db_put($$$) {
2245 BDB::dbreq_pri 4;
2246 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2247} 2247}
2248 2248
2249############################################################################# 2249#############################################################################
2250# the server's main() 2250# the server's init and main functions
2251
2252sub load_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d#
2255}
2251 2256
2252sub cfg_load { 2257sub cfg_load {
2253 open my $fh, "<:utf8", cf::confdir . "/config" 2258 open my $fh, "<:utf8", cf::confdir . "/config"
2254 or return; 2259 or return;
2255 2260
… …
2266 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2267 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
2268 }; 2273 };
2269 warn $@ if $@; 2274 warn $@ if $@;
2270 } 2275 }
2276}
2277
2278sub init {
2279 load_resources;
2271} 2280}
2272 2281
2273sub main { 2282sub main {
2274 # we must not ever block the main coroutine 2283 # we must not ever block the main coroutine
2275 local $Coro::idle = sub { 2284 local $Coro::idle = sub {
… …
2327 my $map = $cf::MAP{$path} or next; 2336 my $map = $cf::MAP{$path} or next;
2328 $map->valid or next; 2337 $map->valid or next;
2329 $map->save; 2338 $map->save;
2330 } 2339 }
2331 warn "end emergency map save\n"; 2340 warn "end emergency map save\n";
2341
2342 warn "begin emergency database checkpoint\n";
2343 BDB::db_env_txn_checkpoint $DB_ENV;
2344 warn "end emergency database checkpoint\n";
2332 }; 2345 };
2333 2346
2334 warn "leave emergency perl save\n"; 2347 warn "leave emergency perl save\n";
2335} 2348}
2336 2349
… …
2349 cf::emergency_save; 2362 cf::emergency_save;
2350 2363
2351 eval { 2364 eval {
2352 # if anything goes wrong in here, we should simply crash as we already saved 2365 # if anything goes wrong in here, we should simply crash as we already saved
2353 2366
2354 warn "syncing database to disk";
2355 cf::db_sync;
2356
2357 warn "cancelling all WF_AUTOCANCEL watchers"; 2367 warn "cancelling all WF_AUTOCANCEL watchers";
2358 for (Event::all_watchers) { 2368 for (Event::all_watchers) {
2359 $_->cancel if $_->data & WF_AUTOCANCEL; 2369 $_->cancel if $_->data & WF_AUTOCANCEL;
2360 } 2370 }
2361 2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374
2362 warn "flushing outstanding aio requests"; 2375 warn "flushing outstanding aio requests";
2363 for (;;) { 2376 for (;;) {
2377 BDB::flush;
2364 IO::AIO::flush; 2378 IO::AIO::flush;
2365 Coro::cede; 2379 Coro::cede;
2366 last unless IO::AIO::nreqs; 2380 last unless IO::AIO::nreqs || BDB::nreqs;
2367 warn "iterate..."; 2381 warn "iterate...";
2368 } 2382 }
2369 2383
2370 warn "cancelling all extension coros"; 2384 warn "cancelling all extension coros";
2371 $_->cancel for values %EXT_CORO; 2385 $_->cancel for values %EXT_CORO;
… …
2435 2449
2436 warn "reattaching attachments to objects/players"; 2450 warn "reattaching attachments to objects/players";
2437 _global_reattach; 2451 _global_reattach;
2438 warn "reattaching attachments to maps"; 2452 warn "reattaching attachments to maps";
2439 reattach $_ for values %MAP; 2453 reattach $_ for values %MAP;
2454
2455 warn "loading reloadable resources";
2456 load_resources;
2440 2457
2441 warn "restarting server ticker"; 2458 warn "restarting server ticker";
2442 2459
2443 $TICK_WATCHER->start; 2460 $TICK_WATCHER->start;
2444 }; 2461 };
… …
2513 $TICK_WATCHER->at ($NEXT_TICK); 2530 $TICK_WATCHER->at ($NEXT_TICK);
2514 $TICK_WATCHER->start; 2531 $TICK_WATCHER->start;
2515 }, 2532 },
2516); 2533);
2517 2534
2535{
2536 BDB::max_poll_time $TICK * 0.1;
2537 $BDB_POLL_WATCHER = Event->io (
2538 reentrant => 0,
2539 fd => BDB::poll_fileno,
2540 poll => 'r',
2541 prio => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => \&BDB::poll_cb,
2544 );
2545 BDB::min_parallel 8;
2546
2547 BDB::set_sync_prepare {
2548 my $status;
2549 my $current = $Coro::current;
2550 (
2551 sub {
2552 $status = $!;
2553 $current->ready; undef $current;
2554 },
2555 sub {
2556 Coro::schedule while defined $current;
2557 $! = $status;
2558 },
2559 )
2560 };
2561
2562 unless ($DB_ENV) {
2563 $DB_ENV = BDB::db_env_create;
2564
2565 cf::sync_job {
2566 eval {
2567 BDB::db_env_open
2568 $DB_ENV,
2569 $BDB_ENV_DIR,
2570 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2571 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2572 0666;
2573
2574 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2575
2576 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2577 $DB_ENV->set_lk_detect;
2578 };
2579
2580 cf::cleanup "db_env_open(db): $@" if $@;
2581 };
2582 }
2583}
2584
2585{
2586 IO::AIO::min_parallel 8;
2587
2588 undef $Coro::AIO::WATCHER;
2518IO::AIO::max_poll_time $TICK * 0.1; 2589 IO::AIO::max_poll_time $TICK * 0.1;
2519
2520undef $Coro::AIO::WATCHER;
2521$AIO_POLL_WATCHER = Event->io ( 2590 $AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0, 2591 reentrant => 0,
2523 fd => IO::AIO::poll_fileno, 2592 fd => IO::AIO::poll_fileno,
2524 poll => 'r', 2593 poll => 'r',
2525 prio => 6, 2594 prio => 6,
2526 data => WF_AUTOCANCEL, 2595 data => WF_AUTOCANCEL,
2527 cb => \&IO::AIO::poll_cb, 2596 cb => \&IO::AIO::poll_cb,
2528); 2597 );
2598}
2529 2599
2530$WRITE_RUNTIME_WATCHER = Event->timer ( 2600$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0, 2601 reentrant => 0,
2532 data => WF_AUTOCANCEL, 2602 data => WF_AUTOCANCEL,
2533 after => 1, 2603 after => 1,

Diff Legend

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