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.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
… …
1176} 1204}
1177 1205
1178sub normalise { 1206sub normalise {
1179 my ($path, $base) = @_; 1207 my ($path, $base) = @_;
1180 1208
1209 $path = "$path"; # make sure its a string
1210
1211 $path =~ s/\.map$//;
1212
1181 # map plan: 1213 # map plan:
1182 # 1214 #
1183 # /! non-realised random map exit (special hack!) 1215 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1216 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1217 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1253 $self->init; # pass $1 etc.
1222 return $self; 1254 return $self;
1223 } 1255 }
1224 } 1256 }
1225 1257
1226 Carp::carp "unable to resolve path '$path'."; 1258 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1259 ()
1228} 1260}
1229 1261
1230sub init { 1262sub init {
1231 my ($self) = @_; 1263 my ($self) = @_;
… …
1246 1278
1247# the original (read-only) location 1279# the original (read-only) location
1248sub load_path { 1280sub load_path {
1249 my ($self) = @_; 1281 my ($self) = @_;
1250 1282
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1284}
1253 1285
1254# the temporary/swap location 1286# the temporary/swap location
1255sub save_path { 1287sub save_path {
1256 my ($self) = @_; 1288 my ($self) = @_;
1257 1289
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1292}
1261 1293
1262# the unique path, undef == no special unique path 1294# the unique path, undef == no special unique path
1263sub uniq_path { 1295sub uniq_path {
1264 my ($self) = @_; 1296 my ($self) = @_;
… …
1286 1318
1287sub load_header_from($) { 1319sub load_header_from($) {
1288 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1289 1321
1290 utf8::encode $path; 1322 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1292 or return; 1324 # or return;
1293 1325
1294 $self->_load_header ($path) 1326 $self->_load_header ($path)
1295 or return; 1327 or return;
1296 1328
1297 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1361 1393
1362 $map->load_header 1394 $map->load_header
1363 or return; 1395 or return;
1364 1396
1365 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1400 $map->reset;
1369 undef $guard; 1401 undef $guard;
1370 $map = find $path 1402 return find $path;
1371 or return;
1372 } 1403 }
1373 1404
1374 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1375 } 1406 }
1376} 1407}
… …
1378sub pre_load { } 1409sub pre_load { }
1379sub post_load { } 1410sub post_load { }
1380 1411
1381sub load { 1412sub load {
1382 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1383 1416
1384 my $path = $self->{path}; 1417 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1386 1419
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1496 delete $MAP_PREFETCH{$path}; 1529 delete $MAP_PREFETCH{$path};
1497 } 1530 }
1498 } 1531 }
1499 undef $MAP_PREFETCHER; 1532 undef $MAP_PREFETCHER;
1500 }; 1533 };
1534 $MAP_PREFETCHER->prio (6);
1501 1535
1502 () 1536 ()
1503} 1537}
1504 1538
1505sub save { 1539sub save {
… …
1575 return if $self->players; 1609 return if $self->players;
1576 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1577 1611
1578 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1579 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
1580 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1581 1625
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear; 1626 $self->clear;
1584 1627
1585 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1586 1629
1587 $self->unlink_save; 1630 $self->unlink_save;
… …
1624 for (@$files) { 1667 for (@$files) {
1625 utf8::decode $_; 1668 utf8::decode $_;
1626 next if /\.pst$/; 1669 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1628 1671
1629 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1630 push @paths, $_;
1631 } 1673 }
1632 1674
1633 \@paths 1675 \@paths
1634} 1676}
1635 1677
… …
1729=cut 1771=cut
1730 1772
1731sub link_map { 1773sub link_map {
1732 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1735 $LINK_MAP->load; 1777 $LINK_MAP->load;
1736 } 1778 }
1737 1779
1738 $LINK_MAP 1780 $LINK_MAP
1739} 1781}
… …
1746 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1747 1789
1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1749 if $self->map; 1791 if $self->map;
1750 1792
1751 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1752} 1794}
1753 1795
1754sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1755 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1756 1798
… …
1778 $map->load; 1820 $map->load;
1779 $map->load_diag; 1821 $map->load_diag;
1780 1822
1781 return unless $self->contr->active; 1823 return unless $self->contr->active;
1782 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1783 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1784} 1828}
1785 1829
1786cf::player->attach ( 1830cf::player->attach (
1787 on_logout => sub { 1831 on_logout => sub {
… …
1800 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1801 # should happen only on crashes 1845 # should happen only on crashes
1802 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1803 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1804 (async { 1848 (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, 1849 $pl->ob->reply (undef,
1808 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1809 . "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.",
1810 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
1811 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1812 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1813 })->prio (2); 1857 })->prio (2);
1814 } 1858 }
1815 }, 1859 },
… …
1823 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1824 1868
1825 $self->enter_link; 1869 $self->enter_link;
1826 1870
1827 (async { 1871 (async {
1872 my $map = eval {
1828 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1829 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1830 1875 $map
1831# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1832# if $map;
1833
1834 $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);
1835 1878
1836 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1837 })->prio (1); 1880 })->prio (1);
1838} 1881}
1839 1882
… …
1870 # that depends on the exit object 1913 # that depends on the exit object
1871 1914
1872 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1873 1916
1874 if ($exit->map) { 1917 if ($exit->map) {
1875 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1876 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1877 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1878 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1879 } 1922 }
1880 1923
… …
1897sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1898 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1899 1942
1900 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1901 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
1902 $self->enter_link; 1954 $self->enter_link;
1903 1955
1904 (async { 1956 (async {
1905 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1906 unless (eval { 1958 unless (eval {
1907 prepare_random_map $exit 1959 $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 1960
1913 1; 1961 1;
1914 }) { 1962 }) {
1915 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1916 . "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. "
… …
1936 1984
1937sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1938 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1939 1987
1940 utf8::encode $text; 1988 utf8::encode $text;
1941 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1942} 1990}
1943 1991
1944 1992
1945=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1946 1994
… …
1977 # get handled first 2025 # get handled first
1978 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1979 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
1980 2028
1981 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1982 2031
1983 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1984 2033
1985 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1986 if (@$queue) { 2035 if (@$queue) {
… …
2147The 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
2148using it, it should be unique. 2197using it, it should be unique.
2149 2198
2150=over 4 2199=over 4
2151 2200
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 2201=item $value = cf::db_get $family => $key
2159 2202
2160Returns a single value from the database 2203Returns 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 2204
2167=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2168 2206
2169Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores 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 2208
2180=cut 2209=cut
2181 2210
2182our $DB; 2211our $DB;
2183 2212
2184{ 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
2185 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;
2186 2232
2187 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2188 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2189 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2190 2237
2191 my $pid; 2238 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 } 2239 };
2201 } 2240 }
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 }); 2241 }
2242}
2213 2243
2214 sub db_dirty() {
2215 $dirty = 1;
2216 $idle->start;
2217 }
2218
2219 sub db_get($;$) { 2244sub db_get($$) {
2220 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2221 ? $DB->{$_[0]}{$_[1]}
2222 : ($DB->{$_[0]} ||= { })
2223 }
2224 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2225 sub db_put($$;$) { 2255sub db_put($$$) {
2226 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2227 $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;
2228 } else { 2293 } else {
2229 $DB->{$_[0]} = $_[1]; 2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2230 }
2231 db_dirty;
2232 }
2233
2234 cf::global->attach (
2235 prio => 10000,
2236 on_cleanup => sub {
2237 db_sync;
2238 }, 2295 }
2239 ); 2296 Coro::cede;
2240} 2297 }
2241 2298
2242############################################################################# 2299 1
2243# 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}
2244 2312
2245sub cfg_load { 2313sub cfg_load {
2246 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2247 or return; 2315 or return;
2248 2316
… …
2271 Event::one_event; 2339 Event::one_event;
2272 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2273 }; 2341 };
2274 2342
2275 cfg_load; 2343 cfg_load;
2276 db_load; 2344 db_init;
2277 load_extensions; 2345 load_extensions;
2278 2346
2279 $TICK_WATCHER->start; 2347 $TICK_WATCHER->start;
2280 Event::loop; 2348 Event::loop;
2281} 2349}
… …
2285 2353
2286# install some emergency cleanup handlers 2354# install some emergency cleanup handlers
2287BEGIN { 2355BEGIN {
2288 for my $signal (qw(INT HUP TERM)) { 2356 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal ( 2357 Event->signal (
2358 reentrant => 0,
2290 data => WF_AUTOCANCEL, 2359 data => WF_AUTOCANCEL,
2291 signal => $signal, 2360 signal => $signal,
2361 prio => 0,
2292 cb => sub { 2362 cb => sub {
2293 cf::cleanup "SIG$signal"; 2363 cf::cleanup "SIG$signal";
2294 }, 2364 },
2295 ); 2365 );
2296 } 2366 }
2297} 2367}
… …
2318 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2319 $map->valid or next; 2389 $map->valid or next;
2320 $map->save; 2390 $map->save;
2321 } 2391 }
2322 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";
2323 }; 2397 };
2324 2398
2325 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;
2326} 2407}
2327 2408
2328sub reload() { 2409sub reload() {
2329 # can/must only be called in main 2410 # can/must only be called in main
2330 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
… …
2332 return; 2413 return;
2333 } 2414 }
2334 2415
2335 warn "reloading..."; 2416 warn "reloading...";
2336 2417
2337 warn "cancelling server ticker"; 2418 warn "entering sync_job";
2338 $TICK_WATCHER->cancel;
2339 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2340 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2341 2424
2342 eval { 2425 warn "syncing database to disk";
2426 BDB::db_env_txn_checkpoint $DB_ENV;
2427
2343 # 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
2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347 2429
2348 warn "cancelling all WF_AUTOCANCEL watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2349 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2350 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2351 } 2433 }
2352 2434
2353 warn "flushing outstanding aio requests"; 2435 warn "flushing outstanding aio requests";
2354 for (;;) { 2436 for (;;) {
2437 BDB::flush;
2355 IO::AIO::flush; 2438 IO::AIO::flush;
2356 Coro::cede; 2439 Coro::cede;
2357 last unless IO::AIO::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2358 warn "iterate..."; 2441 warn "iterate...";
2359 } 2442 }
2443
2444 ++$RELOAD;
2360 2445
2361 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2362 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2363 %EXT_CORO = (); 2448 %EXT_CORO = ();
2364 2449
… …
2417 require cf; 2502 require cf;
2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2419 2504
2420 warn "loading config and database again"; 2505 warn "loading config and database again";
2421 cf::cfg_load; 2506 cf::cfg_load;
2422 cf::db_load;
2423 2507
2424 warn "loading extensions"; 2508 warn "loading extensions";
2425 cf::load_extensions; 2509 cf::load_extensions;
2426 2510
2427 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2428 _global_reattach; 2512 _global_reattach; # objects, sockets
2429 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2430 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2431 2517
2432 warn "restarting server ticker"; 2518 warn "loading reloadable resources";
2519 reload_resources;
2433 2520
2434 $TICK_WATCHER->start; 2521 warn "leaving sync_job";
2435 };
2436 2522
2437 if ($@) { 2523 1
2524 } or do {
2438 warn $@; 2525 warn $@;
2439 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2440 exit 1; 2527 exit 1;
2441 } 2528 };
2442 2529
2443 warn "reloaded"; 2530 warn "reloaded";
2444}; 2531};
2445 2532
2446our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2452 $who->message ("reloading server."); 2539 $who->message ("reloading server.");
2453 2540
2454 # doing reload synchronously and two reloads happen back-to-back, 2541 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here. 2542 # coro crashes during coro_state_free->destroy here.
2456 2543
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2458 reload; 2549 reload;
2459 undef $RELOAD_WATCHER; 2550 undef $RELOAD_WATCHER;
2551 },
2460 }); 2552 );
2461 } 2553 }
2462}; 2554};
2463 2555
2464unshift @INC, $LIBDIR; 2556unshift @INC, $LIBDIR;
2465 2557
… …
2482 2574
2483 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2484 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2485 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2486 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
2487 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d#
2489 2592
2490 # 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
2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2492 2595
2493 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2494 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2495 }, 2598 },
2496); 2599);
2497 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;
2498IO::AIO::max_poll_time $TICK * 0.2; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2499
2500$AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2501 fd => IO::AIO::poll_fileno, 2657 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, 2658 data => WF_AUTOCANCEL,
2510 after => 1, 2659 fd => IO::AIO::poll_fileno,
2511 interval => 10, 2660 poll => 'r',
2512 prio => 6, # keep it lowest so it acts like a watchdog 2661 prio => 6,
2513 cb => Coro::unblock_sub { 2662 cb => \&IO::AIO::poll_cb,
2514 write_runtime 2663 );
2515 or warn "ERROR: unable to write runtime file: $!"; 2664}
2516 },
2517);
2518 2665
2519END { cf::emergency_save } 2666END { cf::emergency_save }
2520 2667
25211 26681
2522 2669

Diff Legend

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