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.188 by root, Sat Jan 20 23:30:16 2007 UTC vs.
Revision 1.215 by root, Thu Feb 15 03:19:02 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 }
… …
356 # 60 allows for the watchdog to kill the server. 366 # 60 allows for the watchdog to kill the server.
357 367
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 369 and return;
360 370
371 # always fsync - this file is important
361 aio_fsync $fh 372 aio_fsync $fh
362 and return; 373 and return;
363 374
364 close $fh 375 close $fh
365 or return; 376 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
751 762
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 767 close $fh;
757 768
758 if (@$objs) { 769 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 775 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
766 } 777 }
767 } else { 778 } else {
768 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
774 } 785 }
775 } else { 786 } else {
776 aio_unlink $filename; 787 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
778 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
779 } 796 }
780} 797}
781 798
782sub object_freezer_as_string { 799sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
789 806
790sub object_thawer_load { 807sub object_thawer_load {
791 my ($filename) = @_; 808 my ($filename) = @_;
792 809
793 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
794 814
795 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
796 or return; 816 or return;
797 817
798 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
1068=cut 1088=cut
1069 1089
1070sub maps($) { 1090sub maps($) {
1071 my ($pl) = @_; 1091 my ($pl) = @_;
1072 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1073 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1074 or return; 1096 or return;
1075 1097
1076 my @paths; 1098 my @paths;
1077 1099
1078 for (@$files) { 1100 for (@$files) {
1079 utf8::decode $_; 1101 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1082 1104
1083 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1106 }
1086 1107
1087 \@paths 1108 \@paths
1088} 1109}
1089 1110
… …
1176} 1197}
1177 1198
1178sub normalise { 1199sub normalise {
1179 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1180 1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1205
1181 # map plan: 1206 # map plan:
1182 # 1207 #
1183 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1210 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1246 $self->init; # pass $1 etc.
1222 return $self; 1247 return $self;
1223 } 1248 }
1224 } 1249 }
1225 1250
1226 Carp::carp "unable to resolve path '$path'."; 1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1252 ()
1228} 1253}
1229 1254
1230sub init { 1255sub init {
1231 my ($self) = @_; 1256 my ($self) = @_;
… …
1246 1271
1247# the original (read-only) location 1272# the original (read-only) location
1248sub load_path { 1273sub load_path {
1249 my ($self) = @_; 1274 my ($self) = @_;
1250 1275
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1277}
1253 1278
1254# the temporary/swap location 1279# the temporary/swap location
1255sub save_path { 1280sub save_path {
1256 my ($self) = @_; 1281 my ($self) = @_;
1257 1282
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1285}
1261 1286
1262# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1263sub uniq_path { 1288sub uniq_path {
1264 my ($self) = @_; 1289 my ($self) = @_;
… …
1280 my ($self) = @_; 1305 my ($self) = @_;
1281 1306
1282 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1315}
1286 1316
1287sub load_header_from($) { 1317sub load_header_from($) {
1288 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1289 1319
1290 utf8::encode $path; 1320 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1292 or return; 1322 # or return;
1293 1323
1294 $self->_load_header ($path) 1324 $self->_load_header ($path)
1295 or return; 1325 or return;
1296 1326
1297 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1361 1391
1362 $map->load_header 1392 $map->load_header
1363 or return; 1393 or return;
1364 1394
1365 if ($map->should_reset) { 1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1396 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1397 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1398 $map->reset;
1369 undef $guard; 1399 undef $guard;
1370 $map = find $path 1400 return find $path;
1371 or return;
1372 } 1401 }
1373 1402
1374 $cf::MAP{$path} = $map 1403 $cf::MAP{$path} = $map
1375 } 1404 }
1376} 1405}
… …
1378sub pre_load { } 1407sub pre_load { }
1379sub post_load { } 1408sub post_load { }
1380 1409
1381sub load { 1410sub load {
1382 my ($self) = @_; 1411 my ($self) = @_;
1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1383 1414
1384 my $path = $self->{path}; 1415 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1416 my $guard = cf::lock_acquire "map_load:$path";
1386 1417
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1496 delete $MAP_PREFETCH{$path}; 1527 delete $MAP_PREFETCH{$path};
1497 } 1528 }
1498 } 1529 }
1499 undef $MAP_PREFETCHER; 1530 undef $MAP_PREFETCHER;
1500 }; 1531 };
1532 $MAP_PREFETCHER->prio (6);
1501 1533
1502 () 1534 ()
1503} 1535}
1504 1536
1505sub save { 1537sub save {
… …
1575 return if $self->players; 1607 return if $self->players;
1576 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1577 1609
1578 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1579 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1580 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1581 1623
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear; 1624 $self->clear;
1584 1625
1585 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1586 1627
1587 $self->unlink_save; 1628 $self->unlink_save;
… …
1624 for (@$files) { 1665 for (@$files) {
1625 utf8::decode $_; 1666 utf8::decode $_;
1626 next if /\.pst$/; 1667 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1628 1669
1629 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1630 push @paths, $_;
1631 } 1671 }
1632 1672
1633 \@paths 1673 \@paths
1634} 1674}
1635 1675
… …
1729=cut 1769=cut
1730 1770
1731sub link_map { 1771sub link_map {
1732 unless ($LINK_MAP) { 1772 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}" 1773 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1735 $LINK_MAP->load; 1775 $LINK_MAP->load;
1736 } 1776 }
1737 1777
1738 $LINK_MAP 1778 $LINK_MAP
1739} 1779}
… …
1746 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1747 1787
1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1749 if $self->map; 1789 if $self->map;
1750 1790
1751 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1752} 1792}
1753 1793
1754sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1755 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1756 1796
… …
1778 $map->load; 1818 $map->load;
1779 $map->load_diag; 1819 $map->load_diag;
1780 1820
1781 return unless $self->contr->active; 1821 return unless $self->contr->active;
1782 $self->activate_recursive; 1822 $self->activate_recursive;
1823
1824 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1783 $self->enter_map ($map, $x, $y); 1825 $self->enter_map ($map, $x, $y);
1784} 1826}
1785 1827
1786cf::player->attach ( 1828cf::player->attach (
1787 on_logout => sub { 1829 on_logout => sub {
… …
1800 # try to abort aborted map switching on player login :) 1842 # try to abort aborted map switching on player login :)
1801 # should happen only on crashes 1843 # should happen only on crashes
1802 if ($pl->ob->{_link_pos}) { 1844 if ($pl->ob->{_link_pos}) {
1803 $pl->ob->enter_link; 1845 $pl->ob->enter_link;
1804 (async { 1846 (async {
1805 # we need this sleep as the login has a concurrent enter_exit running
1806 # and this sleep increases chances of the player not ending up in scorn
1807 $pl->ob->reply (undef, 1847 $pl->ob->reply (undef,
1808 "There was an internal problem at your last logout, " 1848 "There was an internal problem at your last logout, "
1809 . "the server will try to bring you to your intended destination in a second.", 1849 . "the server will try to bring you to your intended destination in a second.",
1810 cf::NDI_RED); 1850 cf::NDI_RED);
1851 # we need this sleep as the login has a concurrent enter_exit running
1852 # and this sleep increases chances of the player not ending up in scorn
1811 Coro::Timer::sleep 1; 1853 Coro::Timer::sleep 1;
1812 $pl->ob->leave_link; 1854 $pl->ob->leave_link;
1813 })->prio (2); 1855 })->prio (2);
1814 } 1856 }
1815 }, 1857 },
… …
1823 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1824 1866
1825 $self->enter_link; 1867 $self->enter_link;
1826 1868
1827 (async { 1869 (async {
1870 my $map = eval {
1828 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1829 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1830 1873 $map
1831# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1832# if $map;
1833
1834 $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);
1835 1876
1836 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1837 })->prio (1); 1878 })->prio (1);
1838} 1879}
1839 1880
… …
1870 # that depends on the exit object 1911 # that depends on the exit object
1871 1912
1872 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1873 1914
1874 if ($exit->map) { 1915 if ($exit->map) {
1875 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1876 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1877 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1878 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1879 } 1920 }
1880 1921
… …
1897sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1898 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1899 1940
1900 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1901 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
1902 $self->enter_link; 1952 $self->enter_link;
1903 1953
1904 (async { 1954 (async {
1905 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1906 unless (eval { 1956 unless (eval {
1907 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1908 if $exit->slaying eq "/!";
1909
1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1912 1958
1913 1; 1959 1;
1914 }) { 1960 }) {
1915 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1916 . "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. "
… …
1977 # get handled first 2023 # get handled first
1978 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1979 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
1980 2026
1981 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1982 2029
1983 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1984 2031
1985 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1986 if (@$queue) { 2033 if (@$queue) {
… …
2147The 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
2148using it, it should be unique. 2195using it, it should be unique.
2149 2196
2150=over 4 2197=over 4
2151 2198
2152=item $hashref = cf::db_get $family
2153
2154Return a hashref for use by the extension C<$family>, which can be
2155modified. After modifications, you have to call C<cf::db_dirty> or
2156C<cf::db_sync>.
2157
2158=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2159 2200
2160Returns a single value from the database 2201Returns a single value from the database.
2161
2162=item cf::db_put $family => $hashref
2163
2164Stores the given family hashref into the database. Updates are delayed, if
2165you want the data to be synced to disk immediately, use C<cf::db_sync>.
2166 2202
2167=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2168 2204
2169Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2170want the data to be synced to disk immediately, use C<cf::db_sync>.
2171
2172=item cf::db_dirty
2173
2174Marks the database as dirty, to be updated at a later time.
2175
2176=item cf::db_sync
2177
2178Immediately write the database to disk I<if it is dirty>.
2179 2206
2180=cut 2207=cut
2181 2208
2182our $DB; 2209our $DB;
2183 2210
2184{ 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
2185 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;
2186 2230
2187 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2188 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2189 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2190 2235
2191 my $pid; 2236 unlink $path;
2192
2193 sub db_save() {
2194 waitpid $pid, 0 if $pid;
2195 if (0 == ($pid = fork)) {
2196 $DB->{_meta}{version} = 1;
2197 Storable::nstore $DB, "$path~";
2198 rename "$path~", $path;
2199 cf::_exit 0 if defined $pid;
2200 } 2237 };
2201 }
2202
2203 my $dirty;
2204
2205 sub db_sync() {
2206 db_save if $dirty;
2207 undef $dirty;
2208 }
2209
2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2211 db_sync;
2212 });
2213
2214 sub db_dirty() {
2215 $dirty = 1;
2216 $idle->start;
2217 }
2218
2219 sub db_get($;$) {
2220 @_ >= 2
2221 ? $DB->{$_[0]}{$_[1]}
2222 : ($DB->{$_[0]} ||= { })
2223 }
2224
2225 sub db_put($$;$) {
2226 if (@_ >= 3) {
2227 $DB->{$_[0]}{$_[1]} = $_[2];
2228 } else {
2229 $DB->{$_[0]} = $_[1];
2230 }
2231 db_dirty;
2232 }
2233
2234 cf::global->attach (
2235 prio => 10000,
2236 on_cleanup => sub {
2237 db_sync;
2238 }, 2238 }
2239 ); 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 { };
2240} 2256}
2241 2257
2242############################################################################# 2258#############################################################################
2243# 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}
2244 2265
2245sub cfg_load { 2266sub cfg_load {
2246 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2247 or return; 2268 or return;
2248 2269
… …
2259 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2260 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2261 }; 2282 };
2262 warn $@ if $@; 2283 warn $@ if $@;
2263 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2264} 2289}
2265 2290
2266sub main { 2291sub main {
2267 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2268 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2271 Event::one_event; 2296 Event::one_event;
2272 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2273 }; 2298 };
2274 2299
2275 cfg_load; 2300 cfg_load;
2276 db_load; 2301 db_init;
2277 load_extensions; 2302 load_extensions;
2278 2303
2279 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2280 Event::loop; 2305 Event::loop;
2281} 2306}
… …
2285 2310
2286# install some emergency cleanup handlers 2311# install some emergency cleanup handlers
2287BEGIN { 2312BEGIN {
2288 for my $signal (qw(INT HUP TERM)) { 2313 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal ( 2314 Event->signal (
2315 reentrant => 0,
2290 data => WF_AUTOCANCEL, 2316 data => WF_AUTOCANCEL,
2291 signal => $signal, 2317 signal => $signal,
2318 prio => 0,
2292 cb => sub { 2319 cb => sub {
2293 cf::cleanup "SIG$signal"; 2320 cf::cleanup "SIG$signal";
2294 }, 2321 },
2295 ); 2322 );
2296 } 2323 }
2297} 2324}
… …
2318 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2319 $map->valid or next; 2346 $map->valid or next;
2320 $map->save; 2347 $map->save;
2321 } 2348 }
2322 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2323 }; 2354 };
2324 2355
2325 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2326} 2364}
2327 2365
2328sub reload() { 2366sub reload() {
2329 # can/must only be called in main 2367 # can/must only be called in main
2330 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
… …
2332 return; 2370 return;
2333 } 2371 }
2334 2372
2335 warn "reloading..."; 2373 warn "reloading...";
2336 2374
2337 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2338 $TICK_WATCHER->cancel;
2339 2376
2377 cf::sync_job {
2378 cf::write_runtime; # external watchdog should not bark
2340 cf::emergency_save; 2379 cf::emergency_save;
2380 cf::write_runtime; # external watchdog should not bark
2341 2381
2342 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2343 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347 2386
2348 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2349 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2350 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2351 } 2390 }
2352 2391
2353 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2354 for (;;) { 2393 for (;;) {
2394 BDB::flush;
2355 IO::AIO::flush; 2395 IO::AIO::flush;
2356 Coro::cede; 2396 Coro::cede;
2357 last unless IO::AIO::nreqs; 2397 last unless IO::AIO::nreqs || BDB::nreqs;
2358 warn "iterate..."; 2398 warn "iterate...";
2359 } 2399 }
2360 2400
2361 warn "cancelling all extension coros"; 2401 warn "cancelling all extension coros";
2362 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
… …
2417 require cf; 2457 require cf;
2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2419 2459
2420 warn "loading config and database again"; 2460 warn "loading config and database again";
2421 cf::cfg_load; 2461 cf::cfg_load;
2422 cf::db_load;
2423 2462
2424 warn "loading extensions"; 2463 warn "loading extensions";
2425 cf::load_extensions; 2464 cf::load_extensions;
2426 2465
2427 warn "reattaching attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2428 _global_reattach; 2467 _global_reattach;
2429 warn "reattaching attachments to maps"; 2468 warn "reattaching attachments to maps";
2430 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2431 2470
2432 warn "restarting server ticker"; 2471 warn "loading reloadable resources";
2472 load_resources;
2433 2473
2434 $TICK_WATCHER->start; 2474 warn "leaving sync_job";
2435 };
2436 2475
2437 if ($@) { 2476 1
2477 } or do {
2438 warn $@; 2478 warn $@;
2439 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2440 exit 1; 2480 exit 1;
2441 } 2481 };
2442 2482
2443 warn "reloaded"; 2483 warn "reloaded";
2444}; 2484};
2445 2485
2446our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2452 $who->message ("reloading server."); 2492 $who->message ("reloading server.");
2453 2493
2454 # doing reload synchronously and two reloads happen back-to-back, 2494 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here. 2495 # coro crashes during coro_state_free->destroy here.
2456 2496
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2458 reload; 2502 reload;
2459 undef $RELOAD_WATCHER; 2503 undef $RELOAD_WATCHER;
2504 },
2460 }); 2505 );
2461 } 2506 }
2462}; 2507};
2463 2508
2464unshift @INC, $LIBDIR; 2509unshift @INC, $LIBDIR;
2465 2510
… …
2482 2527
2483 cf::server_tick; # one server iteration 2528 cf::server_tick; # one server iteration
2484 $RUNTIME += $TICK; 2529 $RUNTIME += $TICK;
2485 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2486 2531
2532 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $NEXT_RUNTIME_WRITE = $NOW + 10;
2534 Coro::async_pool {
2535 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!";
2537 };
2538 }
2539
2540
2487 $WAIT_FOR_TICK->broadcast; 2541 $WAIT_FOR_TICK->broadcast;
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2489 2546
2490 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2492 2549
2493 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2494 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2495 }, 2552 },
2496); 2553);
2497 2554
2555{
2556 BDB::max_poll_time $TICK * 0.1;
2557 $BDB_POLL_WATCHER = Event->io (
2558 reentrant => 0,
2559 fd => BDB::poll_fileno,
2560 poll => 'r',
2561 prio => 0,
2562 data => WF_AUTOCANCEL,
2563 cb => \&BDB::poll_cb,
2564 );
2565 BDB::min_parallel 8;
2566
2567 BDB::set_sync_prepare {
2568 my $status;
2569 my $current = $Coro::current;
2570 (
2571 sub {
2572 $status = $!;
2573 $current->ready; undef $current;
2574 },
2575 sub {
2576 Coro::schedule while defined $current;
2577 $! = $status;
2578 },
2579 )
2580 };
2581
2582 unless ($DB_ENV) {
2583 $DB_ENV = BDB::db_env_create;
2584
2585 cf::sync_job {
2586 eval {
2587 BDB::db_env_open
2588 $DB_ENV,
2589 $BDB_ENV_DIR,
2590 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2591 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2592 0666;
2593
2594 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2595
2596 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2597 $DB_ENV->set_lk_detect;
2598 };
2599
2600 cf::cleanup "db_env_open(db): $@" if $@;
2601 };
2602 }
2603}
2604
2605{
2606 IO::AIO::min_parallel 8;
2607
2608 undef $Coro::AIO::WATCHER;
2498IO::AIO::max_poll_time $TICK * 0.2; 2609 IO::AIO::max_poll_time $TICK * 0.1;
2499
2500$AIO_POLL_WATCHER = Event->io ( 2610 $AIO_POLL_WATCHER = Event->io (
2501 fd => IO::AIO::poll_fileno, 2611 reentrant => 0,
2502 poll => 'r',
2503 prio => 5,
2504 data => WF_AUTOCANCEL,
2505 cb => \&IO::AIO::poll_cb,
2506);
2507
2508$WRITE_RUNTIME_WATCHER = Event->timer (
2509 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2510 after => 1, 2613 fd => IO::AIO::poll_fileno,
2511 interval => 10, 2614 poll => 'r',
2512 prio => 6, # keep it lowest so it acts like a watchdog 2615 prio => 6,
2513 cb => Coro::unblock_sub { 2616 cb => \&IO::AIO::poll_cb,
2514 write_runtime 2617 );
2515 or warn "ERROR: unable to write runtime file: $!"; 2618}
2516 },
2517);
2518 2619
2519END { cf::emergency_save } 2620END { cf::emergency_save }
2520 2621
25211 26221
2522 2623

Diff Legend

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