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.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.135 by root, Thu Jan 4 20:29:46 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.
… …
203 # this is the main coro, too bad, we have to block 267 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 268 # till the operation succeeds, freezing the server :/
205 269
206 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 271 # (but this is cancel-safe)
208 local $FREEZE = 1; 272 my $freeze_guard = freeze_mainloop;
209 273
210 my $busy = 1; 274 my $busy = 1;
211 my @res; 275 my @res;
212 276
213 (Coro::async { 277 (Coro::async {
… …
237=cut 301=cut
238 302
239sub coro(&) { 303sub coro(&) {
240 my $cb = shift; 304 my $cb = shift;
241 305
242 my $coro; $coro = async { 306 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 307
249 $coro->on_destroy (sub { 308 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 309 delete $EXT_CORO{$coro+0};
251 }); 310 });
252 $EXT_CORO{$coro+0} = $coro; 311 $EXT_CORO{$coro+0} = $coro;
… …
289 348
290 $path = $path->as_string if ref $path; 349 $path = $path->as_string if ref $path;
291 350
292 my $self = bless { }, $class; 351 my $self = bless { }, $class;
293 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
294 if ($path =~ s{^\?random/}{}) { 363 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 364 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 365 $self->{random} = cf::from_json $data;
297 } else { 366 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 367 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 368 $self->{user_rel} = 1;
… …
804 or return; 873 or return;
805 874
806 unless (aio_stat "$filename.pst") { 875 unless (aio_stat "$filename.pst") {
807 (aio_load "$filename.pst", $av) >= 0 876 (aio_load "$filename.pst", $av) >= 0
808 or return; 877 or return;
809 $av = eval { (Storable::thaw <$av>)->{objs} }; 878 $av = eval { (Storable::thaw $av)->{objs} };
810 } 879 }
811 880
881 warn sprintf "loading %s (%d)\n",
882 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 883 return ($data, $av);
813} 884}
814 885
815############################################################################# 886#############################################################################
816# command handling &c 887# command handling &c
… …
1050package cf::map; 1121package cf::map;
1051 1122
1052use Fcntl; 1123use Fcntl;
1053use Coro::AIO; 1124use Coro::AIO;
1054 1125
1055our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1057 1128
1058sub generate_random_map { 1129sub generate_random_map {
1059 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1060 1131
1061 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1077# and all this just because we cannot iterate over 1148# and all this just because we cannot iterate over
1078# all maps in C++... 1149# all maps in C++...
1079sub change_all_map_light { 1150sub change_all_map_light {
1080 my ($change) = @_; 1151 my ($change) = @_;
1081 1152
1082 $_->change_map_light ($change) for values %cf::MAP; 1153 $_->change_map_light ($change)
1154 for grep $_->outdoor, values %cf::MAP;
1083} 1155}
1084 1156
1085sub try_load_header($) { 1157sub try_load_header($) {
1086 my ($path) = @_; 1158 my ($path) = @_;
1087 1159
… …
1090 or return; 1162 or return;
1091 1163
1092 my $map = cf::map::new 1164 my $map = cf::map::new
1093 or return; 1165 or return;
1094 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1095 $map->load_header ($path) 1170 $map->load_header ($path)
1096 or return; 1171 or return;
1097 1172
1098 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1099 1174
1100 $map 1175 $map
1101} 1176}
1102 1177
1178sub find;
1103sub find_map { 1179sub find {
1104 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1105 1181
1106 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1107 1183
1108 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1185 my $key = $path->as_string;
1110 1186
1187 cf::lock_wait "map_find:$key";
1188
1111 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1112 # do it the slow way 1192 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1114 1194
1195 Coro::cede;
1196
1115 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1116 # safety 1200 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1203 } else {
1120 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1125 1209
1126 $map or return; 1210 $map or return;
1127 1211
1128 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1215 $map->instantiate;
1131 1216
1132 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1134 } 1219 }
1135 1220
1136 $map->path ($key); 1221 $map->path ($key);
1137 $map->{path} = $path; 1222 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1223 $map->{last_save} = $cf::RUNTIME;
1224
1225 Coro::cede;
1139 1226
1140 if ($map->should_reset) { 1227 if ($map->should_reset) {
1141 $map->reset; 1228 $map->reset;
1229 undef $guard;
1142 $map = find_map $path; 1230 $map = find $path
1231 or return;
1143 } 1232 }
1144 1233
1145 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1146 } 1235 }
1147} 1236}
1148 1237
1149sub load { 1238sub load {
1150 my ($self) = @_; 1239 my ($self) = @_;
1151 1240
1241 my $path = $self->{path};
1242 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1243
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1244 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1245
1154 $self->in_memory (cf::MAP_LOADING); 1246 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1247
1158 $self->alloc; 1248 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1249 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1250 or return;
1161 1251
… …
1167 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1258 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1170 } 1260 }
1171 } 1261 }
1262
1263 Coro::cede;
1172 1264
1173 # now do the right thing for maps 1265 # now do the right thing for maps
1174 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1175 1267
1176 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1184 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1277 unless $self->difficulty;
1186 $self->activate; 1278 $self->activate;
1187 } 1279 }
1188 1280
1281 Coro::cede;
1282
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1284}
1191 1285
1192sub load_map_sync { 1286sub find_sync {
1193 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1194 1288
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1196 1291
1197 cf::sync_job { 1292sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1199 or return; 1294
1200 $map->load; 1295 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1296}
1204 1297
1205sub save { 1298sub save {
1206 my ($self) = @_; 1299 my ($self) = @_;
1207 1300
1301 $self->{last_save} = $cf::RUNTIME;
1302
1303 return unless $self->dirty;
1304
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1305 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1306 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1307
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1308 $self->{load_path} = $save;
1216 1309
1217 return if $self->{deny_save}; 1310 return if $self->{deny_save};
1311
1312 local $self->{last_access} = $self->last_access;#d#
1218 1313
1219 if ($uniq) { 1314 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1316 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1317 } else {
… …
1225} 1320}
1226 1321
1227sub swap_out { 1322sub swap_out {
1228 my ($self) = @_; 1323 my ($self) = @_;
1229 1324
1325 # save first because save cedes
1326 $self->save;
1327
1230 return if $self->players; 1328 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1233 1331
1234 $self->save;
1235 $self->clear; 1332 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1237} 1334}
1238 1335
1239sub reset_at { 1336sub reset_at {
1240 my ($self) = @_; 1337 my ($self) = @_;
1241 1338
1242 # TODO: safety, remove and allow resettable per-player maps 1339 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1340 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1341 return 1e99 if $self->{deny_reset};
1245 1342
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1345
1250 $time + $to 1346 $time + $to
1251} 1347}
1252 1348
1253sub should_reset { 1349sub should_reset {
… …
1262 utf8::encode (my $save = $self->{path}->save_path); 1358 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1361}
1266 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
1267sub reset { 1376sub reset {
1268 my ($self) = @_; 1377 my ($self) = @_;
1269 1378
1270 return if $self->players; 1379 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1380 return if $self->{path}{user_rel};#d#
… …
1278 1387
1279 $self->unlink_save; 1388 $self->unlink_save;
1280 $self->destroy; 1389 $self->destroy;
1281} 1390}
1282 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
1283sub customise_for { 1403sub customise_for {
1284 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1285 1405
1286 if ($map->per_player) { 1406 if ($map->per_player) {
1287 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1407 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1288 } 1408 }
1289 1409
1290 $map 1410 $map
1291} 1411}
1292 1412
1293sub emergency_save { 1413sub emergency_save {
1294 local $cf::FREEZE = 1; 1414 my $freeze_guard = cf::freeze_mainloop;
1295 1415
1296 warn "enter emergency map save\n"; 1416 warn "enter emergency map save\n";
1297 1417
1298 cf::sync_job { 1418 cf::sync_job {
1299 warn "begin emergency map save\n"; 1419 warn "begin emergency map save\n";
… …
1350 (ref $cf::CFG{"may_$access"} 1470 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1471 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1472 : $cf::CFG{"may_$access"})
1353} 1473}
1354 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
1355sub cf::object::player::enter_link { 1493sub cf::object::player::enter_link {
1356 my ($self) = @_; 1494 my ($self) = @_;
1357 1495
1496 $self->deactivate_recursive;
1497
1358 return if $self->map == $LINK_MAP; 1498 return if $self->map == $LINK_MAP;
1359 1499
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1501 if $self->map;
1362 1502
1363 $self->enter_map ($LINK_MAP, 20, 20); 1503 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1504}
1366 1505
1367sub cf::object::player::leave_link { 1506sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1507 my ($self, $map, $x, $y) = @_;
1369 1508
1370 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1371 1510
1372 unless ($map) { 1511 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1512 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1514 $map = cf::map::find $map;
1378 1515
1379 unless ($map) { 1516 unless ($map) {
1380 ($map, $x, $y) = @$EMERGENCY_POSITION; 1517 ($map, $x, $y) = @$EMERGENCY_POSITION;
1381 $map = cf::map::find_map $map 1518 $map = cf::map::find $map
1382 or die "FATAL: cannot load emergency map\n"; 1519 or die "FATAL: cannot load emergency map\n";
1383 } 1520 }
1384 } 1521 }
1385 1522
1386 ($x, $y) = (-1, -1) 1523 ($x, $y) = (-1, -1)
… …
1394 1531
1395 $self->activate_recursive; 1532 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1533 $self->enter_map ($map, $x, $y);
1397} 1534}
1398 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
1399=item $player_object->goto_map ($map, $x, $y) 1564=item $player_object->goto_map ($path, $x, $y)
1400 1565
1401=cut 1566=cut
1402 1567
1403sub cf::object::player::goto_map { 1568sub cf::object::player::goto_map {
1404 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1405 1570
1406 $self->enter_link; 1571 $self->enter_link;
1407 1572
1408 (Coro::async { 1573 (cf::async {
1409 $path = new cf::path $path; 1574 $path = new cf::path $path;
1410 1575
1411 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1413 1578
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1580# if $map;
1581
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1583
1417 $self->leave_link ($map, $x, $y); 1584 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1585 })->prio (1);
1419} 1586}
1420 1587
… …
1473 1640
1474 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1475 1642
1476 $self->enter_link; 1643 $self->enter_link;
1477 1644
1478 (Coro::async { 1645 (cf::async {
1646 $self->deactivate_recursive; # just to be sure
1479 unless (eval { 1647 unless (eval {
1480
1481 prepare_random_map $exit 1648 prepare_random_map $exit
1482 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1483 1650
1484 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;
1485 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1547 on_reply => sub { 1714 on_reply => sub {
1548 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1549 1716
1550 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1551 # get handled first 1718 # get handled first
1552 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
1553 1721
1554 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1555 1723
1556 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1557 1725
… …
1574=cut 1742=cut
1575 1743
1576sub cf::client::coro { 1744sub cf::client::coro {
1577 my ($self, $cb) = @_; 1745 my ($self, $cb) = @_;
1578 1746
1579 my $coro; $coro = async { 1747 my $coro = &cf::async ($cb);
1580 eval {
1581 $cb->();
1582 };
1583 warn $@ if $@;
1584 };
1585 1748
1586 $coro->on_destroy (sub { 1749 $coro->on_destroy (sub {
1587 delete $self->{_coro}{$coro+0}; 1750 delete $self->{_coro}{$coro+0};
1588 }); 1751 });
1589 1752
… …
1761 1924
1762{ 1925{
1763 my $path = cf::localdir . "/database.pst"; 1926 my $path = cf::localdir . "/database.pst";
1764 1927
1765 sub db_load() { 1928 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 1929 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 1930 }
1769 1931
1770 my $pid; 1932 my $pid;
1771 1933
1772 sub db_save() { 1934 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 1935 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 1936 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 1937 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 1938 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 1939 rename "$path~", $path;
… …
1826 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1827 or return; 1988 or return;
1828 1989
1829 local $/; 1990 local $/;
1830 *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 }
1831} 2002}
1832 2003
1833sub main { 2004sub main {
1834 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
1836 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#
1837 (Coro::unblock_sub { 2008 (Coro::unblock_sub {
1838 Event::one_event; 2009 Event::one_event;
1839 })->(); 2010 })->();
1840 }; 2011 };
1841 2012
… …
1855 return; 2026 return;
1856 } 2027 }
1857 2028
1858 warn "reloading..."; 2029 warn "reloading...";
1859 2030
1860 local $FREEZE = 1; 2031 my $guard = freeze_mainloop;
1861 cf::emergency_save; 2032 cf::emergency_save;
1862 2033
1863 eval { 2034 eval {
1864 # 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
1865 2036
… …
2001 reentrant => 0, 2172 reentrant => 0,
2002 prio => 0, 2173 prio => 0,
2003 at => $NEXT_TICK || $TICK, 2174 at => $NEXT_TICK || $TICK,
2004 data => WF_AUTOCANCEL, 2175 data => WF_AUTOCANCEL,
2005 cb => sub { 2176 cb => sub {
2006 unless ($FREEZE) {
2007 cf::server_tick; # one server iteration 2177 cf::server_tick; # one server iteration
2008 $RUNTIME += $TICK; 2178 $RUNTIME += $TICK;
2009 }
2010
2011 $NEXT_TICK += $TICK; 2179 $NEXT_TICK += $TICK;
2012 2180
2013 # 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
2014 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015 2183
… …
2038 or warn "ERROR: unable to write runtime file: $!"; 2206 or warn "ERROR: unable to write runtime file: $!";
2039 })->(); 2207 })->();
2040 }, 2208 },
2041); 2209);
2042 2210
2211END { cf::emergency_save }
2212
20431 22131
2044 2214

Diff Legend

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