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.160 by root, Wed Jan 10 22:54:06 2007 UTC vs.
Revision 1.169 by root, Sun Jan 14 01:09:46 2007 UTC

… …
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38 38
39our @EXTS = (); # list of extension package names 39our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
42 43
43our @EVENT; 44our @EVENT;
44our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
45 46
46our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
48our $NEXT_TICK; 51our $NEXT_TICK;
49our $NOW; 52our $NOW;
50 53
51our %CFG; 54our %CFG;
52 55
53our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 57our $RUNTIME;
55 58
56our %PLAYER; # all users 59our %PLAYER; # all users
57our %MAP; # all maps 60our %MAP; # all maps
58our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
60 63
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $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
63 69
64binmode STDOUT; 70binmode STDOUT;
65binmode STDERR; 71binmode STDERR;
66 72
67# read virtual server time, if available 73# read virtual server time, if available
… …
75mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
76mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
79 85
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
83 87
84############################################################################# 88#############################################################################
85 89
86=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
255} 259}
256 260
257sub freeze_mainloop { 261sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
259 263
260 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;
261 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
262 $guard 270 $guard
263} 271}
264 272
265=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
360} 368}
361 369
362=back 370=back
363 371
364=cut 372=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 373
493############################################################################# 374#############################################################################
494 375
495=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
496 377
… …
802# object support 683# object support
803 684
804sub reattach { 685sub reattach {
805 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 690
808 my $registry = $obj->registry; 691 my $registry = $obj->registry;
809 692
810 @$registry = (); 693 @$registry = ();
811 694
… …
998 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 884 . "\n};\n1";
1002 885
1003 eval $source 886 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1005 : "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 }
1006 896
1007 push @EXTS, $pkg; 897 push @EXTS, $pkg;
1008} 898}
1009 899
1010sub load_extensions { 900sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1017 } 907 }
1018} 908}
1019 909
1020############################################################################# 910#############################################################################
1021# load/save/clean perl data associated with a map
1022
1023*cf::mapsupport::on_clean = sub {
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 911
1036=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1037 913
1038Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1039 915
… …
1175 \@logins 1051 \@logins
1176} 1052}
1177 1053
1178=item $player->maps 1054=item $player->maps
1179 1055
1180Returns 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
1181player. May block. 1057player. May block.
1182 1058
1183=cut 1059=cut
1184 1060
1185sub maps($) { 1061sub maps($) {
… …
1193 for (@$files) { 1069 for (@$files) {
1194 utf8::decode $_; 1070 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1197 1073
1074 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1076 }
1200 1077
1201 \@paths 1078 \@paths
1202} 1079}
1203 1080
… …
1229package cf::map; 1106package cf::map;
1230 1107
1231use Fcntl; 1108use Fcntl;
1232use Coro::AIO; 1109use Coro::AIO;
1233 1110
1111use overload
1112 '""' => \&as_string;
1113
1234our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1236 1116
1237sub generate_random_map { 1117sub generate_random_map {
1238 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1239 1119
1240 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1121 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $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},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (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
1254} 1239}
1255 1240
1256# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1257# all maps in C++... 1242# all maps in C++...
1258sub change_all_map_light { 1243sub change_all_map_light {
… …
1260 1245
1261 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1263} 1248}
1264 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
1265sub try_load_header($) { 1258sub load_header_from($) {
1266 my ($path) = @_; 1259 my ($self, $path) = @_;
1267 1260
1268 utf8::encode $path; 1261 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1270 or return; 1263 or return;
1271 1264
1272 my $map = cf::map::new 1265 $self->_load_header ($path)
1273 or return; 1266 or return;
1274 1267
1275 # for better error messages only, will be overwritten 1268 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1269
1278 $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
1279 or return; 1296 or return;
1280 1297
1281 $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 }
1282 1303
1283 $map 1304 1
1284} 1305}
1285 1306
1286sub find; 1307sub find;
1287sub find { 1308sub find {
1288 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1289 1310
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1312
1295 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1296 1314
1297 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1299 1317 my $map = new_from_path cf::map $path
1300 # do it the slow way
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1318 or return;
1319 1319
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1332 1321
1333 Coro::cede; 1322 $map->load_header
1323 or return;
1334 1324
1335 if ($map->should_reset) { 1325 if ($map->should_reset) {
1336 $map->reset; 1326 $map->reset;
1337 undef $guard; 1327 undef $guard;
1338 $map = find $path 1328 $map = find $path
1339 or return; 1329 or return;
1340 } 1330 }
1341 1331
1342 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1343 } 1333 }
1344} 1334}
1345 1335
1346sub load { 1336sub load {
1347 my ($self) = @_; 1337 my ($self) = @_;
1348 1338
1349 my $path = $self->{path}; 1339 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1351 1341
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1343
1354 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1355 1345
1356 $self->alloc; 1346 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1348 or return;
1359 1349
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1362 1352
1363 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1354 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1356 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1368 } 1358 }
1369 } 1359 }
1370 1360
1371 Coro::cede; 1361 Coro::cede;
1372 1362
1373 # now do the right thing for maps 1363 # now do the right thing for maps
1374 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1375 1365
1376 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1367 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1383 $self->set_darkness_map; 1371 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1386 $self->activate; 1375 $self->activate;
1387 } 1376 }
1388 1377
1389 Coro::cede;
1390
1391 $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
1392} 1388}
1393 1389
1394# 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
1395sub load_diag { 1391sub load_diag {
1396 my ($map) = @_; 1392 my ($map) = @_;
… …
1428} 1424}
1429 1425
1430our %MAP_PREFETCH; 1426our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1427our $MAP_PREFETCHER = Coro::async {
1432 while () { 1428 while () {
1433 while (%MAP_PREFETCH) { 1429 for my $path (keys %MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path 1430 my $map = find $path
1439 or next; 1431 or next;
1440 $map->load; 1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1441 } 1435 }
1442 Coro::schedule; 1436 Coro::schedule;
1443 } 1437 }
1444}; 1438};
1445 1439
1446sub find_async { 1440sub find_async {
1447 my ($path, $origin) = @_; 1441 my ($path, $origin) = @_;
1448 1442
1449 $path = new cf::path $path, $origin && $origin->path; 1443 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1444
1452 if (my $map = $cf::MAP{$key}) { 1445 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1447 }
1455 1448
1456 $MAP_PREFETCH{$key} = $path; 1449 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1450 $MAP_PREFETCHER->ready;
1458 1451
1459 () 1452 ()
1460} 1453}
1461 1454
… …
1466 1459
1467 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1468 1461
1469 return unless $self->dirty; 1462 return unless $self->dirty;
1470 1463
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1466
1474 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1475 1468
1476 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1477 1470
… …
1480 cf::async { 1473 cf::async {
1481 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1482 }; 1475 };
1483 1476
1484 if ($uniq) { 1477 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1480 } else {
1488 $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);
1489 } 1482 }
1490} 1483}
1491 1484
1492sub swap_out { 1485sub swap_out {
1493 my ($self) = @_; 1486 my ($self) = @_;
… …
1507 1500
1508sub reset_at { 1501sub reset_at {
1509 my ($self) = @_; 1502 my ($self) = @_;
1510 1503
1511 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1514 1507
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 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;
1517 1510
… …
1522 my ($self) = @_; 1515 my ($self) = @_;
1523 1516
1524 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1525} 1518}
1526 1519
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename { 1520sub rename {
1536 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1537 1522
1523 normalise $new_path;
1524
1538 $self->unlink_save; 1525 $self->unlink_save;
1539 1526
1540 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1544 1530
1545 $self->save; 1531 $self->save;
1546} 1532}
1547 1533
1548sub reset { 1534sub reset {
1549 my ($self) = @_; 1535 my ($self) = @_;
1550 1536
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1538
1553 return if $self->players; 1539 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1555 1541
1556 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1557 1543
1558 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1559 1548
1560 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1561 1550
1562 $self->unlink_save; 1551 $self->unlink_save;
1563 $self->destroy; 1552 $self->destroy;
… …
1572 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1575} 1564}
1576 1565
1577sub customise_for {
1578 my ($map, $ob) = @_;
1579
1580 if ($map->per_player) {
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1582 }
1583
1584 $map
1585}
1586
1587=item cf::map::unique_maps 1566=item cf::map::unique_maps
1588 1567
1589Returns an arrayref of cf::path's of all shared maps that have 1568Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1569instantiated unique items. May block.
1591 1570
1592=cut 1571=cut
1593 1572
1594sub unique_maps() { 1573sub unique_maps() {
… …
1600 for (@$files) { 1579 for (@$files) {
1601 utf8::decode $_; 1580 utf8::decode $_;
1602 next if /\.pst$/; 1581 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1604 1583
1584 s/\.map$//;
1605 push @paths, new cf::path $_; 1585 push @paths, $_;
1606 } 1586 }
1607 1587
1608 \@paths 1588 \@paths
1609} 1589}
1610 1590
… …
1685 1665
1686=item $player_object->enter_link 1666=item $player_object->enter_link
1687 1667
1688Freezes 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}>).
1689 1669
1690The 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
1691I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1692 1672
1673Will never block.
1674
1693=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1694 1676
1695Moves 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
1696map 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
1697location 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
1698to the emergency map position. 1680fails, to the emergency map position.
1699 1681
1700Might block. 1682Might block.
1701 1683
1702=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}
1703 1695
1704sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1705 my ($self) = @_; 1697 my ($self) = @_;
1706 1698
1707 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1708 1700
1709 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1702
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1704 if $self->map;
1713 1705
1714 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1707}
1716 1708
1717sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1719 1711
… …
1783=cut 1775=cut
1784 1776
1785sub cf::object::player::goto { 1777sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1787 1779
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1780 $self->enter_link;
1791 1781
1792 (async { 1782 (async {
1793 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1795 1785
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1787# if $map;
1798 1788
… …
1863 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1854 unless (eval {
1865 prepare_random_map $exit 1855 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1867 1857
1868 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;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1860
1871 1; 1861 1;
1872 }) { 1862 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
… …
2256 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2257 2247
2258 cf::sync_job { 2248 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2255 $pl->valid or next;
2266 $pl->save; 2256 $pl->save;
… …
2381 } 2371 }
2382 2372
2383 warn "reloaded"; 2373 warn "reloaded";
2384}; 2374};
2385 2375
2386#############################################################################
2387
2388unless ($LINK_MAP) {
2389 $LINK_MAP = cf::map::new;
2390
2391 $LINK_MAP->width (41);
2392 $LINK_MAP->height (41);
2393 $LINK_MAP->alloc;
2394 $LINK_MAP->path ("{link}");
2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2397
2398 # dirty hack because... archetypes are not yet loaded
2399 Event->timer (
2400 after => 10,
2401 cb => sub {
2402 $_[0]->w->cancel;
2403
2404 # provide some exits "home"
2405 my $exit = cf::object::new "exit";
2406
2407 $exit->slaying ($EMERGENCY_POSITION->[0]);
2408 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2409 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2410
2411 $LINK_MAP->insert ($exit->clone, 19, 19);
2412 $LINK_MAP->insert ($exit->clone, 19, 20);
2413 $LINK_MAP->insert ($exit->clone, 19, 21);
2414 $LINK_MAP->insert ($exit->clone, 20, 19);
2415 $LINK_MAP->insert ($exit->clone, 20, 21);
2416 $LINK_MAP->insert ($exit->clone, 21, 19);
2417 $LINK_MAP->insert ($exit->clone, 21, 20);
2418 $LINK_MAP->insert ($exit->clone, 21, 21);
2419
2420 $exit->destroy;
2421 });
2422
2423 $LINK_MAP->{deny_save} = 1;
2424 $LINK_MAP->{deny_reset} = 1;
2425
2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2427}
2428
2429register_command "reload" => sub { 2376register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2431 2378
2432 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2380 $who->message ("start of reload.");
… …
2442 reentrant => 0, 2389 reentrant => 0,
2443 prio => 0, 2390 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2446 cb => sub { 2393 cb => sub {
2394 $NOW = Event::time;
2395
2447 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2450 2399
2451 $WAIT_FOR_TICK->broadcast; 2400 $WAIT_FOR_TICK->broadcast;
… …
2459 }, 2408 },
2460); 2409);
2461 2410
2462IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2463 2412
2464Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2465 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2466 poll => 'r', 2415 poll => 'r',
2467 prio => 5, 2416 prio => 5,
2468 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2470); 2419);
2471 2420
2472Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2473 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2474 after => 0, 2423 after => 0,
2475 interval => 10, 2424 interval => 10,
2476 cb => sub { 2425 cb => sub {
2477 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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