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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

… …
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38 38
39our @EXTS = (); # list of extension package names 39our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
42 43
43our @EVENT; 44our @EVENT;
44our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
45 46
46our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
… …
53our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 55our $RUNTIME;
55 56
56our %PLAYER; # all users 57our %PLAYER; # all users
57our %MAP; # all maps 58our %MAP; # all maps
58our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
60 61
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $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
63 67
64binmode STDOUT; 68binmode STDOUT;
65binmode STDERR; 69binmode STDERR;
66 70
67# read virtual server time, if available 71# read virtual server time, if available
… …
75mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
76mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
79 83
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
83 85
84############################################################################# 86#############################################################################
85 87
86=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
… …
336 338
337 $coro 339 $coro
338} 340}
339 341
340sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
341 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
342 346
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
344 or return; 348 or return;
345 349
… …
360} 364}
361 365
362=back 366=back
363 367
364=cut 368=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 369
493############################################################################# 370#############################################################################
494 371
495=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
496 373
… …
987 my $base = $1; 864 my $base = $1;
988 my $pkg = $1; 865 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
991 868
992 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
993 870
994 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 872 or die "$path: $!";
996 873
997 my $source = 874 my $source =
998 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 878 . "\n};\n1";
1002 879
1003 eval $source 880 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1005 : "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 }
1006 890
1007 push @EXTS, $pkg; 891 push @EXTS, $pkg;
1008} 892}
1009 893
1010sub load_extensions { 894sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1017 } 901 }
1018} 902}
1019 903
1020############################################################################# 904#############################################################################
1021# load/save/clean perl data associated with a map
1022
1023*cf::mapsupport::on_clean = sub {
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 905
1036=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1037 907
1038Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1039 909
… …
1175 \@logins 1045 \@logins
1176} 1046}
1177 1047
1178=item $player->maps 1048=item $player->maps
1179 1049
1180Returns 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
1181player. May block. 1051player. May block.
1182 1052
1183=cut 1053=cut
1184 1054
1185sub maps($) { 1055sub maps($) {
… …
1193 for (@$files) { 1063 for (@$files) {
1194 utf8::decode $_; 1064 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1065 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1066 next unless /^$PATH_SEP/o;
1197 1067
1068 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1070 }
1200 1071
1201 \@paths 1072 \@paths
1202} 1073}
1203 1074
… …
1229package cf::map; 1100package cf::map;
1230 1101
1231use Fcntl; 1102use Fcntl;
1232use Coro::AIO; 1103use Coro::AIO;
1233 1104
1105use overload
1106 '""' => \&as_string;
1107
1234our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1236 1110
1237sub generate_random_map { 1111sub generate_random_map {
1238 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1239 1113
1240 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1115 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $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},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (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
1254} 1233}
1255 1234
1256# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1257# all maps in C++... 1236# all maps in C++...
1258sub change_all_map_light { 1237sub change_all_map_light {
… …
1260 1239
1261 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1263} 1242}
1264 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
1265sub try_load_header($) { 1252sub load_header_from($) {
1266 my ($path) = @_; 1253 my ($self, $path) = @_;
1267 1254
1268 utf8::encode $path; 1255 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1270 or return; 1257 or return;
1271 1258
1272 my $map = cf::map::new 1259 $self->_load_header ($path)
1273 or return; 1260 or return;
1274 1261
1275 # for better error messages only, will be overwritten 1262 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1263
1278 $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
1279 or return; 1290 or return;
1280 1291
1281 $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 }
1282 1297
1283 $map 1298 1
1284} 1299}
1285 1300
1286sub find; 1301sub find;
1287sub find { 1302sub find {
1288 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1289 1304
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1306
1295 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1296 1308
1297 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1299 1311 my $map = new_from_path cf::map $path
1300 # do it the slow way
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1312 or return;
1319 1313
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1332 1315
1333 Coro::cede; 1316 $map->load_header
1317 or return;
1334 1318
1335 if ($map->should_reset) { 1319 if ($map->should_reset) {
1336 $map->reset; 1320 $map->reset;
1337 undef $guard; 1321 undef $guard;
1338 $map = find $path 1322 $map = find $path
1339 or return; 1323 or return;
1340 } 1324 }
1341 1325
1342 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1343 } 1327 }
1344} 1328}
1345 1329
1346sub load { 1330sub load {
1347 my ($self) = @_; 1331 my ($self) = @_;
1348 1332
1349 my $path = $self->{path}; 1333 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1351 1335
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1337
1354 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1355 1339
1356 $self->alloc; 1340 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1342 or return;
1359 1343
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1362 1346
1363 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1348 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1350 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1368 } 1352 }
1369 } 1353 }
1370 1354
1371 Coro::cede; 1355 Coro::cede;
1372 1356
1373 # now do the right thing for maps 1357 # now do the right thing for maps
1374 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1375 1359
1376 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1361 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1383 $self->set_darkness_map; 1365 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1386 $self->activate; 1369 $self->activate;
1387 } 1370 }
1388 1371
1389 Coro::cede;
1390
1391 $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
1392} 1382}
1393 1383
1394# 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
1395sub load_diag { 1385sub load_diag {
1396 my ($map) = @_; 1386 my ($map) = @_;
… …
1428} 1418}
1429 1419
1430our %MAP_PREFETCH; 1420our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1421our $MAP_PREFETCHER = Coro::async {
1432 while () { 1422 while () {
1433 while (%MAP_PREFETCH) { 1423 for my $path (keys %MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path 1424 my $map = find $path
1439 or next; 1425 or next;
1440 $map->load; 1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1441 } 1429 }
1442 Coro::schedule; 1430 Coro::schedule;
1443 } 1431 }
1444}; 1432};
1445 1433
1446sub find_async { 1434sub find_async {
1447 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1448 1436
1449 $path = new cf::path $path, $origin && $origin->path; 1437 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1438
1452 if (my $map = $cf::MAP{$key}) { 1439 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1441 }
1455 1442
1456 $MAP_PREFETCH{$key} = $path; 1443 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1444 $MAP_PREFETCHER->ready;
1458 1445
1459 () 1446 ()
1460} 1447}
1461 1448
… …
1466 1453
1467 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1468 1455
1469 return unless $self->dirty; 1456 return unless $self->dirty;
1470 1457
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1460
1474 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1475 1462
1476 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1477 1464
… …
1480 cf::async { 1467 cf::async {
1481 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1482 }; 1469 };
1483 1470
1484 if ($uniq) { 1471 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1474 } else {
1488 $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);
1489 } 1476 }
1490} 1477}
1491 1478
1492sub swap_out { 1479sub swap_out {
1493 my ($self) = @_; 1480 my ($self) = @_;
… …
1507 1494
1508sub reset_at { 1495sub reset_at {
1509 my ($self) = @_; 1496 my ($self) = @_;
1510 1497
1511 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1513 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1514 1501
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 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;
1517 1504
… …
1522 my ($self) = @_; 1509 my ($self) = @_;
1523 1510
1524 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1525} 1512}
1526 1513
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename { 1514sub rename {
1536 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1537 1516
1517 normalise $new_path;
1518
1538 $self->unlink_save; 1519 $self->unlink_save;
1539 1520
1540 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1544 1524
1545 $self->save; 1525 $self->save;
1546} 1526}
1547 1527
1548sub reset { 1528sub reset {
1549 my ($self) = @_; 1529 my ($self) = @_;
1550 1530
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1532
1553 return if $self->players; 1533 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1555 1535
1556 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1557 1537
1558 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1559 1542
1560 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1561 1544
1562 $self->unlink_save; 1545 $self->unlink_save;
1563 $self->destroy; 1546 $self->destroy;
… …
1572 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1575} 1558}
1576 1559
1577sub customise_for {
1578 my ($map, $ob) = @_;
1579
1580 if ($map->per_player) {
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1582 }
1583
1584 $map
1585}
1586
1587=item cf::map::unique_maps 1560=item cf::map::unique_maps
1588 1561
1589Returns an arrayref of cf::path's of all shared maps that have 1562Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1563instantiated unique items. May block.
1591 1564
1592=cut 1565=cut
1593 1566
1594sub unique_maps() { 1567sub unique_maps() {
… …
1600 for (@$files) { 1573 for (@$files) {
1601 utf8::decode $_; 1574 utf8::decode $_;
1602 next if /\.pst$/; 1575 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1576 next unless /^$PATH_SEP/o;
1604 1577
1578 s/\.map$//;
1605 push @paths, new cf::path $_; 1579 push @paths, $_;
1606 } 1580 }
1607 1581
1608 \@paths 1582 \@paths
1609} 1583}
1610 1584
… …
1685 1659
1686=item $player_object->enter_link 1660=item $player_object->enter_link
1687 1661
1688Freezes 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}>).
1689 1663
1690The 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
1691I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1692 1666
1667Will never block.
1668
1693=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1694 1670
1695Moves 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
1696map 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
1697location 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
1698to the emergency map position. 1674fails, to the emergency map position.
1699 1675
1700Might block. 1676Might block.
1701 1677
1702=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}
1703 1689
1704sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1705 my ($self) = @_; 1691 my ($self) = @_;
1706 1692
1707 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1708 1694
1709 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1696
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1698 if $self->map;
1713 1699
1714 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1701}
1716 1702
1717sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1719 1705
… …
1783=cut 1769=cut
1784 1770
1785sub cf::object::player::goto { 1771sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1787 1773
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1774 $self->enter_link;
1791 1775
1792 (async { 1776 (async {
1793 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1795 1779
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1781# if $map;
1798 1782
… …
1863 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1848 unless (eval {
1865 prepare_random_map $exit 1849 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1867 1851
1868 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;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1854
1871 1; 1855 1;
1872 }) { 1856 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
… …
2256 warn "enter emergency perl save\n"; 2240 warn "enter emergency perl save\n";
2257 2241
2258 cf::sync_job { 2242 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2243 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2244 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2245 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2246 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2247 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2248 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2249 $pl->valid or next;
2266 $pl->save; 2250 $pl->save;
… …
2314 warn "remove ext commands"; 2298 warn "remove ext commands";
2315 %EXTCMD = (); 2299 %EXTCMD = ();
2316 2300
2317 warn "unload/nuke all extensions"; 2301 warn "unload/nuke all extensions";
2318 for my $pkg (@EXTS) { 2302 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2303 warn "... unloading $pkg";
2320 2304
2321 if (my $cb = $pkg->can ("unload")) { 2305 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2306 eval {
2323 $cb->($pkg); 2307 $cb->($pkg);
2324 1 2308 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2309 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2310 }
2327 2311
2312 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2313 Symbol::delete_package $pkg;
2329 } 2314 }
2330 2315
2331 warn "unload all perl modules loaded from $LIBDIR"; 2316 warn "unload all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
… …
2379 exit 1; 2364 exit 1;
2380 } 2365 }
2381 2366
2382 warn "reloaded"; 2367 warn "reloaded";
2383}; 2368};
2384
2385#############################################################################
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2369
2428register_command "reload" => sub { 2370register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2430 2372
2431 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
… …
2441 reentrant => 0, 2383 reentrant => 0,
2442 prio => 0, 2384 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2445 cb => sub { 2387 cb => sub {
2388 $NOW = Event::time;
2389
2446 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2449 2393
2450 $WAIT_FOR_TICK->broadcast; 2394 $WAIT_FOR_TICK->broadcast;

Diff Legend

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