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.161 by root, Thu Jan 11 00:16:58 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 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 369
522############################################################################# 370#############################################################################
523 371
524=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
525 373
… …
1027 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 878 . "\n};\n1";
1031 879
1032 eval $source 880 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1034 : "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 }
1035 890
1036 push @EXTS, $pkg; 891 push @EXTS, $pkg;
1037} 892}
1038 893
1039sub load_extensions { 894sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1046 } 901 }
1047} 902}
1048 903
1049############################################################################# 904#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 905
1065=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1066 907
1067Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1068 909
… …
1204 \@logins 1045 \@logins
1205} 1046}
1206 1047
1207=item $player->maps 1048=item $player->maps
1208 1049
1209Returns 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
1210player. May block. 1051player. May block.
1211 1052
1212=cut 1053=cut
1213 1054
1214sub maps($) { 1055sub maps($) {
… …
1222 for (@$files) { 1063 for (@$files) {
1223 utf8::decode $_; 1064 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1065 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1066 next unless /^$PATH_SEP/o;
1226 1067
1068 s/\.map$//;
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1228 } 1070 }
1229 1071
1230 \@paths 1072 \@paths
1231} 1073}
1232 1074
… …
1258package cf::map; 1100package cf::map;
1259 1101
1260use Fcntl; 1102use Fcntl;
1261use Coro::AIO; 1103use Coro::AIO;
1262 1104
1105use overload
1106 '""' => \&as_string;
1107
1263our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1265 1110
1266sub generate_random_map { 1111sub generate_random_map {
1267 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1268 1113
1269 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1115 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1124 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 )
1128}
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
1283} 1233}
1284 1234
1285# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1286# all maps in C++... 1236# all maps in C++...
1287sub change_all_map_light { 1237sub change_all_map_light {
… …
1289 1239
1290 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1292} 1242}
1293 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
1294sub load_map_header($) { 1252sub load_header_from($) {
1295 my ($path) = @_; 1253 my ($self, $path) = @_;
1296 1254
1297 utf8::encode $path; 1255 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1299 or return; 1257 or return;
1300 1258
1301 my $map = cf::map::new 1259 $self->_load_header ($path)
1302 or return; 1260 or return;
1303 1261
1304 # for better error messages only, will be overwritten later 1262 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1263
1307 $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
1308 or return; 1290 or return;
1309 1291
1310 $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 }
1311 1297
1312 $map 1298 1
1313} 1299}
1314 1300
1315sub find; 1301sub find;
1316sub find { 1302sub find {
1317 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1318 1304
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1306
1324 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1325 1308
1326 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1328 1311 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1312 or return;
1343 1313
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1356 1315
1357 Coro::cede; 1316 $map->load_header
1317 or return;
1358 1318
1359 if ($map->should_reset) { 1319 if ($map->should_reset) {
1360 $map->reset; 1320 $map->reset;
1361 undef $guard; 1321 undef $guard;
1362 $map = find $path 1322 $map = find $path
1363 or return; 1323 or return;
1364 } 1324 }
1365 1325
1366 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1367 } 1327 }
1368} 1328}
1369 1329
1370sub load { 1330sub load {
1371 my ($self) = @_; 1331 my ($self) = @_;
1372 1332
1373 my $path = $self->{path}; 1333 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1375 1335
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1337
1378 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1379 1339
1380 $self->alloc; 1340 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1342 or return;
1383 1343
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1386 1346
1387 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1348 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1350 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1392 } 1352 }
1393 } 1353 }
1394 1354
1395 Coro::cede; 1355 Coro::cede;
1396 1356
1397 # now do the right thing for maps 1357 # now do the right thing for maps
1398 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1399 1359
1400 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1361 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1407 $self->set_darkness_map; 1365 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1410 $self->activate; 1369 $self->activate;
1411 } 1370 }
1412 1371
1413 Coro::cede;
1414
1415 $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
1416} 1382}
1417 1383
1418# 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
1419sub load_diag { 1385sub load_diag {
1420 my ($map) = @_; 1386 my ($map) = @_;
… …
1452} 1418}
1453 1419
1454our %MAP_PREFETCH; 1420our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1421our $MAP_PREFETCHER = Coro::async {
1456 while () { 1422 while () {
1457 while (%MAP_PREFETCH) { 1423 for my $path (keys %MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path 1424 my $map = find $path
1463 or next; 1425 or next;
1464 $map->load; 1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1465 } 1429 }
1466 Coro::schedule; 1430 Coro::schedule;
1467 } 1431 }
1468}; 1432};
1469 1433
1470sub find_async { 1434sub find_async {
1471 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1472 1436
1473 $path = new cf::path $path, $origin && $origin->path; 1437 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1438
1476 if (my $map = $cf::MAP{$key}) { 1439 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1441 }
1479 1442
1480 $MAP_PREFETCH{$key} = $path; 1443 $MAP_PREFETCH{$path} = 0;
1481 $MAP_PREFETCHER->ready; 1444 $MAP_PREFETCHER->ready;
1482 1445
1483 () 1446 ()
1484} 1447}
1485 1448
… …
1490 1453
1491 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1492 1455
1493 return unless $self->dirty; 1456 return unless $self->dirty;
1494 1457
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1460
1498 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1499 1462
1500 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1501 1464
… …
1504 cf::async { 1467 cf::async {
1505 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1506 }; 1469 };
1507 1470
1508 if ($uniq) { 1471 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1474 } else {
1512 $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);
1513 } 1476 }
1514} 1477}
1515 1478
1516sub swap_out { 1479sub swap_out {
1517 my ($self) = @_; 1480 my ($self) = @_;
… …
1531 1494
1532sub reset_at { 1495sub reset_at {
1533 my ($self) = @_; 1496 my ($self) = @_;
1534 1497
1535 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1537 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1538 1501
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1504
… …
1546 my ($self) = @_; 1509 my ($self) = @_;
1547 1510
1548 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1549} 1512}
1550 1513
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename { 1514sub rename {
1560 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1561 1516
1517 normalise $new_path;
1518
1562 $self->unlink_save; 1519 $self->unlink_save;
1563 1520
1564 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1568 1524
1569 $self->save; 1525 $self->save;
1570} 1526}
1571 1527
1572sub reset { 1528sub reset {
1573 my ($self) = @_; 1529 my ($self) = @_;
1574 1530
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1532
1577 return if $self->players; 1533 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1579 1535
1580 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1581 1537
1582 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1583 1542
1584 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1585 1544
1586 $self->unlink_save; 1545 $self->unlink_save;
1587 $self->destroy; 1546 $self->destroy;
… …
1596 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1598 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1599} 1558}
1600 1559
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1560=item cf::map::unique_maps
1612 1561
1613Returns an arrayref of cf::path's of all shared maps that have 1562Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1563instantiated unique items. May block.
1615 1564
1616=cut 1565=cut
1617 1566
1618sub unique_maps() { 1567sub unique_maps() {
… …
1624 for (@$files) { 1573 for (@$files) {
1625 utf8::decode $_; 1574 utf8::decode $_;
1626 next if /\.pst$/; 1575 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1576 next unless /^$PATH_SEP/o;
1628 1577
1578 s/\.map$//;
1629 push @paths, new cf::path $_; 1579 push @paths, $_;
1630 } 1580 }
1631 1581
1632 \@paths 1582 \@paths
1633} 1583}
1634 1584
… …
1709 1659
1710=item $player_object->enter_link 1660=item $player_object->enter_link
1711 1661
1712Freezes 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}>).
1713 1663
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1716 1666
1667Will never block.
1668
1717=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1718 1670
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1674fails, to the emergency map position.
1723 1675
1724Might block. 1676Might block.
1725 1677
1726=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}
1727 1689
1728sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1729 my ($self) = @_; 1691 my ($self) = @_;
1730 1692
1731 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1732 1694
1733 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1696
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1698 if $self->map;
1737 1699
1738 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1701}
1740 1702
1741sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1743 1705
… …
1807=cut 1769=cut
1808 1770
1809sub cf::object::player::goto { 1771sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1811 1773
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1774 $self->enter_link;
1815 1775
1816 (async { 1776 (async {
1817 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1819 1779
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1781# if $map;
1822 1782
… …
1887 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1848 unless (eval {
1889 prepare_random_map $exit 1849 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1891 1851
1892 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;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1854
1895 1; 1855 1;
1896 }) { 1856 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
… …
2280 warn "enter emergency perl save\n"; 2240 warn "enter emergency perl save\n";
2281 2241
2282 cf::sync_job { 2242 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2243 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2244 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2245 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2246 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2247 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2248 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2249 $pl->valid or next;
2290 $pl->save; 2250 $pl->save;
… …
2405 } 2365 }
2406 2366
2407 warn "reloaded"; 2367 warn "reloaded";
2408}; 2368};
2409 2369
2410#############################################################################
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452
2453register_command "reload" => sub { 2370register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2455 2372
2456 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2374 $who->message ("start of reload.");
… …
2466 reentrant => 0, 2383 reentrant => 0,
2467 prio => 0, 2384 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2470 cb => sub { 2387 cb => sub {
2388 $NOW = Event::time;
2389
2471 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2474 2393
2475 $WAIT_FOR_TICK->broadcast; 2394 $WAIT_FOR_TICK->broadcast;

Diff Legend

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