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.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.169 by root, Sun Jan 14 01:09:46 2007 UTC

… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
54our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 57our $RUNTIME;
56 58
57our %PLAYER; # all users 59our %PLAYER; # all users
58our %MAP; # all maps 60our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
61 63
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 69
65binmode STDOUT; 70binmode STDOUT;
66binmode STDERR; 71binmode STDERR;
67 72
68# read virtual server time, if available 73# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
80 85
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
84 87
85############################################################################# 88#############################################################################
86 89
87=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
256} 259}
257 260
258sub freeze_mainloop { 261sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
260 263
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
263 $guard 270 $guard
264} 271}
265 272
266=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
361} 368}
362 369
363=back 370=back
364 371
365=cut 372=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 373
531############################################################################# 374#############################################################################
532 375
533=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
534 377
… …
840# object support 683# object support
841 684
842sub reattach { 685sub reattach {
843 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 690
846 my $registry = $obj->registry; 691 my $registry = $obj->registry;
847 692
848 @$registry = (); 693 @$registry = ();
849 694
… …
1036 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 884 . "\n};\n1";
1040 885
1041 eval $source 886 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1043 : "extension disabled.\n"; 888 : "extension disabled.\n";
889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
890 warn $@;
891 warn "mandatory extension failed to load, exiting.\n";
892 exit 1;
893 }
894 die $@;
895 }
1044 896
1045 push @EXTS, $pkg; 897 push @EXTS, $pkg;
1046} 898}
1047 899
1048sub load_extensions { 900sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1055 } 907 }
1056} 908}
1057 909
1058############################################################################# 910#############################################################################
1059# load/save/clean perl data associated with a map
1060
1061*cf::mapsupport::on_clean = sub {
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 911
1074=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1075 913
1076Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1077 915
… …
1213 \@logins 1051 \@logins
1214} 1052}
1215 1053
1216=item $player->maps 1054=item $player->maps
1217 1055
1218Returns an arrayref of cf::path's of all maps that are private for this 1056Returns an arrayref of map paths that are private for this
1219player. May block. 1057player. May block.
1220 1058
1221=cut 1059=cut
1222 1060
1223sub maps($) { 1061sub maps($) {
… …
1231 for (@$files) { 1069 for (@$files) {
1232 utf8::decode $_; 1070 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1235 1073
1074 s/\.map$//;
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1237 } 1076 }
1238 1077
1239 \@paths 1078 \@paths
1240} 1079}
1241 1080
… …
1267package cf::map; 1106package cf::map;
1268 1107
1269use Fcntl; 1108use Fcntl;
1270use Coro::AIO; 1109use Coro::AIO;
1271 1110
1111use overload
1112 '""' => \&as_string;
1113
1272our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1274 1116
1275sub generate_random_map { 1117sub generate_random_map {
1276 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1277 1119
1278 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1121 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1133 )
1293} 1134}
1294 1135
1136sub register {
1137 my (undef, $regex) = @_;
1138 my $pkg = caller;
1139
1140 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__;
1142
1143 $EXT_MAP{$pkg} = qr<$regex>;
1144}
1145
1146# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148
1149sub normalise {
1150 my ($path, $base) = @_;
1151
1152 # map plan:
1153 #
1154 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched
1156 # ?xxx/... are special absolute paths
1157 # ?random/... random maps
1158 # /... normal maps
1159 # ~user/... per-player map of a specific user
1160
1161 $path =~ s/$PATH_SEP/\//go;
1162
1163 # treat it as relative path if it starts with
1164 # something that looks reasonable
1165 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1166 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1167
1168 $base =~ s{[^/]+/?$}{};
1169 $path = "$base/$path";
1170 }
1171
1172 for ($path) {
1173 redo if s{//}{/};
1174 redo if s{/\.?/}{/};
1175 redo if s{/[^/]+/\.\./}{/};
1176 }
1177
1178 $path
1179}
1180
1181sub new_from_path {
1182 my (undef, $path, $base) = @_;
1183
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185
1186 $path = normalise $path, $base;
1187
1188 for my $pkg (keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) {
1190 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc.
1193 return $self;
1194 }
1195 }
1196
1197 Carp::carp "unable to resolve path '$path'.";
1198 ()
1199}
1200
1201sub init {
1202 my ($self) = @_;
1203
1204 $self
1205}
1206
1207sub as_string {
1208 my ($self) = @_;
1209
1210 "$self->{path}"
1211}
1212
1213# the displayed name, this is a one way mapping
1214sub visible_name {
1215 &as_string
1216}
1217
1218# the original (read-only) location
1219sub load_path {
1220 my ($self) = @_;
1221
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1223}
1224
1225# the temporary/swap location
1226sub save_path {
1227 my ($self) = @_;
1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1231}
1232
1233# the unique path, undef == no special unique path
1234sub uniq_path {
1235 my ($self) = @_;
1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1239}
1240
1295# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1296# all maps in C++... 1242# all maps in C++...
1297sub change_all_map_light { 1243sub change_all_map_light {
1298 my ($change) = @_; 1244 my ($change) = @_;
1299 1245
1300 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1302} 1248}
1303 1249
1250sub unlink_save {
1251 my ($self) = @_;
1252
1253 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1256}
1257
1304sub load_map_header($) { 1258sub load_header_from($) {
1305 my ($path) = @_; 1259 my ($self, $path) = @_;
1306 1260
1307 utf8::encode $path; 1261 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1309 or return; 1263 or return;
1310 1264
1311 my $map = cf::map::new 1265 $self->_load_header ($path)
1312 or return; 1266 or return;
1313 1267
1314 # for better error messages only, will be overwritten later 1268 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1269
1317 $map->load_header ($path) 1270 1
1271}
1272
1273sub load_orig {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->load_path)
1277}
1278
1279sub load_temp {
1280 my ($self) = @_;
1281
1282 $self->load_header_from ($self->save_path)
1283}
1284
1285sub load_header {
1286 my ($self) = @_;
1287
1288 if ($self->load_temp) {
1289 $self->last_access ((delete $self->{last_access})
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else {
1295 $self->load_orig
1318 or return; 1296 or return;
1319 1297
1320 $map->{load_path} = $path; 1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 }
1321 1303
1322 $map 1304 1
1323} 1305}
1324 1306
1325sub find; 1307sub find;
1326sub find { 1308sub find {
1327 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1328 1310
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1312
1334 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1335 1314
1336 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1338 1317 my $map = new_from_path cf::map $path
1339 # do it the slow way
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1318 or return;
1353 1319
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1366 1321
1367 Coro::cede; 1322 $map->load_header
1323 or return;
1368 1324
1369 if ($map->should_reset) { 1325 if ($map->should_reset) {
1370 $map->reset; 1326 $map->reset;
1371 undef $guard; 1327 undef $guard;
1372 $map = find $path 1328 $map = find $path
1373 or return; 1329 or return;
1374 } 1330 }
1375 1331
1376 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1377 } 1333 }
1378} 1334}
1379 1335
1380sub load { 1336sub load {
1381 my ($self) = @_; 1337 my ($self) = @_;
1382 1338
1383 my $path = $self->{path}; 1339 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1385 1341
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1343
1388 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1389 1345
1390 $self->alloc; 1346 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1348 or return;
1393 1349
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1396 1352
1397 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1354 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1356 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1402 } 1358 }
1403 } 1359 }
1404 1360
1405 Coro::cede; 1361 Coro::cede;
1406 1362
1407 # now do the right thing for maps 1363 # now do the right thing for maps
1408 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1409 1365
1410 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1367 $self->decay_objects;
1415 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1416 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1417 $self->set_darkness_map; 1371 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1420 $self->activate; 1375 $self->activate;
1421 } 1376 }
1422 1377
1423 Coro::cede;
1424
1425 $self->in_memory (cf::MAP_IN_MEMORY); 1378 $self->in_memory (cf::MAP_IN_MEMORY);
1379}
1380
1381sub customise_for {
1382 my ($self, $ob) = @_;
1383
1384 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player;
1386
1387 $self
1426} 1388}
1427 1389
1428# find and load all maps in the 3x3 area around a map 1390# find and load all maps in the 3x3 area around a map
1429sub load_diag { 1391sub load_diag {
1430 my ($map) = @_; 1392 my ($map) = @_;
… …
1462} 1424}
1463 1425
1464our %MAP_PREFETCH; 1426our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1427our $MAP_PREFETCHER = Coro::async {
1466 while () { 1428 while () {
1467 while (%MAP_PREFETCH) { 1429 for my $path (keys %MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path 1430 my $map = find $path
1473 or next; 1431 or next;
1474 $map->load; 1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1475 } 1435 }
1476 Coro::schedule; 1436 Coro::schedule;
1477 } 1437 }
1478}; 1438};
1479 1439
1480sub find_async { 1440sub find_async {
1481 my ($path, $origin) = @_; 1441 my ($path, $origin) = @_;
1482 1442
1483 $path = new cf::path $path, $origin && $origin->path; 1443 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1444
1486 if (my $map = $cf::MAP{$key}) { 1445 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1447 }
1489 1448
1490 $MAP_PREFETCH{$key} = $path; 1449 $MAP_PREFETCH{$path} = 0;
1491 $MAP_PREFETCHER->ready; 1450 $MAP_PREFETCHER->ready;
1492 1451
1493 () 1452 ()
1494} 1453}
1495 1454
… …
1500 1459
1501 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1502 1461
1503 return unless $self->dirty; 1462 return unless $self->dirty;
1504 1463
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1466
1508 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1509 1468
1510 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1511 1470
… …
1514 cf::async { 1473 cf::async {
1515 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1516 }; 1475 };
1517 1476
1518 if ($uniq) { 1477 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1480 } else {
1522 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1481 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1523 } 1482 }
1524} 1483}
1525 1484
1526sub swap_out { 1485sub swap_out {
1527 my ($self) = @_; 1486 my ($self) = @_;
… …
1541 1500
1542sub reset_at { 1501sub reset_at {
1543 my ($self) = @_; 1502 my ($self) = @_;
1544 1503
1545 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1548 1507
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1551 1510
… …
1559} 1518}
1560 1519
1561sub rename { 1520sub rename {
1562 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1563 1522
1523 normalise $new_path;
1524
1564 $self->{path}->unlink_save; 1525 $self->unlink_save;
1565 1526
1566 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1570 1530
1571 $self->save; 1531 $self->save;
1572} 1532}
1573 1533
1574sub reset { 1534sub reset {
1575 my ($self) = @_; 1535 my ($self) = @_;
1576 1536
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1538
1579 return if $self->players; 1539 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1581 1541
1582 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1583 1543
1584 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1585 1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1548
1586 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1587 1550
1588 $self->{path}->unlink_save; 1551 $self->unlink_save;
1589 $self->destroy; 1552 $self->destroy;
1590} 1553}
1591 1554
1592my $nuke_counter = "aaaa"; 1555my $nuke_counter = "aaaa";
1593 1556
… …
1598 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1600 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1601} 1564}
1602 1565
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1566=item cf::map::unique_maps
1614 1567
1615Returns an arrayref of cf::path's of all shared maps that have 1568Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1569instantiated unique items. May block.
1617 1570
1618=cut 1571=cut
1619 1572
1620sub unique_maps() { 1573sub unique_maps() {
… …
1626 for (@$files) { 1579 for (@$files) {
1627 utf8::decode $_; 1580 utf8::decode $_;
1628 next if /\.pst$/; 1581 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1630 1583
1584 s/\.map$//;
1631 push @paths, new cf::path $_; 1585 push @paths, $_;
1632 } 1586 }
1633 1587
1634 \@paths 1588 \@paths
1635} 1589}
1636 1590
… …
1711 1665
1712=item $player_object->enter_link 1666=item $player_object->enter_link
1713 1667
1714Freezes the player and moves him/her to a special map (C<{link}>). 1668Freezes the player and moves him/her to a special map (C<{link}>).
1715 1669
1716The player should be reaosnably safe there for short amounts of time. You 1670The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1718 1672
1673Will never block.
1674
1719=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1720 1676
1721Moves the player out of the specila link map onto the given map. If the 1677Moves the player out of the special C<{link}> map onto the specified
1722map is not valid (or omitted), the player will be moved back to the 1678map. If the map is not valid (or omitted), the player will be moved back
1723location he/she was before the call to C<enter_link>, or, if that fails, 1679to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1680fails, to the emergency map position.
1725 1681
1726Might block. 1682Might block.
1727 1683
1728=cut 1684=cut
1685
1686sub link_map {
1687 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1690 $LINK_MAP->load;
1691 }
1692
1693 $LINK_MAP
1694}
1729 1695
1730sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1731 my ($self) = @_; 1697 my ($self) = @_;
1732 1698
1733 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1734 1700
1735 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1702
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1704 if $self->map;
1739 1705
1740 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1707}
1742 1708
1743sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1745 1711
… …
1809=cut 1775=cut
1810 1776
1811sub cf::object::player::goto { 1777sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1813 1779
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1780 $self->enter_link;
1817 1781
1818 (async { 1782 (async {
1819 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1821 1785
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1787# if $map;
1824 1788
… …
1889 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1854 unless (eval {
1891 prepare_random_map $exit 1855 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1893 1857
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1860
1897 1; 1861 1;
1898 }) { 1862 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
… …
2282 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2283 2247
2284 cf::sync_job { 2248 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2255 $pl->valid or next;
2292 $pl->save; 2256 $pl->save;
… …
2406 exit 1; 2370 exit 1;
2407 } 2371 }
2408 2372
2409 warn "reloaded"; 2373 warn "reloaded";
2410}; 2374};
2411
2412#############################################################################
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2375
2455register_command "reload" => sub { 2376register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2457 2378
2458 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
… …
2487 }, 2408 },
2488); 2409);
2489 2410
2490IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2491 2412
2492Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2415 poll => 'r',
2495 prio => 5, 2416 prio => 5,
2496 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2498); 2419);
2499 2420
2500Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2502 after => 0, 2423 after => 0,
2503 interval => 10, 2424 interval => 10,
2504 cb => sub { 2425 cb => sub {
2505 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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