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.136 by root, Fri Jan 5 01:06:28 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
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active;
244
245 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop;
247 $guard
248}
249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 253always 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. 254reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 261=cut
198 262
199sub sync_job(&) { 263sub sync_job(&) {
200 my ($job) = @_; 264 my ($job) = @_;
201 265
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) { 266 if ($Coro::current == $Coro::main) {
267 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/
269
212 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 271 # (but this is cancel-safe)
272 my $freeze_guard = freeze_mainloop;
273
274 my $busy = 1;
275 my @res;
276
277 (Coro::async {
278 @res = eval { $job->() };
279 warn $@ if $@;
280 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 281 })->prio (Coro::PRIO_MAX);
282
215 while ($busy) { 283 while ($busy) {
216 Coro::cede_notself; 284 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 285 Event::one_event unless Coro::nready;
218 } 286 }
287
288 wantarray ? @res : $res[0]
219 } else { 289 } else {
220 $coro->join; 290 # we are in another coroutine, how wonderful, everything just works
291
292 $job->()
221 } 293 }
222
223 wantarray ? @res : $res[0]
224} 294}
225 295
226=item $coro = cf::coro { BLOCK } 296=item $coro = cf::coro { BLOCK }
227 297
228Creates and returns a new coro. This coro is automcatially being canceled 298Creates and returns a new coro. This coro is automcatially being canceled
… …
231=cut 301=cut
232 302
233sub coro(&) { 303sub coro(&) {
234 my $cb = shift; 304 my $cb = shift;
235 305
236 my $coro; $coro = async { 306 my $coro = &cf::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 307
243 $coro->on_destroy (sub { 308 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 309 delete $EXT_CORO{$coro+0};
245 }); 310 });
246 $EXT_CORO{$coro+0} = $coro; 311 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 317 my $runtime = cf::localdir . "/runtime";
253 318
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 319 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 320 or return;
256 321
257 my $value = $cf::RUNTIME; 322 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 323 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 324 and return;
260 325
261 aio_fsync $fh 326 aio_fsync $fh
262 and return; 327 and return;
… …
283 348
284 $path = $path->as_string if ref $path; 349 $path = $path->as_string if ref $path;
285 350
286 my $self = bless { }, $class; 351 my $self = bless { }, $class;
287 352
353 # {... are special paths that are not touched
354 # ?xxx/... are special absolute paths
355 # ?random/... random maps
356 # /! non-realised random map exit
357 # /... normal maps
358 # ~/... per-player maps without a specific player (DO NOT USE)
359 # ~user/... per-player map of a specific user
360
361 if ($path =~ /^{/) {
362 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 363 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 364 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 365 $self->{random} = cf::from_json $data;
291 } else { 366 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 367 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 368 $self->{user_rel} = 1;
… …
798 or return; 873 or return;
799 874
800 unless (aio_stat "$filename.pst") { 875 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 876 (aio_load "$filename.pst", $av) >= 0
802 or return; 877 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 878 $av = eval { (Storable::thaw $av)->{objs} };
804 } 879 }
805 880
881 warn sprintf "loading %s (%d)\n",
882 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 883 return ($data, $av);
807} 884}
808 885
809############################################################################# 886#############################################################################
810# command handling &c 887# command handling &c
… …
1044package cf::map; 1121package cf::map;
1045 1122
1046use Fcntl; 1123use Fcntl;
1047use Coro::AIO; 1124use Coro::AIO;
1048 1125
1049our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1128
1054sub generate_random_map { 1129sub generate_random_map {
1055 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1056 1131
1057 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1148# and all this just because we cannot iterate over
1074# all maps in C++... 1149# all maps in C++...
1075sub change_all_map_light { 1150sub change_all_map_light {
1076 my ($change) = @_; 1151 my ($change) = @_;
1077 1152
1078 $_->change_map_light ($change) for values %cf::MAP; 1153 $_->change_map_light ($change)
1154 for grep $_->outdoor, values %cf::MAP;
1079} 1155}
1080 1156
1081sub try_load_header($) { 1157sub try_load_header($) {
1082 my ($path) = @_; 1158 my ($path) = @_;
1083 1159
… …
1086 or return; 1162 or return;
1087 1163
1088 my $map = cf::map::new 1164 my $map = cf::map::new
1089 or return; 1165 or return;
1090 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1091 $map->load_header ($path) 1170 $map->load_header ($path)
1092 or return; 1171 or return;
1093 1172
1094 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1174
1097 $map 1175 $map
1098} 1176}
1099 1177
1178sub find;
1100sub find_map { 1179sub find {
1101 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1102 1181
1103 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1104 1183
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1185 my $key = $path->as_string;
1107 1186
1187 cf::lock_wait "map_find:$key";
1188
1108 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1109 # do it the slow way 1192 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1111 1194
1195 Coro::cede;
1196
1112 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1113 # safety 1200 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1203 } else {
1117 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1122 1209
1123 $map or return; 1210 $map or return;
1124 1211
1125 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1126 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1127 $map->instantiate; 1215 $map->instantiate;
1128 1216
1129 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1130 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1131 } 1219 }
1132 1220
1133 $map->path ($key); 1221 $map->path ($key);
1134 $map->{path} = $path; 1222 $map->{path} = $path;
1135 $map->last_access ($cf::RUNTIME); 1223 $map->{last_save} = $cf::RUNTIME;
1136 1224
1225 Coro::cede;
1226
1137 $map->reset if $map->should_reset; 1227 if ($map->should_reset) {
1228 $map->reset;
1229 undef $guard;
1230 $map = find $path
1231 or return;
1232 }
1138 1233
1139 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1140 } 1235 }
1141} 1236}
1142 1237
1143sub load { 1238sub load {
1144 my ($self) = @_; 1239 my ($self) = @_;
1145 1240
1241 my $path = $self->{path};
1242 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1243
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1244 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1245
1148 $self->in_memory (cf::MAP_LOADING); 1246 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1247
1152 $self->alloc; 1248 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1249 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1250 or return;
1155 1251
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1252 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1253 if delete $self->{load_original};
1157 1254
1158 if (my $uniq = $path->uniq_path) { 1255 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1256 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1258 $self->clear_unique_items;
1162 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1163 } 1260 }
1164 } 1261 }
1262
1263 Coro::cede;
1165 1264
1166 # now do the right thing for maps 1265 # now do the right thing for maps
1167 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1168 1267
1169 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1177 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1178 unless $self->difficulty; 1277 unless $self->difficulty;
1179 $self->activate; 1278 $self->activate;
1180 } 1279 }
1181 1280
1281 Coro::cede;
1282
1182 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1183} 1284}
1184 1285
1185sub load_map_sync { 1286sub find_sync {
1186 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1187 1288
1188 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1189 1291
1190 cf::sync_job { 1292sub do_load_sync {
1191 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1192 or return; 1294
1193 $map->load; 1295 cf::sync_job { $map->load };
1194 $map
1195 }
1196} 1296}
1197 1297
1198sub save { 1298sub save {
1199 my ($self) = @_; 1299 my ($self) = @_;
1200 1300
1301 $self->{last_save} = $cf::RUNTIME;
1302
1303 return unless $self->dirty;
1304
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1305 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1306 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1307
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1308 $self->{load_path} = $save;
1209 1309
1210 return if $self->{deny_save}; 1310 return if $self->{deny_save};
1211 1311
1212 warn "saving map ", $self->path; 1312 local $self->{last_access} = $self->last_access;#d#
1213 1313
1214 if ($uniq) { 1314 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1316 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1317 } else {
… …
1220} 1320}
1221 1321
1222sub swap_out { 1322sub swap_out {
1223 my ($self) = @_; 1323 my ($self) = @_;
1224 1324
1325 # save first because save cedes
1326 $self->save;
1327
1225 return if $self->players; 1328 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1228 1331
1229 $self->save;
1230 $self->clear; 1332 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1232} 1334}
1233 1335
1336sub reset_at {
1337 my ($self) = @_;
1338
1339 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel};
1341 return 1e99 if $self->{deny_reset};
1342
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1345
1346 $time + $to
1347}
1348
1234sub should_reset { 1349sub should_reset {
1235 my ($map) = @_; 1350 my ($self) = @_;
1236 1351
1237 # TODO: safety, remove and allow resettable per-player maps 1352 $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} 1353}
1248 1354
1249sub unlink_save { 1355sub unlink_save {
1250 my ($self) = @_; 1356 my ($self) = @_;
1251 1357
1252 utf8::encode (my $save = $self->{path}->save_path); 1358 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1361}
1256 1362
1363sub rename {
1364 my ($self, $new_path) = @_;
1365
1366 $self->unlink_save;
1367
1368 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self;
1372
1373 $self->save;
1374}
1375
1257sub reset { 1376sub reset {
1258 my ($self) = @_; 1377 my ($self) = @_;
1259 1378
1260 return if $self->players; 1379 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1380 return if $self->{path}{user_rel};#d#
… …
1268 1387
1269 $self->unlink_save; 1388 $self->unlink_save;
1270 $self->destroy; 1389 $self->destroy;
1271} 1390}
1272 1391
1392my $nuke_counter = "aaaa";
1393
1394sub nuke {
1395 my ($self) = @_;
1396
1397 $self->{deny_save} = 1;
1398 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++));
1400 $self->reset; # polite request, might not happen
1401}
1402
1273sub customise_for { 1403sub customise_for {
1274 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1275 1405
1276 if ($map->per_player) { 1406 if ($map->per_player) {
1277 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1407 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1278 } 1408 }
1279 1409
1280 $map 1410 $map
1281} 1411}
1282 1412
1283sub emergency_save { 1413sub emergency_save {
1284 local $cf::FREEZE = 1; 1414 my $freeze_guard = cf::freeze_mainloop;
1285 1415
1286 warn "enter emergency map save\n"; 1416 warn "enter emergency map save\n";
1287 1417
1288 cf::sync_job { 1418 cf::sync_job {
1289 warn "begin emergency map save\n"; 1419 warn "begin emergency map save\n";
… …
1340 (ref $cf::CFG{"may_$access"} 1470 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1471 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1472 : $cf::CFG{"may_$access"})
1343} 1473}
1344 1474
1475=item $player_object->enter_link
1476
1477Freezes the player and moves him/her to a special map (C<{link}>).
1478
1479The player should be reaosnably safe there for short amounts of time. You
1480I<MUST> call C<leave_link> as soon as possible, though.
1481
1482=item $player_object->leave_link ($map, $x, $y)
1483
1484Moves the player out of the specila link map onto the given map. If the
1485map is not valid (or omitted), the player will be moved back to the
1486location he/she was before the call to C<enter_link>, or, if that fails,
1487to the emergency map position.
1488
1489Might block.
1490
1491=cut
1492
1345sub cf::object::player::enter_link { 1493sub cf::object::player::enter_link {
1346 my ($self) = @_; 1494 my ($self) = @_;
1347 1495
1496 $self->deactivate_recursive;
1497
1348 return if $self->map == $LINK_MAP; 1498 return if $self->map == $LINK_MAP;
1349 1499
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1501 if $self->map;
1352 1502
1353 $self->enter_map ($LINK_MAP, 20, 20); 1503 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1504}
1356 1505
1357sub cf::object::player::leave_link { 1506sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1507 my ($self, $map, $x, $y) = @_;
1359 1508
1360 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1361 1510
1362 unless ($map) { 1511 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1512 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1514 $map = cf::map::find $map;
1368 1515
1369 unless ($map) { 1516 unless ($map) {
1370 ($map, $x, $y) = @$EMERGENCY_POSITION; 1517 ($map, $x, $y) = @$EMERGENCY_POSITION;
1371 $map = cf::map::find_map $map 1518 $map = cf::map::find $map
1372 or die "FATAL: cannot load emergency map\n"; 1519 or die "FATAL: cannot load emergency map\n";
1373 } 1520 }
1374 } 1521 }
1375 1522
1376 ($x, $y) = (-1, -1) 1523 ($x, $y) = (-1, -1)
… …
1384 1531
1385 $self->activate_recursive; 1532 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1533 $self->enter_map ($map, $x, $y);
1387} 1534}
1388 1535
1536cf::player->attach (
1537 on_logout => sub {
1538 my ($pl) = @_;
1539
1540 # abort map switching before logout
1541 if ($pl->ob->{_link_pos}) {
1542 cf::sync_job {
1543 $pl->ob->leave_link
1544 };
1545 }
1546 },
1547 on_login => sub {
1548 my ($pl) = @_;
1549
1550 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link;
1554 cf::async {
1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn
1557 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link;
1559 };
1560 }
1561 },
1562);
1563
1389=item $player_object->goto_map ($map, $x, $y) 1564=item $player_object->goto ($path, $x, $y)
1390 1565
1391=cut 1566=cut
1392 1567
1393sub cf::object::player::goto_map { 1568sub cf::object::player::goto {
1394 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1395 1570
1396 $self->enter_link; 1571 $self->enter_link;
1397 1572
1398 (Coro::async { 1573 (cf::async {
1399 $path = new cf::path $path; 1574 $path = new cf::path $path;
1400 1575
1401 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1403 1578
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1580# if $map;
1581
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1583
1407 $self->leave_link ($map, $x, $y); 1584 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1585 })->prio (1);
1409} 1586}
1410 1587
… …
1463 1640
1464 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1465 1642
1466 $self->enter_link; 1643 $self->enter_link;
1467 1644
1468 (Coro::async { 1645 (cf::async {
1646 $self->deactivate_recursive; # just to be sure
1469 unless (eval { 1647 unless (eval {
1470
1471 prepare_random_map $exit 1648 prepare_random_map $exit
1472 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1473 1650
1474 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1476 1653
1477 1; 1654 1;
1478 }) { 1655 }) {
1479 $self->message ("Something went wrong deep within the crossfire server. " 1656 $self->message ("Something went wrong deep within the crossfire server. "
1480 . "I'll try to bring you back to the map you were before. " 1657 . "I'll try to bring you back to the map you were before. "
… …
1537 on_reply => sub { 1714 on_reply => sub {
1538 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1539 1716
1540 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1541 # get handled first 1718 # get handled first
1542 my $queue = delete $ns->{query_queue}; 1719 my $queue = delete $ns->{query_queue}
1720 or return; # be conservative, not sure how that can happen, but we saw a crash here
1543 1721
1544 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1545 1723
1546 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1547 1725
… …
1564=cut 1742=cut
1565 1743
1566sub cf::client::coro { 1744sub cf::client::coro {
1567 my ($self, $cb) = @_; 1745 my ($self, $cb) = @_;
1568 1746
1569 my $coro; $coro = async { 1747 my $coro = &cf::async ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 1748
1576 $coro->on_destroy (sub { 1749 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 1750 delete $self->{_coro}{$coro+0};
1578 }); 1751 });
1579 1752
… …
1751 1924
1752{ 1925{
1753 my $path = cf::localdir . "/database.pst"; 1926 my $path = cf::localdir . "/database.pst";
1754 1927
1755 sub db_load() { 1928 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1929 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1930 }
1759 1931
1760 my $pid; 1932 my $pid;
1761 1933
1762 sub db_save() { 1934 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1935 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1936 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1937 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1938 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1939 rename "$path~", $path;
… …
1816 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 1988 or return;
1818 1989
1819 local $/; 1990 local $/;
1820 *CFG = YAML::Syck::Load <$fh>; 1991 *CFG = YAML::Syck::Load <$fh>;
1992
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994
1995 if (exists $CFG{mlockall}) {
1996 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n";
1999 };
2000 warn $@ if $@;
2001 }
1821} 2002}
1822 2003
1823sub main { 2004sub main {
1824 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
1826 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827 (Coro::unblock_sub { 2008 (Coro::unblock_sub {
1828 Event::one_event; 2009 Event::one_event;
1829 })->(); 2010 })->();
1830 }; 2011 };
1831 2012
… …
1845 return; 2026 return;
1846 } 2027 }
1847 2028
1848 warn "reloading..."; 2029 warn "reloading...";
1849 2030
1850 local $FREEZE = 1; 2031 my $guard = freeze_mainloop;
1851 cf::emergency_save; 2032 cf::emergency_save;
1852 2033
1853 eval { 2034 eval {
1854 # if anything goes wrong in here, we should simply crash as we already saved 2035 # if anything goes wrong in here, we should simply crash as we already saved
1855 2036
… …
1991 reentrant => 0, 2172 reentrant => 0,
1992 prio => 0, 2173 prio => 0,
1993 at => $NEXT_TICK || $TICK, 2174 at => $NEXT_TICK || $TICK,
1994 data => WF_AUTOCANCEL, 2175 data => WF_AUTOCANCEL,
1995 cb => sub { 2176 cb => sub {
1996 unless ($FREEZE) {
1997 cf::server_tick; # one server iteration 2177 cf::server_tick; # one server iteration
1998 $RUNTIME += $TICK; 2178 $RUNTIME += $TICK;
1999 }
2000
2001 $NEXT_TICK += $TICK; 2179 $NEXT_TICK += $TICK;
2002 2180
2003 # if we are delayed by four ticks or more, skip them all 2181 # if we are delayed by four ticks or more, skip them all
2004 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005 2183
… …
2028 or warn "ERROR: unable to write runtime file: $!"; 2206 or warn "ERROR: unable to write runtime file: $!";
2029 })->(); 2207 })->();
2030 }, 2208 },
2031); 2209);
2032 2210
2211END { cf::emergency_save }
2212
20331 22131
2034 2214

Diff Legend

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