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.191 by root, Tue Jan 23 01:05:18 2007 UTC vs.
Revision 1.209 by root, Mon Feb 12 01:25:55 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.4 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
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
… …
1176} 1199}
1177 1200
1178sub normalise { 1201sub normalise {
1179 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1180 1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1207
1181 # map plan: 1208 # map plan:
1182 # 1209 #
1183 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1212 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1222 return $self; 1249 return $self;
1223 } 1250 }
1224 } 1251 }
1225 1252
1226 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1254 ()
1228} 1255}
1229 1256
1230sub init { 1257sub init {
1231 my ($self) = @_; 1258 my ($self) = @_;
… …
1246 1273
1247# the original (read-only) location 1274# the original (read-only) location
1248sub load_path { 1275sub load_path {
1249 my ($self) = @_; 1276 my ($self) = @_;
1250 1277
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1279}
1253 1280
1254# the temporary/swap location 1281# the temporary/swap location
1255sub save_path { 1282sub save_path {
1256 my ($self) = @_; 1283 my ($self) = @_;
1257 1284
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1287}
1261 1288
1262# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1263sub uniq_path { 1290sub uniq_path {
1264 my ($self) = @_; 1291 my ($self) = @_;
… …
1280 my ($self) = @_; 1307 my ($self) = @_;
1281 1308
1282 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 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#
1285} 1317}
1286 1318
1287sub load_header_from($) { 1319sub load_header_from($) {
1288 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1289 1321
1290 utf8::encode $path; 1322 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1292 or return; 1324 # or return;
1293 1325
1294 $self->_load_header ($path) 1326 $self->_load_header ($path)
1295 or return; 1327 or return;
1296 1328
1297 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1361 1393
1362 $map->load_header 1394 $map->load_header
1363 or return; 1395 or return;
1364 1396
1365 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1400 $map->reset;
1369 undef $guard; 1401 undef $guard;
1370 $map = find $path 1402 return find $path;
1371 or return;
1372 } 1403 }
1373 1404
1374 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1375 } 1406 }
1376} 1407}
… …
1378sub pre_load { } 1409sub pre_load { }
1379sub post_load { } 1410sub post_load { }
1380 1411
1381sub load { 1412sub load {
1382 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1383 1416
1384 my $path = $self->{path}; 1417 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1386 1419
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1625 for (@$files) { 1658 for (@$files) {
1626 utf8::decode $_; 1659 utf8::decode $_;
1627 next if /\.pst$/; 1660 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1629 1662
1630 s/\.map$//; 1663 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1664 }
1633 1665
1634 \@paths 1666 \@paths
1635} 1667}
1636 1668
… …
1730=cut 1762=cut
1731 1763
1732sub link_map { 1764sub link_map {
1733 unless ($LINK_MAP) { 1765 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1766 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1768 $LINK_MAP->load;
1737 } 1769 }
1738 1770
1739 $LINK_MAP 1771 $LINK_MAP
1740} 1772}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1779 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1780
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1781 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1782 if $self->map;
1751 1783
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1784 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1785}
1754 1786
1755sub cf::object::player::leave_link { 1787sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1788 my ($self, $map, $x, $y) = @_;
1757 1789
… …
1824 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1825 1857
1826 $self->enter_link; 1858 $self->enter_link;
1827 1859
1828 (async { 1860 (async {
1861 my $map = eval {
1829 my $map = cf::map::find $path; 1862 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1831 1864 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1833# if $map;
1834
1835 $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);
1836 1867
1837 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1869 })->prio (1);
1839} 1870}
1840 1871
… …
1871 # that depends on the exit object 1902 # that depends on the exit object
1872 1903
1873 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1874 1905
1875 if ($exit->map) { 1906 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1880 } 1911 }
1881 1912
… …
1898sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1900 1931
1901 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1902 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
1903 $self->enter_link; 1943 $self->enter_link;
1904 1944
1905 (async { 1945 (async {
1906 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1947 unless (eval {
1908 prepare_random_map $exit 1948 $self->goto ($slaying, $hp, $sp);
1909 if $exit->slaying eq "/!";
1910
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1913 1949
1914 1; 1950 1;
1915 }) { 1951 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "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. "
… …
1978 # get handled first 2014 # get handled first
1979 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1980 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
1981 2017
1982 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2020
1984 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1985 2022
1986 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2024 if (@$queue) {
… …
2148The 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
2149using it, it should be unique. 2186using it, it should be unique.
2150 2187
2151=over 4 2188=over 4
2152 2189
2153=item $hashref = cf::db_get $family
2154
2155Return a hashref for use by the extension C<$family>, which can be
2156modified. After modifications, you have to call C<cf::db_dirty> or
2157C<cf::db_sync>.
2158
2159=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2160 2191
2161Returns a single value from the database 2192Returns a single value from the database.
2162
2163=item cf::db_put $family => $hashref
2164
2165Stores the given family hashref into the database. Updates are delayed, if
2166you want the data to be synced to disk immediately, use C<cf::db_sync>.
2167 2193
2168=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2169 2195
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2171want the data to be synced to disk immediately, use C<cf::db_sync>.
2172
2173=item cf::db_dirty
2174
2175Marks the database as dirty, to be updated at a later time.
2176
2177=item cf::db_sync
2178
2179Immediately write the database to disk I<if it is dirty>.
2180 2197
2181=cut 2198=cut
2182 2199
2183our $DB; 2200our $DB;
2184 2201
2185{ 2202unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV;
2204
2205 cf::sync_job {
2206 eval {
2207 $DB->set_flags (BDB::CHKSUM);
2208
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!;
2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215
2186 my $path = cf::localdir . "/database.pst"; 2216 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) {
2218 cf::sync_job {
2219 my $pst = Storable::retrieve $path;
2187 2220
2188 sub db_load() { 2221 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2222 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2223 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2225
2192 my $pid; 2226 unlink $path;
2193
2194 sub db_save() {
2195 waitpid $pid, 0 if $pid;
2196 if (0 == ($pid = fork)) {
2197 $DB->{_meta}{version} = 1;
2198 Storable::nstore $DB, "$path~";
2199 rename "$path~", $path;
2200 cf::_exit 0 if defined $pid;
2201 } 2227 };
2202 } 2228 }
2229}
2203 2230
2204 my $dirty;
2205
2206 sub db_sync() {
2207 db_save if $dirty;
2208 undef $dirty;
2209 }
2210
2211 my $idle = Event->idle (
2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2218 );
2219
2220 sub db_dirty() {
2221 $dirty = 1;
2222 $idle->start;
2223 }
2224
2225 sub db_get($;$) { 2231sub db_get($$) {
2226 @_ >= 2 2232 my $key = "$_[0]/$_[1]";
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230 2233
2234 cf::sync_job {
2235 BDB::db_get $DB, undef, $key, my $data;
2236
2237 $! ? ()
2238 : Compress::LZF::sthaw $data
2239 }
2240}
2241
2231 sub db_put($$;$) { 2242sub db_put($$$) {
2232 if (@_ >= 3) { 2243 BDB::dbreq_pri 4;
2233 $DB->{$_[0]}{$_[1]} = $_[2]; 2244 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2234 } else {
2235 $DB->{$_[0]} = $_[1];
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 },
2245 );
2246} 2245}
2247 2246
2248############################################################################# 2247#############################################################################
2249# the server's main() 2248# the server's init and main functions
2249
2250sub load_resources {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2252 or die "unable to load regions file\n";#d#
2253}
2250 2254
2251sub cfg_load { 2255sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2256 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2257 or return;
2254 2258
… …
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2269 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 2270 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 2271 };
2268 warn $@ if $@; 2272 warn $@ if $@;
2269 } 2273 }
2274}
2275
2276sub init {
2277 load_resources;
2270} 2278}
2271 2279
2272sub main { 2280sub main {
2273 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
… …
2277 Event::one_event; 2285 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2286 })->prio (Coro::PRIO_MAX);
2279 }; 2287 };
2280 2288
2281 cfg_load; 2289 cfg_load;
2282 db_load;
2283 load_extensions; 2290 load_extensions;
2284 2291
2285 $TICK_WATCHER->start; 2292 $TICK_WATCHER->start;
2286 Event::loop; 2293 Event::loop;
2287} 2294}
… …
2326 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next; 2334 $map->valid or next;
2328 $map->save; 2335 $map->save;
2329 } 2336 }
2330 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2331 }; 2342 };
2332 2343
2333 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2334} 2345}
2335 2346
… …
2348 cf::emergency_save; 2359 cf::emergency_save;
2349 2360
2350 eval { 2361 eval {
2351 # if anything goes wrong in here, we should simply crash as we already saved 2362 # if anything goes wrong in here, we should simply crash as we already saved
2352 2363
2353 warn "syncing database to disk";
2354 cf::db_sync;
2355
2356 warn "cancelling all WF_AUTOCANCEL watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2357 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2358 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2359 } 2367 }
2360 2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371
2361 warn "flushing outstanding aio requests"; 2372 warn "flushing outstanding aio requests";
2362 for (;;) { 2373 for (;;) {
2374 BDB::flush;
2363 IO::AIO::flush; 2375 IO::AIO::flush;
2364 Coro::cede; 2376 Coro::cede;
2365 last unless IO::AIO::nreqs; 2377 last unless IO::AIO::nreqs || BDB::nreqs;
2366 warn "iterate..."; 2378 warn "iterate...";
2367 } 2379 }
2368 2380
2369 warn "cancelling all extension coros"; 2381 warn "cancelling all extension coros";
2370 $_->cancel for values %EXT_CORO; 2382 $_->cancel for values %EXT_CORO;
… …
2425 require cf; 2437 require cf;
2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2438 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2427 2439
2428 warn "loading config and database again"; 2440 warn "loading config and database again";
2429 cf::cfg_load; 2441 cf::cfg_load;
2430 cf::db_load;
2431 2442
2432 warn "loading extensions"; 2443 warn "loading extensions";
2433 cf::load_extensions; 2444 cf::load_extensions;
2434 2445
2435 warn "reattaching attachments to objects/players"; 2446 warn "reattaching attachments to objects/players";
2436 _global_reattach; 2447 _global_reattach;
2437 warn "reattaching attachments to maps"; 2448 warn "reattaching attachments to maps";
2438 reattach $_ for values %MAP; 2449 reattach $_ for values %MAP;
2450
2451 warn "loading reloadable resources";
2452 load_resources;
2439 2453
2440 warn "restarting server ticker"; 2454 warn "restarting server ticker";
2441 2455
2442 $TICK_WATCHER->start; 2456 $TICK_WATCHER->start;
2443 }; 2457 };
… …
2512 $TICK_WATCHER->at ($NEXT_TICK); 2526 $TICK_WATCHER->at ($NEXT_TICK);
2513 $TICK_WATCHER->start; 2527 $TICK_WATCHER->start;
2514 }, 2528 },
2515); 2529);
2516 2530
2531{
2532 BDB::max_poll_time $TICK * 0.1;
2533 $BDB_POLL_WATCHER = Event->io (
2534 reentrant => 0,
2535 fd => BDB::poll_fileno,
2536 poll => 'r',
2537 prio => 0,
2538 data => WF_AUTOCANCEL,
2539 cb => \&BDB::poll_cb,
2540 );
2541 BDB::min_parallel 8;
2542
2543 BDB::set_sync_prepare {
2544 my $status;
2545 my $current = $Coro::current;
2546 (
2547 sub {
2548 $status = $!;
2549 $current->ready; undef $current;
2550 },
2551 sub {
2552 Coro::schedule while defined $current;
2553 $! = $status;
2554 },
2555 )
2556 };
2557
2558 unless ($DB_ENV) {
2559 $DB_ENV = BDB::db_env_create;
2560
2561 cf::sync_job {
2562 eval {
2563 BDB::db_env_open
2564 $DB_ENV,
2565 $BDB_ENV_DIR,
2566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2568 0666;
2569
2570 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2571
2572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2573 $DB_ENV->set_lk_detect;
2574 };
2575
2576 cf::cleanup "db_env_open(db): $@" if $@;
2577 };
2578 }
2579}
2580
2581{
2582 IO::AIO::min_parallel 8;
2583
2584 undef $Coro::AIO::WATCHER;
2517IO::AIO::max_poll_time $TICK * 0.1; 2585 IO::AIO::max_poll_time $TICK * 0.1;
2518
2519undef $Coro::AIO::WATCHER;
2520$AIO_POLL_WATCHER = Event->io ( 2586 $AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0, 2587 reentrant => 0,
2522 fd => IO::AIO::poll_fileno, 2588 fd => IO::AIO::poll_fileno,
2523 poll => 'r', 2589 poll => 'r',
2524 prio => 6, 2590 prio => 6,
2525 data => WF_AUTOCANCEL, 2591 data => WF_AUTOCANCEL,
2526 cb => \&IO::AIO::poll_cb, 2592 cb => \&IO::AIO::poll_cb,
2527); 2593 );
2594}
2528 2595
2529$WRITE_RUNTIME_WATCHER = Event->timer ( 2596$WRITE_RUNTIME_WATCHER = Event->timer (
2530 reentrant => 0, 2597 reentrant => 0,
2531 data => WF_AUTOCANCEL, 2598 data => WF_AUTOCANCEL,
2532 after => 1, 2599 after => 1,

Diff Legend

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