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.195 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.238 by root, Sat Apr 14 07:23:00 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.5 (); 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;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 60our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 63our $NEXT_TICK;
52our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
53 69
54our %CFG; 70our %CFG;
55 71
56our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 73our $RUNTIME;
58 74
59our %PLAYER; # all users 75our %PLAYER; # all users
60our %MAP; # all maps 76our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
63 80
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 83
67# used to convert map paths into valid unix filenames by replacing / by ∕ 84# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 97mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 98mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 99mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 100mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
85 103
86our $EMERGENCY_POSITION; 104our $EMERGENCY_POSITION;
105
106sub cf::map::normalise;
87 107
88############################################################################# 108#############################################################################
89 109
90=head2 GLOBAL VARIABLES 110=head2 GLOBAL VARIABLES
91 111
… …
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 211 $d
192 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
193} 213}
194 214
195use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 216
197=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
198 218
199Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
200 220
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 221=item $json = cf::to_json $ref
209 222
210Converts a perl data structure into its JSON representation. 223Converts 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 224
219=item cf::lock_wait $string 225=item cf::lock_wait $string
220 226
221Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
222 228
… …
261sub freeze_mainloop { 267sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 268 return unless $TICK_WATCHER->is_active;
263 269
264 my $guard = Coro::guard { 270 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 271 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 272 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 273 $TICK_WATCHER->stop;
270 $guard 274 $guard
271} 275}
272 276
273=item cf::async { BLOCK } 277=item cf::async { BLOCK }
… …
344 348
345 $coro 349 $coro
346} 350}
347 351
348sub write_runtime { 352sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime";
354
349 my $runtime = cf::localdir . "/runtime"; 355 my $runtime = cf::localdir . "/runtime";
350 356
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 358 or return;
353 359
… …
356 # 60 allows for the watchdog to kill the server. 362 # 60 allows for the watchdog to kill the server.
357 363
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 364 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 365 and return;
360 366
367 # always fsync - this file is important
361 aio_fsync $fh 368 aio_fsync $fh
362 and return; 369 and return;
363 370
364 close $fh 371 close $fh
365 or return; 372 or return;
366 373
367 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
368 and return; 375 and return;
369 376
370 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 389}
372 390
373=back 391=back
374 392
375=cut 393=cut
… …
750 $filename, length $$rdata, scalar @$objs; 768 $filename, length $$rdata, scalar @$objs;
751 769
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 772 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 774 close $fh;
757 775
758 if (@$objs) { 776 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 777 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 778 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 779 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 780 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 781 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 782 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 783 aio_rename "$filename.pst~", "$filename.pst";
766 } 784 }
767 } else { 785 } else {
768 aio_unlink "$filename.pst"; 786 aio_unlink "$filename.pst";
… …
947} 965}
948 966
949sub path($) { 967sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 969
952 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
953} 971}
954 972
955sub find_active($) { 973sub find_active($) {
956 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
970 my $login = $_[0]; 988 my $login = $_[0];
971 989
972 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
973 991
974 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
975 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
976 or return; 1001 or return;
977 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
978 } 1003 }
979 } 1004 }
… …
1016 1041
1017=cut 1042=cut
1018 1043
1019sub quit_character { 1044sub quit_character {
1020 my ($pl) = @_; 1045 my ($pl) = @_;
1046
1047 my $name = $pl->ob->name;
1021 1048
1022 $pl->{deny_save} = 1; 1049 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1050 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1051
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1052 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1030 my $path = playerdir $pl; 1057 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1058 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1059 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1060 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1061 $pl->destroy;
1062
1063 my $prefix = qr<^~\Q$name\E/>;
1064
1065 # nuke player maps
1066 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1067
1035 IO::AIO::aio_rmtree $temp; 1068 IO::AIO::aio_rmtree $temp;
1069}
1070
1071=item $pl->kick
1072
1073Kicks a player out of the game. This destroys the connection.
1074
1075=cut
1076
1077sub kick {
1078 my ($pl, $kicker) = @_;
1079
1080 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1081 $pl->killer ("kicked");
1082 $pl->ns->destroy;
1036} 1083}
1037 1084
1038=item cf::player::list_logins 1085=item cf::player::list_logins
1039 1086
1040Returns am arrayref of all valid playernames in the system, can take a 1087Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1115=cut
1069 1116
1070sub maps($) { 1117sub maps($) {
1071 my ($pl) = @_; 1118 my ($pl) = @_;
1072 1119
1120 $pl = ref $pl ? $pl->ob->name : $pl;
1121
1073 my $files = aio_readdir playerdir $pl 1122 my $files = aio_readdir playerdir $pl
1074 or return; 1123 or return;
1075 1124
1076 my @paths; 1125 my @paths;
1077 1126
1078 for (@$files) { 1127 for (@$files) {
1079 utf8::decode $_; 1128 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1129 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1130 next unless /^$PATH_SEP/o;
1082 1131
1083 s/\.map$//; 1132 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1133 }
1086 1134
1087 \@paths 1135 \@paths
1088} 1136}
1089 1137
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1091 1139
1092Sends an ext reply to the player. 1140Sends an ext reply to the player.
1093 1141
1094=cut 1142=cut
1095 1143
1096sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1098 1146
1099 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1100 1148
1101 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1102} 1150}
1103 1151
1104package cf; 1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1162}
1163
1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1105 1192
1106=back 1193=back
1107
1108 1194
1109=head3 cf::map 1195=head3 cf::map
1110 1196
1111=over 4 1197=over 4
1112 1198
… …
1178sub normalise { 1264sub normalise {
1179 my ($path, $base) = @_; 1265 my ($path, $base) = @_;
1180 1266
1181 $path = "$path"; # make sure its a string 1267 $path = "$path"; # make sure its a string
1182 1268
1269 $path =~ s/\.map$//;
1270
1183 # map plan: 1271 # map plan:
1184 # 1272 #
1185 # /! non-realised random map exit (special hack!) 1273 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1274 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1275 # ?xxx/... are special absolute paths
… …
1248 1336
1249# the original (read-only) location 1337# the original (read-only) location
1250sub load_path { 1338sub load_path {
1251 my ($self) = @_; 1339 my ($self) = @_;
1252 1340
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1342}
1255 1343
1256# the temporary/swap location 1344# the temporary/swap location
1257sub save_path { 1345sub save_path {
1258 my ($self) = @_; 1346 my ($self) = @_;
1259 1347
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1350}
1263 1351
1264# the unique path, undef == no special unique path 1352# the unique path, undef == no special unique path
1265sub uniq_path { 1353sub uniq_path {
1266 my ($self) = @_; 1354 my ($self) = @_;
… …
1288 1376
1289sub load_header_from($) { 1377sub load_header_from($) {
1290 my ($self, $path) = @_; 1378 my ($self, $path) = @_;
1291 1379
1292 utf8::encode $path; 1380 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1381 #aio_open $path, O_RDONLY, 0
1294 or return; 1382 # or return;
1295 1383
1296 $self->_load_header ($path) 1384 $self->_load_header ($path)
1297 or return; 1385 or return;
1298 1386
1299 $self->{load_path} = $path; 1387 $self->{load_path} = $path;
… …
1341 $self->load_header_orig 1429 $self->load_header_orig
1342 or return; 1430 or return;
1343 $self->prepare_orig; 1431 $self->prepare_orig;
1344 } 1432 }
1345 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1346 1 1437 1
1347} 1438}
1348 1439
1349sub find; 1440sub find;
1350sub find { 1441sub find {
… …
1379sub pre_load { } 1470sub pre_load { }
1380sub post_load { } 1471sub post_load { }
1381 1472
1382sub load { 1473sub load {
1383 my ($self) = @_; 1474 my ($self) = @_;
1475
1476 local $self->{deny_reset} = 1; # loading can take a long time
1384 1477
1385 my $path = $self->{path}; 1478 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1479 my $guard = cf::lock_acquire "map_load:$path";
1387 1480
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1481 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1577 return if $self->players; 1670 return if $self->players;
1578 return if $self->isa ("ext::map_per_player");#d# 1671 return if $self->isa ("ext::map_per_player");#d#
1579 1672
1580 warn "resetting map ", $self->path;#d# 1673 warn "resetting map ", $self->path;#d#
1581 1674
1675 $self->in_memory (cf::MAP_SWAPPED);
1676
1677 # need to save uniques path
1678 unless ($self->{deny_save}) {
1679 my $uniq = $self->uniq_path; utf8::encode $uniq;
1680
1681 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1682 if $uniq;
1683 }
1684
1582 delete $cf::MAP{$self->path}; 1685 delete $cf::MAP{$self->path};
1583 1686
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear; 1687 $self->clear;
1586 1688
1587 $_->clear_links_to ($self) for values %cf::MAP; 1689 $_->clear_links_to ($self) for values %cf::MAP;
1588 1690
1589 $self->unlink_save; 1691 $self->unlink_save;
… …
1626 for (@$files) { 1728 for (@$files) {
1627 utf8::decode $_; 1729 utf8::decode $_;
1628 next if /\.pst$/; 1730 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1731 next unless /^$PATH_SEP/o;
1630 1732
1631 s/\.map$//; 1733 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1734 }
1634 1735
1635 \@paths 1736 \@paths
1636} 1737}
1637 1738
… …
1731=cut 1832=cut
1732 1833
1733sub link_map { 1834sub link_map {
1734 unless ($LINK_MAP) { 1835 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1836 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1837 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1838 $LINK_MAP->load;
1738 } 1839 }
1739 1840
1740 $LINK_MAP 1841 $LINK_MAP
1741} 1842}
… …
1780 $map->load; 1881 $map->load;
1781 $map->load_diag; 1882 $map->load_diag;
1782 1883
1783 return unless $self->contr->active; 1884 return unless $self->contr->active;
1784 $self->activate_recursive; 1885 $self->activate_recursive;
1886
1887 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1785 $self->enter_map ($map, $x, $y); 1888 $self->enter_map ($map, $x, $y);
1786} 1889}
1787 1890
1788cf::player->attach ( 1891cf::player->attach (
1789 on_logout => sub { 1892 on_logout => sub {
… …
1802 # try to abort aborted map switching on player login :) 1905 # try to abort aborted map switching on player login :)
1803 # should happen only on crashes 1906 # should happen only on crashes
1804 if ($pl->ob->{_link_pos}) { 1907 if ($pl->ob->{_link_pos}) {
1805 $pl->ob->enter_link; 1908 $pl->ob->enter_link;
1806 (async { 1909 (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, 1910 $pl->ob->reply (undef,
1810 "There was an internal problem at your last logout, " 1911 "There was an internal problem at your last logout, "
1811 . "the server will try to bring you to your intended destination in a second.", 1912 . "the server will try to bring you to your intended destination in a second.",
1812 cf::NDI_RED); 1913 cf::NDI_RED);
1914 # we need this sleep as the login has a concurrent enter_exit running
1915 # and this sleep increases chances of the player not ending up in scorn
1813 Coro::Timer::sleep 1; 1916 Coro::Timer::sleep 1;
1814 $pl->ob->leave_link; 1917 $pl->ob->leave_link;
1815 })->prio (2); 1918 })->prio (2);
1816 } 1919 }
1817 }, 1920 },
… …
1825 my ($self, $path, $x, $y) = @_; 1928 my ($self, $path, $x, $y) = @_;
1826 1929
1827 $self->enter_link; 1930 $self->enter_link;
1828 1931
1829 (async { 1932 (async {
1933 my $map = eval {
1830 my $map = cf::map::find $path; 1934 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1935 $map = $map->customise_for ($self) if $map;
1832 1936 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1937 } or
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1938 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1837 1939
1838 $self->leave_link ($map, $x, $y); 1940 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1941 })->prio (1);
1840} 1942}
1841 1943
… …
1872 # that depends on the exit object 1974 # that depends on the exit object
1873 1975
1874 my $rmp = parse_random_map_params $exit->msg; 1976 my $rmp = parse_random_map_params $exit->msg;
1875 1977
1876 if ($exit->map) { 1978 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1979 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1980 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1981 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1982 $rmp->{origin_y} = $exit->y;
1881 } 1983 }
1882 1984
… …
1901 2003
1902 return unless $self->type == cf::PLAYER; 2004 return unless $self->type == cf::PLAYER;
1903 2005
1904 if ($exit->slaying eq "/!") { 2006 if ($exit->slaying eq "/!") {
1905 #TODO: this should de-fi-ni-te-ly not be a sync-job 2007 #TODO: this should de-fi-ni-te-ly not be a sync-job
2008 # the problem is that $exit might not survive long enough
2009 # so it needs to be done right now, right here
1906 cf::sync_job { prepare_random_map $exit }; 2010 cf::sync_job { prepare_random_map $exit };
1907 } 2011 }
1908 2012
1909 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1910 my $hp = $exit->stats->hp; 2014 my $hp = $exit->stats->hp;
… …
1918 $self->goto ($slaying, $hp, $sp); 2022 $self->goto ($slaying, $hp, $sp);
1919 2023
1920 1; 2024 1;
1921 }) { 2025 }) {
1922 $self->message ("Something went wrong deep within the crossfire server. " 2026 $self->message ("Something went wrong deep within the crossfire server. "
1923 . "I'll try to bring you back to the map you were before. " 2027 . "I'll try to bring you back to the map you were before. "
1924 . "Please report this to the dungeon master!", 2028 . "Please report this to the dungeon master!",
1925 cf::NDI_UNIQUE | cf::NDI_RED); 2029 cf::NDI_UNIQUE | cf::NDI_RED);
1926 2030
1927 warn "ERROR in enter_exit: $@"; 2031 warn "ERROR in enter_exit: $@";
1928 $self->leave_link; 2032 $self->leave_link;
1929 } 2033 }
1930 })->prio (1); 2034 })->prio (1);
… …
1943 2047
1944sub cf::client::send_drawinfo { 2048sub cf::client::send_drawinfo {
1945 my ($self, $text, $flags) = @_; 2049 my ($self, $text, $flags) = @_;
1946 2050
1947 utf8::encode $text; 2051 utf8::encode $text;
1948 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2052 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1949} 2053}
1950 2054
2055=item $client->ext_event ($type, %msg)
2056
2057Sends an exti event to the client.
2058
2059=cut
2060
2061sub cf::client::ext_event($$%) {
2062 my ($self, $type, %msg) = @_;
2063
2064 $msg{msgtype} = "event_$type";
2065 $self->send_packet ("ext " . cf::to_json \%msg);
2066}
1951 2067
1952=item $success = $client->query ($flags, "text", \&cb) 2068=item $success = $client->query ($flags, "text", \&cb)
1953 2069
1954Queues a query to the client, calling the given callback with 2070Queues a query to the client, calling the given callback with
1955the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2071the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
1984 # get handled first 2100 # get handled first
1985 my $queue = delete $ns->{query_queue} 2101 my $queue = delete $ns->{query_queue}
1986 or return; # be conservative, not sure how that can happen, but we saw a crash here 2102 or return; # be conservative, not sure how that can happen, but we saw a crash here
1987 2103
1988 (shift @$queue)->[1]->($msg); 2104 (shift @$queue)->[1]->($msg);
2105 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1989 2106
1990 push @{ $ns->{query_queue} }, @$queue; 2107 push @{ $ns->{query_queue} }, @$queue;
1991 2108
1992 if (@{ $ns->{query_queue} } == @$queue) { 2109 if (@{ $ns->{query_queue} } == @$queue) {
1993 if (@$queue) { 2110 if (@$queue) {
… …
2051 2168
2052# here we export the classes and methods available to script code 2169# here we export the classes and methods available to script code
2053 2170
2054=pod 2171=pod
2055 2172
2056The following fucntions and emthods are available within a safe environment: 2173The following functions and methods are available within a safe environment:
2057 2174
2058 cf::object contr pay_amount pay_player map 2175 cf::object contr pay_amount pay_player map
2059 cf::object::player player 2176 cf::object::player player
2060 cf::player peaceful 2177 cf::player peaceful
2061 cf::map trigger 2178 cf::map trigger
… …
2154The parameter C<$family> should best start with the name of the extension 2271The parameter C<$family> should best start with the name of the extension
2155using it, it should be unique. 2272using it, it should be unique.
2156 2273
2157=over 4 2274=over 4
2158 2275
2159=item $hashref = cf::db_get $family
2160
2161Return a hashref for use by the extension C<$family>, which can be
2162modified. After modifications, you have to call C<cf::db_dirty> or
2163C<cf::db_sync>.
2164
2165=item $value = cf::db_get $family => $key 2276=item $value = cf::db_get $family => $key
2166 2277
2167Returns a single value from the database 2278Returns a single value from the database.
2168
2169=item cf::db_put $family => $hashref
2170
2171Stores the given family hashref into the database. Updates are delayed, if
2172you want the data to be synced to disk immediately, use C<cf::db_sync>.
2173 2279
2174=item cf::db_put $family => $key => $value 2280=item cf::db_put $family => $key => $value
2175 2281
2176Stores the given C<$value> in the family hash. Updates are delayed, if you 2282Stores the given C<$value> in the family.
2177want the data to be synced to disk immediately, use C<cf::db_sync>.
2178
2179=item cf::db_dirty
2180
2181Marks the database as dirty, to be updated at a later time.
2182
2183=item cf::db_sync
2184
2185Immediately write the database to disk I<if it is dirty>.
2186 2283
2187=cut 2284=cut
2188 2285
2189our $DB; 2286our $DB;
2190 2287
2191{ 2288sub db_init {
2289 unless ($DB) {
2290 $DB = BDB::db_create $DB_ENV;
2291
2292 cf::sync_job {
2293 eval {
2294 $DB->set_flags (BDB::CHKSUM);
2295
2296 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!;
2299 };
2300 cf::cleanup "db_open(db): $@" if $@;
2301 };
2302
2192 my $path = cf::localdir . "/database.pst"; 2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2193 2307
2194 sub db_load() { 2308 cf::db_put (board => data => $pst->{board});
2195 $DB = stat $path ? Storable::retrieve $path : { }; 2309 cf::db_put (guildrules => data => $pst->{guildrules});
2196 } 2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2197 2312
2198 my $pid; 2313 unlink $path;
2199
2200 sub db_save() {
2201 waitpid $pid, 0 if $pid;
2202 if (0 == ($pid = fork)) {
2203 $DB->{_meta}{version} = 1;
2204 Storable::nstore $DB, "$path~";
2205 rename "$path~", $path;
2206 cf::_exit 0 if defined $pid;
2207 } 2314 };
2208 }
2209
2210 my $dirty;
2211
2212 sub db_sync() {
2213 db_save if $dirty;
2214 undef $dirty;
2215 }
2216
2217 my $idle = Event->idle (
2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2224 );
2225
2226 sub db_dirty() {
2227 $dirty = 1;
2228 $idle->start;
2229 }
2230
2231 sub db_get($;$) {
2232 @_ >= 2
2233 ? $DB->{$_[0]}{$_[1]}
2234 : ($DB->{$_[0]} ||= { })
2235 }
2236
2237 sub db_put($$;$) {
2238 if (@_ >= 3) {
2239 $DB->{$_[0]}{$_[1]} = $_[2];
2240 } else {
2241 $DB->{$_[0]} = $_[1];
2242 }
2243 db_dirty;
2244 }
2245
2246 cf::global->attach (
2247 prio => 10000,
2248 on_cleanup => sub {
2249 db_sync;
2250 }, 2315 }
2251 ); 2316 }
2317}
2318
2319sub db_get($$) {
2320 my $key = "$_[0]/$_[1]";
2321
2322 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data;
2324
2325 $! ? ()
2326 : Compress::LZF::sthaw $data
2327 }
2328}
2329
2330sub db_put($$$) {
2331 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2252} 2333}
2253 2334
2254############################################################################# 2335#############################################################################
2255# the server's main() 2336# the server's init and main functions
2337
2338sub load_facedata {
2339 my $path = sprintf "%s/facedata", cf::datadir;
2340
2341 warn "loading facedata from $path\n";
2342
2343 my $facedata;
2344 0 < aio_load $path, $facedata
2345 or die "$path: $!";
2346
2347 $facedata = Coro::Storable::thaw $facedata;
2348
2349 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351
2352 {
2353 my $faces = $facedata->{faceinfo};
2354
2355 while (my ($face, $info) = each %$faces) {
2356 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2360 Coro::cede;
2361 }
2362
2363 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth};
2365 my $idx = cf::face::find $face
2366 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) {
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2369 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 }
2372 Coro::cede;
2373 }
2374 }
2375
2376 {
2377 my $anims = $facedata->{animinfo};
2378
2379 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede;
2382 }
2383
2384 cf::anim::invalidate_all; # d'oh
2385 }
2386
2387 1
2388}
2389
2390sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2392 or die "unable to load regions file\n";#d#
2393 load_facedata
2394 or die "unable to load facedata\n";#d#
2395}
2396
2397sub init {
2398 reload_resources;
2399}
2256 2400
2257sub cfg_load { 2401sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2402 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2403 or return;
2260 2404
… …
2283 Event::one_event; 2427 Event::one_event;
2284 })->prio (Coro::PRIO_MAX); 2428 })->prio (Coro::PRIO_MAX);
2285 }; 2429 };
2286 2430
2287 cfg_load; 2431 cfg_load;
2288 db_load; 2432 db_init;
2289 load_extensions; 2433 load_extensions;
2290 2434
2291 $TICK_WATCHER->start; 2435 $TICK_WATCHER->start;
2292 Event::loop; 2436 Event::loop;
2293} 2437}
… …
2332 my $map = $cf::MAP{$path} or next; 2476 my $map = $cf::MAP{$path} or next;
2333 $map->valid or next; 2477 $map->valid or next;
2334 $map->save; 2478 $map->save;
2335 } 2479 }
2336 warn "end emergency map save\n"; 2480 warn "end emergency map save\n";
2481
2482 warn "begin emergency database checkpoint\n";
2483 BDB::db_env_txn_checkpoint $DB_ENV;
2484 warn "end emergency database checkpoint\n";
2337 }; 2485 };
2338 2486
2339 warn "leave emergency perl save\n"; 2487 warn "leave emergency perl save\n";
2488}
2489
2490sub post_cleanup {
2491 my ($make_core) = @_;
2492
2493 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core;
2340} 2495}
2341 2496
2342sub reload() { 2497sub reload() {
2343 # can/must only be called in main 2498 # can/must only be called in main
2344 if ($Coro::current != $Coro::main) { 2499 if ($Coro::current != $Coro::main) {
… …
2346 return; 2501 return;
2347 } 2502 }
2348 2503
2349 warn "reloading..."; 2504 warn "reloading...";
2350 2505
2351 warn "cancelling server ticker"; 2506 warn "entering sync_job";
2352 $TICK_WATCHER->cancel;
2353 2507
2508 cf::sync_job {
2509 cf::write_runtime; # external watchdog should not bark
2354 cf::emergency_save; 2510 cf::emergency_save;
2511 cf::write_runtime; # external watchdog should not bark
2355 2512
2356 eval { 2513 warn "syncing database to disk";
2514 BDB::db_env_txn_checkpoint $DB_ENV;
2515
2357 # if anything goes wrong in here, we should simply crash as we already saved 2516 # if anything goes wrong in here, we should simply crash as we already saved
2358
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361 2517
2362 warn "cancelling all WF_AUTOCANCEL watchers"; 2518 warn "cancelling all WF_AUTOCANCEL watchers";
2363 for (Event::all_watchers) { 2519 for (Event::all_watchers) {
2364 $_->cancel if $_->data & WF_AUTOCANCEL; 2520 $_->cancel if $_->data & WF_AUTOCANCEL;
2365 } 2521 }
2366 2522
2367 warn "flushing outstanding aio requests"; 2523 warn "flushing outstanding aio requests";
2368 for (;;) { 2524 for (;;) {
2525 BDB::flush;
2369 IO::AIO::flush; 2526 IO::AIO::flush;
2370 Coro::cede; 2527 Coro::cede;
2371 last unless IO::AIO::nreqs; 2528 last unless IO::AIO::nreqs || BDB::nreqs;
2372 warn "iterate..."; 2529 warn "iterate...";
2373 } 2530 }
2531
2532 ++$RELOAD;
2374 2533
2375 warn "cancelling all extension coros"; 2534 warn "cancelling all extension coros";
2376 $_->cancel for values %EXT_CORO; 2535 $_->cancel for values %EXT_CORO;
2377 %EXT_CORO = (); 2536 %EXT_CORO = ();
2378 2537
… …
2431 require cf; 2590 require cf;
2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2591 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2433 2592
2434 warn "loading config and database again"; 2593 warn "loading config and database again";
2435 cf::cfg_load; 2594 cf::cfg_load;
2436 cf::db_load;
2437 2595
2438 warn "loading extensions"; 2596 warn "loading extensions";
2439 cf::load_extensions; 2597 cf::load_extensions;
2440 2598
2441 warn "reattaching attachments to objects/players"; 2599 warn "reattaching attachments to objects/players";
2442 _global_reattach; 2600 _global_reattach; # objects, sockets
2443 warn "reattaching attachments to maps"; 2601 warn "reattaching attachments to maps";
2444 reattach $_ for values %MAP; 2602 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER;
2445 2605
2446 warn "restarting server ticker"; 2606 warn "loading reloadable resources";
2607 reload_resources;
2447 2608
2448 $TICK_WATCHER->start; 2609 warn "leaving sync_job";
2449 };
2450 2610
2451 if ($@) { 2611 1
2612 } or do {
2452 warn $@; 2613 warn $@;
2453 warn "error while reloading, exiting."; 2614 warn "error while reloading, exiting.";
2454 exit 1; 2615 exit 1;
2455 } 2616 };
2456 2617
2457 warn "reloaded"; 2618 warn "reloaded";
2458}; 2619};
2459 2620
2460our $RELOAD_WATCHER; # used only during reload 2621our $RELOAD_WATCHER; # used only during reload
… …
2501 2662
2502 cf::server_tick; # one server iteration 2663 cf::server_tick; # one server iteration
2503 $RUNTIME += $TICK; 2664 $RUNTIME += $TICK;
2504 $NEXT_TICK += $TICK; 2665 $NEXT_TICK += $TICK;
2505 2666
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10;
2669 Coro::async_pool {
2670 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!";
2672 };
2673 }
2674
2506 $WAIT_FOR_TICK->broadcast; 2675 $WAIT_FOR_TICK->broadcast;
2507 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2508 2677
2509 Event::sweep;
2510 Coro::cede_notself;
2511
2512# my $AFTER = Event::time; 2678# my $AFTER = Event::time;
2513# warn $AFTER - $NOW;#d# 2679# warn $AFTER - $NOW;#d#
2514 2680
2515 # if we are delayed by four ticks or more, skip them all 2681 # if we are delayed by four ticks or more, skip them all
2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2518 $TICK_WATCHER->at ($NEXT_TICK); 2684 $TICK_WATCHER->at ($NEXT_TICK);
2519 $TICK_WATCHER->start; 2685 $TICK_WATCHER->start;
2520 }, 2686 },
2521); 2687);
2522 2688
2689{
2690 BDB::max_poll_time $TICK * 0.1;
2691 $BDB_POLL_WATCHER = Event->io (
2692 reentrant => 0,
2693 fd => BDB::poll_fileno,
2694 poll => 'r',
2695 prio => 0,
2696 data => WF_AUTOCANCEL,
2697 cb => \&BDB::poll_cb,
2698 );
2699 BDB::min_parallel 8;
2700
2701 BDB::set_sync_prepare {
2702 my $status;
2703 my $current = $Coro::current;
2704 (
2705 sub {
2706 $status = $!;
2707 $current->ready; undef $current;
2708 },
2709 sub {
2710 Coro::schedule while defined $current;
2711 $! = $status;
2712 },
2713 )
2714 };
2715
2716 unless ($DB_ENV) {
2717 $DB_ENV = BDB::db_env_create;
2718
2719 cf::sync_job {
2720 eval {
2721 BDB::db_env_open
2722 $DB_ENV,
2723 $BDB_ENV_DIR,
2724 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2725 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2726 0666;
2727
2728 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2729
2730 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2731 $DB_ENV->set_lk_detect;
2732 };
2733
2734 cf::cleanup "db_env_open(db): $@" if $@;
2735 };
2736 }
2737}
2738
2739{
2740 IO::AIO::min_parallel 8;
2741
2742 undef $Coro::AIO::WATCHER;
2523IO::AIO::max_poll_time $TICK * 0.1; 2743 IO::AIO::max_poll_time $TICK * 0.1;
2524
2525undef $Coro::AIO::WATCHER;
2526$AIO_POLL_WATCHER = Event->io ( 2744 $AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0, 2745 reentrant => 0,
2746 data => WF_AUTOCANCEL,
2528 fd => IO::AIO::poll_fileno, 2747 fd => IO::AIO::poll_fileno,
2529 poll => 'r', 2748 poll => 'r',
2530 prio => 6, 2749 prio => 6,
2531 data => WF_AUTOCANCEL,
2532 cb => \&IO::AIO::poll_cb, 2750 cb => \&IO::AIO::poll_cb,
2533); 2751 );
2534 2752}
2535$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0,
2537 data => WF_AUTOCANCEL,
2538 after => 1,
2539 interval => 10,
2540 prio => 6, # keep it lowest so it acts like a watchdog
2541 cb => Coro::unblock_sub {
2542 write_runtime
2543 or warn "ERROR: unable to write runtime file: $!";
2544 },
2545);
2546 2753
2547END { cf::emergency_save } 2754END { cf::emergency_save }
2548 2755
25491 27561
2550 2757

Diff Legend

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