ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.131 by root, Thu Jan 4 00:53:54 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;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string
208
209Wait until the given lock is available. See cf::lock_acquire.
210
211=item my $lock = cf::lock_acquire $string
212
213Wait until the given lock is available and then acquires it and returns
214a guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically
216returned.
217
218Lock names should begin with a unique identifier (for example, find_map
219uses map_find and load_map uses map_load).
220
221=cut
222
223our %LOCK;
224
225sub lock_wait($) {
226 my ($key) = @_;
227
228 # wait for lock, if any
229 while ($LOCK{$key}) {
230 push @{ $LOCK{$key} }, $Coro::current;
231 Coro::schedule;
232 }
233}
234
235sub lock_acquire($) {
236 my ($key) = @_;
237
238 # wait, to be sure we are not locked
239 lock_wait $key;
240
241 $LOCK{$key} = [];
242
243 cf::guard {
244 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} };
246 }
247}
248
249=item cf::async { BLOCK }
250
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
252error instead of exiting the server in case of a problem.
253
254=cut
255
256sub async(&) {
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264
186=item cf::sync_job { BLOCK } 265=item cf::sync_job { BLOCK }
187 266
188The design of crossfire+ requires that the main coro ($Coro::main) is 267The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 268always 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. 269reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 276=cut
198 277
199sub sync_job(&) { 278sub sync_job(&) {
200 my ($job) = @_; 279 my ($job) = @_;
201 280
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) { 281 if ($Coro::current == $Coro::main) {
282 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/
284
212 # TODO: use suspend/resume instead 285 # TODO: use suspend/resume instead
286 # (but this is cancel-safe)
213 local $FREEZE = 1; 287 local $FREEZE = 1;
288
289 my $busy = 1;
290 my @res;
291
292 (Coro::async {
293 @res = eval { $job->() };
294 warn $@ if $@;
295 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 296 })->prio (Coro::PRIO_MAX);
297
215 while ($busy) { 298 while ($busy) {
216 Coro::cede_notself; 299 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 300 Event::one_event unless Coro::nready;
218 } 301 }
302
303 wantarray ? @res : $res[0]
219 } else { 304 } else {
220 $coro->join; 305 # we are in another coroutine, how wonderful, everything just works
306
307 $job->()
221 } 308 }
222
223 wantarray ? @res : $res[0]
224} 309}
225 310
226=item $coro = cf::coro { BLOCK } 311=item $coro = cf::coro { BLOCK }
227 312
228Creates and returns a new coro. This coro is automcatially being canceled 313Creates and returns a new coro. This coro is automcatially being canceled
… …
231=cut 316=cut
232 317
233sub coro(&) { 318sub coro(&) {
234 my $cb = shift; 319 my $cb = shift;
235 320
236 my $coro; $coro = async { 321 my $coro = &cf::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 322
243 $coro->on_destroy (sub { 323 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 324 delete $EXT_CORO{$coro+0};
245 }); 325 });
246 $EXT_CORO{$coro+0} = $coro; 326 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 332 my $runtime = cf::localdir . "/runtime";
253 333
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 334 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 335 or return;
256 336
257 my $value = $cf::RUNTIME; 337 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 338 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 339 and return;
260 340
261 aio_fsync $fh 341 aio_fsync $fh
262 and return; 342 and return;
… …
283 363
284 $path = $path->as_string if ref $path; 364 $path = $path->as_string if ref $path;
285 365
286 my $self = bless { }, $class; 366 my $self = bless { }, $class;
287 367
368 # {... are special paths that are not touched
369 # ?xxx/... are special absolute paths
370 # ?random/... random maps
371 # /! non-realised random map exit
372 # /... normal maps
373 # ~/... per-player maps without a specific player (DO NOT USE)
374 # ~user/... per-player map of a specific user
375
376 if ($path =~ /^{/) {
377 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 378 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 379 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 380 $self->{random} = cf::from_json $data;
291 } else { 381 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 382 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 383 $self->{user_rel} = 1;
… …
798 or return; 888 or return;
799 889
800 unless (aio_stat "$filename.pst") { 890 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 891 (aio_load "$filename.pst", $av) >= 0
802 or return; 892 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 893 $av = eval { (Storable::thaw $av)->{objs} };
804 } 894 }
805 895
896 warn sprintf "loading %s (%d)\n",
897 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 898 return ($data, $av);
807} 899}
808 900
809############################################################################# 901#############################################################################
810# command handling &c 902# command handling &c
… …
1046use Fcntl; 1138use Fcntl;
1047use Coro::AIO; 1139use Coro::AIO;
1048 1140
1049our $MAX_RESET = 7200; 1141our $MAX_RESET = 7200;
1050our $DEFAULT_RESET = 3600; 1142our $DEFAULT_RESET = 3600;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1143
1054sub generate_random_map { 1144sub generate_random_map {
1055 my ($path, $rmp) = @_; 1145 my ($path, $rmp) = @_;
1056 1146
1057 # mit "rum" bekleckern, nicht 1147 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1163# and all this just because we cannot iterate over
1074# all maps in C++... 1164# all maps in C++...
1075sub change_all_map_light { 1165sub change_all_map_light {
1076 my ($change) = @_; 1166 my ($change) = @_;
1077 1167
1078 $_->change_map_light ($change) for values %cf::MAP; 1168 $_->change_map_light ($change)
1169 for grep $_->outdoor, values %cf::MAP;
1079} 1170}
1080 1171
1081sub try_load_header($) { 1172sub try_load_header($) {
1082 my ($path) = @_; 1173 my ($path) = @_;
1083 1174
… …
1090 1181
1091 $map->load_header ($path) 1182 $map->load_header ($path)
1092 or return; 1183 or return;
1093 1184
1094 $map->{load_path} = $path; 1185 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1186
1097 $map 1187 $map
1098} 1188}
1099 1189
1190sub find_map;
1100sub find_map { 1191sub find_map {
1101 my ($path, $origin) = @_; 1192 my ($path, $origin) = @_;
1102 1193
1103 #warn "find_map<$path,$origin>\n";#d# 1194 #warn "find_map<$path,$origin>\n";#d#
1104 1195
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1196 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1197 my $key = $path->as_string;
1107 1198
1199 cf::lock_wait "map_find:$key";
1200
1108 $cf::MAP{$key} || do { 1201 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key";
1203
1109 # do it the slow way 1204 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1205 my $map = try_load_header $path->save_path;
1111 1206
1112 if ($map) { 1207 if ($map) {
1113 # safety 1208 # safety
… …
1130 $map->per_player (0) if $path->{user_rel}; 1225 $map->per_player (0) if $path->{user_rel};
1131 } 1226 }
1132 1227
1133 $map->path ($key); 1228 $map->path ($key);
1134 $map->{path} = $path; 1229 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME;
1135 $map->last_access ($cf::RUNTIME); 1231 $map->last_access ($cf::RUNTIME);
1136 1232
1137 $map->reset if $map->should_reset; 1233 if ($map->should_reset) {
1234 $map->reset;
1235 undef $guard;
1236 $map = find_map $path
1237 or return;
1238 }
1138 1239
1139 $cf::MAP{$key} = $map 1240 $cf::MAP{$key} = $map
1140 } 1241 }
1141} 1242}
1142 1243
1143sub load { 1244sub load {
1144 my ($self) = @_; 1245 my ($self) = @_;
1145 1246
1247 my $path = $self->{path};
1248 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1249
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1250 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1251
1148 $self->in_memory (cf::MAP_LOADING); 1252 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1253
1152 $self->alloc; 1254 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1255 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1256 or return;
1155 1257
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1258 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1259 if delete $self->{load_original};
1157 1260
1158 if (my $uniq = $path->uniq_path) { 1261 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1262 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1263 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1264 $self->clear_unique_items;
… …
1196} 1299}
1197 1300
1198sub save { 1301sub save {
1199 my ($self) = @_; 1302 my ($self) = @_;
1200 1303
1304 $self->{last_save} = $cf::RUNTIME;
1305
1306 return unless $self->dirty;
1307
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1308 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1310
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1311 $self->{load_path} = $save;
1209 1312
1210 return if $self->{deny_save}; 1313 return if $self->{deny_save};
1211
1212 warn "saving map ", $self->path;
1213 1314
1214 if ($uniq) { 1315 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1317 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1318 } else {
… …
1220} 1321}
1221 1322
1222sub swap_out { 1323sub swap_out {
1223 my ($self) = @_; 1324 my ($self) = @_;
1224 1325
1326 # save first because save cedes
1327 $self->save;
1328
1225 return if $self->players; 1329 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1330 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1331 return if $self->{deny_save};
1228 1332
1229 $self->save;
1230 $self->clear; 1333 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1334 $self->in_memory (cf::MAP_SWAPPED);
1232} 1335}
1233 1336
1337sub reset_at {
1338 my ($self) = @_;
1339
1340 # TODO: safety, remove and allow resettable per-player maps
1341 return 1e99 if $self->{path}{user_rel};
1342 return 1e99 if $self->{deny_reset};
1343
1344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1346
1347 $time + $to
1348}
1349
1234sub should_reset { 1350sub should_reset {
1235 my ($map) = @_; 1351 my ($self) = @_;
1236 1352
1237 # TODO: safety, remove and allow resettable per-player maps 1353 $self->reset_at <= $cf::RUNTIME
1238 return if $map->{path}{user_rel};#d#
1239 return if $map->{deny_reset};
1240 #return unless $map->reset_timeout;
1241
1242 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243 my $to = $map->reset_timeout || $DEFAULT_RESET;
1244 $to = $MAX_RESET if $to > $MAX_RESET;
1245
1246 $time + $to < $cf::RUNTIME
1247} 1354}
1248 1355
1249sub unlink_save { 1356sub unlink_save {
1250 my ($self) = @_; 1357 my ($self) = @_;
1251 1358
1252 utf8::encode (my $save = $self->{path}->save_path); 1359 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1360 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1361 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1362}
1256 1363
1364sub rename {
1365 my ($self, $new_path) = @_;
1366
1367 $self->unlink_save;
1368
1369 delete $cf::MAP{$self->path};
1370 $self->{path} = new cf::path $new_path;
1371 $self->path ($self->{path}->as_string);
1372 $cf::MAP{$self->path} = $self;
1373
1374 $self->save;
1375}
1376
1257sub reset { 1377sub reset {
1258 my ($self) = @_; 1378 my ($self) = @_;
1259 1379
1260 return if $self->players; 1380 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1381 return if $self->{path}{user_rel};#d#
… …
1266 1386
1267 $_->clear_links_to ($self) for values %cf::MAP; 1387 $_->clear_links_to ($self) for values %cf::MAP;
1268 1388
1269 $self->unlink_save; 1389 $self->unlink_save;
1270 $self->destroy; 1390 $self->destroy;
1391}
1392
1393my $nuke_counter = "aaaa";
1394
1395sub nuke {
1396 my ($self) = @_;
1397
1398 $self->{deny_save} = 1;
1399 $self->reset_timeout (1);
1400 $self->rename ("{nuke}/" . ($nuke_counter++));
1401 $self->reset; # polite request, might not happen
1271} 1402}
1272 1403
1273sub customise_for { 1404sub customise_for {
1274 my ($map, $ob) = @_; 1405 my ($map, $ob) = @_;
1275 1406
… …
1340 (ref $cf::CFG{"may_$access"} 1471 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1472 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1473 : $cf::CFG{"may_$access"})
1343} 1474}
1344 1475
1476=item $player_object->enter_link
1477
1478Freezes the player and moves him/her to a special map (C<{link}>).
1479
1480The player should be reaosnably safe there for short amounts of time. You
1481I<MUST> call C<leave_link> as soon as possible, though.
1482
1483=item $player_object->leave_link ($map, $x, $y)
1484
1485Moves the player out of the specila link map onto the given map. If the
1486map is not valid (or omitted), the player will be moved back to the
1487location he/she was before the call to C<enter_link>, or, if that fails,
1488to the emergency map position.
1489
1490Might block.
1491
1492=cut
1493
1345sub cf::object::player::enter_link { 1494sub cf::object::player::enter_link {
1346 my ($self) = @_; 1495 my ($self) = @_;
1347 1496
1497 $self->deactivate_recursive;
1498
1348 return if $self->map == $LINK_MAP; 1499 return if $self->map == $LINK_MAP;
1349 1500
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1501 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1502 if $self->map;
1352 1503
1353 $self->enter_map ($LINK_MAP, 20, 20); 1504 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1505}
1356 1506
1357sub cf::object::player::leave_link { 1507sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1508 my ($self, $map, $x, $y) = @_;
1359 1509
1360 my $link_pos = delete $self->{_link_pos}; 1510 my $link_pos = delete $self->{_link_pos};
1361 1511
1362 unless ($map) { 1512 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1513 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1514 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1515 $map = cf::map::find_map $map;
1368 1516
1369 unless ($map) { 1517 unless ($map) {
… …
1384 1532
1385 $self->activate_recursive; 1533 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1534 $self->enter_map ($map, $x, $y);
1387} 1535}
1388 1536
1537cf::player->attach (
1538 on_logout => sub {
1539 my ($pl) = @_;
1540
1541 # abort map switching before logout
1542 if ($pl->ob->{_link_pos}) {
1543 cf::sync_job {
1544 $pl->ob->leave_link
1545 };
1546 }
1547 },
1548 on_login => sub {
1549 my ($pl) = @_;
1550
1551 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link;
1555 cf::async {
1556 # we need this sleep as the login has a concurrent enter_exit running
1557 # and this sleep increases chances of the player not ending up in scorn
1558 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link;
1560 };
1561 }
1562 },
1563);
1564
1389=item $player_object->goto_map ($map, $x, $y) 1565=item $player_object->goto_map ($path, $x, $y)
1390 1566
1391=cut 1567=cut
1392 1568
1393sub cf::object::player::goto_map { 1569sub cf::object::player::goto_map {
1394 my ($self, $path, $x, $y) = @_; 1570 my ($self, $path, $x, $y) = @_;
1395 1571
1396 $self->enter_link; 1572 $self->enter_link;
1397 1573
1398 (Coro::async { 1574 (cf::async {
1399 $path = new cf::path $path; 1575 $path = new cf::path $path;
1400 1576
1401 my $map = cf::map::find_map $path->as_string; 1577 my $map = cf::map::find_map $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1578 $map = $map->customise_for ($self) if $map;
1403 1579
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1580# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1581# if $map;
1582
1583 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1584
1407 $self->leave_link ($map, $x, $y); 1585 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1586 })->prio (1);
1409} 1587}
1410 1588
… …
1463 1641
1464 return unless $self->type == cf::PLAYER; 1642 return unless $self->type == cf::PLAYER;
1465 1643
1466 $self->enter_link; 1644 $self->enter_link;
1467 1645
1468 (Coro::async { 1646 (cf::async {
1469 unless (eval { 1647 unless (eval {
1470
1471 prepare_random_map $exit 1648 prepare_random_map $exit
1472 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1473 1650
1474 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1537 on_reply => sub { 1714 on_reply => sub {
1538 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1539 1716
1540 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1541 # get handled first 1718 # get handled first
1542 my $queue = delete $ns->{query_queue}; 1719 my $queue = delete $ns->{query_queue}
1720 or return; # be conservative, not sure how that can happen, but we saw a crash here
1543 1721
1544 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1545 1723
1546 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1547 1725
… …
1564=cut 1742=cut
1565 1743
1566sub cf::client::coro { 1744sub cf::client::coro {
1567 my ($self, $cb) = @_; 1745 my ($self, $cb) = @_;
1568 1746
1569 my $coro; $coro = async { 1747 my $coro = &cf::async ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 1748
1576 $coro->on_destroy (sub { 1749 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 1750 delete $self->{_coro}{$coro+0};
1578 }); 1751 });
1579 1752
… …
1751 1924
1752{ 1925{
1753 my $path = cf::localdir . "/database.pst"; 1926 my $path = cf::localdir . "/database.pst";
1754 1927
1755 sub db_load() { 1928 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1929 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1930 }
1759 1931
1760 my $pid; 1932 my $pid;
1761 1933
1762 sub db_save() { 1934 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1935 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1936 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1937 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1938 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1939 rename "$path~", $path;
… …
1816 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 1988 or return;
1818 1989
1819 local $/; 1990 local $/;
1820 *CFG = YAML::Syck::Load <$fh>; 1991 *CFG = YAML::Syck::Load <$fh>;
1992
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994
1995 if (exists $CFG{mlockall}) {
1996 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n";
1999 };
2000 warn $@ if $@;
2001 }
1821} 2002}
1822 2003
1823sub main { 2004sub main {
1824 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
1826 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827 (Coro::unblock_sub { 2008 (Coro::unblock_sub {
1828 Event::one_event; 2009 Event::one_event;
1829 })->(); 2010 })->();
1830 }; 2011 };
1831 2012
… …
2028 or warn "ERROR: unable to write runtime file: $!"; 2209 or warn "ERROR: unable to write runtime file: $!";
2029 })->(); 2210 })->();
2030 }, 2211 },
2031); 2212);
2032 2213
2214END { cf::emergency_save }
2215
20331 22161
2034 2217

Diff Legend

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