ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.191 by root, Tue Jan 23 01:05:18 2007 UTC vs.
Revision 1.226 by root, Wed Mar 14 04:12:29 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.4 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
23use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
24use YAML::Syck (); 27use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
28 34
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 36
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
39our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 46our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
43 49
50our $RELOAD; # number of reloads so far
44our @EVENT; 51our @EVENT;
45our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
46 53
47our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 55our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 58our $NEXT_TICK;
52our $NOW; 59our $NOW;
60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
53 64
54our %CFG; 65our %CFG;
55 66
56our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 68our $RUNTIME;
58 69
59our %PLAYER; # all users 70our %PLAYER; # all users
60our %MAP; # all maps 71our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
63 75
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 78
67# used to convert map paths into valid unix filenames by replacing / by ∕ 79# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 92mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
85 98
86our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
100
101sub cf::map::normalise;
87 102
88############################################################################# 103#############################################################################
89 104
90=head2 GLOBAL VARIABLES 105=head2 GLOBAL VARIABLES
91 106
… …
261sub freeze_mainloop { 276sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
263 278
264 my $guard = Coro::guard { 279 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 281 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
270 $guard 283 $guard
271} 284}
272 285
273=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
344 357
345 $coro 358 $coro
346} 359}
347 360
348sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
349 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
350 365
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 367 or return;
353 368
… …
356 # 60 allows for the watchdog to kill the server. 371 # 60 allows for the watchdog to kill the server.
357 372
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 373 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 374 and return;
360 375
376 # always fsync - this file is important
361 aio_fsync $fh 377 aio_fsync $fh
362 and return; 378 and return;
363 379
364 close $fh 380 close $fh
365 or return; 381 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
751 767
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 772 close $fh;
757 773
758 if (@$objs) { 774 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 780 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
766 } 782 }
767 } else { 783 } else {
768 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1017=cut 1033=cut
1018 1034
1019sub quit_character { 1035sub quit_character {
1020 my ($pl) = @_; 1036 my ($pl) = @_;
1021 1037
1038 my $name = $pl->ob->name;
1039
1022 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1042
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1044 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1035 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1036} 1074}
1037 1075
1038=item cf::player::list_logins 1076=item cf::player::list_logins
1039 1077
1040Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1106=cut
1069 1107
1070sub maps($) { 1108sub maps($) {
1071 my ($pl) = @_; 1109 my ($pl) = @_;
1072 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1073 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1074 or return; 1114 or return;
1075 1115
1076 my @paths; 1116 my @paths;
1077 1117
1078 for (@$files) { 1118 for (@$files) {
1079 utf8::decode $_; 1119 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1082 1122
1083 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1124 }
1086 1125
1087 \@paths 1126 \@paths
1088} 1127}
1089 1128
… …
1176} 1215}
1177 1216
1178sub normalise { 1217sub normalise {
1179 my ($path, $base) = @_; 1218 my ($path, $base) = @_;
1180 1219
1220 $path = "$path"; # make sure its a string
1221
1222 $path =~ s/\.map$//;
1223
1181 # map plan: 1224 # map plan:
1182 # 1225 #
1183 # /! non-realised random map exit (special hack!) 1226 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1227 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1228 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1264 $self->init; # pass $1 etc.
1222 return $self; 1265 return $self;
1223 } 1266 }
1224 } 1267 }
1225 1268
1226 Carp::carp "unable to resolve path '$path'."; 1269 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1270 ()
1228} 1271}
1229 1272
1230sub init { 1273sub init {
1231 my ($self) = @_; 1274 my ($self) = @_;
… …
1246 1289
1247# the original (read-only) location 1290# the original (read-only) location
1248sub load_path { 1291sub load_path {
1249 my ($self) = @_; 1292 my ($self) = @_;
1250 1293
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1295}
1253 1296
1254# the temporary/swap location 1297# the temporary/swap location
1255sub save_path { 1298sub save_path {
1256 my ($self) = @_; 1299 my ($self) = @_;
1257 1300
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1303}
1261 1304
1262# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1263sub uniq_path { 1306sub uniq_path {
1264 my ($self) = @_; 1307 my ($self) = @_;
… …
1286 1329
1287sub load_header_from($) { 1330sub load_header_from($) {
1288 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1289 1332
1290 utf8::encode $path; 1333 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1292 or return; 1335 # or return;
1293 1336
1294 $self->_load_header ($path) 1337 $self->_load_header ($path)
1295 or return; 1338 or return;
1296 1339
1297 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1403 $map->{last_save} = $cf::RUNTIME;
1361 1404
1362 $map->load_header 1405 $map->load_header
1363 or return; 1406 or return;
1364 1407
1365 if ($map->should_reset) { 1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1409 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1410 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1411 $map->reset;
1369 undef $guard; 1412 undef $guard;
1370 $map = find $path 1413 return find $path;
1371 or return;
1372 } 1414 }
1373 1415
1374 $cf::MAP{$path} = $map 1416 $cf::MAP{$path} = $map
1375 } 1417 }
1376} 1418}
… …
1378sub pre_load { } 1420sub pre_load { }
1379sub post_load { } 1421sub post_load { }
1380 1422
1381sub load { 1423sub load {
1382 my ($self) = @_; 1424 my ($self) = @_;
1425
1426 local $self->{deny_reset} = 1; # loading can take a long time
1383 1427
1384 my $path = $self->{path}; 1428 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1429 my $guard = cf::lock_acquire "map_load:$path";
1386 1430
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1431 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1576 return if $self->players; 1620 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1578 1622
1579 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1580 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1581 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1582 1636
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1637 $self->clear;
1585 1638
1586 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1587 1640
1588 $self->unlink_save; 1641 $self->unlink_save;
… …
1625 for (@$files) { 1678 for (@$files) {
1626 utf8::decode $_; 1679 utf8::decode $_;
1627 next if /\.pst$/; 1680 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1629 1682
1630 s/\.map$//; 1683 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1684 }
1633 1685
1634 \@paths 1686 \@paths
1635} 1687}
1636 1688
… …
1730=cut 1782=cut
1731 1783
1732sub link_map { 1784sub link_map {
1733 unless ($LINK_MAP) { 1785 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1786 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1787 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1788 $LINK_MAP->load;
1737 } 1789 }
1738 1790
1739 $LINK_MAP 1791 $LINK_MAP
1740} 1792}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1799 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1800
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1802 if $self->map;
1751 1803
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1804 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1805}
1754 1806
1755sub cf::object::player::leave_link { 1807sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1808 my ($self, $map, $x, $y) = @_;
1757 1809
… …
1779 $map->load; 1831 $map->load;
1780 $map->load_diag; 1832 $map->load_diag;
1781 1833
1782 return unless $self->contr->active; 1834 return unless $self->contr->active;
1783 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1784 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1785} 1839}
1786 1840
1787cf::player->attach ( 1841cf::player->attach (
1788 on_logout => sub { 1842 on_logout => sub {
… …
1801 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1802 # should happen only on crashes 1856 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1805 (async { 1859 (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, 1860 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1812 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1814 })->prio (2); 1868 })->prio (2);
1815 } 1869 }
1816 }, 1870 },
… …
1824 my ($self, $path, $x, $y) = @_; 1878 my ($self, $path, $x, $y) = @_;
1825 1879
1826 $self->enter_link; 1880 $self->enter_link;
1827 1881
1828 (async { 1882 (async {
1883 my $map = eval {
1829 my $map = cf::map::find $path; 1884 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1885 $map = $map->customise_for ($self) if $map;
1831 1886 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1887 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1889
1837 $self->leave_link ($map, $x, $y); 1890 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1891 })->prio (1);
1839} 1892}
1840 1893
… …
1871 # that depends on the exit object 1924 # that depends on the exit object
1872 1925
1873 my $rmp = parse_random_map_params $exit->msg; 1926 my $rmp = parse_random_map_params $exit->msg;
1874 1927
1875 if ($exit->map) { 1928 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1929 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1930 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1931 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1932 $rmp->{origin_y} = $exit->y;
1880 } 1933 }
1881 1934
… …
1898sub cf::object::player::enter_exit { 1951sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1952 my ($self, $exit) = @_;
1900 1953
1901 return unless $self->type == cf::PLAYER; 1954 return unless $self->type == cf::PLAYER;
1902 1955
1956 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job
1958 cf::sync_job { prepare_random_map $exit };
1959 }
1960
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp;
1963 my $sp = $exit->stats->sp;
1964
1903 $self->enter_link; 1965 $self->enter_link;
1904 1966
1905 (async { 1967 (async {
1906 $self->deactivate_recursive; # just to be sure 1968 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1969 unless (eval {
1908 prepare_random_map $exit 1970 $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 1971
1914 1; 1972 1;
1915 }) { 1973 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1974 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1975 . "I'll try to bring you back to the map you were before. "
… …
1937 1995
1938sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1939 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1940 1998
1941 utf8::encode $text; 1999 utf8::encode $text;
1942 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1943} 2001}
1944 2002
1945 2003
1946=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1947 2005
… …
1978 # get handled first 2036 # get handled first
1979 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2038 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2039
1982 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2042
1984 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1985 2044
1986 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2046 if (@$queue) {
… …
2148The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2149using it, it should be unique. 2208using it, it should be unique.
2150 2209
2151=over 4 2210=over 4
2152 2211
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 2212=item $value = cf::db_get $family => $key
2160 2213
2161Returns a single value from the database 2214Returns 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 2215
2168=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2169 2217
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores 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 2219
2181=cut 2220=cut
2182 2221
2183our $DB; 2222our $DB;
2184 2223
2185{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2186 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2187 2243
2188 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2248
2192 my $pid; 2249 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 } 2250 };
2251 }
2202 } 2252 }
2253}
2203 2254
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($;$) { 2255sub db_get($$) {
2226 @_ >= 2 2256 my $key = "$_[0]/$_[1]";
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230 2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2231 sub db_put($$;$) { 2266sub db_put($$$) {
2232 if (@_ >= 3) { 2267 BDB::dbreq_pri 4;
2233 $DB->{$_[0]}{$_[1]} = $_[2]; 2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions
2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290
2291 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 Coro::cede;
2296 }
2297
2298 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth};
2300 my $idx = cf::face::find $face
2301 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth;
2234 } else { 2304 } else {
2235 $DB->{$_[0]} = $_[1]; 2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 }, 2306 }
2245 ); 2307 Coro::cede;
2246} 2308 }
2247 2309
2248############################################################################# 2310 1
2249# the server's main() 2311}
2312
2313sub reload_resources {
2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2315 or die "unable to load regions file\n";#d#
2316 load_faces
2317 or die "unable to load faces\n";#d#
2318}
2319
2320sub init {
2321 reload_resources;
2322}
2250 2323
2251sub cfg_load { 2324sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2326 or return;
2254 2327
… …
2277 Event::one_event; 2350 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2351 })->prio (Coro::PRIO_MAX);
2279 }; 2352 };
2280 2353
2281 cfg_load; 2354 cfg_load;
2282 db_load; 2355 db_init;
2283 load_extensions; 2356 load_extensions;
2284 2357
2285 $TICK_WATCHER->start; 2358 $TICK_WATCHER->start;
2286 Event::loop; 2359 Event::loop;
2287} 2360}
… …
2326 my $map = $cf::MAP{$path} or next; 2399 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next; 2400 $map->valid or next;
2328 $map->save; 2401 $map->save;
2329 } 2402 }
2330 warn "end emergency map save\n"; 2403 warn "end emergency map save\n";
2404
2405 warn "begin emergency database checkpoint\n";
2406 BDB::db_env_txn_checkpoint $DB_ENV;
2407 warn "end emergency database checkpoint\n";
2331 }; 2408 };
2332 2409
2333 warn "leave emergency perl save\n"; 2410 warn "leave emergency perl save\n";
2411}
2412
2413sub post_cleanup {
2414 my ($make_core) = @_;
2415
2416 warn Carp::longmess "post_cleanup backtrace"
2417 if $make_core;
2334} 2418}
2335 2419
2336sub reload() { 2420sub reload() {
2337 # can/must only be called in main 2421 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2422 if ($Coro::current != $Coro::main) {
… …
2340 return; 2424 return;
2341 } 2425 }
2342 2426
2343 warn "reloading..."; 2427 warn "reloading...";
2344 2428
2345 warn "cancelling server ticker"; 2429 warn "entering sync_job";
2346 $TICK_WATCHER->cancel;
2347 2430
2431 cf::sync_job {
2432 cf::write_runtime; # external watchdog should not bark
2348 cf::emergency_save; 2433 cf::emergency_save;
2434 cf::write_runtime; # external watchdog should not bark
2349 2435
2350 eval { 2436 warn "syncing database to disk";
2437 BDB::db_env_txn_checkpoint $DB_ENV;
2438
2351 # if anything goes wrong in here, we should simply crash as we already saved 2439 # if anything goes wrong in here, we should simply crash as we already saved
2352
2353 warn "syncing database to disk";
2354 cf::db_sync;
2355 2440
2356 warn "cancelling all WF_AUTOCANCEL watchers"; 2441 warn "cancelling all WF_AUTOCANCEL watchers";
2357 for (Event::all_watchers) { 2442 for (Event::all_watchers) {
2358 $_->cancel if $_->data & WF_AUTOCANCEL; 2443 $_->cancel if $_->data & WF_AUTOCANCEL;
2359 } 2444 }
2360 2445
2361 warn "flushing outstanding aio requests"; 2446 warn "flushing outstanding aio requests";
2362 for (;;) { 2447 for (;;) {
2448 BDB::flush;
2363 IO::AIO::flush; 2449 IO::AIO::flush;
2364 Coro::cede; 2450 Coro::cede;
2365 last unless IO::AIO::nreqs; 2451 last unless IO::AIO::nreqs || BDB::nreqs;
2366 warn "iterate..."; 2452 warn "iterate...";
2367 } 2453 }
2454
2455 ++$RELOAD;
2368 2456
2369 warn "cancelling all extension coros"; 2457 warn "cancelling all extension coros";
2370 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2371 %EXT_CORO = (); 2459 %EXT_CORO = ();
2372 2460
… …
2425 require cf; 2513 require cf;
2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2427 2515
2428 warn "loading config and database again"; 2516 warn "loading config and database again";
2429 cf::cfg_load; 2517 cf::cfg_load;
2430 cf::db_load;
2431 2518
2432 warn "loading extensions"; 2519 warn "loading extensions";
2433 cf::load_extensions; 2520 cf::load_extensions;
2434 2521
2435 warn "reattaching attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2436 _global_reattach; 2523 _global_reattach; # objects, sockets
2437 warn "reattaching attachments to maps"; 2524 warn "reattaching attachments to maps";
2438 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2439 2528
2440 warn "restarting server ticker"; 2529 warn "loading reloadable resources";
2530 reload_resources;
2441 2531
2442 $TICK_WATCHER->start; 2532 warn "leaving sync_job";
2443 };
2444 2533
2445 if ($@) { 2534 1
2535 } or do {
2446 warn $@; 2536 warn $@;
2447 warn "error while reloading, exiting."; 2537 warn "error while reloading, exiting.";
2448 exit 1; 2538 exit 1;
2449 } 2539 };
2450 2540
2451 warn "reloaded"; 2541 warn "reloaded";
2452}; 2542};
2453 2543
2454our $RELOAD_WATCHER; # used only during reload 2544our $RELOAD_WATCHER; # used only during reload
… …
2495 2585
2496 cf::server_tick; # one server iteration 2586 cf::server_tick; # one server iteration
2497 $RUNTIME += $TICK; 2587 $RUNTIME += $TICK;
2498 $NEXT_TICK += $TICK; 2588 $NEXT_TICK += $TICK;
2499 2589
2590 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591 $NEXT_RUNTIME_WRITE = $NOW + 10;
2592 Coro::async_pool {
2593 write_runtime
2594 or warn "ERROR: unable to write runtime file: $!";
2595 };
2596 }
2597
2500 $WAIT_FOR_TICK->broadcast; 2598 $WAIT_FOR_TICK->broadcast;
2501 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2599 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2502 2600
2503 Event::sweep;
2504 Coro::cede_notself;
2505
2506# my $AFTER = Event::time; 2601# my $AFTER = Event::time;
2507# warn $AFTER - $NOW;#d# 2602# warn $AFTER - $NOW;#d#
2508 2603
2509 # if we are delayed by four ticks or more, skip them all 2604 # if we are delayed by four ticks or more, skip them all
2510 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2512 $TICK_WATCHER->at ($NEXT_TICK); 2607 $TICK_WATCHER->at ($NEXT_TICK);
2513 $TICK_WATCHER->start; 2608 $TICK_WATCHER->start;
2514 }, 2609 },
2515); 2610);
2516 2611
2612{
2613 BDB::max_poll_time $TICK * 0.1;
2614 $BDB_POLL_WATCHER = Event->io (
2615 reentrant => 0,
2616 fd => BDB::poll_fileno,
2617 poll => 'r',
2618 prio => 0,
2619 data => WF_AUTOCANCEL,
2620 cb => \&BDB::poll_cb,
2621 );
2622 BDB::min_parallel 8;
2623
2624 BDB::set_sync_prepare {
2625 my $status;
2626 my $current = $Coro::current;
2627 (
2628 sub {
2629 $status = $!;
2630 $current->ready; undef $current;
2631 },
2632 sub {
2633 Coro::schedule while defined $current;
2634 $! = $status;
2635 },
2636 )
2637 };
2638
2639 unless ($DB_ENV) {
2640 $DB_ENV = BDB::db_env_create;
2641
2642 cf::sync_job {
2643 eval {
2644 BDB::db_env_open
2645 $DB_ENV,
2646 $BDB_ENV_DIR,
2647 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2648 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2649 0666;
2650
2651 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2652
2653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2654 $DB_ENV->set_lk_detect;
2655 };
2656
2657 cf::cleanup "db_env_open(db): $@" if $@;
2658 };
2659 }
2660}
2661
2662{
2663 IO::AIO::min_parallel 8;
2664
2665 undef $Coro::AIO::WATCHER;
2517IO::AIO::max_poll_time $TICK * 0.1; 2666 IO::AIO::max_poll_time $TICK * 0.1;
2518
2519undef $Coro::AIO::WATCHER;
2520$AIO_POLL_WATCHER = Event->io ( 2667 $AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0, 2668 reentrant => 0,
2669 data => WF_AUTOCANCEL,
2522 fd => IO::AIO::poll_fileno, 2670 fd => IO::AIO::poll_fileno,
2523 poll => 'r', 2671 poll => 'r',
2524 prio => 6, 2672 prio => 6,
2525 data => WF_AUTOCANCEL,
2526 cb => \&IO::AIO::poll_cb, 2673 cb => \&IO::AIO::poll_cb,
2527); 2674 );
2528 2675}
2529$WRITE_RUNTIME_WATCHER = Event->timer (
2530 reentrant => 0,
2531 data => WF_AUTOCANCEL,
2532 after => 1,
2533 interval => 10,
2534 prio => 6, # keep it lowest so it acts like a watchdog
2535 cb => Coro::unblock_sub {
2536 write_runtime
2537 or warn "ERROR: unable to write runtime file: $!";
2538 },
2539);
2540 2676
2541END { cf::emergency_save } 2677END { cf::emergency_save }
2542 2678
25431 26791
2544 2680

Diff Legend

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