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.189 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.213 by root, Tue Feb 13 20:01:04 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;
… …
1576 return if $self->players; 1609 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1578 1611
1579 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1580 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
1581 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1582 1625
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1626 $self->clear;
1585 1627
1586 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1587 1629
1588 $self->unlink_save; 1630 $self->unlink_save;
… …
1625 for (@$files) { 1667 for (@$files) {
1626 utf8::decode $_; 1668 utf8::decode $_;
1627 next if /\.pst$/; 1669 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1629 1671
1630 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1673 }
1633 1674
1634 \@paths 1675 \@paths
1635} 1676}
1636 1677
… …
1730=cut 1771=cut
1731 1772
1732sub link_map { 1773sub link_map {
1733 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1777 $LINK_MAP->load;
1737 } 1778 }
1738 1779
1739 $LINK_MAP 1780 $LINK_MAP
1740} 1781}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1789
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1791 if $self->map;
1751 1792
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1794}
1754 1795
1755sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1757 1798
… …
1824 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1825 1866
1826 $self->enter_link; 1867 $self->enter_link;
1827 1868
1828 (async { 1869 (async {
1870 my $map = eval {
1829 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1831 1873 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1833# if $map;
1834
1835 $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);
1836 1876
1837 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1878 })->prio (1);
1839} 1879}
1840 1880
… …
1871 # that depends on the exit object 1911 # that depends on the exit object
1872 1912
1873 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1874 1914
1875 if ($exit->map) { 1915 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1880 } 1920 }
1881 1921
… …
1898sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1900 1940
1901 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1902 1942
1943 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job
1945 cf::sync_job { prepare_random_map $exit };
1946 }
1947
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp;
1950 my $sp = $exit->stats->sp;
1951
1903 $self->enter_link; 1952 $self->enter_link;
1904 1953
1905 (async { 1954 (async {
1906 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1956 unless (eval {
1908 prepare_random_map $exit 1957 $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 1958
1914 1; 1959 1;
1915 }) { 1960 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1962 . "I'll try to bring you back to the map you were before. "
… …
1978 # get handled first 2023 # get handled first
1979 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1980 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
1981 2026
1982 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2029
1984 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1985 2031
1986 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2033 if (@$queue) {
… …
2148The 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
2149using it, it should be unique. 2195using it, it should be unique.
2150 2196
2151=over 4 2197=over 4
2152 2198
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 2199=item $value = cf::db_get $family => $key
2160 2200
2161Returns a single value from the database 2201Returns 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 2202
2168=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2169 2204
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores 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 2206
2181=cut 2207=cut
2182 2208
2183our $DB; 2209our $DB;
2184 2210
2185{ 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
2186 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;
2187 2230
2188 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2235
2192 my $pid; 2236 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 } 2237 };
2202 }
2203
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($;$) {
2226 @_ >= 2
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230
2231 sub db_put($$;$) {
2232 if (@_ >= 3) {
2233 $DB->{$_[0]}{$_[1]} = $_[2];
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 }, 2238 }
2245 ); 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 { };
2246} 2256}
2247 2257
2248############################################################################# 2258#############################################################################
2249# 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}
2250 2265
2251sub cfg_load { 2266sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2268 or return;
2254 2269
… …
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 2282 };
2268 warn $@ if $@; 2283 warn $@ if $@;
2269 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2270} 2289}
2271 2290
2272sub main { 2291sub main {
2273 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2277 Event::one_event; 2296 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2279 }; 2298 };
2280 2299
2281 cfg_load; 2300 cfg_load;
2282 db_load; 2301 db_init;
2283 load_extensions; 2302 load_extensions;
2284 2303
2285 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2286 Event::loop; 2306 Event::loop;
2287} 2307}
2288 2308
2289############################################################################# 2309#############################################################################
2290# initialisation and cleanup 2310# initialisation and cleanup
… …
2294 for my $signal (qw(INT HUP TERM)) { 2314 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2315 Event->signal (
2296 reentrant => 0, 2316 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2317 data => WF_AUTOCANCEL,
2298 signal => $signal, 2318 signal => $signal,
2319 prio => 0,
2299 cb => sub { 2320 cb => sub {
2300 cf::cleanup "SIG$signal"; 2321 cf::cleanup "SIG$signal";
2301 }, 2322 },
2302 ); 2323 );
2303 } 2324 }
… …
2325 my $map = $cf::MAP{$path} or next; 2346 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 2347 $map->valid or next;
2327 $map->save; 2348 $map->save;
2328 } 2349 }
2329 warn "end emergency map save\n"; 2350 warn "end emergency map save\n";
2351
2352 warn "begin emergency database checkpoint\n";
2353 BDB::db_env_txn_checkpoint $DB_ENV;
2354 warn "end emergency database checkpoint\n";
2330 }; 2355 };
2331 2356
2332 warn "leave emergency perl save\n"; 2357 warn "leave emergency perl save\n";
2358}
2359
2360sub post_cleanup {
2361 my ($make_core) = @_;
2362
2363 warn Carp::longmess "post_cleanup backtrace"
2364 if $make_core;
2333} 2365}
2334 2366
2335sub reload() { 2367sub reload() {
2336 # can/must only be called in main 2368 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 2369 if ($Coro::current != $Coro::main) {
… …
2339 return; 2371 return;
2340 } 2372 }
2341 2373
2342 warn "reloading..."; 2374 warn "reloading...";
2343 2375
2344 warn "cancelling server ticker"; 2376 warn "entering sync_job";
2345 $TICK_WATCHER->cancel;
2346 2377
2378 cf::sync_job {
2379 cf::write_runtime;
2347 cf::emergency_save; 2380 cf::emergency_save;
2381 cf::write_runtime;
2348 2382
2349 eval { 2383 warn "syncing database to disk";
2384 BDB::db_env_txn_checkpoint $DB_ENV;
2385
2350 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2351
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354 2387
2355 warn "cancelling all WF_AUTOCANCEL watchers"; 2388 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) { 2389 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL; 2390 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 } 2391 }
2359 2392
2360 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2361 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2362 IO::AIO::flush; 2396 IO::AIO::flush;
2363 Coro::cede; 2397 Coro::cede;
2364 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2365 warn "iterate..."; 2399 warn "iterate...";
2366 } 2400 }
2367 2401
2368 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2424 require cf; 2458 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2426 2460
2427 warn "loading config and database again"; 2461 warn "loading config and database again";
2428 cf::cfg_load; 2462 cf::cfg_load;
2429 cf::db_load;
2430 2463
2431 warn "loading extensions"; 2464 warn "loading extensions";
2432 cf::load_extensions; 2465 cf::load_extensions;
2433 2466
2434 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2435 _global_reattach; 2468 _global_reattach;
2436 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2438 2471
2439 warn "restarting server ticker"; 2472 warn "loading reloadable resources";
2473 load_resources;
2440 2474
2441 $TICK_WATCHER->start; 2475 warn "leaving sync_job";
2442 };
2443 2476
2444 if ($@) { 2477 1
2478 } or do {
2445 warn $@; 2479 warn $@;
2446 warn "error while reloading, exiting."; 2480 warn "error while reloading, exiting.";
2447 exit 1; 2481 exit 1;
2448 } 2482 };
2449 2483
2450 warn "reloaded"; 2484 warn "reloaded";
2451}; 2485};
2452 2486
2453our $RELOAD_WATCHER; # used only during reload 2487our $RELOAD_WATCHER; # used only during reload
… …
2497 $NEXT_TICK += $TICK; 2531 $NEXT_TICK += $TICK;
2498 2532
2499 $WAIT_FOR_TICK->broadcast; 2533 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 2535
2536# my $AFTER = Event::time;
2537# warn $AFTER - $NOW;#d#
2538
2502 # if we are delayed by four ticks or more, skip them all 2539 # if we are delayed by four ticks or more, skip them all
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2540 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2504 2541
2505 $TICK_WATCHER->at ($NEXT_TICK); 2542 $TICK_WATCHER->at ($NEXT_TICK);
2506 $TICK_WATCHER->start; 2543 $TICK_WATCHER->start;
2507 }, 2544 },
2508); 2545);
2509 2546
2547{
2510IO::AIO::max_poll_time $TICK * 0.2; 2548 BDB::max_poll_time $TICK * 0.1;
2549 $BDB_POLL_WATCHER = Event->io (
2550 reentrant => 0,
2551 fd => BDB::poll_fileno,
2552 poll => 'r',
2553 prio => 0,
2554 data => WF_AUTOCANCEL,
2555 cb => \&BDB::poll_cb,
2556 );
2557 BDB::min_parallel 8;
2511 2558
2559 BDB::set_sync_prepare {
2560 my $status;
2561 my $current = $Coro::current;
2562 (
2563 sub {
2564 $status = $!;
2565 $current->ready; undef $current;
2566 },
2567 sub {
2568 Coro::schedule while defined $current;
2569 $! = $status;
2570 },
2571 )
2572 };
2573
2574 unless ($DB_ENV) {
2575 $DB_ENV = BDB::db_env_create;
2576
2577 cf::sync_job {
2578 eval {
2579 BDB::db_env_open
2580 $DB_ENV,
2581 $BDB_ENV_DIR,
2582 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2583 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2584 0666;
2585
2586 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2587
2588 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2589 $DB_ENV->set_lk_detect;
2590 };
2591
2592 cf::cleanup "db_env_open(db): $@" if $@;
2593 };
2594 }
2595}
2596
2597{
2598 IO::AIO::min_parallel 8;
2599
2512undef $Coro::AIO::WATCHER; 2600 undef $Coro::AIO::WATCHER;
2601 IO::AIO::max_poll_time $TICK * 0.1;
2513$AIO_POLL_WATCHER = Event->io ( 2602 $AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0, 2603 reentrant => 0,
2515 fd => IO::AIO::poll_fileno, 2604 fd => IO::AIO::poll_fileno,
2516 poll => 'r', 2605 poll => 'r',
2517 prio => 6, 2606 prio => 6,
2518 data => WF_AUTOCANCEL, 2607 data => WF_AUTOCANCEL,
2519 cb => \&IO::AIO::poll_cb, 2608 cb => \&IO::AIO::poll_cb,
2520); 2609 );
2610}
2521 2611
2522$WRITE_RUNTIME_WATCHER = Event->timer ( 2612$WRITE_RUNTIME_WATCHER = Event->timer (
2523 reentrant => 0, 2613 reentrant => 0,
2524 data => WF_AUTOCANCEL, 2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2525 after => 1, 2616 after => 1,
2526 interval => 10, 2617 interval => 10,
2527 prio => 6, # keep it lowest so it acts like a watchdog 2618 prio => 6, # keep it lowest so it acts like a watchdog
2528 cb => Coro::unblock_sub { 2619 cb => sub {
2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2529 write_runtime 2623 write_runtime
2530 or warn "ERROR: unable to write runtime file: $!"; 2624 or warn "ERROR: unable to write runtime file: $!";
2625 };
2531 }, 2626 },
2532); 2627);
2533 2628
2534END { cf::emergency_save } 2629END { cf::emergency_save }
2535 2630

Diff Legend

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