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.170 by root, Sun Jan 14 02:00:37 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
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 504our @CB_MAP = ();
674 505
675my %attachment; 506my %attachment;
676 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
677sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
679 516
680 use sort 'stable'; 517 use sort 'stable';
681 518
… …
852# object support 689# object support
853 690
854sub reattach { 691sub reattach {
855 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 696
858 my $registry = $obj->registry; 697 my $registry = $obj->registry;
859 698
860 @$registry = (); 699 @$registry = ();
861 700
… …
1048 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 890 . "\n};\n1";
1052 891
1053 eval $source 892 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1055 : "extension disabled.\n"; 894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
1056 902
1057 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1058} 904}
1059 905
1060sub load_extensions { 906sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1067 } 913 }
1068} 914}
1069 915
1070############################################################################# 916#############################################################################
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 917
1086=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1087 919
1088Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1089 921
… …
1225 \@logins 1057 \@logins
1226} 1058}
1227 1059
1228=item $player->maps 1060=item $player->maps
1229 1061
1230Returns an arrayref of cf::path's of all maps that are private for this 1062Returns an arrayref of map paths that are private for this
1231player. May block. 1063player. May block.
1232 1064
1233=cut 1065=cut
1234 1066
1235sub maps($) { 1067sub maps($) {
… …
1243 for (@$files) { 1075 for (@$files) {
1244 utf8::decode $_; 1076 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1247 1079
1080 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1082 }
1250 1083
1251 \@paths 1084 \@paths
1252} 1085}
1253 1086
… …
1279package cf::map; 1112package cf::map;
1280 1113
1281use Fcntl; 1114use Fcntl;
1282use Coro::AIO; 1115use Coro::AIO;
1283 1116
1117use overload
1118 '""' => \&as_string;
1119
1284our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1286 1122
1287sub generate_random_map { 1123sub generate_random_map {
1288 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1289 1125
1290 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1139 )
1305} 1140}
1306 1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 # we have to keep some variables in memory intact
1157 local $_[0]{path};
1158 local $_[0]{deny_save};
1159 local $_[0]{deny_reset};
1160
1161 $_[0]->SUPER::thawer_merge ($_[1]);
1162}
1163
1164sub normalise {
1165 my ($path, $base) = @_;
1166
1167 # map plan:
1168 #
1169 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched
1171 # ?xxx/... are special absolute paths
1172 # ?random/... random maps
1173 # /... normal maps
1174 # ~user/... per-player map of a specific user
1175
1176 $path =~ s/$PATH_SEP/\//go;
1177
1178 # treat it as relative path if it starts with
1179 # something that looks reasonable
1180 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1181 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1182
1183 $base =~ s{[^/]+/?$}{};
1184 $path = "$base/$path";
1185 }
1186
1187 for ($path) {
1188 redo if s{//}{/};
1189 redo if s{/\.?/}{/};
1190 redo if s{/[^/]+/\.\./}{/};
1191 }
1192
1193 $path
1194}
1195
1196sub new_from_path {
1197 my (undef, $path, $base) = @_;
1198
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200
1201 $path = normalise $path, $base;
1202
1203 for my $pkg (keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) {
1205 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc.
1208 return $self;
1209 }
1210 }
1211
1212 Carp::carp "unable to resolve path '$path'.";
1213 ()
1214}
1215
1216sub init {
1217 my ($self) = @_;
1218
1219 $self
1220}
1221
1222sub as_string {
1223 my ($self) = @_;
1224
1225 "$self->{path}"
1226}
1227
1228# the displayed name, this is a one way mapping
1229sub visible_name {
1230 &as_string
1231}
1232
1233# the original (read-only) location
1234sub load_path {
1235 my ($self) = @_;
1236
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1238}
1239
1240# the temporary/swap location
1241sub save_path {
1242 my ($self) = @_;
1243
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1246}
1247
1248# the unique path, undef == no special unique path
1249sub uniq_path {
1250 my ($self) = @_;
1251
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254}
1255
1307# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1308# all maps in C++... 1257# all maps in C++...
1309sub change_all_map_light { 1258sub change_all_map_light {
1310 my ($change) = @_; 1259 my ($change) = @_;
1311 1260
1312 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1314} 1263}
1315 1264
1265sub unlink_save {
1266 my ($self) = @_;
1267
1268 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1270 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1271}
1272
1316sub load_map_header($) { 1273sub load_header_from($) {
1317 my ($path) = @_; 1274 my ($self, $path) = @_;
1318 1275
1319 utf8::encode $path; 1276 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1321 or return; 1278 or return;
1322 1279
1323 my $map = cf::map::new 1280 $self->_load_header ($path)
1324 or return; 1281 or return;
1325 1282
1326 # for better error messages only, will be overwritten later 1283 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1284
1329 $map->load_header ($path) 1285 1
1286}
1287
1288sub load_orig {
1289 my ($self) = @_;
1290
1291 $self->load_header_from ($self->load_path)
1292}
1293
1294sub load_temp {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->save_path)
1298}
1299
1300sub load_header {
1301 my ($self) = @_;
1302
1303 if ($self->load_temp) {
1304 $self->last_access ((delete $self->{last_access})
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else {
1310 $self->load_orig
1330 or return; 1311 or return;
1331 1312
1332 $map->{load_path} = $path; 1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 }
1333 1318
1334 $map 1319 1
1335} 1320}
1336 1321
1337sub find; 1322sub find;
1338sub find { 1323sub find {
1339 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1340 1325
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1327
1346 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1347 1329
1348 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1350 1332 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; 1333 or return;
1365 1334
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; 1335 $map->{last_save} = $cf::RUNTIME;
1378 1336
1379 Coro::cede; 1337 $map->load_header
1338 or return;
1380 1339
1381 if ($map->should_reset) { 1340 if ($map->should_reset) {
1382 $map->reset; 1341 $map->reset;
1383 undef $guard; 1342 undef $guard;
1384 $map = find $path 1343 $map = find $path
1385 or return; 1344 or return;
1386 } 1345 }
1387 1346
1388 $cf::MAP{$key} = $map 1347 $cf::MAP{$path} = $map
1389 } 1348 }
1390} 1349}
1391 1350
1392sub load { 1351sub load {
1393 my ($self) = @_; 1352 my ($self) = @_;
1394 1353
1395 my $path = $self->{path}; 1354 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1355 my $guard = cf::lock_acquire "map_load:$path";
1397 1356
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1357 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1358
1400 $self->in_memory (cf::MAP_LOADING); 1359 $self->in_memory (cf::MAP_LOADING);
1401 1360
1402 $self->alloc; 1361 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1362 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1363 or return;
1405 1364
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1366 if delete $self->{load_original};
1408 1367
1409 if (my $uniq = $path->uniq_path) { 1368 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1369 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1370 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1371 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1372 $self->_load_objects ($uniq, 0);
1414 } 1373 }
1415 } 1374 }
1416 1375
1417 Coro::cede; 1376 Coro::cede;
1418 1377
1419 # now do the right thing for maps 1378 # now do the right thing for maps
1420 $self->link_multipart_objects; 1379 $self->link_multipart_objects;
1421 1380
1422 if ($self->{path}->is_style_map) { 1381 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1382 $self->decay_objects;
1427 $self->fix_auto_apply; 1383 $self->fix_auto_apply;
1428 $self->update_buttons; 1384 $self->update_buttons;
1385 Coro::cede;
1429 $self->set_darkness_map; 1386 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1387 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1388 unless $self->difficulty;
1389 Coro::cede;
1432 $self->activate; 1390 $self->activate;
1433 } 1391 }
1434 1392
1435 Coro::cede;
1436
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1393 $self->in_memory (cf::MAP_IN_MEMORY);
1394}
1395
1396sub customise_for {
1397 my ($self, $ob) = @_;
1398
1399 return find "~" . $ob->name . "/" . $self->{path}
1400 if $self->per_player;
1401
1402 $self
1438} 1403}
1439 1404
1440# find and load all maps in the 3x3 area around a map 1405# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1406sub load_diag {
1442 my ($map) = @_; 1407 my ($map) = @_;
… …
1474} 1439}
1475 1440
1476our %MAP_PREFETCH; 1441our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1442our $MAP_PREFETCHER = Coro::async {
1478 while () { 1443 while () {
1479 while (%MAP_PREFETCH) { 1444 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 1445 my $map = find $path
1485 or next; 1446 or next;
1486 $map->load; 1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1487 } 1450 }
1488 Coro::schedule; 1451 Coro::schedule;
1489 } 1452 }
1490}; 1453};
1491 1454
1492sub find_async { 1455sub find_async {
1493 my ($path, $origin) = @_; 1456 my ($path, $origin) = @_;
1494 1457
1495 $path = new cf::path $path, $origin && $origin->path; 1458 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1459
1498 if (my $map = $cf::MAP{$key}) { 1460 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1462 }
1501 1463
1502 $MAP_PREFETCH{$key} = $path; 1464 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1465 $MAP_PREFETCHER->ready;
1504 1466
1505 () 1467 ()
1506} 1468}
1507 1469
… …
1512 1474
1513 $self->{last_save} = $cf::RUNTIME; 1475 $self->{last_save} = $cf::RUNTIME;
1514 1476
1515 return unless $self->dirty; 1477 return unless $self->dirty;
1516 1478
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1479 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1480 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1481
1520 $self->{load_path} = $save; 1482 $self->{load_path} = $save;
1521 1483
1522 return if $self->{deny_save}; 1484 return if $self->{deny_save};
1523 1485
… …
1526 cf::async { 1488 cf::async {
1527 $_->contr->save for $self->players; 1489 $_->contr->save for $self->players;
1528 }; 1490 };
1529 1491
1530 if ($uniq) { 1492 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1494 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1495 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1496 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1497 }
1536} 1498}
1537 1499
1538sub swap_out { 1500sub swap_out {
1539 my ($self) = @_; 1501 my ($self) = @_;
… …
1553 1515
1554sub reset_at { 1516sub reset_at {
1555 my ($self) = @_; 1517 my ($self) = @_;
1556 1518
1557 # TODO: safety, remove and allow resettable per-player maps 1519 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1520 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1521 return 1e99 if $self->{deny_reset};
1560 1522
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1523 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1524 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1525
… …
1571} 1533}
1572 1534
1573sub rename { 1535sub rename {
1574 my ($self, $new_path) = @_; 1536 my ($self, $new_path) = @_;
1575 1537
1538 normalise $new_path;
1539
1576 $self->{path}->unlink_save; 1540 $self->unlink_save;
1577 1541
1578 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path; 1543 $self->{path} = $new_path; $self->path ($self->{path});
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self; 1544 $cf::MAP{$self->path} = $self;
1582 1545
1583 $self->save; 1546 $self->save;
1584} 1547}
1585 1548
1586sub reset { 1549sub reset {
1587 my ($self) = @_; 1550 my ($self) = @_;
1588 1551
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1552 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1553
1591 return if $self->players; 1554 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1555 return if $self->isa ("ext::map_per_player");#d#
1593 1556
1594 warn "resetting map ", $self->path;#d# 1557 warn "resetting map ", $self->path;#d#
1595 1558
1596 delete $cf::MAP{$self->path}; 1559 delete $cf::MAP{$self->path};
1597 1560
1561 $self->in_memory (cf::MAP_SWAPPED);
1562 $self->clear;
1563
1598 $_->clear_links_to ($self) for values %cf::MAP; 1564 $_->clear_links_to ($self) for values %cf::MAP;
1599 1565
1600 $self->{path}->unlink_save; 1566 $self->unlink_save;
1601 $self->destroy; 1567 $self->destroy;
1602} 1568}
1603 1569
1604my $nuke_counter = "aaaa"; 1570my $nuke_counter = "aaaa";
1605 1571
… …
1612 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1613} 1579}
1614 1580
1615=item cf::map::unique_maps 1581=item cf::map::unique_maps
1616 1582
1617Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1584instantiated unique items. May block.
1619 1585
1620=cut 1586=cut
1621 1587
1622sub unique_maps() { 1588sub unique_maps() {
… …
1628 for (@$files) { 1594 for (@$files) {
1629 utf8::decode $_; 1595 utf8::decode $_;
1630 next if /\.pst$/; 1596 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1632 1598
1599 s/\.map$//;
1633 push @paths, new cf::path $_; 1600 push @paths, $_;
1634 } 1601 }
1635 1602
1636 \@paths 1603 \@paths
1637} 1604}
1638 1605
… …
1713 1680
1714=item $player_object->enter_link 1681=item $player_object->enter_link
1715 1682
1716Freezes the player and moves him/her to a special map (C<{link}>). 1683Freezes the player and moves him/her to a special map (C<{link}>).
1717 1684
1718The player should be reaosnably safe there for short amounts of time. You 1685The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1720 1687
1688Will never block.
1689
1721=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1722 1691
1723Moves the player out of the specila link map onto the given map. If the 1692Moves 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 1693map. 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, 1694to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1695fails, to the emergency map position.
1727 1696
1728Might block. 1697Might block.
1729 1698
1730=cut 1699=cut
1700
1701sub link_map {
1702 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1705 $LINK_MAP->load;
1706 }
1707
1708 $LINK_MAP
1709}
1731 1710
1732sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1733 my ($self) = @_; 1712 my ($self) = @_;
1734 1713
1735 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1736 1715
1737 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1717
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1719 if $self->map;
1741 1720
1742 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1722}
1744 1723
1745sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1747 1726
… …
1811=cut 1790=cut
1812 1791
1813sub cf::object::player::goto { 1792sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1815 1794
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1795 $self->enter_link;
1819 1796
1820 (async { 1797 (async {
1821 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1823 1800
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1802# if $map;
1826 1803
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1804 $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 1868 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1869 unless (eval {
1893 prepare_random_map $exit 1870 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1871 if $exit->slaying eq "/!";
1895 1872
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1875
1899 1; 1876 1;
1900 }) { 1877 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1878 $self->message ("Something went wrong deep within the crossfire server. "
… …
2284 warn "enter emergency perl save\n"; 2261 warn "enter emergency perl save\n";
2285 2262
2286 cf::sync_job { 2263 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2264 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2265 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2266 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2267 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2268 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2269 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2270 $pl->valid or next;
2294 $pl->save; 2271 $pl->save;
… …
2408 exit 1; 2385 exit 1;
2409 } 2386 }
2410 2387
2411 warn "reloaded"; 2388 warn "reloaded";
2412}; 2389};
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 2390
2457register_command "reload" => sub { 2391register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2392 my ($who, $arg) = @_;
2459 2393
2460 if ($who->flag (FLAG_WIZ)) { 2394 if ($who->flag (FLAG_WIZ)) {
… …
2489 }, 2423 },
2490); 2424);
2491 2425
2492IO::AIO::max_poll_time $TICK * 0.2; 2426IO::AIO::max_poll_time $TICK * 0.2;
2493 2427
2494Event->io ( 2428$AIO_POLL_WATCHER = Event->io (
2495 fd => IO::AIO::poll_fileno, 2429 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2430 poll => 'r',
2497 prio => 5, 2431 prio => 5,
2498 data => WF_AUTOCANCEL, 2432 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2433 cb => \&IO::AIO::poll_cb,
2500); 2434);
2501 2435
2502Event->timer ( 2436$WRITE_RUNTIME_WATCHER = Event->timer (
2503 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2504 after => 0, 2438 after => 0,
2505 interval => 10, 2439 interval => 10,
2506 cb => sub { 2440 cb => sub {
2507 (Coro::unblock_sub { 2441 (Coro::unblock_sub {

Diff Legend

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