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.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 $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
… …
1048 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 882 . "\n};\n1";
1052 883
1053 eval $source 884 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 894
1057 push @EXTS, $pkg; 895 push @EXTS, $pkg;
1058} 896}
1059 897
1060sub load_extensions { 898sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1067 } 905 }
1068} 906}
1069 907
1070############################################################################# 908#############################################################################
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 909
1086=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1087 911
1088Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1089 913
… …
1225 \@logins 1049 \@logins
1226} 1050}
1227 1051
1228=item $player->maps 1052=item $player->maps
1229 1053
1230Returns 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
1231player. May block. 1055player. May block.
1232 1056
1233=cut 1057=cut
1234 1058
1235sub maps($) { 1059sub maps($) {
… …
1243 for (@$files) { 1067 for (@$files) {
1244 utf8::decode $_; 1068 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1069 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1070 next unless /^$PATH_SEP/o;
1247 1071
1072 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1074 }
1250 1075
1251 \@paths 1076 \@paths
1252} 1077}
1253 1078
… …
1279package cf::map; 1104package cf::map;
1280 1105
1281use Fcntl; 1106use Fcntl;
1282use Coro::AIO; 1107use Coro::AIO;
1283 1108
1109use overload
1110 '""' => \&as_string;
1111
1284our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1286 1114
1287sub generate_random_map { 1115sub generate_random_map {
1288 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1289 1117
1290 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1119 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1131 )
1305} 1132}
1306 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
1307# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1308# all maps in C++... 1240# all maps in C++...
1309sub change_all_map_light { 1241sub change_all_map_light {
1310 my ($change) = @_; 1242 my ($change) = @_;
1311 1243
1312 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1314} 1246}
1315 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
1316sub load_map_header($) { 1256sub load_header_from($) {
1317 my ($path) = @_; 1257 my ($self, $path) = @_;
1318 1258
1319 utf8::encode $path; 1259 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1321 or return; 1261 or return;
1322 1262
1323 my $map = cf::map::new 1263 $self->_load_header ($path)
1324 or return; 1264 or return;
1325 1265
1326 # for better error messages only, will be overwritten later 1266 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1267
1329 $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
1330 or return; 1294 or return;
1331 1295
1332 $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 }
1333 1301
1334 $map 1302 1
1335} 1303}
1336 1304
1337sub find; 1305sub find;
1338sub find { 1306sub find {
1339 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1340 1308
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1310
1346 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1347 1312
1348 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1350 1315 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; 1316 or return;
1365 1317
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; 1318 $map->{last_save} = $cf::RUNTIME;
1378 1319
1379 Coro::cede; 1320 $map->load_header
1321 or return;
1380 1322
1381 if ($map->should_reset) { 1323 if ($map->should_reset) {
1382 $map->reset; 1324 $map->reset;
1383 undef $guard; 1325 undef $guard;
1384 $map = find $path 1326 $map = find $path
1385 or return; 1327 or return;
1386 } 1328 }
1387 1329
1388 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1389 } 1331 }
1390} 1332}
1391 1333
1392sub load { 1334sub load {
1393 my ($self) = @_; 1335 my ($self) = @_;
1394 1336
1395 my $path = $self->{path}; 1337 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1397 1339
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1341
1400 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1401 1343
1402 $self->alloc; 1344 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1346 or return;
1405 1347
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1408 1350
1409 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1352 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1354 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1414 } 1356 }
1415 } 1357 }
1416 1358
1417 Coro::cede; 1359 Coro::cede;
1418 1360
1419 # now do the right thing for maps 1361 # now do the right thing for maps
1420 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1421 1363
1422 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1365 $self->decay_objects;
1427 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1428 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1429 $self->set_darkness_map; 1369 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1432 $self->activate; 1373 $self->activate;
1433 } 1374 }
1434 1375
1435 Coro::cede;
1436
1437 $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
1438} 1386}
1439 1387
1440# 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
1441sub load_diag { 1389sub load_diag {
1442 my ($map) = @_; 1390 my ($map) = @_;
… …
1474} 1422}
1475 1423
1476our %MAP_PREFETCH; 1424our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1425our $MAP_PREFETCHER = Coro::async {
1478 while () { 1426 while () {
1479 while (%MAP_PREFETCH) { 1427 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 1428 my $map = find $path
1485 or next; 1429 or next;
1486 $map->load; 1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1487 } 1433 }
1488 Coro::schedule; 1434 Coro::schedule;
1489 } 1435 }
1490}; 1436};
1491 1437
1492sub find_async { 1438sub find_async {
1493 my ($path, $origin) = @_; 1439 my ($path, $origin) = @_;
1494 1440
1495 $path = new cf::path $path, $origin && $origin->path; 1441 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1442
1498 if (my $map = $cf::MAP{$key}) { 1443 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1445 }
1501 1446
1502 $MAP_PREFETCH{$key} = $path; 1447 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1448 $MAP_PREFETCHER->ready;
1504 1449
1505 () 1450 ()
1506} 1451}
1507 1452
… …
1512 1457
1513 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1514 1459
1515 return unless $self->dirty; 1460 return unless $self->dirty;
1516 1461
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1464
1520 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1521 1466
1522 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1523 1468
… …
1526 cf::async { 1471 cf::async {
1527 $_->contr->save for $self->players; 1472 $_->contr->save for $self->players;
1528 }; 1473 };
1529 1474
1530 if ($uniq) { 1475 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1478 } else {
1534 $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);
1535 } 1480 }
1536} 1481}
1537 1482
1538sub swap_out { 1483sub swap_out {
1539 my ($self) = @_; 1484 my ($self) = @_;
… …
1553 1498
1554sub reset_at { 1499sub reset_at {
1555 my ($self) = @_; 1500 my ($self) = @_;
1556 1501
1557 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1559 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1560 1505
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1508
… …
1571} 1516}
1572 1517
1573sub rename { 1518sub rename {
1574 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1575 1520
1521 normalise $new_path;
1522
1576 $self->{path}->unlink_save; 1523 $self->unlink_save;
1577 1524
1578 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1582 1528
1583 $self->save; 1529 $self->save;
1584} 1530}
1585 1531
1586sub reset { 1532sub reset {
1587 my ($self) = @_; 1533 my ($self) = @_;
1588 1534
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1536
1591 return if $self->players; 1537 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1593 1539
1594 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1595 1541
1596 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1597 1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1546
1598 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1599 1548
1600 $self->{path}->unlink_save; 1549 $self->unlink_save;
1601 $self->destroy; 1550 $self->destroy;
1602} 1551}
1603 1552
1604my $nuke_counter = "aaaa"; 1553my $nuke_counter = "aaaa";
1605 1554
… …
1612 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1613} 1562}
1614 1563
1615=item cf::map::unique_maps 1564=item cf::map::unique_maps
1616 1565
1617Returns an arrayref of cf::path's of all shared maps that have 1566Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1567instantiated unique items. May block.
1619 1568
1620=cut 1569=cut
1621 1570
1622sub unique_maps() { 1571sub unique_maps() {
… …
1628 for (@$files) { 1577 for (@$files) {
1629 utf8::decode $_; 1578 utf8::decode $_;
1630 next if /\.pst$/; 1579 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1580 next unless /^$PATH_SEP/o;
1632 1581
1582 s/\.map$//;
1633 push @paths, new cf::path $_; 1583 push @paths, $_;
1634 } 1584 }
1635 1585
1636 \@paths 1586 \@paths
1637} 1587}
1638 1588
… …
1713 1663
1714=item $player_object->enter_link 1664=item $player_object->enter_link
1715 1665
1716Freezes 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}>).
1717 1667
1718The 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
1719I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1720 1670
1671Will never block.
1672
1721=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1722 1674
1723Moves 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
1724map 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
1725location 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
1726to the emergency map position. 1678fails, to the emergency map position.
1727 1679
1728Might block. 1680Might block.
1729 1681
1730=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}
1731 1693
1732sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1733 my ($self) = @_; 1695 my ($self) = @_;
1734 1696
1735 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1736 1698
1737 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1700
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1702 if $self->map;
1741 1703
1742 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1705}
1744 1706
1745sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1747 1709
… …
1811=cut 1773=cut
1812 1774
1813sub cf::object::player::goto { 1775sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1815 1777
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1778 $self->enter_link;
1819 1779
1820 (async { 1780 (async {
1821 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1823 1783
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1785# if $map;
1826 1786
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1787 $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 1851 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1852 unless (eval {
1893 prepare_random_map $exit 1853 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1895 1855
1896 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;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1858
1899 1; 1859 1;
1900 }) { 1860 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
… …
2284 warn "enter emergency perl save\n"; 2244 warn "enter emergency perl save\n";
2285 2245
2286 cf::sync_job { 2246 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2247 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2248 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2249 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2250 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2251 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2252 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2253 $pl->valid or next;
2294 $pl->save; 2254 $pl->save;
… …
2408 exit 1; 2368 exit 1;
2409 } 2369 }
2410 2370
2411 warn "reloaded"; 2371 warn "reloaded";
2412}; 2372};
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 2373
2457register_command "reload" => sub { 2374register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2459 2376
2460 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2489 }, 2406 },
2490); 2407);
2491 2408
2492IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2493 2410
2494Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2495 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2413 poll => 'r',
2497 prio => 5, 2414 prio => 5,
2498 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2500); 2417);
2501 2418
2502Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2503 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2504 after => 0, 2421 after => 0,
2505 interval => 10, 2422 interval => 10,
2506 cb => sub { 2423 cb => sub {
2507 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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