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.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.138 by root, Fri Jan 5 17:07:17 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
186=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
187 235
188The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 237always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 238reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 245=cut
198 246
199sub sync_job(&) { 247sub sync_job(&) {
200 my ($job) = @_; 248 my ($job) = @_;
201 249
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 250 if ($Coro::current == $Coro::main) {
251 # this is the main coro, too bad, we have to block
252 # till the operation succeeds, freezing the server :/
253
212 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 255 # (but this is cancel-safe)
256 my $freeze_guard = freeze_mainloop;
257
258 my $busy = 1;
259 my @res;
260
261 (Coro::async_pool {
262 @res = eval { $job->() };
263 warn $@ if $@;
264 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
266
215 while ($busy) { 267 while ($busy) {
216 Coro::cede_notself; 268 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 269 Event::one_event unless Coro::nready;
218 } 270 }
271
272 wantarray ? @res : $res[0]
219 } else { 273 } else {
220 $coro->join; 274 # we are in another coroutine, how wonderful, everything just works
275
276 $job->()
221 } 277 }
222
223 wantarray ? @res : $res[0]
224} 278}
225 279
226=item $coro = cf::coro { BLOCK } 280=item $coro = cf::coro { BLOCK }
227 281
228Creates and returns a new coro. This coro is automcatially being canceled 282Creates (and readies) and returns a new coro. This coro is automcatially
229when the extension calling this is being unloaded. 283being canceled when the extension calling this is being unloaded.
230 284
231=cut 285=cut
232 286
233sub coro(&) { 287sub coro(&) {
234 my $cb = shift; 288 my $cb = shift;
235 289
236 my $coro; $coro = async { 290 my $coro = &Coro::async_pool ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 291
243 $coro->on_destroy (sub { 292 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 293 delete $EXT_CORO{$coro+0};
245 }); 294 });
246 $EXT_CORO{$coro+0} = $coro; 295 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 301 my $runtime = cf::localdir . "/runtime";
253 302
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 303 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 304 or return;
256 305
257 my $value = $cf::RUNTIME; 306 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 307 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 308 and return;
260 309
261 aio_fsync $fh 310 aio_fsync $fh
262 and return; 311 and return;
… …
283 332
284 $path = $path->as_string if ref $path; 333 $path = $path->as_string if ref $path;
285 334
286 my $self = bless { }, $class; 335 my $self = bless { }, $class;
287 336
337 # {... are special paths that are not touched
338 # ?xxx/... are special absolute paths
339 # ?random/... random maps
340 # /! non-realised random map exit
341 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user
344
345 if ($path =~ /^{/) {
346 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 347 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 349 $self->{random} = cf::from_json $data;
291 } else { 350 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 351 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 352 $self->{user_rel} = 1;
… …
798 or return; 857 or return;
799 858
800 unless (aio_stat "$filename.pst") { 859 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 860 (aio_load "$filename.pst", $av) >= 0
802 or return; 861 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 862 $av = eval { (Storable::thaw $av)->{objs} };
804 } 863 }
805 864
865 warn sprintf "loading %s (%d)\n",
866 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 867 return ($data, $av);
807} 868}
808 869
809############################################################################# 870#############################################################################
810# command handling &c 871# command handling &c
… …
1044package cf::map; 1105package cf::map;
1045 1106
1046use Fcntl; 1107use Fcntl;
1047use Coro::AIO; 1108use Coro::AIO;
1048 1109
1049our $MAX_RESET = 7200; 1110our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1111our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1112
1054sub generate_random_map { 1113sub generate_random_map {
1055 my ($path, $rmp) = @_; 1114 my ($path, $rmp) = @_;
1056 1115
1057 # mit "rum" bekleckern, nicht 1116 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1132# and all this just because we cannot iterate over
1074# all maps in C++... 1133# all maps in C++...
1075sub change_all_map_light { 1134sub change_all_map_light {
1076 my ($change) = @_; 1135 my ($change) = @_;
1077 1136
1078 $_->change_map_light ($change) for values %cf::MAP; 1137 $_->change_map_light ($change)
1138 for grep $_->outdoor, values %cf::MAP;
1079} 1139}
1080 1140
1081sub try_load_header($) { 1141sub try_load_header($) {
1082 my ($path) = @_; 1142 my ($path) = @_;
1083 1143
… …
1086 or return; 1146 or return;
1087 1147
1088 my $map = cf::map::new 1148 my $map = cf::map::new
1089 or return; 1149 or return;
1090 1150
1151 # for better error messages only, will be overwritten
1152 $map->path ($path);
1153
1091 $map->load_header ($path) 1154 $map->load_header ($path)
1092 or return; 1155 or return;
1093 1156
1094 $map->{load_path} = $path; 1157 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1158
1097 $map 1159 $map
1098} 1160}
1099 1161
1162sub find;
1100sub find_map { 1163sub find {
1101 my ($path, $origin) = @_; 1164 my ($path, $origin) = @_;
1102 1165
1103 #warn "find_map<$path,$origin>\n";#d# 1166 #warn "find<$path,$origin>\n";#d#
1104 1167
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1168 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1169 my $key = $path->as_string;
1107 1170
1171 cf::lock_wait "map_find:$key";
1172
1108 $cf::MAP{$key} || do { 1173 $cf::MAP{$key} || do {
1174 my $guard = cf::lock_acquire "map_find:$key";
1175
1109 # do it the slow way 1176 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1177 my $map = try_load_header $path->save_path;
1111 1178
1179 Coro::cede;
1180
1112 if ($map) { 1181 if ($map) {
1182 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d#
1113 # safety 1184 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1185 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1186 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1187 } else {
1117 if (my $rmp = $path->random_map_params) { 1188 if (my $rmp = $path->random_map_params) {
… …
1122 1193
1123 $map or return; 1194 $map or return;
1124 1195
1125 $map->{load_original} = 1; 1196 $map->{load_original} = 1;
1126 $map->{instantiate_time} = $cf::RUNTIME; 1197 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME);
1127 $map->instantiate; 1199 $map->instantiate;
1128 1200
1129 # per-player maps become, after loading, normal maps 1201 # per-player maps become, after loading, normal maps
1130 $map->per_player (0) if $path->{user_rel}; 1202 $map->per_player (0) if $path->{user_rel};
1131 } 1203 }
1132 1204
1133 $map->path ($key); 1205 $map->path ($key);
1134 $map->{path} = $path; 1206 $map->{path} = $path;
1135 $map->last_access ($cf::RUNTIME); 1207 $map->{last_save} = $cf::RUNTIME;
1136 1208
1209 Coro::cede;
1210
1137 $map->reset if $map->should_reset; 1211 if ($map->should_reset) {
1212 $map->reset;
1213 undef $guard;
1214 $map = find $path
1215 or return;
1216 }
1138 1217
1139 $cf::MAP{$key} = $map 1218 $cf::MAP{$key} = $map
1140 } 1219 }
1141} 1220}
1142 1221
1143sub load { 1222sub load {
1144 my ($self) = @_; 1223 my ($self) = @_;
1145 1224
1225 my $path = $self->{path};
1226 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1227
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1228 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1229
1148 $self->in_memory (cf::MAP_LOADING); 1230 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1231
1152 $self->alloc; 1232 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1233 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1234 or return;
1155 1235
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1236 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1237 if delete $self->{load_original};
1157 1238
1158 if (my $uniq = $path->uniq_path) { 1239 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1240 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1241 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1242 $self->clear_unique_items;
1162 $self->load_objects ($uniq, 0); 1243 $self->load_objects ($uniq, 0);
1163 } 1244 }
1164 } 1245 }
1246
1247 Coro::cede;
1165 1248
1166 # now do the right thing for maps 1249 # now do the right thing for maps
1167 $self->link_multipart_objects; 1250 $self->link_multipart_objects;
1168 1251
1169 if ($self->{path}->is_style_map) { 1252 if ($self->{path}->is_style_map) {
… …
1177 $self->difficulty ($self->estimate_difficulty) 1260 $self->difficulty ($self->estimate_difficulty)
1178 unless $self->difficulty; 1261 unless $self->difficulty;
1179 $self->activate; 1262 $self->activate;
1180 } 1263 }
1181 1264
1265 Coro::cede;
1266
1182 $self->in_memory (cf::MAP_IN_MEMORY); 1267 $self->in_memory (cf::MAP_IN_MEMORY);
1183} 1268}
1184 1269
1185sub load_map_sync { 1270sub find_sync {
1186 my ($path, $origin) = @_; 1271 my ($path, $origin) = @_;
1187 1272
1188 #warn "load_map_sync<$path, $origin>\n";#d# 1273 cf::sync_job { cf::map::find $path, $origin }
1274}
1189 1275
1190 cf::sync_job { 1276sub do_load_sync {
1191 my $map = cf::map::find_map $path, $origin 1277 my ($map) = @_;
1192 or return; 1278
1193 $map->load; 1279 cf::sync_job { $map->load };
1194 $map
1195 }
1196} 1280}
1197 1281
1198sub save { 1282sub save {
1199 my ($self) = @_; 1283 my ($self) = @_;
1200 1284
1285 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286
1287 $self->{last_save} = $cf::RUNTIME;
1288
1289 return unless $self->dirty;
1290
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1291 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1292 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1293
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1294 $self->{load_path} = $save;
1209 1295
1210 return if $self->{deny_save}; 1296 return if $self->{deny_save};
1211 1297
1212 warn "saving map ", $self->path; 1298 local $self->{last_access} = $self->last_access;#d#
1213 1299
1214 if ($uniq) { 1300 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1302 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1303 } else {
… …
1220} 1306}
1221 1307
1222sub swap_out { 1308sub swap_out {
1223 my ($self) = @_; 1309 my ($self) = @_;
1224 1310
1311 # save first because save cedes
1312 $self->save;
1313
1314 my $lock = cf::lock_acquire "map_data:" . $self->path;
1315
1225 return if $self->players; 1316 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1317 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1318 return if $self->{deny_save};
1228 1319
1229 $self->save;
1230 $self->clear; 1320 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1321 $self->in_memory (cf::MAP_SWAPPED);
1232} 1322}
1233 1323
1324sub reset_at {
1325 my ($self) = @_;
1326
1327 # TODO: safety, remove and allow resettable per-player maps
1328 return 1e99 if $self->{path}{user_rel};
1329 return 1e99 if $self->{deny_reset};
1330
1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1333
1334 $time + $to
1335}
1336
1234sub should_reset { 1337sub should_reset {
1235 my ($map) = @_; 1338 my ($self) = @_;
1236 1339
1237 # TODO: safety, remove and allow resettable per-player maps 1340 $self->reset_at <= $cf::RUNTIME
1238 return if $map->{path}{user_rel};#d#
1239 return if $map->{deny_reset};
1240 #return unless $map->reset_timeout;
1241
1242 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243 my $to = $map->reset_timeout || $DEFAULT_RESET;
1244 $to = $MAX_RESET if $to > $MAX_RESET;
1245
1246 $time + $to < $cf::RUNTIME
1247} 1341}
1248 1342
1249sub unlink_save { 1343sub unlink_save {
1250 my ($self) = @_; 1344 my ($self) = @_;
1251 1345
1252 utf8::encode (my $save = $self->{path}->save_path); 1346 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1349}
1256 1350
1351sub rename {
1352 my ($self, $new_path) = @_;
1353
1354 $self->unlink_save;
1355
1356 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self;
1360
1361 $self->save;
1362}
1363
1257sub reset { 1364sub reset {
1258 my ($self) = @_; 1365 my ($self) = @_;
1259 1366
1367 my $lock = cf::lock_acquire "map_data:" . $self->path;
1368
1260 return if $self->players; 1369 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1370 return if $self->{path}{user_rel};#d#
1262 1371
1263 warn "resetting map ", $self->path;#d# 1372 warn "resetting map ", $self->path;#d#
1264 1373
… …
1268 1377
1269 $self->unlink_save; 1378 $self->unlink_save;
1270 $self->destroy; 1379 $self->destroy;
1271} 1380}
1272 1381
1382my $nuke_counter = "aaaa";
1383
1384sub nuke {
1385 my ($self) = @_;
1386
1387 $self->{deny_save} = 1;
1388 $self->reset_timeout (1);
1389 $self->rename ("{nuke}/" . ($nuke_counter++));
1390 $self->reset; # polite request, might not happen
1391}
1392
1273sub customise_for { 1393sub customise_for {
1274 my ($map, $ob) = @_; 1394 my ($map, $ob) = @_;
1275 1395
1276 if ($map->per_player) { 1396 if ($map->per_player) {
1277 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1278 } 1398 }
1279 1399
1280 $map 1400 $map
1281} 1401}
1282 1402
1283sub emergency_save { 1403sub emergency_save {
1284 local $cf::FREEZE = 1; 1404 my $freeze_guard = cf::freeze_mainloop;
1285 1405
1286 warn "enter emergency map save\n"; 1406 warn "enter emergency map save\n";
1287 1407
1288 cf::sync_job { 1408 cf::sync_job {
1289 warn "begin emergency map save\n"; 1409 warn "begin emergency map save\n";
… …
1340 (ref $cf::CFG{"may_$access"} 1460 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1461 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1462 : $cf::CFG{"may_$access"})
1343} 1463}
1344 1464
1465=item $player_object->enter_link
1466
1467Freezes the player and moves him/her to a special map (C<{link}>).
1468
1469The player should be reaosnably safe there for short amounts of time. You
1470I<MUST> call C<leave_link> as soon as possible, though.
1471
1472=item $player_object->leave_link ($map, $x, $y)
1473
1474Moves the player out of the specila link map onto the given map. If the
1475map is not valid (or omitted), the player will be moved back to the
1476location he/she was before the call to C<enter_link>, or, if that fails,
1477to the emergency map position.
1478
1479Might block.
1480
1481=cut
1482
1345sub cf::object::player::enter_link { 1483sub cf::object::player::enter_link {
1346 my ($self) = @_; 1484 my ($self) = @_;
1347 1485
1486 $self->deactivate_recursive;
1487
1348 return if $self->map == $LINK_MAP; 1488 return if $self->map == $LINK_MAP;
1349 1489
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1491 if $self->map;
1352 1492
1353 $self->enter_map ($LINK_MAP, 20, 20); 1493 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1494}
1356 1495
1357sub cf::object::player::leave_link { 1496sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1497 my ($self, $map, $x, $y) = @_;
1359 1498
1360 my $link_pos = delete $self->{_link_pos}; 1499 my $link_pos = delete $self->{_link_pos};
1361 1500
1362 unless ($map) { 1501 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1502 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1503 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1504 $map = cf::map::find $map;
1368 1505
1369 unless ($map) { 1506 unless ($map) {
1370 ($map, $x, $y) = @$EMERGENCY_POSITION; 1507 ($map, $x, $y) = @$EMERGENCY_POSITION;
1371 $map = cf::map::find_map $map 1508 $map = cf::map::find $map
1372 or die "FATAL: cannot load emergency map\n"; 1509 or die "FATAL: cannot load emergency map\n";
1373 } 1510 }
1374 } 1511 }
1375 1512
1376 ($x, $y) = (-1, -1) 1513 ($x, $y) = (-1, -1)
… …
1384 1521
1385 $self->activate_recursive; 1522 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1523 $self->enter_map ($map, $x, $y);
1387} 1524}
1388 1525
1526cf::player->attach (
1527 on_logout => sub {
1528 my ($pl) = @_;
1529
1530 # abort map switching before logout
1531 if ($pl->ob->{_link_pos}) {
1532 cf::sync_job {
1533 $pl->ob->leave_link
1534 };
1535 }
1536 },
1537 on_login => sub {
1538 my ($pl) = @_;
1539
1540 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link;
1544 Coro::async_pool {
1545 # we need this sleep as the login has a concurrent enter_exit running
1546 # and this sleep increases chances of the player not ending up in scorn
1547 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link;
1549 };
1550 }
1551 },
1552);
1553
1389=item $player_object->goto_map ($map, $x, $y) 1554=item $player_object->goto ($path, $x, $y)
1390 1555
1391=cut 1556=cut
1392 1557
1393sub cf::object::player::goto_map { 1558sub cf::object::player::goto {
1394 my ($self, $path, $x, $y) = @_; 1559 my ($self, $path, $x, $y) = @_;
1395 1560
1396 $self->enter_link; 1561 $self->enter_link;
1397 1562
1398 (Coro::async { 1563 (Coro::async_pool {
1399 $path = new cf::path $path; 1564 $path = new cf::path $path;
1400 1565
1401 my $map = cf::map::find_map $path->as_string; 1566 my $map = cf::map::find $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1567 $map = $map->customise_for ($self) if $map;
1403 1568
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1569# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1570# if $map;
1571
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1573
1407 $self->leave_link ($map, $x, $y); 1574 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1575 })->prio (1);
1409} 1576}
1410 1577
… …
1463 1630
1464 return unless $self->type == cf::PLAYER; 1631 return unless $self->type == cf::PLAYER;
1465 1632
1466 $self->enter_link; 1633 $self->enter_link;
1467 1634
1468 (Coro::async { 1635 (Coro::async_pool {
1636 $self->deactivate_recursive; # just to be sure
1469 unless (eval { 1637 unless (eval {
1470
1471 prepare_random_map $exit 1638 prepare_random_map $exit
1472 if $exit->slaying eq "/!"; 1639 if $exit->slaying eq "/!";
1473 1640
1474 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1476 1643
1477 1; 1644 1;
1478 }) { 1645 }) {
1479 $self->message ("Something went wrong deep within the crossfire server. " 1646 $self->message ("Something went wrong deep within the crossfire server. "
1480 . "I'll try to bring you back to the map you were before. " 1647 . "I'll try to bring you back to the map you were before. "
… …
1537 on_reply => sub { 1704 on_reply => sub {
1538 my ($ns, $msg) = @_; 1705 my ($ns, $msg) = @_;
1539 1706
1540 # this weird shuffling is so that direct followup queries 1707 # this weird shuffling is so that direct followup queries
1541 # get handled first 1708 # get handled first
1542 my $queue = delete $ns->{query_queue}; 1709 my $queue = delete $ns->{query_queue}
1710 or return; # be conservative, not sure how that can happen, but we saw a crash here
1543 1711
1544 (shift @$queue)->[1]->($msg); 1712 (shift @$queue)->[1]->($msg);
1545 1713
1546 push @{ $ns->{query_queue} }, @$queue; 1714 push @{ $ns->{query_queue} }, @$queue;
1547 1715
… …
1564=cut 1732=cut
1565 1733
1566sub cf::client::coro { 1734sub cf::client::coro {
1567 my ($self, $cb) = @_; 1735 my ($self, $cb) = @_;
1568 1736
1569 my $coro; $coro = async { 1737 my $coro = &Coro::async_pool ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 1738
1576 $coro->on_destroy (sub { 1739 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 1740 delete $self->{_coro}{$coro+0};
1578 }); 1741 });
1579 1742
… …
1751 1914
1752{ 1915{
1753 my $path = cf::localdir . "/database.pst"; 1916 my $path = cf::localdir . "/database.pst";
1754 1917
1755 sub db_load() { 1918 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1919 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1920 }
1759 1921
1760 my $pid; 1922 my $pid;
1761 1923
1762 sub db_save() { 1924 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1925 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1926 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1927 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1928 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1929 rename "$path~", $path;
… …
1816 open my $fh, "<:utf8", cf::confdir . "/config" 1977 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 1978 or return;
1818 1979
1819 local $/; 1980 local $/;
1820 *CFG = YAML::Syck::Load <$fh>; 1981 *CFG = YAML::Syck::Load <$fh>;
1982
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984
1985 if (exists $CFG{mlockall}) {
1986 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall
1988 and die "WARNING: m(un)lockall failed: $!\n";
1989 };
1990 warn $@ if $@;
1991 }
1821} 1992}
1822 1993
1823sub main { 1994sub main {
1824 # we must not ever block the main coroutine 1995 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 1996 local $Coro::idle = sub {
1826 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827 (Coro::unblock_sub { 1998 (Coro::unblock_sub {
1828 Event::one_event; 1999 Event::one_event;
1829 })->(); 2000 })->();
1830 }; 2001 };
1831 2002
… …
1845 return; 2016 return;
1846 } 2017 }
1847 2018
1848 warn "reloading..."; 2019 warn "reloading...";
1849 2020
1850 local $FREEZE = 1; 2021 my $guard = freeze_mainloop;
1851 cf::emergency_save; 2022 cf::emergency_save;
1852 2023
1853 eval { 2024 eval {
1854 # if anything goes wrong in here, we should simply crash as we already saved 2025 # if anything goes wrong in here, we should simply crash as we already saved
1855 2026
… …
1991 reentrant => 0, 2162 reentrant => 0,
1992 prio => 0, 2163 prio => 0,
1993 at => $NEXT_TICK || $TICK, 2164 at => $NEXT_TICK || $TICK,
1994 data => WF_AUTOCANCEL, 2165 data => WF_AUTOCANCEL,
1995 cb => sub { 2166 cb => sub {
1996 unless ($FREEZE) {
1997 cf::server_tick; # one server iteration 2167 cf::server_tick; # one server iteration
1998 $RUNTIME += $TICK; 2168 $RUNTIME += $TICK;
1999 }
2000
2001 $NEXT_TICK += $TICK; 2169 $NEXT_TICK += $TICK;
2002 2170
2003 # if we are delayed by four ticks or more, skip them all 2171 # if we are delayed by four ticks or more, skip them all
2004 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005 2173
… …
2028 or warn "ERROR: unable to write runtime file: $!"; 2196 or warn "ERROR: unable to write runtime file: $!";
2029 })->(); 2197 })->();
2030 }, 2198 },
2031); 2199);
2032 2200
2201END { cf::emergency_save }
2202
20331 22031
2034 2204

Diff Legend

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