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.221 by pippijn, Fri Mar 2 13:32:52 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";
… …
1017=cut 1030=cut
1018 1031
1019sub quit_character { 1032sub quit_character {
1020 my ($pl) = @_; 1033 my ($pl) = @_;
1021 1034
1035 my $name = $pl->ob->name;
1036
1022 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1039
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1041 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1035 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1036} 1071}
1037 1072
1038=item cf::player::list_logins 1073=item cf::player::list_logins
1039 1074
1040Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1103=cut
1069 1104
1070sub maps($) { 1105sub maps($) {
1071 my ($pl) = @_; 1106 my ($pl) = @_;
1072 1107
1108 $pl = ref $pl ? $pl->ob->name : $pl;
1109
1073 my $files = aio_readdir playerdir $pl 1110 my $files = aio_readdir playerdir $pl
1074 or return; 1111 or return;
1075 1112
1076 my @paths; 1113 my @paths;
1077 1114
1078 for (@$files) { 1115 for (@$files) {
1079 utf8::decode $_; 1116 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1117 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1118 next unless /^$PATH_SEP/o;
1082 1119
1083 s/\.map$//; 1120 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1121 }
1086 1122
1087 \@paths 1123 \@paths
1088} 1124}
1089 1125
… …
1176} 1212}
1177 1213
1178sub normalise { 1214sub normalise {
1179 my ($path, $base) = @_; 1215 my ($path, $base) = @_;
1180 1216
1217 $path = "$path"; # make sure its a string
1218
1219 $path =~ s/\.map$//;
1220
1181 # map plan: 1221 # map plan:
1182 # 1222 #
1183 # /! non-realised random map exit (special hack!) 1223 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1224 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1225 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1261 $self->init; # pass $1 etc.
1222 return $self; 1262 return $self;
1223 } 1263 }
1224 } 1264 }
1225 1265
1226 Carp::carp "unable to resolve path '$path'."; 1266 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1267 ()
1228} 1268}
1229 1269
1230sub init { 1270sub init {
1231 my ($self) = @_; 1271 my ($self) = @_;
… …
1246 1286
1247# the original (read-only) location 1287# the original (read-only) location
1248sub load_path { 1288sub load_path {
1249 my ($self) = @_; 1289 my ($self) = @_;
1250 1290
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1291 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1292}
1253 1293
1254# the temporary/swap location 1294# the temporary/swap location
1255sub save_path { 1295sub save_path {
1256 my ($self) = @_; 1296 my ($self) = @_;
1257 1297
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1299 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1300}
1261 1301
1262# the unique path, undef == no special unique path 1302# the unique path, undef == no special unique path
1263sub uniq_path { 1303sub uniq_path {
1264 my ($self) = @_; 1304 my ($self) = @_;
… …
1286 1326
1287sub load_header_from($) { 1327sub load_header_from($) {
1288 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1289 1329
1290 utf8::encode $path; 1330 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1331 #aio_open $path, O_RDONLY, 0
1292 or return; 1332 # or return;
1293 1333
1294 $self->_load_header ($path) 1334 $self->_load_header ($path)
1295 or return; 1335 or return;
1296 1336
1297 $self->{load_path} = $path; 1337 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1400 $map->{last_save} = $cf::RUNTIME;
1361 1401
1362 $map->load_header 1402 $map->load_header
1363 or return; 1403 or return;
1364 1404
1365 if ($map->should_reset) { 1405 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1406 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1407 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1408 $map->reset;
1369 undef $guard; 1409 undef $guard;
1370 $map = find $path 1410 return find $path;
1371 or return;
1372 } 1411 }
1373 1412
1374 $cf::MAP{$path} = $map 1413 $cf::MAP{$path} = $map
1375 } 1414 }
1376} 1415}
… …
1378sub pre_load { } 1417sub pre_load { }
1379sub post_load { } 1418sub post_load { }
1380 1419
1381sub load { 1420sub load {
1382 my ($self) = @_; 1421 my ($self) = @_;
1422
1423 local $self->{deny_reset} = 1; # loading can take a long time
1383 1424
1384 my $path = $self->{path}; 1425 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1426 my $guard = cf::lock_acquire "map_load:$path";
1386 1427
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1428 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1576 return if $self->players; 1617 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1578 1619
1579 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1580 1621
1622 $self->in_memory (cf::MAP_SWAPPED);
1623
1624 # need to save uniques path
1625 unless ($self->{deny_save}) {
1626 my $uniq = $self->uniq_path; utf8::encode $uniq;
1627
1628 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1629 if $uniq;
1630 }
1631
1581 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1582 1633
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1634 $self->clear;
1585 1635
1586 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1587 1637
1588 $self->unlink_save; 1638 $self->unlink_save;
… …
1625 for (@$files) { 1675 for (@$files) {
1626 utf8::decode $_; 1676 utf8::decode $_;
1627 next if /\.pst$/; 1677 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1678 next unless /^$PATH_SEP/o;
1629 1679
1630 s/\.map$//; 1680 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1681 }
1633 1682
1634 \@paths 1683 \@paths
1635} 1684}
1636 1685
… …
1730=cut 1779=cut
1731 1780
1732sub link_map { 1781sub link_map {
1733 unless ($LINK_MAP) { 1782 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1783 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1784 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1785 $LINK_MAP->load;
1737 } 1786 }
1738 1787
1739 $LINK_MAP 1788 $LINK_MAP
1740} 1789}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1796 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1797
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1798 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1799 if $self->map;
1751 1800
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1801 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1802}
1754 1803
1755sub cf::object::player::leave_link { 1804sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1805 my ($self, $map, $x, $y) = @_;
1757 1806
… …
1779 $map->load; 1828 $map->load;
1780 $map->load_diag; 1829 $map->load_diag;
1781 1830
1782 return unless $self->contr->active; 1831 return unless $self->contr->active;
1783 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1784 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1785} 1836}
1786 1837
1787cf::player->attach ( 1838cf::player->attach (
1788 on_logout => sub { 1839 on_logout => sub {
… …
1801 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1802 # should happen only on crashes 1853 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1805 (async { 1856 (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, 1857 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1812 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1814 })->prio (2); 1865 })->prio (2);
1815 } 1866 }
1816 }, 1867 },
… …
1824 my ($self, $path, $x, $y) = @_; 1875 my ($self, $path, $x, $y) = @_;
1825 1876
1826 $self->enter_link; 1877 $self->enter_link;
1827 1878
1828 (async { 1879 (async {
1880 my $map = eval {
1829 my $map = cf::map::find $path; 1881 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1882 $map = $map->customise_for ($self) if $map;
1831 1883 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1884 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1885 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1886
1837 $self->leave_link ($map, $x, $y); 1887 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1888 })->prio (1);
1839} 1889}
1840 1890
… …
1871 # that depends on the exit object 1921 # that depends on the exit object
1872 1922
1873 my $rmp = parse_random_map_params $exit->msg; 1923 my $rmp = parse_random_map_params $exit->msg;
1874 1924
1875 if ($exit->map) { 1925 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1926 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1927 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1928 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1929 $rmp->{origin_y} = $exit->y;
1880 } 1930 }
1881 1931
… …
1898sub cf::object::player::enter_exit { 1948sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1949 my ($self, $exit) = @_;
1900 1950
1901 return unless $self->type == cf::PLAYER; 1951 return unless $self->type == cf::PLAYER;
1902 1952
1953 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job
1955 cf::sync_job { prepare_random_map $exit };
1956 }
1957
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp;
1960 my $sp = $exit->stats->sp;
1961
1903 $self->enter_link; 1962 $self->enter_link;
1904 1963
1905 (async { 1964 (async {
1906 $self->deactivate_recursive; # just to be sure 1965 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1966 unless (eval {
1908 prepare_random_map $exit 1967 $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 1968
1914 1; 1969 1;
1915 }) { 1970 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1971 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1972 . "I'll try to bring you back to the map you were before. "
… …
1978 # get handled first 2033 # get handled first
1979 my $queue = delete $ns->{query_queue} 2034 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2035 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2036
1982 (shift @$queue)->[1]->($msg); 2037 (shift @$queue)->[1]->($msg);
2038 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2039
1984 push @{ $ns->{query_queue} }, @$queue; 2040 push @{ $ns->{query_queue} }, @$queue;
1985 2041
1986 if (@{ $ns->{query_queue} } == @$queue) { 2042 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2043 if (@$queue) {
… …
2148The parameter C<$family> should best start with the name of the extension 2204The parameter C<$family> should best start with the name of the extension
2149using it, it should be unique. 2205using it, it should be unique.
2150 2206
2151=over 4 2207=over 4
2152 2208
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 2209=item $value = cf::db_get $family => $key
2160 2210
2161Returns a single value from the database 2211Returns 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 2212
2168=item cf::db_put $family => $key => $value 2213=item cf::db_put $family => $key => $value
2169 2214
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2215Stores 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 2216
2181=cut 2217=cut
2182 2218
2183our $DB; 2219our $DB;
2184 2220
2185{ 2221sub db_init {
2222 unless ($DB) {
2223 $DB = BDB::db_create $DB_ENV;
2224
2225 cf::sync_job {
2226 eval {
2227 $DB->set_flags (BDB::CHKSUM);
2228
2229 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!;
2232 };
2233 cf::cleanup "db_open(db): $@" if $@;
2234 };
2235
2186 my $path = cf::localdir . "/database.pst"; 2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2187 2240
2188 sub db_load() { 2241 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2242 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2245
2192 my $pid; 2246 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 } 2247 };
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 }, 2248 }
2245 ); 2249 }
2250}
2251
2252sub db_get($$) {
2253 my $key = "$_[0]/$_[1]";
2254
2255 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data;
2257
2258 $! ? ()
2259 : Compress::LZF::sthaw $data
2260 }
2261}
2262
2263sub db_put($$$) {
2264 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2246} 2266}
2247 2267
2248############################################################################# 2268#############################################################################
2249# the server's main() 2269# the server's init and main functions
2270
2271sub init_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d#
2274}
2250 2275
2251sub cfg_load { 2276sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2278 or return;
2254 2279
… …
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 2291 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 2292 };
2268 warn $@ if $@; 2293 warn $@ if $@;
2269 } 2294 }
2295}
2296
2297sub init {
2298 init_resources;
2270} 2299}
2271 2300
2272sub main { 2301sub main {
2273 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
… …
2277 Event::one_event; 2306 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2307 })->prio (Coro::PRIO_MAX);
2279 }; 2308 };
2280 2309
2281 cfg_load; 2310 cfg_load;
2282 db_load; 2311 db_init;
2283 load_extensions; 2312 load_extensions;
2284 2313
2285 $TICK_WATCHER->start; 2314 $TICK_WATCHER->start;
2286 Event::loop; 2315 Event::loop;
2287} 2316}
… …
2294 for my $signal (qw(INT HUP TERM)) { 2323 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2324 Event->signal (
2296 reentrant => 0, 2325 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2326 data => WF_AUTOCANCEL,
2298 signal => $signal, 2327 signal => $signal,
2328 prio => 0,
2299 cb => sub { 2329 cb => sub {
2300 cf::cleanup "SIG$signal"; 2330 cf::cleanup "SIG$signal";
2301 }, 2331 },
2302 ); 2332 );
2303 } 2333 }
… …
2325 my $map = $cf::MAP{$path} or next; 2355 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 2356 $map->valid or next;
2327 $map->save; 2357 $map->save;
2328 } 2358 }
2329 warn "end emergency map save\n"; 2359 warn "end emergency map save\n";
2360
2361 warn "begin emergency database checkpoint\n";
2362 BDB::db_env_txn_checkpoint $DB_ENV;
2363 warn "end emergency database checkpoint\n";
2330 }; 2364 };
2331 2365
2332 warn "leave emergency perl save\n"; 2366 warn "leave emergency perl save\n";
2367}
2368
2369sub post_cleanup {
2370 my ($make_core) = @_;
2371
2372 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core;
2333} 2374}
2334 2375
2335sub reload() { 2376sub reload() {
2336 # can/must only be called in main 2377 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
… …
2339 return; 2380 return;
2340 } 2381 }
2341 2382
2342 warn "reloading..."; 2383 warn "reloading...";
2343 2384
2344 warn "cancelling server ticker"; 2385 warn "entering sync_job";
2345 $TICK_WATCHER->cancel;
2346 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2347 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2348 2391
2349 eval { 2392 warn "syncing database to disk";
2393 BDB::db_env_txn_checkpoint $DB_ENV;
2394
2350 # if anything goes wrong in here, we should simply crash as we already saved 2395 # 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 2396
2355 warn "cancelling all WF_AUTOCANCEL watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 } 2400 }
2359 2401
2360 warn "flushing outstanding aio requests"; 2402 warn "flushing outstanding aio requests";
2361 for (;;) { 2403 for (;;) {
2404 BDB::flush;
2362 IO::AIO::flush; 2405 IO::AIO::flush;
2363 Coro::cede; 2406 Coro::cede;
2364 last unless IO::AIO::nreqs; 2407 last unless IO::AIO::nreqs || BDB::nreqs;
2365 warn "iterate..."; 2408 warn "iterate...";
2366 } 2409 }
2367 2410
2368 warn "cancelling all extension coros"; 2411 warn "cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO; 2412 $_->cancel for values %EXT_CORO;
… …
2424 require cf; 2467 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2426 2469
2427 warn "loading config and database again"; 2470 warn "loading config and database again";
2428 cf::cfg_load; 2471 cf::cfg_load;
2429 cf::db_load;
2430 2472
2431 warn "loading extensions"; 2473 warn "loading extensions";
2432 cf::load_extensions; 2474 cf::load_extensions;
2433 2475
2434 warn "reattaching attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2435 _global_reattach; 2477 _global_reattach;
2436 warn "reattaching attachments to maps"; 2478 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2438 2480
2439 warn "restarting server ticker"; 2481 warn "loading reloadable resources";
2482 init_resources;
2440 2483
2441 $TICK_WATCHER->start; 2484 warn "leaving sync_job";
2442 };
2443 2485
2444 if ($@) { 2486 1
2487 } or do {
2445 warn $@; 2488 warn $@;
2446 warn "error while reloading, exiting."; 2489 warn "error while reloading, exiting.";
2447 exit 1; 2490 exit 1;
2448 } 2491 };
2449 2492
2450 warn "reloaded"; 2493 warn "reloaded";
2451}; 2494};
2452 2495
2453our $RELOAD_WATCHER; # used only during reload 2496our $RELOAD_WATCHER; # used only during reload
… …
2494 2537
2495 cf::server_tick; # one server iteration 2538 cf::server_tick; # one server iteration
2496 $RUNTIME += $TICK; 2539 $RUNTIME += $TICK;
2497 $NEXT_TICK += $TICK; 2540 $NEXT_TICK += $TICK;
2498 2541
2542 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2543 $NEXT_RUNTIME_WRITE = $NOW + 10;
2544 Coro::async_pool {
2545 write_runtime
2546 or warn "ERROR: unable to write runtime file: $!";
2547 };
2548 }
2549
2499 $WAIT_FOR_TICK->broadcast; 2550 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2551 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2552
2553# my $AFTER = Event::time;
2554# warn $AFTER - $NOW;#d#
2501 2555
2502 # if we are delayed by four ticks or more, skip them all 2556 # if we are delayed by four ticks or more, skip them all
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2557 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2504 2558
2505 $TICK_WATCHER->at ($NEXT_TICK); 2559 $TICK_WATCHER->at ($NEXT_TICK);
2506 $TICK_WATCHER->start; 2560 $TICK_WATCHER->start;
2507 }, 2561 },
2508); 2562);
2509 2563
2564{
2510IO::AIO::max_poll_time $TICK * 0.2; 2565 BDB::max_poll_time $TICK * 0.1;
2566 $BDB_POLL_WATCHER = Event->io (
2567 reentrant => 0,
2568 fd => BDB::poll_fileno,
2569 poll => 'r',
2570 prio => 0,
2571 data => WF_AUTOCANCEL,
2572 cb => \&BDB::poll_cb,
2573 );
2574 BDB::min_parallel 8;
2511 2575
2576 BDB::set_sync_prepare {
2577 my $status;
2578 my $current = $Coro::current;
2579 (
2580 sub {
2581 $status = $!;
2582 $current->ready; undef $current;
2583 },
2584 sub {
2585 Coro::schedule while defined $current;
2586 $! = $status;
2587 },
2588 )
2589 };
2590
2591 unless ($DB_ENV) {
2592 $DB_ENV = BDB::db_env_create;
2593
2594 cf::sync_job {
2595 eval {
2596 BDB::db_env_open
2597 $DB_ENV,
2598 $BDB_ENV_DIR,
2599 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2600 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2601 0666;
2602
2603 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2604
2605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2606 $DB_ENV->set_lk_detect;
2607 };
2608
2609 cf::cleanup "db_env_open(db): $@" if $@;
2610 };
2611 }
2612}
2613
2614{
2615 IO::AIO::min_parallel 8;
2616
2512undef $Coro::AIO::WATCHER; 2617 undef $Coro::AIO::WATCHER;
2618 IO::AIO::max_poll_time $TICK * 0.1;
2513$AIO_POLL_WATCHER = Event->io ( 2619 $AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0, 2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2515 fd => IO::AIO::poll_fileno, 2622 fd => IO::AIO::poll_fileno,
2516 poll => 'r', 2623 poll => 'r',
2517 prio => 6, 2624 prio => 6,
2518 data => WF_AUTOCANCEL,
2519 cb => \&IO::AIO::poll_cb, 2625 cb => \&IO::AIO::poll_cb,
2520); 2626 );
2521 2627}
2522$WRITE_RUNTIME_WATCHER = Event->timer (
2523 reentrant => 0,
2524 data => WF_AUTOCANCEL,
2525 after => 1,
2526 interval => 10,
2527 prio => 6, # keep it lowest so it acts like a watchdog
2528 cb => Coro::unblock_sub {
2529 write_runtime
2530 or warn "ERROR: unable to write runtime file: $!";
2531 },
2532);
2533 2628
2534END { cf::emergency_save } 2629END { cf::emergency_save }
2535 2630
25361 26311
2537 2632

Diff Legend

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