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.192 by root, Wed Jan 24 01:43:01 2007 UTC vs.
Revision 1.227 by root, Fri Mar 23 18:32:48 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;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 61our $NEXT_TICK;
52our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
53 67
54our %CFG; 68our %CFG;
55 69
56our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 71our $RUNTIME;
58 72
59our %PLAYER; # all users 73our %PLAYER; # all users
60our %MAP; # all maps 74our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
63 78
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 81
67# used to convert map paths into valid unix filenames by replacing / by ∕ 82# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 95mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
85 101
86our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
103
104sub cf::map::normalise;
87 105
88############################################################################# 106#############################################################################
89 107
90=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
91 109
… …
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 209 $d
192 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
193} 211}
194 212
195use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 214
197=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
198 216
199Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
200 218
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
209 220
210Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 222
219=item cf::lock_wait $string 223=item cf::lock_wait $string
220 224
221Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
222 226
… …
261sub freeze_mainloop { 265sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
263 267
264 my $guard = Coro::guard { 268 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 270 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
270 $guard 272 $guard
271} 273}
272 274
273=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
344 346
345 $coro 347 $coro
346} 348}
347 349
348sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
349 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
350 354
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 356 or return;
353 357
… …
356 # 60 allows for the watchdog to kill the server. 360 # 60 allows for the watchdog to kill the server.
357 361
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 363 and return;
360 364
365 # always fsync - this file is important
361 aio_fsync $fh 366 aio_fsync $fh
362 and return; 367 and return;
363 368
364 close $fh 369 close $fh
365 or return; 370 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
751 756
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 761 close $fh;
757 762
758 if (@$objs) { 763 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 769 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
766 } 771 }
767 } else { 772 } else {
768 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
… …
1017=cut 1022=cut
1018 1023
1019sub quit_character { 1024sub quit_character {
1020 my ($pl) = @_; 1025 my ($pl) = @_;
1021 1026
1027 my $name = $pl->ob->name;
1028
1022 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1031
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1033 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1035 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1036} 1063}
1037 1064
1038=item cf::player::list_logins 1065=item cf::player::list_logins
1039 1066
1040Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1095=cut
1069 1096
1070sub maps($) { 1097sub maps($) {
1071 my ($pl) = @_; 1098 my ($pl) = @_;
1072 1099
1100 $pl = ref $pl ? $pl->ob->name : $pl;
1101
1073 my $files = aio_readdir playerdir $pl 1102 my $files = aio_readdir playerdir $pl
1074 or return; 1103 or return;
1075 1104
1076 my @paths; 1105 my @paths;
1077 1106
1078 for (@$files) { 1107 for (@$files) {
1079 utf8::decode $_; 1108 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1109 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1110 next unless /^$PATH_SEP/o;
1082 1111
1083 s/\.map$//; 1112 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1113 }
1086 1114
1087 \@paths 1115 \@paths
1088} 1116}
1089 1117
… …
1178sub normalise { 1206sub normalise {
1179 my ($path, $base) = @_; 1207 my ($path, $base) = @_;
1180 1208
1181 $path = "$path"; # make sure its a string 1209 $path = "$path"; # make sure its a string
1182 1210
1211 $path =~ s/\.map$//;
1212
1183 # map plan: 1213 # map plan:
1184 # 1214 #
1185 # /! non-realised random map exit (special hack!) 1215 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1216 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1217 # ?xxx/... are special absolute paths
… …
1248 1278
1249# the original (read-only) location 1279# the original (read-only) location
1250sub load_path { 1280sub load_path {
1251 my ($self) = @_; 1281 my ($self) = @_;
1252 1282
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1284}
1255 1285
1256# the temporary/swap location 1286# the temporary/swap location
1257sub save_path { 1287sub save_path {
1258 my ($self) = @_; 1288 my ($self) = @_;
1259 1289
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1292}
1263 1293
1264# the unique path, undef == no special unique path 1294# the unique path, undef == no special unique path
1265sub uniq_path { 1295sub uniq_path {
1266 my ($self) = @_; 1296 my ($self) = @_;
… …
1288 1318
1289sub load_header_from($) { 1319sub load_header_from($) {
1290 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1291 1321
1292 utf8::encode $path; 1322 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1294 or return; 1324 # or return;
1295 1325
1296 $self->_load_header ($path) 1326 $self->_load_header ($path)
1297 or return; 1327 or return;
1298 1328
1299 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
… …
1362 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1363 1393
1364 $map->load_header 1394 $map->load_header
1365 or return; 1395 or return;
1366 1396
1367 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1400 $map->reset;
1371 undef $guard; 1401 undef $guard;
1372 return find $path; 1402 return find $path;
… …
1379sub pre_load { } 1409sub pre_load { }
1380sub post_load { } 1410sub post_load { }
1381 1411
1382sub load { 1412sub load {
1383 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1384 1416
1385 my $path = $self->{path}; 1417 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1387 1419
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1577 return if $self->players; 1609 return if $self->players;
1578 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1579 1611
1580 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1581 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1582 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1583 1625
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear; 1626 $self->clear;
1586 1627
1587 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1588 1629
1589 $self->unlink_save; 1630 $self->unlink_save;
… …
1626 for (@$files) { 1667 for (@$files) {
1627 utf8::decode $_; 1668 utf8::decode $_;
1628 next if /\.pst$/; 1669 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1630 1671
1631 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1673 }
1634 1674
1635 \@paths 1675 \@paths
1636} 1676}
1637 1677
… …
1731=cut 1771=cut
1732 1772
1733sub link_map { 1773sub link_map {
1734 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1777 $LINK_MAP->load;
1738 } 1778 }
1739 1779
1740 $LINK_MAP 1780 $LINK_MAP
1741} 1781}
… …
1748 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1749 1789
1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1751 if $self->map; 1791 if $self->map;
1752 1792
1753 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1754} 1794}
1755 1795
1756sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1757 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1758 1798
… …
1780 $map->load; 1820 $map->load;
1781 $map->load_diag; 1821 $map->load_diag;
1782 1822
1783 return unless $self->contr->active; 1823 return unless $self->contr->active;
1784 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1785 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1786} 1828}
1787 1829
1788cf::player->attach ( 1830cf::player->attach (
1789 on_logout => sub { 1831 on_logout => sub {
… …
1802 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1803 # should happen only on crashes 1845 # should happen only on crashes
1804 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1805 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1806 (async { 1848 (async {
1807 # we need this sleep as the login has a concurrent enter_exit running
1808 # and this sleep increases chances of the player not ending up in scorn
1809 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1810 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1811 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1812 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1813 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1814 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1815 })->prio (2); 1857 })->prio (2);
1816 } 1858 }
1817 }, 1859 },
… …
1825 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1826 1868
1827 $self->enter_link; 1869 $self->enter_link;
1828 1870
1829 (async { 1871 (async {
1872 my $map = eval {
1830 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1832 1875 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1837 1878
1838 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1880 })->prio (1);
1840} 1881}
1841 1882
… …
1872 # that depends on the exit object 1913 # that depends on the exit object
1873 1914
1874 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1875 1916
1876 if ($exit->map) { 1917 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1881 } 1922 }
1882 1923
… …
1899sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1900 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1901 1942
1902 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1903 1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1953
1904 $self->enter_link; 1954 $self->enter_link;
1905 1955
1906 (async { 1956 (async {
1907 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1908 unless (eval { 1958 unless (eval {
1909 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1910 if $exit->slaying eq "/!";
1911
1912 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1913 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1914 1960
1915 1; 1961 1;
1916 }) { 1962 }) {
1917 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1918 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1938 1984
1939sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1940 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1941 1987
1942 utf8::encode $text; 1988 utf8::encode $text;
1943 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1944} 1990}
1945 1991
1946 1992
1947=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1948 1994
… …
1979 # get handled first 2025 # get handled first
1980 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1981 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1982 2028
1983 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1984 2031
1985 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1986 2033
1987 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1988 if (@$queue) { 2035 if (@$queue) {
… …
2149The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2150using it, it should be unique. 2197using it, it should be unique.
2151 2198
2152=over 4 2199=over 4
2153 2200
2154=item $hashref = cf::db_get $family
2155
2156Return a hashref for use by the extension C<$family>, which can be
2157modified. After modifications, you have to call C<cf::db_dirty> or
2158C<cf::db_sync>.
2159
2160=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2161 2202
2162Returns a single value from the database 2203Returns a single value from the database.
2163
2164=item cf::db_put $family => $hashref
2165
2166Stores the given family hashref into the database. Updates are delayed, if
2167you want the data to be synced to disk immediately, use C<cf::db_sync>.
2168 2204
2169=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2170 2206
2171Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2172want the data to be synced to disk immediately, use C<cf::db_sync>.
2173
2174=item cf::db_dirty
2175
2176Marks the database as dirty, to be updated at a later time.
2177
2178=item cf::db_sync
2179
2180Immediately write the database to disk I<if it is dirty>.
2181 2208
2182=cut 2209=cut
2183 2210
2184our $DB; 2211our $DB;
2185 2212
2186{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2187 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2188 2232
2189 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2190 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2191 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2192 2237
2193 my $pid; 2238 unlink $path;
2194
2195 sub db_save() {
2196 waitpid $pid, 0 if $pid;
2197 if (0 == ($pid = fork)) {
2198 $DB->{_meta}{version} = 1;
2199 Storable::nstore $DB, "$path~";
2200 rename "$path~", $path;
2201 cf::_exit 0 if defined $pid;
2202 } 2239 };
2240 }
2203 } 2241 }
2242}
2204 2243
2205 my $dirty;
2206
2207 sub db_sync() {
2208 db_save if $dirty;
2209 undef $dirty;
2210 }
2211
2212 my $idle = Event->idle (
2213 reentrant => 0,
2214 min => 10,
2215 max => 20,
2216 repeat => 0,
2217 data => WF_AUTOCANCEL,
2218 cb => \&db_sync,
2219 );
2220
2221 sub db_dirty() {
2222 $dirty = 1;
2223 $idle->start;
2224 }
2225
2226 sub db_get($;$) { 2244sub db_get($$) {
2227 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2228 ? $DB->{$_[0]}{$_[1]}
2229 : ($DB->{$_[0]} ||= { })
2230 }
2231 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2232 sub db_put($$;$) { 2255sub db_put($$$) {
2233 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2234 $DB->{$_[0]}{$_[1]} = $_[2]; 2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions
2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2235 } else { 2293 } else {
2236 $DB->{$_[0]} = $_[1]; 2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2237 }
2238 db_dirty;
2239 }
2240
2241 cf::global->attach (
2242 prio => 10000,
2243 on_cleanup => sub {
2244 db_sync;
2245 }, 2295 }
2246 ); 2296 Coro::cede;
2247} 2297 }
2248 2298
2249############################################################################# 2299 1
2250# the server's main() 2300}
2301
2302sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2311}
2251 2312
2252sub cfg_load { 2313sub cfg_load {
2253 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2254 or return; 2315 or return;
2255 2316
… …
2278 Event::one_event; 2339 Event::one_event;
2279 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2280 }; 2341 };
2281 2342
2282 cfg_load; 2343 cfg_load;
2283 db_load; 2344 db_init;
2284 load_extensions; 2345 load_extensions;
2285 2346
2286 $TICK_WATCHER->start; 2347 $TICK_WATCHER->start;
2287 Event::loop; 2348 Event::loop;
2288} 2349}
… …
2327 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2328 $map->valid or next; 2389 $map->valid or next;
2329 $map->save; 2390 $map->save;
2330 } 2391 }
2331 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2332 }; 2397 };
2333 2398
2334 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2335} 2407}
2336 2408
2337sub reload() { 2409sub reload() {
2338 # can/must only be called in main 2410 # can/must only be called in main
2339 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
… …
2341 return; 2413 return;
2342 } 2414 }
2343 2415
2344 warn "reloading..."; 2416 warn "reloading...";
2345 2417
2346 warn "cancelling server ticker"; 2418 warn "entering sync_job";
2347 $TICK_WATCHER->cancel;
2348 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2349 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2350 2424
2351 eval { 2425 warn "syncing database to disk";
2426 BDB::db_env_txn_checkpoint $DB_ENV;
2427
2352 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2353
2354 warn "syncing database to disk";
2355 cf::db_sync;
2356 2429
2357 warn "cancelling all WF_AUTOCANCEL watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2358 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2359 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2360 } 2433 }
2361 2434
2362 warn "flushing outstanding aio requests"; 2435 warn "flushing outstanding aio requests";
2363 for (;;) { 2436 for (;;) {
2437 BDB::flush;
2364 IO::AIO::flush; 2438 IO::AIO::flush;
2365 Coro::cede; 2439 Coro::cede;
2366 last unless IO::AIO::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2367 warn "iterate..."; 2441 warn "iterate...";
2368 } 2442 }
2443
2444 ++$RELOAD;
2369 2445
2370 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2371 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2372 %EXT_CORO = (); 2448 %EXT_CORO = ();
2373 2449
… …
2426 require cf; 2502 require cf;
2427 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2428 2504
2429 warn "loading config and database again"; 2505 warn "loading config and database again";
2430 cf::cfg_load; 2506 cf::cfg_load;
2431 cf::db_load;
2432 2507
2433 warn "loading extensions"; 2508 warn "loading extensions";
2434 cf::load_extensions; 2509 cf::load_extensions;
2435 2510
2436 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2437 _global_reattach; 2512 _global_reattach; # objects, sockets
2438 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2439 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2440 2517
2441 warn "restarting server ticker"; 2518 warn "loading reloadable resources";
2519 reload_resources;
2442 2520
2443 $TICK_WATCHER->start; 2521 warn "leaving sync_job";
2444 };
2445 2522
2446 if ($@) { 2523 1
2524 } or do {
2447 warn $@; 2525 warn $@;
2448 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2449 exit 1; 2527 exit 1;
2450 } 2528 };
2451 2529
2452 warn "reloaded"; 2530 warn "reloaded";
2453}; 2531};
2454 2532
2455our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2496 2574
2497 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2498 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2499 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2500 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2501 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2502 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2503 2589
2504 Event::sweep;
2505 Coro::cede_notself;
2506
2507# my $AFTER = Event::time; 2590# my $AFTER = Event::time;
2508# warn $AFTER - $NOW;#d# 2591# warn $AFTER - $NOW;#d#
2509 2592
2510 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2511 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2513 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2514 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2515 }, 2598 },
2516); 2599);
2517 2600
2601{
2602 BDB::max_poll_time $TICK * 0.1;
2603 $BDB_POLL_WATCHER = Event->io (
2604 reentrant => 0,
2605 fd => BDB::poll_fileno,
2606 poll => 'r',
2607 prio => 0,
2608 data => WF_AUTOCANCEL,
2609 cb => \&BDB::poll_cb,
2610 );
2611 BDB::min_parallel 8;
2612
2613 BDB::set_sync_prepare {
2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2647 };
2648 }
2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2518IO::AIO::max_poll_time $TICK * 0.1; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2519
2520undef $Coro::AIO::WATCHER;
2521$AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0, 2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2523 fd => IO::AIO::poll_fileno, 2659 fd => IO::AIO::poll_fileno,
2524 poll => 'r', 2660 poll => 'r',
2525 prio => 6, 2661 prio => 6,
2526 data => WF_AUTOCANCEL,
2527 cb => \&IO::AIO::poll_cb, 2662 cb => \&IO::AIO::poll_cb,
2528); 2663 );
2529 2664}
2530$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0,
2532 data => WF_AUTOCANCEL,
2533 after => 1,
2534 interval => 10,
2535 prio => 6, # keep it lowest so it acts like a watchdog
2536 cb => Coro::unblock_sub {
2537 write_runtime
2538 or warn "ERROR: unable to write runtime file: $!";
2539 },
2540);
2541 2665
2542END { cf::emergency_save } 2666END { cf::emergency_save }
2543 2667
25441 26681
2545 2669

Diff Legend

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