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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC

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

Diff Legend

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