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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.133 by root, Thu Jan 4 16:19:32 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 my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string
207
208Wait until the given lock is available. See cf::lock_acquire.
209
210=item my $lock = cf::lock_acquire $string
211
212Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically
215returned.
216
217Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load).
219
220=cut
221
222our %LOCK;
223
224sub lock_wait($) {
225 my ($key) = @_;
226
227 # wait for lock, if any
228 while ($LOCK{$key}) {
229 push @{ $LOCK{$key} }, $Coro::current;
230 Coro::schedule;
231 }
232}
233
234sub lock_acquire($) {
235 my ($key) = @_;
236
237 # wait, to be sure we are not locked
238 lock_wait $key;
239
240 $LOCK{$key} = [];
241
242 cf::guard {
243 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} };
245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
270}
271
186=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
187 273
188The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 275always 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. 276reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 283=cut
198 284
199sub sync_job(&) { 285sub sync_job(&) {
200 my ($job) = @_; 286 my ($job) = @_;
201 287
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) { 288 if ($Coro::current == $Coro::main) {
289 # this is the main coro, too bad, we have to block
290 # till the operation succeeds, freezing the server :/
291
212 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 293 # (but this is cancel-safe)
294 my $freeze_guard = freeze_mainloop;
295
296 my $busy = 1;
297 my @res;
298
299 (Coro::async {
300 @res = eval { $job->() };
301 warn $@ if $@;
302 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 303 })->prio (Coro::PRIO_MAX);
304
215 while ($busy) { 305 while ($busy) {
216 Coro::cede_notself; 306 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 307 Event::one_event unless Coro::nready;
218 } 308 }
309
310 wantarray ? @res : $res[0]
219 } else { 311 } else {
220 $coro->join; 312 # we are in another coroutine, how wonderful, everything just works
313
314 $job->()
221 } 315 }
222
223 wantarray ? @res : $res[0]
224} 316}
225 317
226=item $coro = cf::coro { BLOCK } 318=item $coro = cf::coro { BLOCK }
227 319
228Creates and returns a new coro. This coro is automcatially being canceled 320Creates and returns a new coro. This coro is automcatially being canceled
… …
231=cut 323=cut
232 324
233sub coro(&) { 325sub coro(&) {
234 my $cb = shift; 326 my $cb = shift;
235 327
236 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 329
243 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
245 }); 332 });
246 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 339 my $runtime = cf::localdir . "/runtime";
253 340
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 341 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 342 or return;
256 343
257 my $value = $cf::RUNTIME; 344 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 345 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 346 and return;
260 347
261 aio_fsync $fh 348 aio_fsync $fh
262 and return; 349 and return;
… …
283 370
284 $path = $path->as_string if ref $path; 371 $path = $path->as_string if ref $path;
285 372
286 my $self = bless { }, $class; 373 my $self = bless { }, $class;
287 374
375 # {... are special paths that are not touched
376 # ?xxx/... are special absolute paths
377 # ?random/... random maps
378 # /! non-realised random map exit
379 # /... normal maps
380 # ~/... per-player maps without a specific player (DO NOT USE)
381 # ~user/... per-player map of a specific user
382
383 if ($path =~ /^{/) {
384 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 385 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 387 $self->{random} = cf::from_json $data;
291 } else { 388 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 389 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 390 $self->{user_rel} = 1;
… …
798 or return; 895 or return;
799 896
800 unless (aio_stat "$filename.pst") { 897 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 898 (aio_load "$filename.pst", $av) >= 0
802 or return; 899 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 900 $av = eval { (Storable::thaw $av)->{objs} };
804 } 901 }
805 902
903 warn sprintf "loading %s (%d)\n",
904 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 905 return ($data, $av);
807} 906}
808 907
809############################################################################# 908#############################################################################
810# command handling &c 909# command handling &c
… …
1044package cf::map; 1143package cf::map;
1045 1144
1046use Fcntl; 1145use Fcntl;
1047use Coro::AIO; 1146use Coro::AIO;
1048 1147
1049our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1150
1054sub generate_random_map { 1151sub generate_random_map {
1055 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1056 1153
1057 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1170# and all this just because we cannot iterate over
1074# all maps in C++... 1171# all maps in C++...
1075sub change_all_map_light { 1172sub change_all_map_light {
1076 my ($change) = @_; 1173 my ($change) = @_;
1077 1174
1078 $_->change_map_light ($change) for values %cf::MAP; 1175 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP;
1079} 1177}
1080 1178
1081sub try_load_header($) { 1179sub try_load_header($) {
1082 my ($path) = @_; 1180 my ($path) = @_;
1083 1181
… …
1090 1188
1091 $map->load_header ($path) 1189 $map->load_header ($path)
1092 or return; 1190 or return;
1093 1191
1094 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1193
1097 $map 1194 $map
1098} 1195}
1099 1196
1197sub find;
1100sub find_map { 1198sub find {
1101 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1102 1200
1103 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1104 1202
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1204 my $key = $path->as_string;
1107 1205
1206 cf::lock_wait "map_find:$key";
1207
1108 $cf::MAP{$key} || do { 1208 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key";
1210
1109 # do it the slow way 1211 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1111 1213
1112 if ($map) { 1214 if ($map) {
1215 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d#
1113 # safety 1217 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1218 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1219 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1220 } else {
1117 if (my $rmp = $path->random_map_params) { 1221 if (my $rmp = $path->random_map_params) {
… …
1120 $map = try_load_header $path->load_path; 1224 $map = try_load_header $path->load_path;
1121 } 1225 }
1122 1226
1123 $map or return; 1227 $map or return;
1124 1228
1229 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1230 $map->{instantiate_time} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME);
1126 $map->instantiate; 1232 $map->instantiate;
1127 1233
1128 # per-player maps become, after loading, normal maps 1234 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1235 $map->per_player (0) if $path->{user_rel};
1130 } 1236 }
1131 1237
1132 $map->path ($key); 1238 $map->path ($key);
1133 $map->{path} = $path; 1239 $map->{path} = $path;
1134 $map->last_access ($cf::RUNTIME); 1240 $map->{last_save} = $cf::RUNTIME;
1135 1241
1136 $map->reset if $map->should_reset; 1242 if ($map->should_reset) {
1243 $map->reset;
1244 undef $guard;
1245 $map = find $path
1246 or return;
1247 }
1137 1248
1138 $cf::MAP{$key} = $map 1249 $cf::MAP{$key} = $map
1139 } 1250 }
1140} 1251}
1141 1252
1142sub load { 1253sub load {
1143 my ($self) = @_; 1254 my ($self) = @_;
1144 1255
1256 my $path = $self->{path};
1257 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1258
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1259 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1260
1147 $self->in_memory (cf::MAP_LOADING); 1261 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1262
1151 $self->alloc; 1263 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1264 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1265 or return;
1266
1267 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1268 if delete $self->{load_original};
1154 1269
1155 if (my $uniq = $path->uniq_path) { 1270 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1271 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1272 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1273 $self->clear_unique_items;
… …
1177 } 1292 }
1178 1293
1179 $self->in_memory (cf::MAP_IN_MEMORY); 1294 $self->in_memory (cf::MAP_IN_MEMORY);
1180} 1295}
1181 1296
1182sub load_map_sync { 1297sub find_sync {
1183 my ($path, $origin) = @_; 1298 my ($path, $origin) = @_;
1184 1299
1185 #warn "load_map_sync<$path, $origin>\n";#d# 1300 cf::sync_job { cf::map::find $path, $origin }
1301}
1186 1302
1187 cf::sync_job { 1303sub do_load_sync {
1188 my $map = cf::map::find_map $path, $origin 1304 my ($map) = @_;
1189 or return; 1305
1190 $map->load; 1306 cf::sync_job { $map->load };
1191 $map
1192 }
1193} 1307}
1194 1308
1195sub save { 1309sub save {
1196 my ($self) = @_; 1310 my ($self) = @_;
1197 1311
1312 $self->{last_save} = $cf::RUNTIME;
1313
1314 return unless $self->dirty;
1315
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1316 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1317 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1318
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1319 $self->{load_path} = $save;
1206 1320
1207 return if $self->{deny_save}; 1321 return if $self->{deny_save};
1208 1322
1209 warn "saving map ", $self->path; 1323 local $self->{last_access} = $self->last_access;#d#
1210 1324
1211 if ($uniq) { 1325 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1327 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1328 } else {
… …
1217} 1331}
1218 1332
1219sub swap_out { 1333sub swap_out {
1220 my ($self) = @_; 1334 my ($self) = @_;
1221 1335
1336 # save first because save cedes
1337 $self->save;
1338
1222 return if $self->players; 1339 return if $self->players;
1223 return if $self->in_memory != cf::MAP_IN_MEMORY; 1340 return if $self->in_memory != cf::MAP_IN_MEMORY;
1224 return if $self->{deny_save}; 1341 return if $self->{deny_save};
1225 1342
1226 $self->save;
1227 $self->clear; 1343 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1344 $self->in_memory (cf::MAP_SWAPPED);
1229} 1345}
1230 1346
1347sub reset_at {
1348 my ($self) = @_;
1349
1350 # TODO: safety, remove and allow resettable per-player maps
1351 return 1e99 if $self->{path}{user_rel};
1352 return 1e99 if $self->{deny_reset};
1353
1354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1356
1357 $time + $to
1358}
1359
1231sub should_reset { 1360sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1361 my ($self) = @_;
1246 1362
1247 return if $self->players; 1363 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1364}
1249 1365
1250 warn "resetting map ", $self->path;#d# 1366sub unlink_save {
1367 my ($self) = @_;
1251 1368
1252 utf8::encode (my $save = $self->{path}->save_path); 1369 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1370 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1371 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1372}
1373
1374sub rename {
1375 my ($self, $new_path) = @_;
1376
1377 $self->unlink_save;
1378
1379 delete $cf::MAP{$self->path};
1380 $self->{path} = new cf::path $new_path;
1381 $self->path ($self->{path}->as_string);
1382 $cf::MAP{$self->path} = $self;
1383
1384 $self->save;
1385}
1386
1387sub reset {
1388 my ($self) = @_;
1389
1390 return if $self->players;
1391 return if $self->{path}{user_rel};#d#
1392
1393 warn "resetting map ", $self->path;#d#
1394
1395 delete $cf::MAP{$self->path};
1255 1396
1256 $_->clear_links_to ($self) for values %cf::MAP; 1397 $_->clear_links_to ($self) for values %cf::MAP;
1257 1398
1399 $self->unlink_save;
1258 $self->clear; 1400 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1401}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1402
1403my $nuke_counter = "aaaa";
1404
1405sub nuke {
1406 my ($self) = @_;
1407
1408 $self->{deny_save} = 1;
1409 $self->reset_timeout (1);
1410 $self->rename ("{nuke}/" . ($nuke_counter++));
1411 $self->reset; # polite request, might not happen
1261} 1412}
1262 1413
1263sub customise_for { 1414sub customise_for {
1264 my ($map, $ob) = @_; 1415 my ($map, $ob) = @_;
1265 1416
1266 if ($map->per_player) { 1417 if ($map->per_player) {
1267 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1418 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1268 } 1419 }
1269 1420
1270 $map 1421 $map
1271} 1422}
1272 1423
1273sub emergency_save { 1424sub emergency_save {
1274 local $cf::FREEZE = 1; 1425 my $freeze_guard = cf::freeze_mainloop;
1275 1426
1276 warn "enter emergency map save\n"; 1427 warn "enter emergency map save\n";
1277 1428
1278 cf::sync_job { 1429 cf::sync_job {
1279 warn "begin emergency map save\n"; 1430 warn "begin emergency map save\n";
… …
1330 (ref $cf::CFG{"may_$access"} 1481 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1482 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1483 : $cf::CFG{"may_$access"})
1333} 1484}
1334 1485
1486=item $player_object->enter_link
1487
1488Freezes the player and moves him/her to a special map (C<{link}>).
1489
1490The player should be reaosnably safe there for short amounts of time. You
1491I<MUST> call C<leave_link> as soon as possible, though.
1492
1493=item $player_object->leave_link ($map, $x, $y)
1494
1495Moves the player out of the specila link map onto the given map. If the
1496map is not valid (or omitted), the player will be moved back to the
1497location he/she was before the call to C<enter_link>, or, if that fails,
1498to the emergency map position.
1499
1500Might block.
1501
1502=cut
1503
1335sub cf::object::player::enter_link { 1504sub cf::object::player::enter_link {
1336 my ($self) = @_; 1505 my ($self) = @_;
1337 1506
1507 $self->deactivate_recursive;
1508
1338 return if $self->map == $LINK_MAP; 1509 return if $self->map == $LINK_MAP;
1339 1510
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1512 if $self->map;
1342 1513
1343 $self->enter_map ($LINK_MAP, 20, 20); 1514 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1515}
1346 1516
1347sub cf::object::player::leave_link { 1517sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1518 my ($self, $map, $x, $y) = @_;
1349 1519
1350 my $link_pos = delete $self->{_link_pos}; 1520 my $link_pos = delete $self->{_link_pos};
1351 1521
1352 unless ($map) { 1522 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1523 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1524 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1525 $map = cf::map::find $map;
1358 1526
1359 unless ($map) { 1527 unless ($map) {
1360 ($map, $x, $y) = @$EMERGENCY_POSITION; 1528 ($map, $x, $y) = @$EMERGENCY_POSITION;
1361 $map = cf::map::find_map $map 1529 $map = cf::map::find $map
1362 or die "FATAL: cannot load emergency map\n"; 1530 or die "FATAL: cannot load emergency map\n";
1363 } 1531 }
1364 } 1532 }
1365 1533
1366 ($x, $y) = (-1, -1) 1534 ($x, $y) = (-1, -1)
… …
1374 1542
1375 $self->activate_recursive; 1543 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1544 $self->enter_map ($map, $x, $y);
1377} 1545}
1378 1546
1547cf::player->attach (
1548 on_logout => sub {
1549 my ($pl) = @_;
1550
1551 # abort map switching before logout
1552 if ($pl->ob->{_link_pos}) {
1553 cf::sync_job {
1554 $pl->ob->leave_link
1555 };
1556 }
1557 },
1558 on_login => sub {
1559 my ($pl) = @_;
1560
1561 # try to abort aborted map switching on player login :)
1562 # should happen only on crashes
1563 if ($pl->ob->{_link_pos}) {
1564 $pl->ob->enter_link;
1565 cf::async {
1566 # we need this sleep as the login has a concurrent enter_exit running
1567 # and this sleep increases chances of the player not ending up in scorn
1568 Coro::Timer::sleep 1;
1569 $pl->ob->leave_link;
1570 };
1571 }
1572 },
1573);
1574
1379=item $player_object->goto_map ($map, $x, $y) 1575=item $player_object->goto_map ($path, $x, $y)
1380 1576
1381=cut 1577=cut
1382 1578
1383sub cf::object::player::goto_map { 1579sub cf::object::player::goto_map {
1384 my ($self, $path, $x, $y) = @_; 1580 my ($self, $path, $x, $y) = @_;
1385 1581
1386 $self->enter_link; 1582 $self->enter_link;
1387 1583
1388 (Coro::async { 1584 (cf::async {
1389 $path = new cf::path $path; 1585 $path = new cf::path $path;
1390 1586
1391 my $map = cf::map::find_map $path->as_string; 1587 my $map = cf::map::find $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1588 $map = $map->customise_for ($self) if $map;
1393 1589
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1590# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1591# if $map;
1592
1593 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1594
1397 $self->leave_link ($map, $x, $y); 1595 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1596 })->prio (1);
1399} 1597}
1400 1598
… …
1453 1651
1454 return unless $self->type == cf::PLAYER; 1652 return unless $self->type == cf::PLAYER;
1455 1653
1456 $self->enter_link; 1654 $self->enter_link;
1457 1655
1458 (Coro::async { 1656 (cf::async {
1657 $self->deactivate_recursive; # just to be sure
1459 unless (eval { 1658 unless (eval {
1460
1461 prepare_random_map $exit 1659 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1660 if $exit->slaying eq "/!";
1463 1661
1464 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1662 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1527 on_reply => sub { 1725 on_reply => sub {
1528 my ($ns, $msg) = @_; 1726 my ($ns, $msg) = @_;
1529 1727
1530 # this weird shuffling is so that direct followup queries 1728 # this weird shuffling is so that direct followup queries
1531 # get handled first 1729 # get handled first
1532 my $queue = delete $ns->{query_queue}; 1730 my $queue = delete $ns->{query_queue}
1731 or return; # be conservative, not sure how that can happen, but we saw a crash here
1533 1732
1534 (shift @$queue)->[1]->($msg); 1733 (shift @$queue)->[1]->($msg);
1535 1734
1536 push @{ $ns->{query_queue} }, @$queue; 1735 push @{ $ns->{query_queue} }, @$queue;
1537 1736
… …
1554=cut 1753=cut
1555 1754
1556sub cf::client::coro { 1755sub cf::client::coro {
1557 my ($self, $cb) = @_; 1756 my ($self, $cb) = @_;
1558 1757
1559 my $coro; $coro = async { 1758 my $coro = &cf::async ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1759
1566 $coro->on_destroy (sub { 1760 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1761 delete $self->{_coro}{$coro+0};
1568 }); 1762 });
1569 1763
… …
1741 1935
1742{ 1936{
1743 my $path = cf::localdir . "/database.pst"; 1937 my $path = cf::localdir . "/database.pst";
1744 1938
1745 sub db_load() { 1939 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1940 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1941 }
1749 1942
1750 my $pid; 1943 my $pid;
1751 1944
1752 sub db_save() { 1945 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1946 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1947 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1948 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1949 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1950 rename "$path~", $path;
… …
1806 open my $fh, "<:utf8", cf::confdir . "/config" 1998 open my $fh, "<:utf8", cf::confdir . "/config"
1807 or return; 1999 or return;
1808 2000
1809 local $/; 2001 local $/;
1810 *CFG = YAML::Syck::Load <$fh>; 2002 *CFG = YAML::Syck::Load <$fh>;
2003
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005
2006 if (exists $CFG{mlockall}) {
2007 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall
2009 and die "WARNING: m(un)lockall failed: $!\n";
2010 };
2011 warn $@ if $@;
2012 }
1811} 2013}
1812 2014
1813sub main { 2015sub main {
1814 # we must not ever block the main coroutine 2016 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 2017 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2018 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub { 2019 (Coro::unblock_sub {
1818 Event::one_event; 2020 Event::one_event;
1819 })->(); 2021 })->();
1820 }; 2022 };
1821 2023
… …
1826} 2028}
1827 2029
1828############################################################################# 2030#############################################################################
1829# initialisation 2031# initialisation
1830 2032
1831sub perl_reload() { 2033sub reload() {
1832 # can/must only be called in main 2034 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2035 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2036 warn "can only reload from main coroutine\n";
1835 return; 2037 return;
1836 } 2038 }
1837 2039
1838 warn "reloading..."; 2040 warn "reloading...";
1839 2041
1840 local $FREEZE = 1; 2042 my $guard = freeze_mainloop;
1841 cf::emergency_save; 2043 cf::emergency_save;
1842 2044
1843 eval { 2045 eval {
1844 # if anything goes wrong in here, we should simply crash as we already saved 2046 # if anything goes wrong in here, we should simply crash as we already saved
1845 2047
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2165 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2166}
1965 2167
1966register "<global>", __PACKAGE__; 2168register "<global>", __PACKAGE__;
1967 2169
1968register_command "perl-reload" => sub { 2170register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2171 my ($who, $arg) = @_;
1970 2172
1971 if ($who->flag (FLAG_WIZ)) { 2173 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2174 $who->message ("start of reload.");
1973 perl_reload; 2175 reload;
1974 $who->message ("end of reload."); 2176 $who->message ("end of reload.");
1975 } 2177 }
1976}; 2178};
1977 2179
1978unshift @INC, $LIBDIR; 2180unshift @INC, $LIBDIR;
… …
1981 reentrant => 0, 2183 reentrant => 0,
1982 prio => 0, 2184 prio => 0,
1983 at => $NEXT_TICK || $TICK, 2185 at => $NEXT_TICK || $TICK,
1984 data => WF_AUTOCANCEL, 2186 data => WF_AUTOCANCEL,
1985 cb => sub { 2187 cb => sub {
1986 unless ($FREEZE) {
1987 cf::server_tick; # one server iteration 2188 cf::server_tick; # one server iteration
1988 $RUNTIME += $TICK; 2189 $RUNTIME += $TICK;
1989 }
1990
1991 $NEXT_TICK += $TICK; 2190 $NEXT_TICK += $TICK;
1992 2191
1993 # if we are delayed by four ticks or more, skip them all 2192 # if we are delayed by four ticks or more, skip them all
1994 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1995 2194
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2217 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2218 })->();
2020 }, 2219 },
2021); 2220);
2022 2221
2222END { cf::emergency_save }
2223
20231 22241
2024 2225

Diff Legend

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