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.160 by root, Wed Jan 10 22:54:06 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 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
… …
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 {
… …
1175 \@logins 1059 \@logins
1176} 1060}
1177 1061
1178=item $player->maps 1062=item $player->maps
1179 1063
1180Returns an arrayref of cf::path's of all maps that are private for this 1064Returns an arrayref of map paths that are private for this
1181player. May block. 1065player. May block.
1182 1066
1183=cut 1067=cut
1184 1068
1185sub maps($) { 1069sub maps($) {
… …
1193 for (@$files) { 1077 for (@$files) {
1194 utf8::decode $_; 1078 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1079 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1080 next unless /^$PATH_SEP/o;
1197 1081
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1083 }
1200 1084
1201 \@paths 1085 \@paths
1202} 1086}
1203 1087
… …
1229package cf::map; 1113package cf::map;
1230 1114
1231use Fcntl; 1115use Fcntl;
1232use Coro::AIO; 1116use Coro::AIO;
1233 1117
1118use overload
1119 '""' => \&as_string;
1120
1234our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1236 1123
1237sub generate_random_map { 1124sub generate_random_map {
1238 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1239 1126
1240 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1128 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub normalise {
1157 my ($path, $base) = @_;
1158
1159 # map plan:
1160 #
1161 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched
1163 # ?xxx/... are special absolute paths
1164 # ?random/... random maps
1165 # /... normal maps
1166 # ~user/... per-player map of a specific user
1167
1168 $path =~ s/$PATH_SEP/\//go;
1169
1170 # treat it as relative path if it starts with
1171 # something that looks reasonable
1172 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1173 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1174
1175 $base =~ s{[^/]+/?$}{};
1176 $path = "$base/$path";
1177 }
1178
1179 for ($path) {
1180 redo if s{//}{/};
1181 redo if s{/\.?/}{/};
1182 redo if s{/[^/]+/\.\./}{/};
1183 }
1184
1185 $path
1186}
1187
1188sub new_from_path {
1189 my (undef, $path, $base) = @_;
1190
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192
1193 $path = normalise $path, $base;
1194
1195 for my $pkg (keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) {
1197 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc.
1200 return $self;
1201 }
1202 }
1203
1204 Carp::carp "unable to resolve path '$path'.";
1205 ()
1206}
1207
1208sub init {
1209 my ($self) = @_;
1210
1211 $self
1212}
1213
1214sub as_string {
1215 my ($self) = @_;
1216
1217 "$self->{path}"
1218}
1219
1220# the displayed name, this is a one way mapping
1221sub visible_name {
1222 &as_string
1223}
1224
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location
1233sub load_path {
1234 my ($self) = @_;
1235
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1237}
1238
1239# the temporary/swap location
1240sub save_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
1244}
1245
1246# the unique path, undef == no special unique path
1247sub uniq_path {
1248 my ($self) = @_;
1249
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1254} 1251}
1255 1252
1256# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1257# all maps in C++... 1254# all maps in C++...
1258sub change_all_map_light { 1255sub change_all_map_light {
… …
1260 1257
1261 $_->change_map_light ($change) 1258 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1259 for grep $_->outdoor, values %cf::MAP;
1263} 1260}
1264 1261
1262sub unlink_save {
1263 my ($self) = @_;
1264
1265 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1268}
1269
1265sub try_load_header($) { 1270sub load_header_from($) {
1266 my ($path) = @_; 1271 my ($self, $path) = @_;
1267 1272
1268 utf8::encode $path; 1273 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1270 or return; 1275 or return;
1271 1276
1272 my $map = cf::map::new 1277 $self->_load_header ($path)
1273 or return; 1278 or return;
1274 1279
1275 # for better error messages only, will be overwritten 1280 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1281
1278 $map->load_header ($path) 1282 1
1283}
1284
1285sub load_orig {
1286 my ($self) = @_;
1287
1288 $self->load_header_from ($self->load_path)
1289}
1290
1291sub load_temp {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->save_path)
1295}
1296
1297sub load_header {
1298 my ($self) = @_;
1299
1300 if ($self->load_temp) {
1301 $self->last_access ((delete $self->{last_access})
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else {
1307 $self->load_orig
1279 or return; 1308 or return;
1280 1309
1281 $map->{load_path} = $path; 1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 }
1282 1315
1283 $map 1316 1
1284} 1317}
1285 1318
1286sub find; 1319sub find;
1287sub find { 1320sub find {
1288 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1289 1322
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1324
1295 cf::lock_wait "map_find:$key"; 1325 cf::lock_wait "map_find:$path";
1296 1326
1297 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1328 my $guard = cf::lock_acquire "map_find:$path";
1299 1329 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; 1330 or return;
1319 1331
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; 1332 $map->{last_save} = $cf::RUNTIME;
1332 1333
1333 Coro::cede; 1334 $map->load_header
1335 or return;
1334 1336
1335 if ($map->should_reset) { 1337 if ($map->should_reset) {
1336 $map->reset; 1338 $map->reset;
1337 undef $guard; 1339 undef $guard;
1338 $map = find $path 1340 $map = find $path
1339 or return; 1341 or return;
1340 } 1342 }
1341 1343
1342 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1343 } 1345 }
1344} 1346}
1345 1347
1346sub load { 1348sub load {
1347 my ($self) = @_; 1349 my ($self) = @_;
1348 1350
1349 my $path = $self->{path}; 1351 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1352 my $guard = cf::lock_acquire "map_load:$path";
1351 1353
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1355
1354 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1355 1357
1356 $self->alloc; 1358 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1360 or return;
1359 1361
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1362 1364
1363 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1366 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1368 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1368 } 1370 }
1369 } 1371 }
1370 1372
1371 Coro::cede; 1373 Coro::cede;
1372 1374
1373 # now do the right thing for maps 1375 # now do the right thing for maps
1374 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1375 1377
1376 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1379 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1383 $self->set_darkness_map; 1383 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1386 $self->activate; 1387 $self->activate;
1387 } 1388 }
1388 1389
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1390 $self->in_memory (cf::MAP_IN_MEMORY);
1391}
1392
1393sub customise_for {
1394 my ($self, $ob) = @_;
1395
1396 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player;
1398
1399 $self
1392} 1400}
1393 1401
1394# find and load all maps in the 3x3 area around a map 1402# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1403sub load_diag {
1396 my ($map) = @_; 1404 my ($map) = @_;
… …
1428} 1436}
1429 1437
1430our %MAP_PREFETCH; 1438our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1439our $MAP_PREFETCHER = Coro::async {
1432 while () { 1440 while () {
1433 while (%MAP_PREFETCH) { 1441 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 1442 my $map = find $path
1439 or next; 1443 or next;
1440 $map->load; 1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1441 } 1447 }
1442 Coro::schedule; 1448 Coro::schedule;
1443 } 1449 }
1444}; 1450};
1445 1451
1446sub find_async { 1452sub find_async {
1447 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1448 1454
1449 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1456
1452 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1459 }
1455 1460
1456 $MAP_PREFETCH{$key} = $path; 1461 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER->ready;
1458 1463
1459 () 1464 ()
1460} 1465}
1461 1466
… …
1466 1471
1467 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1468 1473
1469 return unless $self->dirty; 1474 return unless $self->dirty;
1470 1475
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1476 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1478
1474 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1475 1480
1476 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1477 1482
… …
1480 cf::async { 1485 cf::async {
1481 $_->contr->save for $self->players; 1486 $_->contr->save for $self->players;
1482 }; 1487 };
1483 1488
1484 if ($uniq) { 1489 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1492 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1494 }
1490} 1495}
1491 1496
1492sub swap_out { 1497sub swap_out {
1493 my ($self) = @_; 1498 my ($self) = @_;
… …
1507 1512
1508sub reset_at { 1513sub reset_at {
1509 my ($self) = @_; 1514 my ($self) = @_;
1510 1515
1511 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1513 return 1e99 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1514 1519
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1522
… …
1522 my ($self) = @_; 1527 my ($self) = @_;
1523 1528
1524 $self->reset_at <= $cf::RUNTIME 1529 $self->reset_at <= $cf::RUNTIME
1525} 1530}
1526 1531
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 { 1532sub rename {
1536 my ($self, $new_path) = @_; 1533 my ($self, $new_path) = @_;
1537 1534
1535 normalise $new_path;
1536
1538 $self->unlink_save; 1537 $self->unlink_save;
1539 1538
1540 delete $cf::MAP{$self->path}; 1539 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1540 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1541 $cf::MAP{$self->path} = $self;
1544 1542
1545 $self->save; 1543 $self->save;
1546} 1544}
1547 1545
… …
1549 my ($self) = @_; 1547 my ($self) = @_;
1550 1548
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1552 1550
1553 return if $self->players; 1551 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1555 1553
1556 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1557 1555
1558 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1559 1557
… …
1572 $self->reset_timeout (1); 1570 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1571 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1572 $self->reset; # polite request, might not happen
1575} 1573}
1576 1574
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 1575=item cf::map::unique_maps
1588 1576
1589Returns an arrayref of cf::path's of all shared maps that have 1577Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1578instantiated unique items. May block.
1591 1579
1592=cut 1580=cut
1593 1581
1594sub unique_maps() { 1582sub unique_maps() {
… …
1600 for (@$files) { 1588 for (@$files) {
1601 utf8::decode $_; 1589 utf8::decode $_;
1602 next if /\.pst$/; 1590 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1591 next unless /^$PATH_SEP/o;
1604 1592
1605 push @paths, new cf::path $_; 1593 push @paths, $_;
1606 } 1594 }
1607 1595
1608 \@paths 1596 \@paths
1609} 1597}
1610 1598
… …
1685 1673
1686=item $player_object->enter_link 1674=item $player_object->enter_link
1687 1675
1688Freezes the player and moves him/her to a special map (C<{link}>). 1676Freezes the player and moves him/her to a special map (C<{link}>).
1689 1677
1690The player should be reaosnably safe there for short amounts of time. You 1678The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1679I<MUST> call C<leave_link> as soon as possible, though.
1692 1680
1681Will never block.
1682
1693=item $player_object->leave_link ($map, $x, $y) 1683=item $player_object->leave_link ($map, $x, $y)
1694 1684
1695Moves the player out of the specila link map onto the given map. If the 1685Moves 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 1686map. 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, 1687to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1688fails, to the emergency map position.
1699 1689
1700Might block. 1690Might block.
1701 1691
1702=cut 1692=cut
1693
1694sub link_map {
1695 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1698 $LINK_MAP->load;
1699 }
1700
1701 $LINK_MAP
1702}
1703 1703
1704sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1705 my ($self) = @_; 1705 my ($self) = @_;
1706 1706
1707 $self->deactivate_recursive; 1707 $self->deactivate_recursive;
1708 1708
1709 return if $self->map == $LINK_MAP; 1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1710
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1712 if $self->map;
1713 1713
1714 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1715}
1716 1716
1717sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1719 1719
… …
1783=cut 1783=cut
1784 1784
1785sub cf::object::player::goto { 1785sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1787 1787
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1788 $self->enter_link;
1791 1789
1792 (async { 1790 (async {
1793 my $map = cf::map::find $path->as_string; 1791 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1795 1793
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1795# if $map;
1798 1796
… …
1863 $self->deactivate_recursive; # just to be sure 1861 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1862 unless (eval {
1865 prepare_random_map $exit 1863 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1867 1865
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1868
1871 1; 1869 1;
1872 }) { 1870 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
… …
2381 } 2379 }
2382 2380
2383 warn "reloaded"; 2381 warn "reloaded";
2384}; 2382};
2385 2383
2386#############################################################################
2387
2388unless ($LINK_MAP) {
2389 $LINK_MAP = cf::map::new;
2390
2391 $LINK_MAP->width (41);
2392 $LINK_MAP->height (41);
2393 $LINK_MAP->alloc;
2394 $LINK_MAP->path ("{link}");
2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2397
2398 # dirty hack because... archetypes are not yet loaded
2399 Event->timer (
2400 after => 10,
2401 cb => sub {
2402 $_[0]->w->cancel;
2403
2404 # provide some exits "home"
2405 my $exit = cf::object::new "exit";
2406
2407 $exit->slaying ($EMERGENCY_POSITION->[0]);
2408 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2409 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2410
2411 $LINK_MAP->insert ($exit->clone, 19, 19);
2412 $LINK_MAP->insert ($exit->clone, 19, 20);
2413 $LINK_MAP->insert ($exit->clone, 19, 21);
2414 $LINK_MAP->insert ($exit->clone, 20, 19);
2415 $LINK_MAP->insert ($exit->clone, 20, 21);
2416 $LINK_MAP->insert ($exit->clone, 21, 19);
2417 $LINK_MAP->insert ($exit->clone, 21, 20);
2418 $LINK_MAP->insert ($exit->clone, 21, 21);
2419
2420 $exit->destroy;
2421 });
2422
2423 $LINK_MAP->{deny_save} = 1;
2424 $LINK_MAP->{deny_reset} = 1;
2425
2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2427}
2428
2429register_command "reload" => sub { 2384register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
2431 2386
2432 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2388 $who->message ("start of reload.");
… …
2442 reentrant => 0, 2397 reentrant => 0,
2443 prio => 0, 2398 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2399 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2400 data => WF_AUTOCANCEL,
2446 cb => sub { 2401 cb => sub {
2402 $NOW = Event::time;
2403
2447 cf::server_tick; # one server iteration 2404 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2405 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2406 $NEXT_TICK += $TICK;
2450 2407
2451 $WAIT_FOR_TICK->broadcast; 2408 $WAIT_FOR_TICK->broadcast;

Diff Legend

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