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.190 by root, Mon Jan 22 03:44:41 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19:44 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
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
344 354
345 $coro 355 $coro
346} 356}
347 357
348sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
349 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
350 362
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 364 or return;
353 365
… …
356 # 60 allows for the watchdog to kill the server. 368 # 60 allows for the watchdog to kill the server.
357 369
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 371 and return;
360 372
373 # always fsync - this file is important
361 aio_fsync $fh 374 aio_fsync $fh
362 and return; 375 and return;
363 376
364 close $fh 377 close $fh
365 or return; 378 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
751 764
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 769 close $fh;
757 770
758 if (@$objs) { 771 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 777 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
766 } 779 }
767 } else { 780 } else {
768 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
1068=cut 1081=cut
1069 1082
1070sub maps($) { 1083sub maps($) {
1071 my ($pl) = @_; 1084 my ($pl) = @_;
1072 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1073 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1074 or return; 1089 or return;
1075 1090
1076 my @paths; 1091 my @paths;
1077 1092
1078 for (@$files) { 1093 for (@$files) {
1079 utf8::decode $_; 1094 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1082 1097
1083 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1099 }
1086 1100
1087 \@paths 1101 \@paths
1088} 1102}
1089 1103
… …
1176} 1190}
1177 1191
1178sub normalise { 1192sub normalise {
1179 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1180 1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1198
1181 # map plan: 1199 # map plan:
1182 # 1200 #
1183 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1203 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1222 return $self; 1240 return $self;
1223 } 1241 }
1224 } 1242 }
1225 1243
1226 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1245 ()
1228} 1246}
1229 1247
1230sub init { 1248sub init {
1231 my ($self) = @_; 1249 my ($self) = @_;
… …
1246 1264
1247# the original (read-only) location 1265# the original (read-only) location
1248sub load_path { 1266sub load_path {
1249 my ($self) = @_; 1267 my ($self) = @_;
1250 1268
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1270}
1253 1271
1254# the temporary/swap location 1272# the temporary/swap location
1255sub save_path { 1273sub save_path {
1256 my ($self) = @_; 1274 my ($self) = @_;
1257 1275
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1278}
1261 1279
1262# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1263sub uniq_path { 1281sub uniq_path {
1264 my ($self) = @_; 1282 my ($self) = @_;
… …
1286 1304
1287sub load_header_from($) { 1305sub load_header_from($) {
1288 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1289 1307
1290 utf8::encode $path; 1308 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1309 #aio_open $path, O_RDONLY, 0
1292 or return; 1310 # or return;
1293 1311
1294 $self->_load_header ($path) 1312 $self->_load_header ($path)
1295 or return; 1313 or return;
1296 1314
1297 $self->{load_path} = $path; 1315 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1378 $map->{last_save} = $cf::RUNTIME;
1361 1379
1362 $map->load_header 1380 $map->load_header
1363 or return; 1381 or return;
1364 1382
1365 if ($map->should_reset) { 1383 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1384 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1385 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1386 $map->reset;
1369 undef $guard; 1387 undef $guard;
1370 $map = find $path 1388 return find $path;
1371 or return;
1372 } 1389 }
1373 1390
1374 $cf::MAP{$path} = $map 1391 $cf::MAP{$path} = $map
1375 } 1392 }
1376} 1393}
… …
1378sub pre_load { } 1395sub pre_load { }
1379sub post_load { } 1396sub post_load { }
1380 1397
1381sub load { 1398sub load {
1382 my ($self) = @_; 1399 my ($self) = @_;
1400
1401 local $self->{deny_reset} = 1; # loading can take a long time
1383 1402
1384 my $path = $self->{path}; 1403 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1404 my $guard = cf::lock_acquire "map_load:$path";
1386 1405
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1406 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1576 return if $self->players; 1595 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d# 1596 return if $self->isa ("ext::map_per_player");#d#
1578 1597
1579 warn "resetting map ", $self->path;#d# 1598 warn "resetting map ", $self->path;#d#
1580 1599
1600 $self->in_memory (cf::MAP_SWAPPED);
1601
1602 # need to save uniques path
1603 unless ($self->{deny_save}) {
1604 my $uniq = $self->uniq_path; utf8::encode $uniq;
1605
1606 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1607 if $uniq;
1608 }
1609
1581 delete $cf::MAP{$self->path}; 1610 delete $cf::MAP{$self->path};
1582 1611
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1612 $self->clear;
1585 1613
1586 $_->clear_links_to ($self) for values %cf::MAP; 1614 $_->clear_links_to ($self) for values %cf::MAP;
1587 1615
1588 $self->unlink_save; 1616 $self->unlink_save;
… …
1625 for (@$files) { 1653 for (@$files) {
1626 utf8::decode $_; 1654 utf8::decode $_;
1627 next if /\.pst$/; 1655 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1656 next unless /^$PATH_SEP/o;
1629 1657
1630 s/\.map$//; 1658 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1659 }
1633 1660
1634 \@paths 1661 \@paths
1635} 1662}
1636 1663
… …
1730=cut 1757=cut
1731 1758
1732sub link_map { 1759sub link_map {
1733 unless ($LINK_MAP) { 1760 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1761 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1762 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1763 $LINK_MAP->load;
1737 } 1764 }
1738 1765
1739 $LINK_MAP 1766 $LINK_MAP
1740} 1767}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1774 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1775
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1776 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1777 if $self->map;
1751 1778
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1779 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1780}
1754 1781
1755sub cf::object::player::leave_link { 1782sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1783 my ($self, $map, $x, $y) = @_;
1757 1784
… …
1779 $map->load; 1806 $map->load;
1780 $map->load_diag; 1807 $map->load_diag;
1781 1808
1782 return unless $self->contr->active; 1809 return unless $self->contr->active;
1783 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1784 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1785} 1814}
1786 1815
1787cf::player->attach ( 1816cf::player->attach (
1788 on_logout => sub { 1817 on_logout => sub {
… …
1801 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1802 # should happen only on crashes 1831 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1805 (async { 1834 (async {
1806 # we need this sleep as the login has a concurrent enter_exit running
1807 # and this sleep increases chances of the player not ending up in scorn
1808 $pl->ob->reply (undef, 1835 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1812 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1814 })->prio (2); 1843 })->prio (2);
1815 } 1844 }
1816 }, 1845 },
… …
1824 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1825 1854
1826 $self->enter_link; 1855 $self->enter_link;
1827 1856
1828 (async { 1857 (async {
1858 my $map = eval {
1829 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1831 1861 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1864
1837 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1866 })->prio (1);
1839} 1867}
1840 1868
… …
1871 # that depends on the exit object 1899 # that depends on the exit object
1872 1900
1873 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1874 1902
1875 if ($exit->map) { 1903 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1880 } 1908 }
1881 1909
… …
1898sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1900 1928
1901 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1902 1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1939
1903 $self->enter_link; 1940 $self->enter_link;
1904 1941
1905 (async { 1942 (async {
1906 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1944 unless (eval {
1908 prepare_random_map $exit 1945 $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 1946
1914 1; 1947 1;
1915 }) { 1948 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1978 # get handled first 2011 # get handled first
1979 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2014
1982 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2017
1984 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1985 2019
1986 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2021 if (@$queue) {
… …
2148The parameter C<$family> should best start with the name of the extension 2182The parameter C<$family> should best start with the name of the extension
2149using it, it should be unique. 2183using it, it should be unique.
2150 2184
2151=over 4 2185=over 4
2152 2186
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 2187=item $value = cf::db_get $family => $key
2160 2188
2161Returns a single value from the database 2189Returns 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 2190
2168=item cf::db_put $family => $key => $value 2191=item cf::db_put $family => $key => $value
2169 2192
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2193Stores 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 2194
2181=cut 2195=cut
2182 2196
2183our $DB; 2197our $DB;
2184 2198
2185{ 2199sub db_init {
2200 unless ($DB) {
2201 $DB = BDB::db_create $DB_ENV;
2202
2203 cf::sync_job {
2204 eval {
2205 $DB->set_flags (BDB::CHKSUM);
2206
2207 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2209 cf::cleanup "db_open(db): $!" if $!;
2210 };
2211 cf::cleanup "db_open(db): $@" if $@;
2212 };
2213
2186 my $path = cf::localdir . "/database.pst"; 2214 my $path = cf::localdir . "/database.pst";
2215 if (stat $path) {
2216 cf::sync_job {
2217 my $pst = Storable::retrieve $path;
2187 2218
2188 sub db_load() { 2219 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2220 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2222 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2223
2192 my $pid; 2224 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 } 2225 };
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 }, 2226 }
2245 ); 2227 }
2228}
2229
2230sub db_get($$) {
2231 my $key = "$_[0]/$_[1]";
2232
2233 cf::sync_job {
2234 BDB::db_get $DB, undef, $key, my $data;
2235
2236 $! ? ()
2237 : Compress::LZF::sthaw $data
2238 }
2239}
2240
2241sub db_put($$$) {
2242 BDB::dbreq_pri 4;
2243 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2246} 2244}
2247 2245
2248############################################################################# 2246#############################################################################
2249# the server's main() 2247# the server's init and main functions
2248
2249sub init_resources {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2251 or die "unable to load regions file\n";#d#
2252}
2250 2253
2251sub cfg_load { 2254sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2256 or return;
2254 2257
… …
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2268 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 2269 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 2270 };
2268 warn $@ if $@; 2271 warn $@ if $@;
2269 } 2272 }
2273}
2274
2275sub init {
2276 init_resources;
2270} 2277}
2271 2278
2272sub main { 2279sub main {
2273 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2277 Event::one_event; 2284 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2285 })->prio (Coro::PRIO_MAX);
2279 }; 2286 };
2280 2287
2281 cfg_load; 2288 cfg_load;
2282 db_load; 2289 db_init;
2283 load_extensions; 2290 load_extensions;
2284 2291
2285 $TICK_WATCHER->start; 2292 $TICK_WATCHER->start;
2286 Event::loop; 2293 Event::loop;
2287} 2294}
… …
2294 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2302 Event->signal (
2296 reentrant => 0, 2303 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2298 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2299 cb => sub { 2307 cb => sub {
2300 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2301 }, 2309 },
2302 ); 2310 );
2303 } 2311 }
… …
2325 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 2334 $map->valid or next;
2327 $map->save; 2335 $map->save;
2328 } 2336 }
2329 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";
2330 }; 2342 };
2331 2343
2332 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2345}
2346
2347sub post_cleanup {
2348 my ($make_core) = @_;
2349
2350 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core;
2333} 2352}
2334 2353
2335sub reload() { 2354sub reload() {
2336 # can/must only be called in main 2355 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 2356 if ($Coro::current != $Coro::main) {
… …
2339 return; 2358 return;
2340 } 2359 }
2341 2360
2342 warn "reloading..."; 2361 warn "reloading...";
2343 2362
2344 warn "cancelling server ticker"; 2363 warn "entering sync_job";
2345 $TICK_WATCHER->cancel;
2346 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2347 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2348 2369
2349 eval { 2370 warn "syncing database to disk";
2371 BDB::db_env_txn_checkpoint $DB_ENV;
2372
2350 # if anything goes wrong in here, we should simply crash as we already saved 2373 # 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 2374
2355 warn "cancelling all WF_AUTOCANCEL watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 } 2378 }
2359 2379
2360 warn "flushing outstanding aio requests"; 2380 warn "flushing outstanding aio requests";
2361 for (;;) { 2381 for (;;) {
2382 BDB::flush;
2362 IO::AIO::flush; 2383 IO::AIO::flush;
2363 Coro::cede; 2384 Coro::cede;
2364 last unless IO::AIO::nreqs; 2385 last unless IO::AIO::nreqs || BDB::nreqs;
2365 warn "iterate..."; 2386 warn "iterate...";
2366 } 2387 }
2367 2388
2368 warn "cancelling all extension coros"; 2389 warn "cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO; 2390 $_->cancel for values %EXT_CORO;
… …
2424 require cf; 2445 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2446 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2426 2447
2427 warn "loading config and database again"; 2448 warn "loading config and database again";
2428 cf::cfg_load; 2449 cf::cfg_load;
2429 cf::db_load;
2430 2450
2431 warn "loading extensions"; 2451 warn "loading extensions";
2432 cf::load_extensions; 2452 cf::load_extensions;
2433 2453
2434 warn "reattaching attachments to objects/players"; 2454 warn "reattaching attachments to objects/players";
2435 _global_reattach; 2455 _global_reattach;
2436 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2438 2458
2439 warn "restarting server ticker"; 2459 warn "loading reloadable resources";
2460 init_resources;
2440 2461
2441 $TICK_WATCHER->start; 2462 warn "leaving sync_job";
2442 };
2443 2463
2444 if ($@) { 2464 1
2465 } or do {
2445 warn $@; 2466 warn $@;
2446 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2447 exit 1; 2468 exit 1;
2448 } 2469 };
2449 2470
2450 warn "reloaded"; 2471 warn "reloaded";
2451}; 2472};
2452 2473
2453our $RELOAD_WATCHER; # used only during reload 2474our $RELOAD_WATCHER; # used only during reload
… …
2478my $bug_warning = 0; 2499my $bug_warning = 0;
2479 2500
2480$TICK_WATCHER = Event->timer ( 2501$TICK_WATCHER = Event->timer (
2481 reentrant => 0, 2502 reentrant => 0,
2482 parked => 1, 2503 parked => 1,
2483 prio => -1, 2504 prio => 0,
2484 at => $NEXT_TICK || $TICK, 2505 at => $NEXT_TICK || $TICK,
2485 data => WF_AUTOCANCEL, 2506 data => WF_AUTOCANCEL,
2486 cb => sub { 2507 cb => sub {
2487 if ($Coro::current != $Coro::main) { 2508 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2509 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
… …
2494 2515
2495 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2496 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2497 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2498 2519
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10;
2522 Coro::async_pool {
2523 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!";
2525 };
2526 }
2527
2499 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 2530
2502 my $AFTER = Event::time; 2531# my $AFTER = Event::time;
2503 warn $AFTER - $NOW;#d# 2532# warn $AFTER - $NOW;#d#
2504 2533
2505 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2506 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2507 2536
2508 $TICK_WATCHER->at ($NEXT_TICK); 2537 $TICK_WATCHER->at ($NEXT_TICK);
2509 $TICK_WATCHER->start; 2538 $TICK_WATCHER->start;
2510 }, 2539 },
2511); 2540);
2512 2541
2542{
2513IO::AIO::max_poll_time $TICK * 0.2; 2543 BDB::max_poll_time $TICK * 0.1;
2544 $BDB_POLL_WATCHER = Event->io (
2545 reentrant => 0,
2546 fd => BDB::poll_fileno,
2547 poll => 'r',
2548 prio => 0,
2549 data => WF_AUTOCANCEL,
2550 cb => \&BDB::poll_cb,
2551 );
2552 BDB::min_parallel 8;
2514 2553
2554 BDB::set_sync_prepare {
2555 my $status;
2556 my $current = $Coro::current;
2557 (
2558 sub {
2559 $status = $!;
2560 $current->ready; undef $current;
2561 },
2562 sub {
2563 Coro::schedule while defined $current;
2564 $! = $status;
2565 },
2566 )
2567 };
2568
2569 unless ($DB_ENV) {
2570 $DB_ENV = BDB::db_env_create;
2571
2572 cf::sync_job {
2573 eval {
2574 BDB::db_env_open
2575 $DB_ENV,
2576 $BDB_ENV_DIR,
2577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2579 0666;
2580
2581 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2582
2583 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2584 $DB_ENV->set_lk_detect;
2585 };
2586
2587 cf::cleanup "db_env_open(db): $@" if $@;
2588 };
2589 }
2590}
2591
2592{
2593 IO::AIO::min_parallel 8;
2594
2515undef $Coro::AIO::WATCHER; 2595 undef $Coro::AIO::WATCHER;
2596 IO::AIO::max_poll_time $TICK * 0.1;
2516$AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2517 reentrant => 0, 2598 reentrant => 0,
2599 data => WF_AUTOCANCEL,
2518 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2519 poll => 'r', 2601 poll => 'r',
2520 prio => 6, 2602 prio => 6,
2521 data => WF_AUTOCANCEL,
2522 cb => \&IO::AIO::poll_cb, 2603 cb => \&IO::AIO::poll_cb,
2523); 2604 );
2524 2605}
2525$WRITE_RUNTIME_WATCHER = Event->timer (
2526 reentrant => 0,
2527 data => WF_AUTOCANCEL,
2528 after => 1,
2529 interval => 10,
2530 prio => 6, # keep it lowest so it acts like a watchdog
2531 cb => Coro::unblock_sub {
2532 write_runtime
2533 or warn "ERROR: unable to write runtime file: $!";
2534 },
2535);
2536 2606
2537END { cf::emergency_save } 2607END { cf::emergency_save }
2538 2608
25391 26091
2540 2610

Diff Legend

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