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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.134 by root, Thu Jan 4 17:28:49 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.
… …
203 # this is the main coro, too bad, we have to block 289 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 290 # till the operation succeeds, freezing the server :/
205 291
206 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 293 # (but this is cancel-safe)
208 local $FREEZE = 1; 294 my $freeze_guard = freeze_mainloop;
209 295
210 my $busy = 1; 296 my $busy = 1;
211 my @res; 297 my @res;
212 298
213 (Coro::async { 299 (Coro::async {
… …
237=cut 323=cut
238 324
239sub coro(&) { 325sub coro(&) {
240 my $cb = shift; 326 my $cb = shift;
241 327
242 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 329
249 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
251 }); 332 });
252 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
289 370
290 $path = $path->as_string if ref $path; 371 $path = $path->as_string if ref $path;
291 372
292 my $self = bless { }, $class; 373 my $self = bless { }, $class;
293 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
294 if ($path =~ s{^\?random/}{}) { 385 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 387 $self->{random} = cf::from_json $data;
297 } else { 388 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 389 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 390 $self->{user_rel} = 1;
… …
807 (aio_load "$filename.pst", $av) >= 0 898 (aio_load "$filename.pst", $av) >= 0
808 or return; 899 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 900 $av = eval { (Storable::thaw $av)->{objs} };
810 } 901 }
811 902
903 warn sprintf "loading %s (%d)\n",
904 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 905 return ($data, $av);
813} 906}
814 907
815############################################################################# 908#############################################################################
816# command handling &c 909# command handling &c
… …
1050package cf::map; 1143package cf::map;
1051 1144
1052use Fcntl; 1145use Fcntl;
1053use Coro::AIO; 1146use Coro::AIO;
1054 1147
1055our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1057 1150
1058sub generate_random_map { 1151sub generate_random_map {
1059 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1060 1153
1061 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1077# and all this just because we cannot iterate over 1170# and all this just because we cannot iterate over
1078# all maps in C++... 1171# all maps in C++...
1079sub change_all_map_light { 1172sub change_all_map_light {
1080 my ($change) = @_; 1173 my ($change) = @_;
1081 1174
1082 $_->change_map_light ($change) for values %cf::MAP; 1175 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP;
1083} 1177}
1084 1178
1085sub try_load_header($) { 1179sub try_load_header($) {
1086 my ($path) = @_; 1180 my ($path) = @_;
1087 1181
… …
1098 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1099 1193
1100 $map 1194 $map
1101} 1195}
1102 1196
1197sub find;
1103sub find_map { 1198sub find {
1104 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1105 1200
1106 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1107 1202
1108 $path = new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1204 my $key = $path->as_string;
1110 1205
1206 cf::lock_wait "map_find:$key";
1207
1111 $cf::MAP{$key} || do { 1208 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key";
1210
1112 # do it the slow way 1211 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1114 1213
1214 Coro::cede;
1215
1115 if ($map) { 1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1116 # safety 1219 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1220 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1221 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1222 } else {
1120 if (my $rmp = $path->random_map_params) { 1223 if (my $rmp = $path->random_map_params) {
… …
1125 1228
1126 $map or return; 1229 $map or return;
1127 1230
1128 $map->{load_original} = 1; 1231 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1234 $map->instantiate;
1131 1235
1132 # per-player maps become, after loading, normal maps 1236 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1237 $map->per_player (0) if $path->{user_rel};
1134 } 1238 }
1135 1239
1136 $map->path ($key); 1240 $map->path ($key);
1137 $map->{path} = $path; 1241 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1242 $map->{last_save} = $cf::RUNTIME;
1243
1244 Coro::cede;
1139 1245
1140 if ($map->should_reset) { 1246 if ($map->should_reset) {
1141 $map->reset; 1247 $map->reset;
1248 undef $guard;
1142 $map = find_map $path; 1249 $map = find $path
1250 or return;
1143 } 1251 }
1144 1252
1145 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1146 } 1254 }
1147} 1255}
1148 1256
1149sub load { 1257sub load {
1150 my ($self) = @_; 1258 my ($self) = @_;
1151 1259
1260 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1262
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1263 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1264
1154 $self->in_memory (cf::MAP_LOADING); 1265 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1266
1158 $self->alloc; 1267 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1268 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1269 or return;
1161 1270
… …
1167 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1277 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1170 } 1279 }
1171 } 1280 }
1281
1282 Coro::cede;
1172 1283
1173 # now do the right thing for maps 1284 # now do the right thing for maps
1174 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1175 1286
1176 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1184 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1296 unless $self->difficulty;
1186 $self->activate; 1297 $self->activate;
1187 } 1298 }
1188 1299
1300 Coro::cede;
1301
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1303}
1191 1304
1192sub load_map_sync { 1305sub find_sync {
1193 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1194 1307
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1196 1310
1197 cf::sync_job { 1311sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1199 or return; 1313
1200 $map->load; 1314 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1315}
1204 1316
1205sub save { 1317sub save {
1206 my ($self) = @_; 1318 my ($self) = @_;
1207 1319
1320 $self->{last_save} = $cf::RUNTIME;
1321
1322 return unless $self->dirty;
1323
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1324 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1326
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1216 1328
1217 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1330
1331 local $self->{last_access} = $self->last_access;#d#
1218 1332
1219 if ($uniq) { 1333 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1336 } else {
… …
1225} 1339}
1226 1340
1227sub swap_out { 1341sub swap_out {
1228 my ($self) = @_; 1342 my ($self) = @_;
1229 1343
1344 # save first because save cedes
1345 $self->save;
1346
1230 return if $self->players; 1347 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1233 1350
1234 $self->save;
1235 $self->clear; 1351 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1237} 1353}
1238 1354
1239sub reset_at { 1355sub reset_at {
1240 my ($self) = @_; 1356 my ($self) = @_;
1241 1357
1242 # TODO: safety, remove and allow resettable per-player maps 1358 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1359 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1360 return 1e99 if $self->{deny_reset};
1245 1361
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1362 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1363 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1364
1250 $time + $to 1365 $time + $to
1251} 1366}
1252 1367
1253sub should_reset { 1368sub should_reset {
… …
1269 1384
1270 $self->unlink_save; 1385 $self->unlink_save;
1271 1386
1272 delete $cf::MAP{$self->path}; 1387 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1388 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1389 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1390 $cf::MAP{$self->path} = $self;
1276 1391
1277 $self->save; 1392 $self->save;
1278} 1393}
1279 1394
… …
1291 1406
1292 $self->unlink_save; 1407 $self->unlink_save;
1293 $self->destroy; 1408 $self->destroy;
1294} 1409}
1295 1410
1411my $nuke_counter = "aaaa";
1412
1413sub nuke {
1414 my ($self) = @_;
1415
1416 $self->{deny_save} = 1;
1417 $self->reset_timeout (1);
1418 $self->rename ("{nuke}/" . ($nuke_counter++));
1419 $self->reset; # polite request, might not happen
1420}
1421
1296sub customise_for { 1422sub customise_for {
1297 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1298 1424
1299 if ($map->per_player) { 1425 if ($map->per_player) {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1301 } 1427 }
1302 1428
1303 $map 1429 $map
1304} 1430}
1305 1431
1306sub emergency_save { 1432sub emergency_save {
1307 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1308 1434
1309 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1310 1436
1311 cf::sync_job { 1437 cf::sync_job {
1312 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1363 (ref $cf::CFG{"may_$access"} 1489 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1490 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1491 : $cf::CFG{"may_$access"})
1366} 1492}
1367 1493
1494=item $player_object->enter_link
1495
1496Freezes the player and moves him/her to a special map (C<{link}>).
1497
1498The player should be reaosnably safe there for short amounts of time. You
1499I<MUST> call C<leave_link> as soon as possible, though.
1500
1501=item $player_object->leave_link ($map, $x, $y)
1502
1503Moves the player out of the specila link map onto the given map. If the
1504map is not valid (or omitted), the player will be moved back to the
1505location he/she was before the call to C<enter_link>, or, if that fails,
1506to the emergency map position.
1507
1508Might block.
1509
1510=cut
1511
1368sub cf::object::player::enter_link { 1512sub cf::object::player::enter_link {
1369 my ($self) = @_; 1513 my ($self) = @_;
1370 1514
1515 $self->deactivate_recursive;
1516
1371 return if $self->map == $LINK_MAP; 1517 return if $self->map == $LINK_MAP;
1372 1518
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1520 if $self->map;
1375 1521
1376 $self->enter_map ($LINK_MAP, 20, 20); 1522 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1523}
1379 1524
1380sub cf::object::player::leave_link { 1525sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1526 my ($self, $map, $x, $y) = @_;
1382 1527
1383 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1384 1529
1385 unless ($map) { 1530 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1531 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1391 1534
1392 unless ($map) { 1535 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1396 } 1539 }
1397 } 1540 }
1398 1541
1399 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1407 1550
1408 $self->activate_recursive; 1551 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1552 $self->enter_map ($map, $x, $y);
1410} 1553}
1411 1554
1555cf::player->attach (
1556 on_logout => sub {
1557 my ($pl) = @_;
1558
1559 # abort map switching before logout
1560 if ($pl->ob->{_link_pos}) {
1561 cf::sync_job {
1562 $pl->ob->leave_link
1563 };
1564 }
1565 },
1566 on_login => sub {
1567 my ($pl) = @_;
1568
1569 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link;
1573 cf::async {
1574 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn
1576 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link;
1578 };
1579 }
1580 },
1581);
1582
1412=item $player_object->goto_map ($map, $x, $y) 1583=item $player_object->goto_map ($path, $x, $y)
1413 1584
1414=cut 1585=cut
1415 1586
1416sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1417 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1418 1589
1419 $self->enter_link; 1590 $self->enter_link;
1420 1591
1421 (Coro::async { 1592 (cf::async {
1422 $path = new cf::path $path; 1593 $path = new cf::path $path;
1423 1594
1424 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1426 1597
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1599# if $map;
1600
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1602
1430 $self->leave_link ($map, $x, $y); 1603 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1604 })->prio (1);
1432} 1605}
1433 1606
… …
1486 1659
1487 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1488 1661
1489 $self->enter_link; 1662 $self->enter_link;
1490 1663
1491 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1666 unless (eval {
1493
1494 prepare_random_map $exit 1667 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1496 1669
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1560 on_reply => sub { 1733 on_reply => sub {
1561 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1562 1735
1563 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1564 # get handled first 1737 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1738 my $queue = delete $ns->{query_queue}
1739 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1740
1567 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1568 1742
1569 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1570 1744
… …
1587=cut 1761=cut
1588 1762
1589sub cf::client::coro { 1763sub cf::client::coro {
1590 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1591 1765
1592 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1767
1599 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1601 }); 1770 });
1602 1771
… …
1774 1943
1775{ 1944{
1776 my $path = cf::localdir . "/database.pst"; 1945 my $path = cf::localdir . "/database.pst";
1777 1946
1778 sub db_load() { 1947 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 1948 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 1949 }
1782 1950
1783 my $pid; 1951 my $pid;
1784 1952
1785 sub db_save() { 1953 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 1954 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 1955 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 1956 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 1957 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 1958 rename "$path~", $path;
… …
1839 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 2007 or return;
1841 2008
1842 local $/; 2009 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 2010 *CFG = YAML::Syck::Load <$fh>;
2011
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013
2014 if (exists $CFG{mlockall}) {
2015 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n";
2018 };
2019 warn $@ if $@;
2020 }
1844} 2021}
1845 2022
1846sub main { 2023sub main {
1847 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub { 2027 (Coro::unblock_sub {
1851 Event::one_event; 2028 Event::one_event;
1852 })->(); 2029 })->();
1853 }; 2030 };
1854 2031
… …
1868 return; 2045 return;
1869 } 2046 }
1870 2047
1871 warn "reloading..."; 2048 warn "reloading...";
1872 2049
1873 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2051 cf::emergency_save;
1875 2052
1876 eval { 2053 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2054 # if anything goes wrong in here, we should simply crash as we already saved
1878 2055
… …
2014 reentrant => 0, 2191 reentrant => 0,
2015 prio => 0, 2192 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
2018 cb => sub { 2195 cb => sub {
2019 unless ($FREEZE) {
2020 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
2025 2199
2026 # if we are delayed by four ticks or more, skip them all 2200 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2202
… …
2051 or warn "ERROR: unable to write runtime file: $!"; 2225 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2226 })->();
2053 }, 2227 },
2054); 2228);
2055 2229
2230END { cf::emergency_save }
2231
20561 22321
2057 2233

Diff Legend

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