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.165 by root, Fri Jan 12 22:09:22 2007 UTC vs.
Revision 1.169 by root, Sun Jan 14 01:09:46 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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 373
543############################################################################# 374#############################################################################
544 375
545=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
546 377
… …
852# object support 683# object support
853 684
854sub reattach { 685sub reattach {
855 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 690
858 my $registry = $obj->registry; 691 my $registry = $obj->registry;
859 692
860 @$registry = (); 693 @$registry = ();
861 694
… …
1048 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 884 . "\n};\n1";
1052 885
1053 eval $source 886 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1055 : "extension disabled.\n"; 888 : "extension disabled.\n";
889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
890 warn $@;
891 warn "mandatory extension failed to load, exiting.\n";
892 exit 1;
893 }
894 die $@;
895 }
1056 896
1057 push @EXTS, $pkg; 897 push @EXTS, $pkg;
1058} 898}
1059 899
1060sub load_extensions { 900sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1067 } 907 }
1068} 908}
1069 909
1070############################################################################# 910#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 911
1086=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1087 913
1088Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1089 915
… …
1225 \@logins 1051 \@logins
1226} 1052}
1227 1053
1228=item $player->maps 1054=item $player->maps
1229 1055
1230Returns an arrayref of cf::path's of all maps that are private for this 1056Returns an arrayref of map paths that are private for this
1231player. May block. 1057player. May block.
1232 1058
1233=cut 1059=cut
1234 1060
1235sub maps($) { 1061sub maps($) {
… …
1243 for (@$files) { 1069 for (@$files) {
1244 utf8::decode $_; 1070 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1247 1073
1074 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1076 }
1250 1077
1251 \@paths 1078 \@paths
1252} 1079}
1253 1080
… …
1279package cf::map; 1106package cf::map;
1280 1107
1281use Fcntl; 1108use Fcntl;
1282use Coro::AIO; 1109use Coro::AIO;
1283 1110
1111use overload
1112 '""' => \&as_string;
1113
1284our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1286 1116
1287sub generate_random_map { 1117sub generate_random_map {
1288 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1289 1119
1290 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1121 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1133 )
1305} 1134}
1306 1135
1136sub register {
1137 my (undef, $regex) = @_;
1138 my $pkg = caller;
1139
1140 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__;
1142
1143 $EXT_MAP{$pkg} = qr<$regex>;
1144}
1145
1146# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148
1149sub normalise {
1150 my ($path, $base) = @_;
1151
1152 # map plan:
1153 #
1154 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched
1156 # ?xxx/... are special absolute paths
1157 # ?random/... random maps
1158 # /... normal maps
1159 # ~user/... per-player map of a specific user
1160
1161 $path =~ s/$PATH_SEP/\//go;
1162
1163 # treat it as relative path if it starts with
1164 # something that looks reasonable
1165 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1166 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1167
1168 $base =~ s{[^/]+/?$}{};
1169 $path = "$base/$path";
1170 }
1171
1172 for ($path) {
1173 redo if s{//}{/};
1174 redo if s{/\.?/}{/};
1175 redo if s{/[^/]+/\.\./}{/};
1176 }
1177
1178 $path
1179}
1180
1181sub new_from_path {
1182 my (undef, $path, $base) = @_;
1183
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185
1186 $path = normalise $path, $base;
1187
1188 for my $pkg (keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) {
1190 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc.
1193 return $self;
1194 }
1195 }
1196
1197 Carp::carp "unable to resolve path '$path'.";
1198 ()
1199}
1200
1201sub init {
1202 my ($self) = @_;
1203
1204 $self
1205}
1206
1207sub as_string {
1208 my ($self) = @_;
1209
1210 "$self->{path}"
1211}
1212
1213# the displayed name, this is a one way mapping
1214sub visible_name {
1215 &as_string
1216}
1217
1218# the original (read-only) location
1219sub load_path {
1220 my ($self) = @_;
1221
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1223}
1224
1225# the temporary/swap location
1226sub save_path {
1227 my ($self) = @_;
1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1231}
1232
1233# the unique path, undef == no special unique path
1234sub uniq_path {
1235 my ($self) = @_;
1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1239}
1240
1307# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1308# all maps in C++... 1242# all maps in C++...
1309sub change_all_map_light { 1243sub change_all_map_light {
1310 my ($change) = @_; 1244 my ($change) = @_;
1311 1245
1312 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1314} 1248}
1315 1249
1250sub unlink_save {
1251 my ($self) = @_;
1252
1253 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1256}
1257
1316sub load_map_header($) { 1258sub load_header_from($) {
1317 my ($path) = @_; 1259 my ($self, $path) = @_;
1318 1260
1319 utf8::encode $path; 1261 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1321 or return; 1263 or return;
1322 1264
1323 my $map = cf::map::new 1265 $self->_load_header ($path)
1324 or return; 1266 or return;
1325 1267
1326 # for better error messages only, will be overwritten later 1268 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1269
1329 $map->load_header ($path) 1270 1
1271}
1272
1273sub load_orig {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->load_path)
1277}
1278
1279sub load_temp {
1280 my ($self) = @_;
1281
1282 $self->load_header_from ($self->save_path)
1283}
1284
1285sub load_header {
1286 my ($self) = @_;
1287
1288 if ($self->load_temp) {
1289 $self->last_access ((delete $self->{last_access})
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else {
1295 $self->load_orig
1330 or return; 1296 or return;
1331 1297
1332 $map->{load_path} = $path; 1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 }
1333 1303
1334 $map 1304 1
1335} 1305}
1336 1306
1337sub find; 1307sub find;
1338sub find { 1308sub find {
1339 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1340 1310
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1312
1346 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1347 1314
1348 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1350 1317 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1318 or return;
1365 1319
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1378 1321
1379 Coro::cede; 1322 $map->load_header
1323 or return;
1380 1324
1381 if ($map->should_reset) { 1325 if ($map->should_reset) {
1382 $map->reset; 1326 $map->reset;
1383 undef $guard; 1327 undef $guard;
1384 $map = find $path 1328 $map = find $path
1385 or return; 1329 or return;
1386 } 1330 }
1387 1331
1388 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1389 } 1333 }
1390} 1334}
1391 1335
1392sub load { 1336sub load {
1393 my ($self) = @_; 1337 my ($self) = @_;
1394 1338
1395 my $path = $self->{path}; 1339 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1397 1341
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1343
1400 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1401 1345
1402 $self->alloc; 1346 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1348 or return;
1405 1349
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1408 1352
1409 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1354 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1356 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1414 } 1358 }
1415 } 1359 }
1416 1360
1417 Coro::cede; 1361 Coro::cede;
1418 1362
1419 # now do the right thing for maps 1363 # now do the right thing for maps
1420 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1421 1365
1422 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1367 $self->decay_objects;
1427 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1428 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1429 $self->set_darkness_map; 1371 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1432 $self->activate; 1375 $self->activate;
1433 } 1376 }
1434 1377
1435 Coro::cede;
1436
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1378 $self->in_memory (cf::MAP_IN_MEMORY);
1379}
1380
1381sub customise_for {
1382 my ($self, $ob) = @_;
1383
1384 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player;
1386
1387 $self
1438} 1388}
1439 1389
1440# find and load all maps in the 3x3 area around a map 1390# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1391sub load_diag {
1442 my ($map) = @_; 1392 my ($map) = @_;
… …
1474} 1424}
1475 1425
1476our %MAP_PREFETCH; 1426our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1427our $MAP_PREFETCHER = Coro::async {
1478 while () { 1428 while () {
1479 while (%MAP_PREFETCH) { 1429 for my $path (keys %MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path 1430 my $map = find $path
1485 or next; 1431 or next;
1486 $map->load; 1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1487 } 1435 }
1488 Coro::schedule; 1436 Coro::schedule;
1489 } 1437 }
1490}; 1438};
1491 1439
1492sub find_async { 1440sub find_async {
1493 my ($path, $origin) = @_; 1441 my ($path, $origin) = @_;
1494 1442
1495 $path = new cf::path $path, $origin && $origin->path; 1443 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1444
1498 if (my $map = $cf::MAP{$key}) { 1445 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1447 }
1501 1448
1502 $MAP_PREFETCH{$key} = $path; 1449 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1450 $MAP_PREFETCHER->ready;
1504 1451
1505 () 1452 ()
1506} 1453}
1507 1454
… …
1512 1459
1513 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1514 1461
1515 return unless $self->dirty; 1462 return unless $self->dirty;
1516 1463
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1466
1520 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1521 1468
1522 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1523 1470
… …
1526 cf::async { 1473 cf::async {
1527 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1528 }; 1475 };
1529 1476
1530 if ($uniq) { 1477 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1480 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1481 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1482 }
1536} 1483}
1537 1484
1538sub swap_out { 1485sub swap_out {
1539 my ($self) = @_; 1486 my ($self) = @_;
… …
1553 1500
1554sub reset_at { 1501sub reset_at {
1555 my ($self) = @_; 1502 my ($self) = @_;
1556 1503
1557 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1560 1507
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1510
… …
1571} 1518}
1572 1519
1573sub rename { 1520sub rename {
1574 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1575 1522
1523 normalise $new_path;
1524
1576 $self->{path}->unlink_save; 1525 $self->unlink_save;
1577 1526
1578 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1582 1530
1583 $self->save; 1531 $self->save;
1584} 1532}
1585 1533
1586sub reset { 1534sub reset {
1587 my ($self) = @_; 1535 my ($self) = @_;
1588 1536
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1538
1591 return if $self->players; 1539 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1593 1541
1594 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1595 1543
1596 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1597 1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1548
1598 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1599 1550
1600 $self->{path}->unlink_save; 1551 $self->unlink_save;
1601 $self->destroy; 1552 $self->destroy;
1602} 1553}
1603 1554
1604my $nuke_counter = "aaaa"; 1555my $nuke_counter = "aaaa";
1605 1556
… …
1612 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1613} 1564}
1614 1565
1615=item cf::map::unique_maps 1566=item cf::map::unique_maps
1616 1567
1617Returns an arrayref of cf::path's of all shared maps that have 1568Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1569instantiated unique items. May block.
1619 1570
1620=cut 1571=cut
1621 1572
1622sub unique_maps() { 1573sub unique_maps() {
… …
1628 for (@$files) { 1579 for (@$files) {
1629 utf8::decode $_; 1580 utf8::decode $_;
1630 next if /\.pst$/; 1581 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1632 1583
1584 s/\.map$//;
1633 push @paths, new cf::path $_; 1585 push @paths, $_;
1634 } 1586 }
1635 1587
1636 \@paths 1588 \@paths
1637} 1589}
1638 1590
… …
1713 1665
1714=item $player_object->enter_link 1666=item $player_object->enter_link
1715 1667
1716Freezes the player and moves him/her to a special map (C<{link}>). 1668Freezes the player and moves him/her to a special map (C<{link}>).
1717 1669
1718The player should be reaosnably safe there for short amounts of time. You 1670The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1720 1672
1673Will never block.
1674
1721=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1722 1676
1723Moves the player out of the specila link map onto the given map. If the 1677Moves the player out of the special C<{link}> map onto the specified
1724map is not valid (or omitted), the player will be moved back to the 1678map. If the map is not valid (or omitted), the player will be moved back
1725location he/she was before the call to C<enter_link>, or, if that fails, 1679to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1680fails, to the emergency map position.
1727 1681
1728Might block. 1682Might block.
1729 1683
1730=cut 1684=cut
1685
1686sub link_map {
1687 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1690 $LINK_MAP->load;
1691 }
1692
1693 $LINK_MAP
1694}
1731 1695
1732sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1733 my ($self) = @_; 1697 my ($self) = @_;
1734 1698
1735 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1736 1700
1737 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1702
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1704 if $self->map;
1741 1705
1742 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1707}
1744 1708
1745sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1747 1711
… …
1811=cut 1775=cut
1812 1776
1813sub cf::object::player::goto { 1777sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1815 1779
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1780 $self->enter_link;
1819 1781
1820 (async { 1782 (async {
1821 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1823 1785
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1787# if $map;
1826 1788
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
… …
1891 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1854 unless (eval {
1893 prepare_random_map $exit 1855 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1895 1857
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1860
1899 1; 1861 1;
1900 }) { 1862 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
… …
2284 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2285 2247
2286 cf::sync_job { 2248 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2255 $pl->valid or next;
2294 $pl->save; 2256 $pl->save;
… …
2408 exit 1; 2370 exit 1;
2409 } 2371 }
2410 2372
2411 warn "reloaded"; 2373 warn "reloaded";
2412}; 2374};
2413
2414#############################################################################
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2375
2457register_command "reload" => sub { 2376register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2459 2378
2460 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
… …
2489 }, 2408 },
2490); 2409);
2491 2410
2492IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2493 2412
2494Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2495 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2415 poll => 'r',
2497 prio => 5, 2416 prio => 5,
2498 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2500); 2419);
2501 2420
2502Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2503 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2504 after => 0, 2423 after => 0,
2505 interval => 10, 2424 interval => 10,
2506 cb => sub { 2425 cb => sub {
2507 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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