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.161 by root, Thu Jan 11 00:16:58 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 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 373
522############################################################################# 374#############################################################################
523 375
524=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
525 377
… …
831# object support 683# object support
832 684
833sub reattach { 685sub reattach {
834 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 690
837 my $registry = $obj->registry; 691 my $registry = $obj->registry;
838 692
839 @$registry = (); 693 @$registry = ();
840 694
… …
1027 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 884 . "\n};\n1";
1031 885
1032 eval $source 886 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1034 : "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 }
1035 896
1036 push @EXTS, $pkg; 897 push @EXTS, $pkg;
1037} 898}
1038 899
1039sub load_extensions { 900sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1046 } 907 }
1047} 908}
1048 909
1049############################################################################# 910#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 911
1065=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1066 913
1067Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1068 915
… …
1204 \@logins 1051 \@logins
1205} 1052}
1206 1053
1207=item $player->maps 1054=item $player->maps
1208 1055
1209Returns 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
1210player. May block. 1057player. May block.
1211 1058
1212=cut 1059=cut
1213 1060
1214sub maps($) { 1061sub maps($) {
… …
1222 for (@$files) { 1069 for (@$files) {
1223 utf8::decode $_; 1070 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1226 1073
1074 s/\.map$//;
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1228 } 1076 }
1229 1077
1230 \@paths 1078 \@paths
1231} 1079}
1232 1080
… …
1258package cf::map; 1106package cf::map;
1259 1107
1260use Fcntl; 1108use Fcntl;
1261use Coro::AIO; 1109use Coro::AIO;
1262 1110
1111use overload
1112 '""' => \&as_string;
1113
1263our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1265 1116
1266sub generate_random_map { 1117sub generate_random_map {
1267 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1268 1119
1269 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1121 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1130 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 )
1134}
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
1283} 1239}
1284 1240
1285# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1286# all maps in C++... 1242# all maps in C++...
1287sub change_all_map_light { 1243sub change_all_map_light {
… …
1289 1245
1290 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1292} 1248}
1293 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
1294sub load_map_header($) { 1258sub load_header_from($) {
1295 my ($path) = @_; 1259 my ($self, $path) = @_;
1296 1260
1297 utf8::encode $path; 1261 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1299 or return; 1263 or return;
1300 1264
1301 my $map = cf::map::new 1265 $self->_load_header ($path)
1302 or return; 1266 or return;
1303 1267
1304 # for better error messages only, will be overwritten later 1268 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1269
1307 $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
1308 or return; 1296 or return;
1309 1297
1310 $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 }
1311 1303
1312 $map 1304 1
1313} 1305}
1314 1306
1315sub find; 1307sub find;
1316sub find { 1308sub find {
1317 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1318 1310
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1312
1324 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1325 1314
1326 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1328 1317 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1318 or return;
1343 1319
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1356 1321
1357 Coro::cede; 1322 $map->load_header
1323 or return;
1358 1324
1359 if ($map->should_reset) { 1325 if ($map->should_reset) {
1360 $map->reset; 1326 $map->reset;
1361 undef $guard; 1327 undef $guard;
1362 $map = find $path 1328 $map = find $path
1363 or return; 1329 or return;
1364 } 1330 }
1365 1331
1366 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1367 } 1333 }
1368} 1334}
1369 1335
1370sub load { 1336sub load {
1371 my ($self) = @_; 1337 my ($self) = @_;
1372 1338
1373 my $path = $self->{path}; 1339 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1375 1341
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1343
1378 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1379 1345
1380 $self->alloc; 1346 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1348 or return;
1383 1349
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1386 1352
1387 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1354 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1356 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1392 } 1358 }
1393 } 1359 }
1394 1360
1395 Coro::cede; 1361 Coro::cede;
1396 1362
1397 # now do the right thing for maps 1363 # now do the right thing for maps
1398 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1399 1365
1400 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1367 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1407 $self->set_darkness_map; 1371 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1410 $self->activate; 1375 $self->activate;
1411 } 1376 }
1412 1377
1413 Coro::cede;
1414
1415 $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
1416} 1388}
1417 1389
1418# 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
1419sub load_diag { 1391sub load_diag {
1420 my ($map) = @_; 1392 my ($map) = @_;
… …
1452} 1424}
1453 1425
1454our %MAP_PREFETCH; 1426our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1427our $MAP_PREFETCHER = Coro::async {
1456 while () { 1428 while () {
1457 while (%MAP_PREFETCH) { 1429 for my $path (keys %MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path 1430 my $map = find $path
1463 or next; 1431 or next;
1464 $map->load; 1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1465 } 1435 }
1466 Coro::schedule; 1436 Coro::schedule;
1467 } 1437 }
1468}; 1438};
1469 1439
1470sub find_async { 1440sub find_async {
1471 my ($path, $origin) = @_; 1441 my ($path, $origin) = @_;
1472 1442
1473 $path = new cf::path $path, $origin && $origin->path; 1443 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1444
1476 if (my $map = $cf::MAP{$key}) { 1445 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1447 }
1479 1448
1480 $MAP_PREFETCH{$key} = $path; 1449 $MAP_PREFETCH{$path} = 0;
1481 $MAP_PREFETCHER->ready; 1450 $MAP_PREFETCHER->ready;
1482 1451
1483 () 1452 ()
1484} 1453}
1485 1454
… …
1490 1459
1491 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1492 1461
1493 return unless $self->dirty; 1462 return unless $self->dirty;
1494 1463
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1466
1498 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1499 1468
1500 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1501 1470
… …
1504 cf::async { 1473 cf::async {
1505 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1506 }; 1475 };
1507 1476
1508 if ($uniq) { 1477 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1480 } else {
1512 $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);
1513 } 1482 }
1514} 1483}
1515 1484
1516sub swap_out { 1485sub swap_out {
1517 my ($self) = @_; 1486 my ($self) = @_;
… …
1531 1500
1532sub reset_at { 1501sub reset_at {
1533 my ($self) = @_; 1502 my ($self) = @_;
1534 1503
1535 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1538 1507
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1510
… …
1546 my ($self) = @_; 1515 my ($self) = @_;
1547 1516
1548 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1549} 1518}
1550 1519
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename { 1520sub rename {
1560 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1561 1522
1523 normalise $new_path;
1524
1562 $self->unlink_save; 1525 $self->unlink_save;
1563 1526
1564 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1568 1530
1569 $self->save; 1531 $self->save;
1570} 1532}
1571 1533
1572sub reset { 1534sub reset {
1573 my ($self) = @_; 1535 my ($self) = @_;
1574 1536
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1538
1577 return if $self->players; 1539 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1579 1541
1580 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1581 1543
1582 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1583 1548
1584 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1585 1550
1586 $self->unlink_save; 1551 $self->unlink_save;
1587 $self->destroy; 1552 $self->destroy;
… …
1596 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1598 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1599} 1564}
1600 1565
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1566=item cf::map::unique_maps
1612 1567
1613Returns an arrayref of cf::path's of all shared maps that have 1568Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1569instantiated unique items. May block.
1615 1570
1616=cut 1571=cut
1617 1572
1618sub unique_maps() { 1573sub unique_maps() {
… …
1624 for (@$files) { 1579 for (@$files) {
1625 utf8::decode $_; 1580 utf8::decode $_;
1626 next if /\.pst$/; 1581 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1628 1583
1584 s/\.map$//;
1629 push @paths, new cf::path $_; 1585 push @paths, $_;
1630 } 1586 }
1631 1587
1632 \@paths 1588 \@paths
1633} 1589}
1634 1590
… …
1709 1665
1710=item $player_object->enter_link 1666=item $player_object->enter_link
1711 1667
1712Freezes 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}>).
1713 1669
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1716 1672
1673Will never block.
1674
1717=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1718 1676
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1680fails, to the emergency map position.
1723 1681
1724Might block. 1682Might block.
1725 1683
1726=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}
1727 1695
1728sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1729 my ($self) = @_; 1697 my ($self) = @_;
1730 1698
1731 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1732 1700
1733 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1702
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1704 if $self->map;
1737 1705
1738 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1707}
1740 1708
1741sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1743 1711
… …
1807=cut 1775=cut
1808 1776
1809sub cf::object::player::goto { 1777sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1811 1779
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1780 $self->enter_link;
1815 1781
1816 (async { 1782 (async {
1817 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1819 1785
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1787# if $map;
1822 1788
… …
1887 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1854 unless (eval {
1889 prepare_random_map $exit 1855 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1891 1857
1892 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;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1860
1895 1; 1861 1;
1896 }) { 1862 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
… …
2280 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2281 2247
2282 cf::sync_job { 2248 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2255 $pl->valid or next;
2290 $pl->save; 2256 $pl->save;
… …
2405 } 2371 }
2406 2372
2407 warn "reloaded"; 2373 warn "reloaded";
2408}; 2374};
2409 2375
2410#############################################################################
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452
2453register_command "reload" => sub { 2376register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2455 2378
2456 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2380 $who->message ("start of reload.");
… …
2466 reentrant => 0, 2389 reentrant => 0,
2467 prio => 0, 2390 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2470 cb => sub { 2393 cb => sub {
2394 $NOW = Event::time;
2395
2471 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2474 2399
2475 $WAIT_FOR_TICK->broadcast; 2400 $WAIT_FOR_TICK->broadcast;
… …
2483 }, 2408 },
2484); 2409);
2485 2410
2486IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2487 2412
2488Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2489 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2415 poll => 'r',
2491 prio => 5, 2416 prio => 5,
2492 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2494); 2419);
2495 2420
2496Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2497 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2498 after => 0, 2423 after => 0,
2499 interval => 10, 2424 interval => 10,
2500 cb => sub { 2425 cb => sub {
2501 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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