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.133 by root, Thu Jan 4 16:19:32 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string
207
208Wait until the given lock is available. See cf::lock_acquire.
209
210=item my $lock = cf::lock_acquire $string
211
212Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically
215returned.
216
217Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load).
219
220=cut
221
222our %LOCK;
223
224sub lock_wait($) {
225 my ($key) = @_;
226
227 # wait for lock, if any
228 while ($LOCK{$key}) {
229 push @{ $LOCK{$key} }, $Coro::current;
230 Coro::schedule;
231 }
232}
233
234sub lock_acquire($) {
235 my ($key) = @_;
236
237 # wait, to be sure we are not locked
238 lock_wait $key;
239
240 $LOCK{$key} = [];
241
242 cf::guard {
243 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} };
245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
270}
271
186=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
187 273
188The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 275always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 276reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
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;
… …
804 or return; 895 or return;
805 896
806 unless (aio_stat "$filename.pst") { 897 unless (aio_stat "$filename.pst") {
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
1115 if ($map) { 1214 if ($map) {
1215 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d#
1116 # safety 1217 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1218 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1219 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1220 } else {
1120 if (my $rmp = $path->random_map_params) { 1221 if (my $rmp = $path->random_map_params) {
… …
1125 1226
1126 $map or return; 1227 $map or return;
1127 1228
1128 $map->{load_original} = 1; 1229 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1230 $map->{instantiate_time} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1232 $map->instantiate;
1131 1233
1132 # per-player maps become, after loading, normal maps 1234 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1235 $map->per_player (0) if $path->{user_rel};
1134 } 1236 }
1135 1237
1136 $map->path ($key); 1238 $map->path ($key);
1137 $map->{path} = $path; 1239 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1240 $map->{last_save} = $cf::RUNTIME;
1139 1241
1140 if ($map->should_reset) { 1242 if ($map->should_reset) {
1141 $map->reset; 1243 $map->reset;
1244 undef $guard;
1142 $map = find_map $path; 1245 $map = find $path
1246 or return;
1143 } 1247 }
1144 1248
1145 $cf::MAP{$key} = $map 1249 $cf::MAP{$key} = $map
1146 } 1250 }
1147} 1251}
1148 1252
1149sub load { 1253sub load {
1150 my ($self) = @_; 1254 my ($self) = @_;
1151 1255
1256 my $path = $self->{path};
1257 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1258
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1259 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1260
1154 $self->in_memory (cf::MAP_LOADING); 1261 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1262
1158 $self->alloc; 1263 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1264 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1265 or return;
1161 1266
… …
1187 } 1292 }
1188 1293
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1294 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1295}
1191 1296
1192sub load_map_sync { 1297sub find_sync {
1193 my ($path, $origin) = @_; 1298 my ($path, $origin) = @_;
1194 1299
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1300 cf::sync_job { cf::map::find $path, $origin }
1301}
1196 1302
1197 cf::sync_job { 1303sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1304 my ($map) = @_;
1199 or return; 1305
1200 $map->load; 1306 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1307}
1204 1308
1205sub save { 1309sub save {
1206 my ($self) = @_; 1310 my ($self) = @_;
1207 1311
1312 $self->{last_save} = $cf::RUNTIME;
1313
1314 return unless $self->dirty;
1315
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1316 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1317 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1318
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1319 $self->{load_path} = $save;
1216 1320
1217 return if $self->{deny_save}; 1321 return if $self->{deny_save};
1322
1323 local $self->{last_access} = $self->last_access;#d#
1218 1324
1219 if ($uniq) { 1325 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1327 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1328 } else {
… …
1225} 1331}
1226 1332
1227sub swap_out { 1333sub swap_out {
1228 my ($self) = @_; 1334 my ($self) = @_;
1229 1335
1336 # save first because save cedes
1337 $self->save;
1338
1230 return if $self->players; 1339 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1340 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1341 return if $self->{deny_save};
1233 1342
1234 $self->save;
1235 $self->clear; 1343 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1344 $self->in_memory (cf::MAP_SWAPPED);
1237} 1345}
1238 1346
1239sub reset_at { 1347sub reset_at {
1240 my ($self) = @_; 1348 my ($self) = @_;
1241 1349
1242 # TODO: safety, remove and allow resettable per-player maps 1350 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1351 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1352 return 1e99 if $self->{deny_reset};
1245 1353
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1356
1250 $time + $to 1357 $time + $to
1251} 1358}
1252 1359
1253sub should_reset { 1360sub should_reset {
… …
1262 utf8::encode (my $save = $self->{path}->save_path); 1369 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1370 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1371 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1372}
1266 1373
1374sub rename {
1375 my ($self, $new_path) = @_;
1376
1377 $self->unlink_save;
1378
1379 delete $cf::MAP{$self->path};
1380 $self->{path} = new cf::path $new_path;
1381 $self->path ($self->{path}->as_string);
1382 $cf::MAP{$self->path} = $self;
1383
1384 $self->save;
1385}
1386
1267sub reset { 1387sub reset {
1268 my ($self) = @_; 1388 my ($self) = @_;
1269 1389
1270 return if $self->players; 1390 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1391 return if $self->{path}{user_rel};#d#
… …
1278 1398
1279 $self->unlink_save; 1399 $self->unlink_save;
1280 $self->destroy; 1400 $self->destroy;
1281} 1401}
1282 1402
1403my $nuke_counter = "aaaa";
1404
1405sub nuke {
1406 my ($self) = @_;
1407
1408 $self->{deny_save} = 1;
1409 $self->reset_timeout (1);
1410 $self->rename ("{nuke}/" . ($nuke_counter++));
1411 $self->reset; # polite request, might not happen
1412}
1413
1283sub customise_for { 1414sub customise_for {
1284 my ($map, $ob) = @_; 1415 my ($map, $ob) = @_;
1285 1416
1286 if ($map->per_player) { 1417 if ($map->per_player) {
1287 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1418 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1288 } 1419 }
1289 1420
1290 $map 1421 $map
1291} 1422}
1292 1423
1293sub emergency_save { 1424sub emergency_save {
1294 local $cf::FREEZE = 1; 1425 my $freeze_guard = cf::freeze_mainloop;
1295 1426
1296 warn "enter emergency map save\n"; 1427 warn "enter emergency map save\n";
1297 1428
1298 cf::sync_job { 1429 cf::sync_job {
1299 warn "begin emergency map save\n"; 1430 warn "begin emergency map save\n";
… …
1350 (ref $cf::CFG{"may_$access"} 1481 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1482 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1483 : $cf::CFG{"may_$access"})
1353} 1484}
1354 1485
1486=item $player_object->enter_link
1487
1488Freezes the player and moves him/her to a special map (C<{link}>).
1489
1490The player should be reaosnably safe there for short amounts of time. You
1491I<MUST> call C<leave_link> as soon as possible, though.
1492
1493=item $player_object->leave_link ($map, $x, $y)
1494
1495Moves the player out of the specila link map onto the given map. If the
1496map is not valid (or omitted), the player will be moved back to the
1497location he/she was before the call to C<enter_link>, or, if that fails,
1498to the emergency map position.
1499
1500Might block.
1501
1502=cut
1503
1355sub cf::object::player::enter_link { 1504sub cf::object::player::enter_link {
1356 my ($self) = @_; 1505 my ($self) = @_;
1357 1506
1507 $self->deactivate_recursive;
1508
1358 return if $self->map == $LINK_MAP; 1509 return if $self->map == $LINK_MAP;
1359 1510
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1512 if $self->map;
1362 1513
1363 $self->enter_map ($LINK_MAP, 20, 20); 1514 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1515}
1366 1516
1367sub cf::object::player::leave_link { 1517sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1518 my ($self, $map, $x, $y) = @_;
1369 1519
1370 my $link_pos = delete $self->{_link_pos}; 1520 my $link_pos = delete $self->{_link_pos};
1371 1521
1372 unless ($map) { 1522 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1523 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1524 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1525 $map = cf::map::find $map;
1378 1526
1379 unless ($map) { 1527 unless ($map) {
1380 ($map, $x, $y) = @$EMERGENCY_POSITION; 1528 ($map, $x, $y) = @$EMERGENCY_POSITION;
1381 $map = cf::map::find_map $map 1529 $map = cf::map::find $map
1382 or die "FATAL: cannot load emergency map\n"; 1530 or die "FATAL: cannot load emergency map\n";
1383 } 1531 }
1384 } 1532 }
1385 1533
1386 ($x, $y) = (-1, -1) 1534 ($x, $y) = (-1, -1)
… …
1394 1542
1395 $self->activate_recursive; 1543 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1544 $self->enter_map ($map, $x, $y);
1397} 1545}
1398 1546
1547cf::player->attach (
1548 on_logout => sub {
1549 my ($pl) = @_;
1550
1551 # abort map switching before logout
1552 if ($pl->ob->{_link_pos}) {
1553 cf::sync_job {
1554 $pl->ob->leave_link
1555 };
1556 }
1557 },
1558 on_login => sub {
1559 my ($pl) = @_;
1560
1561 # try to abort aborted map switching on player login :)
1562 # should happen only on crashes
1563 if ($pl->ob->{_link_pos}) {
1564 $pl->ob->enter_link;
1565 cf::async {
1566 # we need this sleep as the login has a concurrent enter_exit running
1567 # and this sleep increases chances of the player not ending up in scorn
1568 Coro::Timer::sleep 1;
1569 $pl->ob->leave_link;
1570 };
1571 }
1572 },
1573);
1574
1399=item $player_object->goto_map ($map, $x, $y) 1575=item $player_object->goto_map ($path, $x, $y)
1400 1576
1401=cut 1577=cut
1402 1578
1403sub cf::object::player::goto_map { 1579sub cf::object::player::goto_map {
1404 my ($self, $path, $x, $y) = @_; 1580 my ($self, $path, $x, $y) = @_;
1405 1581
1406 $self->enter_link; 1582 $self->enter_link;
1407 1583
1408 (Coro::async { 1584 (cf::async {
1409 $path = new cf::path $path; 1585 $path = new cf::path $path;
1410 1586
1411 my $map = cf::map::find_map $path->as_string; 1587 my $map = cf::map::find $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1588 $map = $map->customise_for ($self) if $map;
1413 1589
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1590# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1591# if $map;
1592
1593 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1594
1417 $self->leave_link ($map, $x, $y); 1595 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1596 })->prio (1);
1419} 1597}
1420 1598
… …
1473 1651
1474 return unless $self->type == cf::PLAYER; 1652 return unless $self->type == cf::PLAYER;
1475 1653
1476 $self->enter_link; 1654 $self->enter_link;
1477 1655
1478 (Coro::async { 1656 (cf::async {
1657 $self->deactivate_recursive; # just to be sure
1479 unless (eval { 1658 unless (eval {
1480
1481 prepare_random_map $exit 1659 prepare_random_map $exit
1482 if $exit->slaying eq "/!"; 1660 if $exit->slaying eq "/!";
1483 1661
1484 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1662 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1485 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1547 on_reply => sub { 1725 on_reply => sub {
1548 my ($ns, $msg) = @_; 1726 my ($ns, $msg) = @_;
1549 1727
1550 # this weird shuffling is so that direct followup queries 1728 # this weird shuffling is so that direct followup queries
1551 # get handled first 1729 # get handled first
1552 my $queue = delete $ns->{query_queue}; 1730 my $queue = delete $ns->{query_queue}
1731 or return; # be conservative, not sure how that can happen, but we saw a crash here
1553 1732
1554 (shift @$queue)->[1]->($msg); 1733 (shift @$queue)->[1]->($msg);
1555 1734
1556 push @{ $ns->{query_queue} }, @$queue; 1735 push @{ $ns->{query_queue} }, @$queue;
1557 1736
… …
1574=cut 1753=cut
1575 1754
1576sub cf::client::coro { 1755sub cf::client::coro {
1577 my ($self, $cb) = @_; 1756 my ($self, $cb) = @_;
1578 1757
1579 my $coro; $coro = async { 1758 my $coro = &cf::async ($cb);
1580 eval {
1581 $cb->();
1582 };
1583 warn $@ if $@;
1584 };
1585 1759
1586 $coro->on_destroy (sub { 1760 $coro->on_destroy (sub {
1587 delete $self->{_coro}{$coro+0}; 1761 delete $self->{_coro}{$coro+0};
1588 }); 1762 });
1589 1763
… …
1761 1935
1762{ 1936{
1763 my $path = cf::localdir . "/database.pst"; 1937 my $path = cf::localdir . "/database.pst";
1764 1938
1765 sub db_load() { 1939 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 1940 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 1941 }
1769 1942
1770 my $pid; 1943 my $pid;
1771 1944
1772 sub db_save() { 1945 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 1946 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 1947 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 1948 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 1949 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 1950 rename "$path~", $path;
… …
1826 open my $fh, "<:utf8", cf::confdir . "/config" 1998 open my $fh, "<:utf8", cf::confdir . "/config"
1827 or return; 1999 or return;
1828 2000
1829 local $/; 2001 local $/;
1830 *CFG = YAML::Syck::Load <$fh>; 2002 *CFG = YAML::Syck::Load <$fh>;
2003
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005
2006 if (exists $CFG{mlockall}) {
2007 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall
2009 and die "WARNING: m(un)lockall failed: $!\n";
2010 };
2011 warn $@ if $@;
2012 }
1831} 2013}
1832 2014
1833sub main { 2015sub main {
1834 # we must not ever block the main coroutine 2016 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 2017 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2018 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub { 2019 (Coro::unblock_sub {
1838 Event::one_event; 2020 Event::one_event;
1839 })->(); 2021 })->();
1840 }; 2022 };
1841 2023
… …
1855 return; 2037 return;
1856 } 2038 }
1857 2039
1858 warn "reloading..."; 2040 warn "reloading...";
1859 2041
1860 local $FREEZE = 1; 2042 my $guard = freeze_mainloop;
1861 cf::emergency_save; 2043 cf::emergency_save;
1862 2044
1863 eval { 2045 eval {
1864 # if anything goes wrong in here, we should simply crash as we already saved 2046 # if anything goes wrong in here, we should simply crash as we already saved
1865 2047
… …
2001 reentrant => 0, 2183 reentrant => 0,
2002 prio => 0, 2184 prio => 0,
2003 at => $NEXT_TICK || $TICK, 2185 at => $NEXT_TICK || $TICK,
2004 data => WF_AUTOCANCEL, 2186 data => WF_AUTOCANCEL,
2005 cb => sub { 2187 cb => sub {
2006 unless ($FREEZE) {
2007 cf::server_tick; # one server iteration 2188 cf::server_tick; # one server iteration
2008 $RUNTIME += $TICK; 2189 $RUNTIME += $TICK;
2009 }
2010
2011 $NEXT_TICK += $TICK; 2190 $NEXT_TICK += $TICK;
2012 2191
2013 # if we are delayed by four ticks or more, skip them all 2192 # if we are delayed by four ticks or more, skip them all
2014 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015 2194
… …
2038 or warn "ERROR: unable to write runtime file: $!"; 2217 or warn "ERROR: unable to write runtime file: $!";
2039 })->(); 2218 })->();
2040 }, 2219 },
2041); 2220);
2042 2221
2222END { cf::emergency_save }
2223
20431 22241
2044 2225

Diff Legend

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