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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

… …
54our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 55our $RUNTIME;
56 56
57our %PLAYER; # all users 57our %PLAYER; # all users
58our %MAP; # all maps 58our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
61 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 67
65binmode STDOUT; 68binmode STDOUT;
66binmode STDERR; 69binmode STDERR;
67 70
68# read virtual server time, if available 71# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
80 83
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
84 85
85############################################################################# 86#############################################################################
86 87
87=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
… …
337 338
338 $coro 339 $coro
339} 340}
340 341
341sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
342 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
343 346
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 348 or return;
346 349
… …
361} 364}
362 365
363=back 366=back
364 367
365=cut 368=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
521package cf;
522 369
523############################################################################# 370#############################################################################
524 371
525=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
526 373
… …
1028 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 878 . "\n};\n1";
1032 879
1033 eval $source 880 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 882 : "extension disabled.\n";
883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
884 warn $@;
885 warn "mandatory extension failed to load, exiting.\n";
886 exit 1;
887 }
888 die $@;
889 }
1036 890
1037 push @EXTS, $pkg; 891 push @EXTS, $pkg;
1038} 892}
1039 893
1040sub load_extensions { 894sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1047 } 901 }
1048} 902}
1049 903
1050############################################################################# 904#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 905
1066=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1067 907
1068Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1069 909
… …
1205 \@logins 1045 \@logins
1206} 1046}
1207 1047
1208=item $player->maps 1048=item $player->maps
1209 1049
1210Returns an arrayref of cf::path's of all maps that are private for this 1050Returns an arrayref of map paths that are private for this
1211player. May block. 1051player. May block.
1212 1052
1213=cut 1053=cut
1214 1054
1215sub maps($) { 1055sub maps($) {
… …
1223 for (@$files) { 1063 for (@$files) {
1224 utf8::decode $_; 1064 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1065 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1066 next unless /^$PATH_SEP/o;
1227 1067
1068 s/\.map$//;
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1229 } 1070 }
1230 1071
1231 \@paths 1072 \@paths
1232} 1073}
1233 1074
… …
1259package cf::map; 1100package cf::map;
1260 1101
1261use Fcntl; 1102use Fcntl;
1262use Coro::AIO; 1103use Coro::AIO;
1263 1104
1105use overload
1106 '""' => \&as_string;
1107
1264our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1266 1110
1267sub generate_random_map { 1111sub generate_random_map {
1268 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1269 1113
1270 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1115 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1127 )
1285} 1128}
1286 1129
1130sub register {
1131 my (undef, $regex) = @_;
1132 my $pkg = caller;
1133
1134 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__;
1136
1137 $EXT_MAP{$pkg} = qr<$regex>;
1138}
1139
1140# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142
1143sub normalise {
1144 my ($path, $base) = @_;
1145
1146 # map plan:
1147 #
1148 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched
1150 # ?xxx/... are special absolute paths
1151 # ?random/... random maps
1152 # /... normal maps
1153 # ~user/... per-player map of a specific user
1154
1155 $path =~ s/$PATH_SEP/\//go;
1156
1157 # treat it as relative path if it starts with
1158 # something that looks reasonable
1159 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1160 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1161
1162 $base =~ s{[^/]+/?$}{};
1163 $path = "$base/$path";
1164 }
1165
1166 for ($path) {
1167 redo if s{//}{/};
1168 redo if s{/\.?/}{/};
1169 redo if s{/[^/]+/\.\./}{/};
1170 }
1171
1172 $path
1173}
1174
1175sub new_from_path {
1176 my (undef, $path, $base) = @_;
1177
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179
1180 $path = normalise $path, $base;
1181
1182 for my $pkg (keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) {
1184 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc.
1187 return $self;
1188 }
1189 }
1190
1191 Carp::carp "unable to resolve path '$path'.";
1192 ()
1193}
1194
1195sub init {
1196 my ($self) = @_;
1197
1198 $self
1199}
1200
1201sub as_string {
1202 my ($self) = @_;
1203
1204 "$self->{path}"
1205}
1206
1207# the displayed name, this is a one way mapping
1208sub visible_name {
1209 &as_string
1210}
1211
1212# the original (read-only) location
1213sub load_path {
1214 my ($self) = @_;
1215
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1217}
1218
1219# the temporary/swap location
1220sub save_path {
1221 my ($self) = @_;
1222
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1225}
1226
1227# the unique path, undef == no special unique path
1228sub uniq_path {
1229 my ($self) = @_;
1230
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1233}
1234
1287# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1288# all maps in C++... 1236# all maps in C++...
1289sub change_all_map_light { 1237sub change_all_map_light {
1290 my ($change) = @_; 1238 my ($change) = @_;
1291 1239
1292 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1294} 1242}
1295 1243
1244sub unlink_save {
1245 my ($self) = @_;
1246
1247 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1250}
1251
1296sub load_map_header($) { 1252sub load_header_from($) {
1297 my ($path) = @_; 1253 my ($self, $path) = @_;
1298 1254
1299 utf8::encode $path; 1255 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1301 or return; 1257 or return;
1302 1258
1303 my $map = cf::map::new 1259 $self->_load_header ($path)
1304 or return; 1260 or return;
1305 1261
1306 # for better error messages only, will be overwritten later 1262 $self->{load_path} = $path;
1307 $map->path ($path);
1308 1263
1309 $map->load_header ($path) 1264 1
1265}
1266
1267sub load_orig {
1268 my ($self) = @_;
1269
1270 $self->load_header_from ($self->load_path)
1271}
1272
1273sub load_temp {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->save_path)
1277}
1278
1279sub load_header {
1280 my ($self) = @_;
1281
1282 if ($self->load_temp) {
1283 $self->last_access ((delete $self->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 $self->load_orig
1310 or return; 1290 or return;
1311 1291
1312 $map->{load_path} = $path; 1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 }
1313 1297
1314 $map 1298 1
1315} 1299}
1316 1300
1317sub find; 1301sub find;
1318sub find { 1302sub find {
1319 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1320 1304
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1306
1326 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1327 1308
1328 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1330 1311 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1312 or return;
1345 1313
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1358 1315
1359 Coro::cede; 1316 $map->load_header
1317 or return;
1360 1318
1361 if ($map->should_reset) { 1319 if ($map->should_reset) {
1362 $map->reset; 1320 $map->reset;
1363 undef $guard; 1321 undef $guard;
1364 $map = find $path 1322 $map = find $path
1365 or return; 1323 or return;
1366 } 1324 }
1367 1325
1368 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1369 } 1327 }
1370} 1328}
1371 1329
1372sub load { 1330sub load {
1373 my ($self) = @_; 1331 my ($self) = @_;
1374 1332
1375 my $path = $self->{path}; 1333 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1377 1335
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1337
1380 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1381 1339
1382 $self->alloc; 1340 $self->alloc;
1383 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1342 or return;
1385 1343
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1388 1346
1389 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1348 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1350 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1394 } 1352 }
1395 } 1353 }
1396 1354
1397 Coro::cede; 1355 Coro::cede;
1398 1356
1399 # now do the right thing for maps 1357 # now do the right thing for maps
1400 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1401 1359
1402 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1361 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1409 $self->set_darkness_map; 1365 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1412 $self->activate; 1369 $self->activate;
1413 } 1370 }
1414 1371
1415 Coro::cede;
1416
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1373}
1374
1375sub customise_for {
1376 my ($self, $ob) = @_;
1377
1378 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player;
1380
1381 $self
1418} 1382}
1419 1383
1420# find and load all maps in the 3x3 area around a map 1384# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1385sub load_diag {
1422 my ($map) = @_; 1386 my ($map) = @_;
… …
1454} 1418}
1455 1419
1456our %MAP_PREFETCH; 1420our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1421our $MAP_PREFETCHER = Coro::async {
1458 while () { 1422 while () {
1459 while (%MAP_PREFETCH) { 1423 for my $path (keys %MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path 1424 my $map = find $path
1465 or next; 1425 or next;
1466 $map->load; 1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1467 } 1429 }
1468 Coro::schedule; 1430 Coro::schedule;
1469 } 1431 }
1470}; 1432};
1471 1433
1472sub find_async { 1434sub find_async {
1473 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1474 1436
1475 $path = new cf::path $path, $origin && $origin->path; 1437 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1438
1478 if (my $map = $cf::MAP{$key}) { 1439 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1441 }
1481 1442
1482 $MAP_PREFETCH{$key} = $path; 1443 $MAP_PREFETCH{$path} = 0;
1483 $MAP_PREFETCHER->ready; 1444 $MAP_PREFETCHER->ready;
1484 1445
1485 () 1446 ()
1486} 1447}
1487 1448
… …
1492 1453
1493 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1494 1455
1495 return unless $self->dirty; 1456 return unless $self->dirty;
1496 1457
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1460
1500 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1501 1462
1502 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1503 1464
… …
1506 cf::async { 1467 cf::async {
1507 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1508 }; 1469 };
1509 1470
1510 if ($uniq) { 1471 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1474 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1475 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1476 }
1516} 1477}
1517 1478
1518sub swap_out { 1479sub swap_out {
1519 my ($self) = @_; 1480 my ($self) = @_;
… …
1533 1494
1534sub reset_at { 1495sub reset_at {
1535 my ($self) = @_; 1496 my ($self) = @_;
1536 1497
1537 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1539 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1540 1501
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1504
… …
1548 my ($self) = @_; 1509 my ($self) = @_;
1549 1510
1550 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1551} 1512}
1552 1513
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename { 1514sub rename {
1562 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1563 1516
1517 normalise $new_path;
1518
1564 $self->unlink_save; 1519 $self->unlink_save;
1565 1520
1566 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1570 1524
1571 $self->save; 1525 $self->save;
1572} 1526}
1573 1527
1574sub reset { 1528sub reset {
1575 my ($self) = @_; 1529 my ($self) = @_;
1576 1530
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1532
1579 return if $self->players; 1533 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1581 1535
1582 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1583 1537
1584 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1585 1542
1586 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1587 1544
1588 $self->unlink_save; 1545 $self->unlink_save;
1589 $self->destroy; 1546 $self->destroy;
… …
1598 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1600 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1601} 1558}
1602 1559
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 1560=item cf::map::unique_maps
1614 1561
1615Returns an arrayref of cf::path's of all shared maps that have 1562Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1563instantiated unique items. May block.
1617 1564
1618=cut 1565=cut
1619 1566
1620sub unique_maps() { 1567sub unique_maps() {
… …
1626 for (@$files) { 1573 for (@$files) {
1627 utf8::decode $_; 1574 utf8::decode $_;
1628 next if /\.pst$/; 1575 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1576 next unless /^$PATH_SEP/o;
1630 1577
1578 s/\.map$//;
1631 push @paths, new cf::path $_; 1579 push @paths, $_;
1632 } 1580 }
1633 1581
1634 \@paths 1582 \@paths
1635} 1583}
1636 1584
… …
1711 1659
1712=item $player_object->enter_link 1660=item $player_object->enter_link
1713 1661
1714Freezes the player and moves him/her to a special map (C<{link}>). 1662Freezes the player and moves him/her to a special map (C<{link}>).
1715 1663
1716The player should be reaosnably safe there for short amounts of time. You 1664The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1718 1666
1667Will never block.
1668
1719=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1720 1670
1721Moves the player out of the specila link map onto the given map. If the 1671Moves 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 1672map. 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, 1673to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1674fails, to the emergency map position.
1725 1675
1726Might block. 1676Might block.
1727 1677
1728=cut 1678=cut
1679
1680sub link_map {
1681 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1684 $LINK_MAP->load;
1685 }
1686
1687 $LINK_MAP
1688}
1729 1689
1730sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1731 my ($self) = @_; 1691 my ($self) = @_;
1732 1692
1733 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1734 1694
1735 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1696
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1698 if $self->map;
1739 1699
1740 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1701}
1742 1702
1743sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1745 1705
… …
1809=cut 1769=cut
1810 1770
1811sub cf::object::player::goto { 1771sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1813 1773
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1774 $self->enter_link;
1817 1775
1818 (async { 1776 (async {
1819 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1821 1779
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1781# if $map;
1824 1782
… …
1889 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1848 unless (eval {
1891 prepare_random_map $exit 1849 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1893 1851
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1854
1897 1; 1855 1;
1898 }) { 1856 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
… …
2282 warn "enter emergency perl save\n"; 2240 warn "enter emergency perl save\n";
2283 2241
2284 cf::sync_job { 2242 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2243 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2244 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2245 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2246 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2247 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2248 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2249 $pl->valid or next;
2292 $pl->save; 2250 $pl->save;
… …
2406 exit 1; 2364 exit 1;
2407 } 2365 }
2408 2366
2409 warn "reloaded"; 2367 warn "reloaded";
2410}; 2368};
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 2369
2455register_command "reload" => sub { 2370register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2457 2372
2458 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {

Diff Legend

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