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.170 by root, Sun Jan 14 02:00:37 2007 UTC vs.
Revision 1.241 by root, Mon Apr 16 11:09:32 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.3 (); 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";
63 79our $BDB_ENV_DIR = cf::localdir . "/db";
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 80
67# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 83
70binmode STDOUT; 84binmode STDOUT;
80mkdir cf::localdir; 94mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 95mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 96mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 97mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
85 100
86our $EMERGENCY_POSITION; 101our $EMERGENCY_POSITION;
102
103sub cf::map::normalise;
87 104
88############################################################################# 105#############################################################################
89 106
90=head2 GLOBAL VARIABLES 107=head2 GLOBAL VARIABLES
91 108
116=item %cf::CFG 133=item %cf::CFG
117 134
118Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 136from wherever your confdir points to.
120 137
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
122 139
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 143
128=back 144=back
129 145
130=cut 146=cut
131 147
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 207 $d
192 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
193} 209}
194 210
195use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 212
197=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
198 214
199Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
200 216
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 217=item $json = cf::to_json $ref
209 218
210Converts a perl data structure into its JSON representation. 219Converts 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 220
219=item cf::lock_wait $string 221=item cf::lock_wait $string
220 222
221Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
222 224
261sub freeze_mainloop { 263sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
263 265
264 my $guard = Coro::guard { 266 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 267 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 268 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
270 $guard 270 $guard
271} 271}
272 272
273=item cf::async { BLOCK } 273=item cf::async { BLOCK }
344 344
345 $coro 345 $coro
346} 346}
347 347
348sub write_runtime { 348sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime";
350
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 361 and return;
357 362
363 # always fsync - this file is important
358 aio_fsync $fh 364 aio_fsync $fh
359 and return; 365 and return;
360 366
361 close $fh 367 close $fh
362 or return; 368 or return;
363 369
364 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
365 and return; 371 and return;
366 372
367 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 385}
369 386
370=back 387=back
371 388
372=cut 389=cut
747 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
748 765
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 770 close $fh;
754 771
755 if (@$objs) { 772 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 778 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
763 } 780 }
764 } else { 781 } else {
765 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
944} 961}
945 962
946sub path($) { 963sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 965
949 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
950} 967}
951 968
952sub find_active($) { 969sub find_active($) {
953 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
957 974
958sub exists($) { 975sub exists($) {
959 my ($login) = @_; 976 my ($login) = @_;
960 977
961 $cf::PLAYER{$login} 978 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 979 or cf::sync_job { !aio_stat path $login }
963} 980}
964 981
965sub find($) { 982sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 983 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 984 my $login = $_[0];
968 985
969 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
970 987
971 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
972 my $pl = load_pl path $login 996 my $pl = load_pl path $login
973 or return; 997 or return;
974 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
975 } 999 }
976 } 1000 }
1013 1037
1014=cut 1038=cut
1015 1039
1016sub quit_character { 1040sub quit_character {
1017 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1018 1044
1019 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1047
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1032 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1033} 1079}
1034 1080
1035=item cf::player::list_logins 1081=item cf::player::list_logins
1036 1082
1037Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
1065=cut 1111=cut
1066 1112
1067sub maps($) { 1113sub maps($) {
1068 my ($pl) = @_; 1114 my ($pl) = @_;
1069 1115
1116 $pl = ref $pl ? $pl->ob->name : $pl;
1117
1070 my $files = aio_readdir playerdir $pl 1118 my $files = aio_readdir playerdir $pl
1071 or return; 1119 or return;
1072 1120
1073 my @paths; 1121 my @paths;
1074 1122
1075 for (@$files) { 1123 for (@$files) {
1076 utf8::decode $_; 1124 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1125 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1126 next unless /^$PATH_SEP/o;
1079 1127
1080 s/\.map$//; 1128 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1129 }
1083 1130
1084 \@paths 1131 \@paths
1085} 1132}
1086 1133
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1088 1135
1089Sends an ext reply to the player. 1136Sends an ext reply to the player.
1090 1137
1091=cut 1138=cut
1092 1139
1093sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1095 1142
1096 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1097 1144
1098 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1099} 1146}
1100 1147
1101package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1102 1188
1103=back 1189=back
1104
1105 1190
1106=head3 cf::map 1191=head3 cf::map
1107 1192
1108=over 4 1193=over 4
1109 1194
1113 1198
1114use Fcntl; 1199use Fcntl;
1115use Coro::AIO; 1200use Coro::AIO;
1116 1201
1117use overload 1202use overload
1118 '""' => \&as_string; 1203 '""' => \&as_string,
1204 fallback => 1;
1119 1205
1120our $MAX_RESET = 3600; 1206our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1207our $DEFAULT_RESET = 3000;
1122 1208
1123sub generate_random_map { 1209sub generate_random_map {
1124 my ($self, $rmp) = @_; 1210 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1211 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1212 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1213 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1214 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1215 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1222 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1223 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1224 )
1140} 1225}
1141 1226
1227=item cf::map->register ($regex, $prio)
1228
1229Register a handler for the map path matching the given regex at the
1230givne priority (higher is better, built-in handlers have priority 0, the
1231default).
1232
1233=cut
1234
1142sub register { 1235sub register {
1143 my (undef, $regex) = @_; 1236 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1237 my $pkg = caller;
1145 1238
1146 no strict; 1239 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1240 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1241
1149 $EXT_MAP{$pkg} = qr<$regex>; 1242 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1243}
1151 1244
1152# also paths starting with '/' 1245# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1246$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1247
1155sub thawer_merge { 1248sub thawer_merge {
1249 my ($self, $merge) = @_;
1250
1156 # we have to keep some variables in memory intact 1251 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1252 local $self->{path};
1253 local $self->{load_path};
1158 local $_[0]{deny_save}; 1254 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1255 local $self->{deny_reset};
1160 1256
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1257 $self->SUPER::thawer_merge ($merge);
1162} 1258}
1163 1259
1164sub normalise { 1260sub normalise {
1165 my ($path, $base) = @_; 1261 my ($path, $base) = @_;
1262
1263 $path = "$path"; # make sure its a string
1264
1265 $path =~ s/\.map$//;
1166 1266
1167 # map plan: 1267 # map plan:
1168 # 1268 #
1169 # /! non-realised random map exit (special hack!) 1269 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched 1270 # {... are special paths that are not being touched
1198 1298
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1299 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200 1300
1201 $path = normalise $path, $base; 1301 $path = normalise $path, $base;
1202 1302
1203 for my $pkg (keys %EXT_MAP) { 1303 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1304 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1305 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1306 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1307 $self->init; # pass $1 etc.
1208 return $self; 1308 return $self;
1209 } 1309 }
1210 } 1310 }
1211 1311
1212 Carp::carp "unable to resolve path '$path'."; 1312 Carp::carp "unable to resolve path '$path' (base '$base').";
1213 () 1313 ()
1214} 1314}
1215 1315
1216sub init { 1316sub init {
1217 my ($self) = @_; 1317 my ($self) = @_;
1232 1332
1233# the original (read-only) location 1333# the original (read-only) location
1234sub load_path { 1334sub load_path {
1235 my ($self) = @_; 1335 my ($self) = @_;
1236 1336
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1238} 1338}
1239 1339
1240# the temporary/swap location 1340# the temporary/swap location
1241sub save_path { 1341sub save_path {
1242 my ($self) = @_; 1342 my ($self) = @_;
1243 1343
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1246} 1346}
1247 1347
1248# the unique path, undef == no special unique path 1348# the unique path, undef == no special unique path
1249sub uniq_path { 1349sub uniq_path {
1250 my ($self) = @_; 1350 my ($self) = @_;
1272 1372
1273sub load_header_from($) { 1373sub load_header_from($) {
1274 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1275 1375
1276 utf8::encode $path; 1376 utf8::encode $path;
1277 aio_open $path, O_RDONLY, 0 1377 #aio_open $path, O_RDONLY, 0
1278 or return; 1378 # or return;
1279 1379
1280 $self->_load_header ($path) 1380 $self->_load_header ($path)
1281 or return; 1381 or return;
1282 1382
1283 $self->{load_path} = $path; 1383 $self->{load_path} = $path;
1284 1384
1285 1 1385 1
1286} 1386}
1287 1387
1288sub load_orig { 1388sub load_header_orig {
1289 my ($self) = @_; 1389 my ($self) = @_;
1290 1390
1291 $self->load_header_from ($self->load_path) 1391 $self->load_header_from ($self->load_path)
1292} 1392}
1293 1393
1294sub load_temp { 1394sub load_header_temp {
1295 my ($self) = @_; 1395 my ($self) = @_;
1296 1396
1297 $self->load_header_from ($self->save_path) 1397 $self->load_header_from ($self->save_path)
1398}
1399
1400sub prepare_temp {
1401 my ($self) = @_;
1402
1403 $self->last_access ((delete $self->{last_access})
1404 || $cf::RUNTIME); #d#
1405 # safety
1406 $self->{instantiate_time} = $cf::RUNTIME
1407 if $self->{instantiate_time} > $cf::RUNTIME;
1408}
1409
1410sub prepare_orig {
1411 my ($self) = @_;
1412
1413 $self->{load_original} = 1;
1414 $self->{instantiate_time} = $cf::RUNTIME;
1415 $self->last_access ($cf::RUNTIME);
1416 $self->instantiate;
1298} 1417}
1299 1418
1300sub load_header { 1419sub load_header {
1301 my ($self) = @_; 1420 my ($self) = @_;
1302 1421
1303 if ($self->load_temp) { 1422 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1423 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1424 } else {
1310 $self->load_orig 1425 $self->load_header_orig
1311 or return; 1426 or return;
1312 1427 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1428 }
1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1318 1432
1319 1 1433 1
1320} 1434}
1321 1435
1322sub find; 1436sub find;
1335 $map->{last_save} = $cf::RUNTIME; 1449 $map->{last_save} = $cf::RUNTIME;
1336 1450
1337 $map->load_header 1451 $map->load_header
1338 or return; 1452 or return;
1339 1453
1340 if ($map->should_reset) { 1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait;
1341 $map->reset; 1457 $map->reset;
1342 undef $guard; 1458 undef $guard;
1343 $map = find $path 1459 return find $path;
1344 or return;
1345 } 1460 }
1346 1461
1347 $cf::MAP{$path} = $map 1462 $cf::MAP{$path} = $map
1348 } 1463 }
1349} 1464}
1465
1466sub pre_load { }
1467sub post_load { }
1350 1468
1351sub load { 1469sub load {
1352 my ($self) = @_; 1470 my ($self) = @_;
1353 1471
1472 local $self->{deny_reset} = 1; # loading can take a long time
1473
1354 my $path = $self->{path}; 1474 my $path = $self->{path};
1355 my $guard = cf::lock_acquire "map_load:$path"; 1475 my $guard = cf::lock_acquire "map_load:$path";
1356 1476
1357 return if $self->in_memory != cf::MAP_SWAPPED; 1477 return if $self->in_memory != cf::MAP_SWAPPED;
1358 1478
1359 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1360 1480
1361 $self->alloc; 1481 $self->alloc;
1482
1483 $self->pre_load;
1484 Coro::cede;
1485
1362 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1363 or return; 1487 or return;
1364 1488
1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1366 if delete $self->{load_original}; 1490 if delete $self->{load_original};
1372 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1373 } 1497 }
1374 } 1498 }
1375 1499
1376 Coro::cede; 1500 Coro::cede;
1377
1378 # now do the right thing for maps 1501 # now do the right thing for maps
1379 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1380 1504
1381 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1382 $self->decay_objects; 1506 $self->decay_objects;
1383 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1384 $self->update_buttons; 1508 $self->update_buttons;
1386 $self->set_darkness_map; 1510 $self->set_darkness_map;
1387 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1388 unless $self->difficulty; 1512 unless $self->difficulty;
1389 Coro::cede; 1513 Coro::cede;
1390 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1391 } 1516 }
1517
1518 $self->post_load;
1519 Coro::cede;
1392 1520
1393 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1394} 1522}
1395 1523
1396sub customise_for { 1524sub customise_for {
1437 1565
1438 cf::sync_job { $map->load }; 1566 cf::sync_job { $map->load };
1439} 1567}
1440 1568
1441our %MAP_PREFETCH; 1569our %MAP_PREFETCH;
1442our $MAP_PREFETCHER = Coro::async { 1570our $MAP_PREFETCHER = undef;
1443 while () {
1444 for my $path (keys %MAP_PREFETCH) {
1445 my $map = find $path
1446 or next;
1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1450 }
1451 Coro::schedule;
1452 }
1453};
1454 1571
1455sub find_async { 1572sub find_async {
1456 my ($path, $origin) = @_; 1573 my ($path, $origin) = @_;
1457 1574
1458 $path = normalise $path, $origin && $origin->{path}; 1575 $path = normalise $path, $origin && $origin->{path};
1459 1576
1460 if (my $map = $cf::MAP{$path}) { 1577 if (my $map = $cf::MAP{$path}) {
1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1462 } 1579 }
1463 1580
1464 $MAP_PREFETCH{$path} = 0; 1581 undef $MAP_PREFETCH{$path};
1582 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) {
1585 my $map = find $path
1586 or next;
1587 $map->load;
1588
1589 delete $MAP_PREFETCH{$path};
1590 }
1591 }
1592 undef $MAP_PREFETCHER;
1593 };
1465 $MAP_PREFETCHER->ready; 1594 $MAP_PREFETCHER->prio (6);
1466 1595
1467 () 1596 ()
1468} 1597}
1469 1598
1470sub save { 1599sub save {
1530 my ($self) = @_; 1659 my ($self) = @_;
1531 1660
1532 $self->reset_at <= $cf::RUNTIME 1661 $self->reset_at <= $cf::RUNTIME
1533} 1662}
1534 1663
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 normalise $new_path;
1539
1540 $self->unlink_save;
1541
1542 delete $cf::MAP{$self->path};
1543 $self->{path} = $new_path; $self->path ($self->{path});
1544 $cf::MAP{$self->path} = $self;
1545
1546 $self->save;
1547}
1548
1549sub reset { 1664sub reset {
1550 my ($self) = @_; 1665 my ($self) = @_;
1551 1666
1552 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1667 my $lock = cf::lock_acquire "map_data:$self->{path}";
1553 1668
1554 return if $self->players; 1669 return if $self->players;
1555 return if $self->isa ("ext::map_per_player");#d# 1670 return if $self->isa ("ext::map_per_player");#d#
1556 1671
1557 warn "resetting map ", $self->path;#d# 1672 warn "resetting map ", $self->path;#d#
1558 1673
1674 $self->in_memory (cf::MAP_SWAPPED);
1675
1676 # need to save uniques path
1677 unless ($self->{deny_save}) {
1678 my $uniq = $self->uniq_path; utf8::encode $uniq;
1679
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1681 if $uniq;
1682 }
1683
1559 delete $cf::MAP{$self->path}; 1684 delete $cf::MAP{$self->path};
1560 1685
1561 $self->in_memory (cf::MAP_SWAPPED);
1562 $self->clear; 1686 $self->clear;
1563 1687
1564 $_->clear_links_to ($self) for values %cf::MAP; 1688 $_->clear_links_to ($self) for values %cf::MAP;
1565 1689
1566 $self->unlink_save; 1690 $self->unlink_save;
1570my $nuke_counter = "aaaa"; 1694my $nuke_counter = "aaaa";
1571 1695
1572sub nuke { 1696sub nuke {
1573 my ($self) = @_; 1697 my ($self) = @_;
1574 1698
1699 delete $cf::MAP{$self->path};
1700
1701 $self->unlink_save;
1702
1703 bless $self, "cf::map";
1704 delete $self->{deny_reset};
1575 $self->{deny_save} = 1; 1705 $self->{deny_save} = 1;
1576 $self->reset_timeout (1); 1706 $self->reset_timeout (1);
1577 $self->rename ("{nuke}/" . ($nuke_counter++)); 1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708
1709 $cf::MAP{$self->path} = $self;
1710
1578 $self->reset; # polite request, might not happen 1711 $self->reset; # polite request, might not happen
1579} 1712}
1580 1713
1581=item cf::map::unique_maps 1714=item cf::map::unique_maps
1582 1715
1594 for (@$files) { 1727 for (@$files) {
1595 utf8::decode $_; 1728 utf8::decode $_;
1596 next if /\.pst$/; 1729 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1730 next unless /^$PATH_SEP/o;
1598 1731
1599 s/\.map$//; 1732 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1733 }
1602 1734
1603 \@paths 1735 \@paths
1604} 1736}
1605 1737
1699=cut 1831=cut
1700 1832
1701sub link_map { 1833sub link_map {
1702 unless ($LINK_MAP) { 1834 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1835 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1836 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1837 $LINK_MAP->load;
1706 } 1838 }
1707 1839
1708 $LINK_MAP 1840 $LINK_MAP
1709} 1841}
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1848 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1849
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1851 if $self->map;
1720 1852
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1853 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1854}
1723 1855
1724sub cf::object::player::leave_link { 1856sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1857 my ($self, $map, $x, $y) = @_;
1726 1858
1748 $map->load; 1880 $map->load;
1749 $map->load_diag; 1881 $map->load_diag;
1750 1882
1751 return unless $self->contr->active; 1883 return unless $self->contr->active;
1752 $self->activate_recursive; 1884 $self->activate_recursive;
1885
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1887 $self->enter_map ($map, $x, $y);
1754} 1888}
1755 1889
1756cf::player->attach ( 1890cf::player->attach (
1757 on_logout => sub { 1891 on_logout => sub {
1770 # try to abort aborted map switching on player login :) 1904 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes 1905 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) { 1906 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link; 1907 $pl->ob->enter_link;
1774 (async { 1908 (async {
1775 # we need this sleep as the login has a concurrent enter_exit running
1776 # and this sleep increases chances of the player not ending up in scorn
1777 $pl->ob->reply (undef, 1909 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, " 1910 "There was an internal problem at your last logout, "
1779 . "the server will try to bring you to your intended destination in a second.", 1911 . "the server will try to bring you to your intended destination in a second.",
1780 cf::NDI_RED); 1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1781 Coro::Timer::sleep 1; 1915 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link; 1916 $pl->ob->leave_link;
1783 })->prio (2); 1917 })->prio (2);
1784 } 1918 }
1785 }, 1919 },
1793 my ($self, $path, $x, $y) = @_; 1927 my ($self, $path, $x, $y) = @_;
1794 1928
1795 $self->enter_link; 1929 $self->enter_link;
1796 1930
1797 (async { 1931 (async {
1932 my $map = eval {
1798 my $map = cf::map::find $path; 1933 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1934 $map = $map->customise_for ($self) if $map;
1800 1935 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1936 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1938
1806 $self->leave_link ($map, $x, $y); 1939 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1940 })->prio (1);
1808} 1941}
1809 1942
1813 1946
1814sub parse_random_map_params { 1947sub parse_random_map_params {
1815 my ($spec) = @_; 1948 my ($spec) = @_;
1816 1949
1817 my $rmp = { # defaults 1950 my $rmp = { # defaults
1818 xsize => 10, 1951 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1952 ysize => (cf::rndm 15, 40),
1953 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1954 #layout => string,
1820 }; 1955 };
1821 1956
1822 for (split /\n/, $spec) { 1957 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1958 my ($k, $v) = split /\s+/, $_, 2;
1824 1959
1828 $rmp 1963 $rmp
1829} 1964}
1830 1965
1831sub prepare_random_map { 1966sub prepare_random_map {
1832 my ($exit) = @_; 1967 my ($exit) = @_;
1968
1969 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1970
1834 # all this does is basically replace the /! path by 1971 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1972 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1973 # that depends on the exit object
1837 1974
1838 my $rmp = parse_random_map_params $exit->msg; 1975 my $rmp = parse_random_map_params $exit->msg;
1839 1976
1840 if ($exit->map) { 1977 if ($exit->map) {
1841 $rmp->{region} = $exit->map->region_name; 1978 $rmp->{region} = $exit->region->name;
1842 $rmp->{origin_map} = $exit->map->path; 1979 $rmp->{origin_map} = $exit->map->path;
1843 $rmp->{origin_x} = $exit->x; 1980 $rmp->{origin_x} = $exit->x;
1844 $rmp->{origin_y} = $exit->y; 1981 $rmp->{origin_y} = $exit->y;
1845 } 1982 }
1846 1983
1847 $rmp->{random_seed} ||= $exit->random_seed; 1984 $rmp->{random_seed} ||= $exit->random_seed;
1848 1985
1849 my $data = cf::to_json $rmp; 1986 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 1987 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1851 1989
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 1991 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh;
1993 aio_rename "$meta~", $meta;
1854 1994
1855 $exit->slaying ("?random/$md5"); 1995 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 1996 $exit->msg (undef);
1857 } 1997 }
1858} 1998}
1859 1999
1860sub cf::object::player::enter_exit { 2000sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 2001 my ($self, $exit) = @_;
1862 2002
1863 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
2004
2005 if ($exit->slaying eq "/!") {
2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
2009 cf::sync_job { prepare_random_map $exit };
2010 }
2011
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp;
1864 2015
1865 $self->enter_link; 2016 $self->enter_link;
1866 2017
1867 (async { 2018 (async {
1868 $self->deactivate_recursive; # just to be sure 2019 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 2020 unless (eval {
1870 prepare_random_map $exit 2021 $self->goto ($slaying, $hp, $sp);
1871 if $exit->slaying eq "/!";
1872
1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1875 2022
1876 1; 2023 1;
1877 }) { 2024 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1880 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1881 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1882 2029
1883 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1884 $self->leave_link; 2031 $self->leave_link;
1885 } 2032 }
1886 })->prio (1); 2033 })->prio (1);
1899 2046
1900sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1901 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1902 2049
1903 utf8::encode $text; 2050 utf8::encode $text;
1904 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1905} 2052}
1906 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1907 2066
1908=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1909 2068
1910Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1911the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1940 # get handled first 2099 # get handled first
1941 my $queue = delete $ns->{query_queue} 2100 my $queue = delete $ns->{query_queue}
1942 or return; # be conservative, not sure how that can happen, but we saw a crash here 2101 or return; # be conservative, not sure how that can happen, but we saw a crash here
1943 2102
1944 (shift @$queue)->[1]->($msg); 2103 (shift @$queue)->[1]->($msg);
2104 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1945 2105
1946 push @{ $ns->{query_queue} }, @$queue; 2106 push @{ $ns->{query_queue} }, @$queue;
1947 2107
1948 if (@{ $ns->{query_queue} } == @$queue) { 2108 if (@{ $ns->{query_queue} } == @$queue) {
1949 if (@$queue) { 2109 if (@$queue) {
2007 2167
2008# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2009 2169
2010=pod 2170=pod
2011 2171
2012The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2013 2173
2014 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2015 cf::object::player player 2175 cf::object::player player
2016 cf::player peaceful 2176 cf::player peaceful
2017 cf::map trigger 2177 cf::map trigger
2110The parameter C<$family> should best start with the name of the extension 2270The parameter C<$family> should best start with the name of the extension
2111using it, it should be unique. 2271using it, it should be unique.
2112 2272
2113=over 4 2273=over 4
2114 2274
2115=item $hashref = cf::db_get $family
2116
2117Return a hashref for use by the extension C<$family>, which can be
2118modified. After modifications, you have to call C<cf::db_dirty> or
2119C<cf::db_sync>.
2120
2121=item $value = cf::db_get $family => $key 2275=item $value = cf::db_get $family => $key
2122 2276
2123Returns a single value from the database 2277Returns a single value from the database.
2124
2125=item cf::db_put $family => $hashref
2126
2127Stores the given family hashref into the database. Updates are delayed, if
2128you want the data to be synced to disk immediately, use C<cf::db_sync>.
2129 2278
2130=item cf::db_put $family => $key => $value 2279=item cf::db_put $family => $key => $value
2131 2280
2132Stores the given C<$value> in the family hash. Updates are delayed, if you 2281Stores the given C<$value> in the family.
2133want the data to be synced to disk immediately, use C<cf::db_sync>.
2134
2135=item cf::db_dirty
2136
2137Marks the database as dirty, to be updated at a later time.
2138
2139=item cf::db_sync
2140
2141Immediately write the database to disk I<if it is dirty>.
2142 2282
2143=cut 2283=cut
2144 2284
2145our $DB; 2285our $DB;
2146 2286
2147{ 2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2148 my $path = cf::localdir . "/database.pst"; 2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2149 2306
2150 sub db_load() { 2307 cf::db_put (board => data => $pst->{board});
2151 $DB = stat $path ? Storable::retrieve $path : { }; 2308 cf::db_put (guildrules => data => $pst->{guildrules});
2152 } 2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2153 2311
2154 my $pid; 2312 unlink $path;
2155
2156 sub db_save() {
2157 waitpid $pid, 0 if $pid;
2158 if (0 == ($pid = fork)) {
2159 $DB->{_meta}{version} = 1;
2160 Storable::nstore $DB, "$path~";
2161 rename "$path~", $path;
2162 cf::_exit 0 if defined $pid;
2163 } 2313 };
2164 }
2165
2166 my $dirty;
2167
2168 sub db_sync() {
2169 db_save if $dirty;
2170 undef $dirty;
2171 }
2172
2173 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2174 db_sync;
2175 });
2176
2177 sub db_dirty() {
2178 $dirty = 1;
2179 $idle->start;
2180 }
2181
2182 sub db_get($;$) {
2183 @_ >= 2
2184 ? $DB->{$_[0]}{$_[1]}
2185 : ($DB->{$_[0]} ||= { })
2186 }
2187
2188 sub db_put($$;$) {
2189 if (@_ >= 3) {
2190 $DB->{$_[0]}{$_[1]} = $_[2];
2191 } else {
2192 $DB->{$_[0]} = $_[1];
2193 }
2194 db_dirty;
2195 }
2196
2197 cf::global->attach (
2198 prio => 10000,
2199 on_cleanup => sub {
2200 db_sync;
2201 }, 2314 }
2202 ); 2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2203} 2332}
2204 2333
2205############################################################################# 2334#############################################################################
2206# the server's main() 2335# the server's init and main functions
2336
2337sub load_facedata {
2338 my $path = sprintf "%s/facedata", cf::datadir;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2384 }
2385
2386 1
2387}
2388
2389our $archetypes_loaded;
2390
2391sub load_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir
2394}
2395
2396sub load_treasures {
2397 load_treasure_file sprintf "%s/treasures", cf::datadir
2398}
2399
2400sub reload_resources {
2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2402 or die "unable to load regions file\n";
2403 load_facedata
2404 or die "unable to load facedata\n";
2405 load_archetypes
2406 or die "unable to load archetypes\n";
2407 load_treasures
2408 or die "unable to load treasurelists\n";
2409}
2410
2411sub init {
2412 reload_resources;
2413}
2207 2414
2208sub cfg_load { 2415sub cfg_load {
2209 open my $fh, "<:utf8", cf::confdir . "/config" 2416 open my $fh, "<:utf8", cf::confdir . "/config"
2210 or return; 2417 or return;
2211 2418
2228 2435
2229sub main { 2436sub main {
2230 # we must not ever block the main coroutine 2437 # we must not ever block the main coroutine
2231 local $Coro::idle = sub { 2438 local $Coro::idle = sub {
2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2439 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2440 (async {
2233 async { Event::one_event }; 2441 Event::one_event;
2442 })->prio (Coro::PRIO_MAX);
2234 }; 2443 };
2235 2444
2236 cfg_load; 2445 cfg_load;
2237 db_load; 2446 db_init;
2238 load_extensions; 2447 load_extensions;
2448
2449 $TICK_WATCHER->start;
2239 Event::loop; 2450 Event::loop;
2240} 2451}
2241 2452
2242############################################################################# 2453#############################################################################
2243# initialisation and cleanup 2454# initialisation and cleanup
2244 2455
2245# install some emergency cleanup handlers 2456# install some emergency cleanup handlers
2246BEGIN { 2457BEGIN {
2247 for my $signal (qw(INT HUP TERM)) { 2458 for my $signal (qw(INT HUP TERM)) {
2248 Event->signal ( 2459 Event->signal (
2460 reentrant => 0,
2249 data => WF_AUTOCANCEL, 2461 data => WF_AUTOCANCEL,
2250 signal => $signal, 2462 signal => $signal,
2463 prio => 0,
2251 cb => sub { 2464 cb => sub {
2252 cf::cleanup "SIG$signal"; 2465 cf::cleanup "SIG$signal";
2253 }, 2466 },
2254 ); 2467 );
2255 } 2468 }
2256} 2469}
2277 my $map = $cf::MAP{$path} or next; 2490 my $map = $cf::MAP{$path} or next;
2278 $map->valid or next; 2491 $map->valid or next;
2279 $map->save; 2492 $map->save;
2280 } 2493 }
2281 warn "end emergency map save\n"; 2494 warn "end emergency map save\n";
2495
2496 warn "begin emergency database checkpoint\n";
2497 BDB::db_env_txn_checkpoint $DB_ENV;
2498 warn "end emergency database checkpoint\n";
2282 }; 2499 };
2283 2500
2284 warn "leave emergency perl save\n"; 2501 warn "leave emergency perl save\n";
2502}
2503
2504sub post_cleanup {
2505 my ($make_core) = @_;
2506
2507 warn Carp::longmess "post_cleanup backtrace"
2508 if $make_core;
2285} 2509}
2286 2510
2287sub reload() { 2511sub reload() {
2288 # can/must only be called in main 2512 # can/must only be called in main
2289 if ($Coro::current != $Coro::main) { 2513 if ($Coro::current != $Coro::main) {
2290 warn "can only reload from main coroutine\n"; 2514 warn "can only reload from main coroutine";
2291 return; 2515 return;
2292 } 2516 }
2293 2517
2294 warn "reloading..."; 2518 warn "reloading...";
2295 2519
2296 warn "freezing server"; 2520 warn "entering sync_job";
2297 my $guard = freeze_mainloop; 2521
2522 cf::sync_job {
2523 cf::write_runtime; # external watchdog should not bark
2298 cf::emergency_save; 2524 cf::emergency_save;
2525 cf::write_runtime; # external watchdog should not bark
2299 2526
2300 warn "sync database to disk"; 2527 warn "syncing database to disk";
2301 cf::db_sync; 2528 BDB::db_env_txn_checkpoint $DB_ENV;
2302 IO::AIO::flush;
2303 2529
2304 eval {
2305 # if anything goes wrong in here, we should simply crash as we already saved 2530 # if anything goes wrong in here, we should simply crash as we already saved
2306 2531
2307 warn "cancel all watchers"; 2532 warn "cancelling all WF_AUTOCANCEL watchers";
2308 for (Event::all_watchers) { 2533 for (Event::all_watchers) {
2309 $_->cancel if $_->data & WF_AUTOCANCEL; 2534 $_->cancel if $_->data & WF_AUTOCANCEL;
2310 } 2535 }
2311 2536
2537 warn "flushing outstanding aio requests";
2538 for (;;) {
2539 BDB::flush;
2540 IO::AIO::flush;
2541 Coro::cede;
2542 last unless IO::AIO::nreqs || BDB::nreqs;
2543 warn "iterate...";
2544 }
2545
2546 ++$RELOAD;
2547
2312 warn "cancel all extension coros"; 2548 warn "cancelling all extension coros";
2313 $_->cancel for values %EXT_CORO; 2549 $_->cancel for values %EXT_CORO;
2314 %EXT_CORO = (); 2550 %EXT_CORO = ();
2315 2551
2316 warn "remove commands"; 2552 warn "removing commands";
2317 %COMMAND = (); 2553 %COMMAND = ();
2318 2554
2319 warn "remove ext commands"; 2555 warn "removing ext commands";
2320 %EXTCMD = (); 2556 %EXTCMD = ();
2321 2557
2322 warn "unload/nuke all extensions"; 2558 warn "unloading/nuking all extensions";
2323 for my $pkg (@EXTS) { 2559 for my $pkg (@EXTS) {
2324 warn "... unloading $pkg"; 2560 warn "... unloading $pkg";
2325 2561
2326 if (my $cb = $pkg->can ("unload")) { 2562 if (my $cb = $pkg->can ("unload")) {
2327 eval { 2563 eval {
2332 2568
2333 warn "... nuking $pkg"; 2569 warn "... nuking $pkg";
2334 Symbol::delete_package $pkg; 2570 Symbol::delete_package $pkg;
2335 } 2571 }
2336 2572
2337 warn "unload all perl modules loaded from $LIBDIR"; 2573 warn "unloading all perl modules loaded from $LIBDIR";
2338 while (my ($k, $v) = each %INC) { 2574 while (my ($k, $v) = each %INC) {
2339 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2575 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2340 2576
2341 warn "removing <$k>"; 2577 warn "... unloading $k";
2342 delete $INC{$k}; 2578 delete $INC{$k};
2343 2579
2344 $k =~ s/\.pm$//; 2580 $k =~ s/\.pm$//;
2345 $k =~ s/\//::/g; 2581 $k =~ s/\//::/g;
2346 2582
2349 } 2585 }
2350 2586
2351 Symbol::delete_package $k; 2587 Symbol::delete_package $k;
2352 } 2588 }
2353 2589
2354 warn "get rid of safe::, as good as possible"; 2590 warn "getting rid of safe::, as good as possible";
2355 Symbol::delete_package "safe::$_" 2591 Symbol::delete_package "safe::$_"
2356 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2592 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2357 2593
2358 warn "unload cf.pm \"a bit\""; 2594 warn "unloading cf.pm \"a bit\"";
2359 delete $INC{"cf.pm"}; 2595 delete $INC{"cf.pm"};
2360 2596
2361 # don't, removes xs symbols, too, 2597 # don't, removes xs symbols, too,
2362 # and global variables created in xs 2598 # and global variables created in xs
2363 #Symbol::delete_package __PACKAGE__; 2599 #Symbol::delete_package __PACKAGE__;
2364 2600
2601 warn "unload completed, starting to reload now";
2602
2365 warn "reloading cf.pm"; 2603 warn "reloading cf.pm";
2366 require cf; 2604 require cf;
2367 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2605 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2368 2606
2369 warn "load config and database again"; 2607 warn "loading config and database again";
2370 cf::cfg_load; 2608 cf::cfg_load;
2371 cf::db_load;
2372 2609
2373 warn "load extensions"; 2610 warn "loading extensions";
2374 cf::load_extensions; 2611 cf::load_extensions;
2375 2612
2376 warn "reattach attachments to objects/players"; 2613 warn "reattaching attachments to objects/players";
2377 _global_reattach; 2614 _global_reattach; # objects, sockets
2378 warn "reattach attachments to maps"; 2615 warn "reattaching attachments to maps";
2379 reattach $_ for values %MAP; 2616 reattach $_ for values %MAP;
2380 }; 2617 warn "reattaching attachments to players";
2618 reattach $_ for values %PLAYER;
2381 2619
2382 if ($@) { 2620 warn "loading reloadable resources";
2621 reload_resources;
2622
2623 warn "leaving sync_job";
2624
2625 1
2626 } or do {
2383 warn $@; 2627 warn $@;
2384 warn "error while reloading, exiting."; 2628 warn "error while reloading, exiting.";
2385 exit 1; 2629 exit 1;
2386 } 2630 };
2387 2631
2388 warn "reloaded"; 2632 warn "reloaded";
2389}; 2633};
2390 2634
2635our $RELOAD_WATCHER; # used only during reload
2636
2391register_command "reload" => sub { 2637register_command "reload" => sub {
2392 my ($who, $arg) = @_; 2638 my ($who, $arg) = @_;
2393 2639
2394 if ($who->flag (FLAG_WIZ)) { 2640 if ($who->flag (FLAG_WIZ)) {
2395 $who->message ("start of reload."); 2641 $who->message ("reloading server.");
2642
2643 # doing reload synchronously and two reloads happen back-to-back,
2644 # coro crashes during coro_state_free->destroy here.
2645
2646 $RELOAD_WATCHER ||= Event->timer (
2647 reentrant => 0,
2648 after => 0,
2649 data => WF_AUTOCANCEL,
2650 cb => sub {
2396 reload; 2651 reload;
2397 $who->message ("end of reload."); 2652 undef $RELOAD_WATCHER;
2653 },
2654 );
2398 } 2655 }
2399}; 2656};
2400 2657
2401unshift @INC, $LIBDIR; 2658unshift @INC, $LIBDIR;
2659
2660my $bug_warning = 0;
2661
2662our @WAIT_FOR_TICK;
2663our @WAIT_FOR_TICK_BEGIN;
2664
2665sub wait_for_tick {
2666 return unless $TICK_WATCHER->is_active;
2667 return if $Coro::current == $Coro::main;
2668
2669 my $signal = new Coro::Signal;
2670 push @WAIT_FOR_TICK, $signal;
2671 $signal->wait;
2672}
2673
2674sub wait_for_tick_begin {
2675 return unless $TICK_WATCHER->is_active;
2676 return if $Coro::current == $Coro::main;
2677
2678 my $signal = new Coro::Signal;
2679 push @WAIT_FOR_TICK_BEGIN, $signal;
2680 $signal->wait;
2681}
2402 2682
2403$TICK_WATCHER = Event->timer ( 2683$TICK_WATCHER = Event->timer (
2404 reentrant => 0, 2684 reentrant => 0,
2685 parked => 1,
2405 prio => 0, 2686 prio => 0,
2406 at => $NEXT_TICK || $TICK, 2687 at => $NEXT_TICK || $TICK,
2407 data => WF_AUTOCANCEL, 2688 data => WF_AUTOCANCEL,
2408 cb => sub { 2689 cb => sub {
2690 if ($Coro::current != $Coro::main) {
2691 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2692 unless ++$bug_warning > 10;
2693 return;
2694 }
2695
2409 $NOW = Event::time; 2696 $NOW = Event::time;
2410 2697
2411 cf::server_tick; # one server iteration 2698 cf::server_tick; # one server iteration
2412 $RUNTIME += $TICK; 2699 $RUNTIME += $TICK;
2413 $NEXT_TICK += $TICK; 2700 $NEXT_TICK += $TICK;
2414 2701
2415 $WAIT_FOR_TICK->broadcast; 2702 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2416 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2703 $NEXT_RUNTIME_WRITE = $NOW + 10;
2704 Coro::async_pool {
2705 write_runtime
2706 or warn "ERROR: unable to write runtime file: $!";
2707 };
2708 }
2709
2710 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2711 $sig->send;
2712 }
2713 while (my $sig = shift @WAIT_FOR_TICK) {
2714 $sig->send;
2715 }
2716
2717# my $AFTER = Event::time;
2718# warn $AFTER - $NOW;#d#
2417 2719
2418 # if we are delayed by four ticks or more, skip them all 2720 # if we are delayed by four ticks or more, skip them all
2419 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2721 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2420 2722
2421 $TICK_WATCHER->at ($NEXT_TICK); 2723 $TICK_WATCHER->at ($NEXT_TICK);
2422 $TICK_WATCHER->start; 2724 $TICK_WATCHER->start;
2423 }, 2725 },
2424); 2726);
2425 2727
2728{
2729 BDB::max_poll_time $TICK * 0.1;
2730 $BDB_POLL_WATCHER = Event->io (
2731 reentrant => 0,
2732 fd => BDB::poll_fileno,
2733 poll => 'r',
2734 prio => 0,
2735 data => WF_AUTOCANCEL,
2736 cb => \&BDB::poll_cb,
2737 );
2738 BDB::min_parallel 8;
2739
2740 BDB::set_sync_prepare {
2741 my $status;
2742 my $current = $Coro::current;
2743 (
2744 sub {
2745 $status = $!;
2746 $current->ready; undef $current;
2747 },
2748 sub {
2749 Coro::schedule while defined $current;
2750 $! = $status;
2751 },
2752 )
2753 };
2754
2755 unless ($DB_ENV) {
2756 $DB_ENV = BDB::db_env_create;
2757
2758 cf::sync_job {
2759 eval {
2760 BDB::db_env_open
2761 $DB_ENV,
2762 $BDB_ENV_DIR,
2763 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2764 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2765 0666;
2766
2767 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2768
2769 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2770 $DB_ENV->set_lk_detect;
2771 };
2772
2773 cf::cleanup "db_env_open(db): $@" if $@;
2774 };
2775 }
2776}
2777
2778{
2779 IO::AIO::min_parallel 8;
2780
2781 undef $Coro::AIO::WATCHER;
2426IO::AIO::max_poll_time $TICK * 0.2; 2782 IO::AIO::max_poll_time $TICK * 0.1;
2427
2428$AIO_POLL_WATCHER = Event->io ( 2783 $AIO_POLL_WATCHER = Event->io (
2429 fd => IO::AIO::poll_fileno, 2784 reentrant => 0,
2430 poll => 'r',
2431 prio => 5,
2432 data => WF_AUTOCANCEL,
2433 cb => \&IO::AIO::poll_cb,
2434);
2435
2436$WRITE_RUNTIME_WATCHER = Event->timer (
2437 data => WF_AUTOCANCEL, 2785 data => WF_AUTOCANCEL,
2438 after => 0, 2786 fd => IO::AIO::poll_fileno,
2439 interval => 10, 2787 poll => 'r',
2440 cb => sub { 2788 prio => 6,
2441 (Coro::unblock_sub { 2789 cb => \&IO::AIO::poll_cb,
2442 write_runtime 2790 );
2443 or warn "ERROR: unable to write runtime file: $!"; 2791}
2444 })->();
2445 },
2446);
2447 2792
2448END { cf::emergency_save } 2793END { cf::emergency_save }
2449 2794
24501 27951
2451 2796

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines