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.138 by root, Fri Jan 5 17:07:17 2007 UTC

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

Diff Legend

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