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.159 by root, Wed Jan 10 22:50:12 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 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
… …
987 my $base = $1; 868 my $base = $1;
988 my $pkg = $1; 869 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 870 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 871 $pkg = "ext::$pkg";
991 872
992 warn "loading '$path' into '$pkg'\n"; 873 warn "... loading '$path' into '$pkg'\n";
993 874
994 open my $fh, "<:utf8", $path 875 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 876 or die "$path: $!";
996 877
997 my $source = 878 my $source =
998 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 882 . "\n};\n1";
1002 883
1003 eval $source 884 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 886 : "extension disabled.\n";
887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
888 warn $@;
889 warn "mandatory extension failed to load, exiting.\n";
890 exit 1;
891 }
892 die $@;
893 }
1006 894
1007 push @EXTS, $pkg; 895 push @EXTS, $pkg;
1008} 896}
1009 897
1010sub load_extensions { 898sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1017 } 905 }
1018} 906}
1019 907
1020############################################################################# 908#############################################################################
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 909
1036=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1037 911
1038Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1039 913
… …
1175 \@logins 1049 \@logins
1176} 1050}
1177 1051
1178=item $player->maps 1052=item $player->maps
1179 1053
1180Returns an arrayref of cf::path's of all maps that are private for this 1054Returns an arrayref of map paths that are private for this
1181player. May block. 1055player. May block.
1182 1056
1183=cut 1057=cut
1184 1058
1185sub maps($) { 1059sub maps($) {
… …
1193 for (@$files) { 1067 for (@$files) {
1194 utf8::decode $_; 1068 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1069 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1070 next unless /^$PATH_SEP/o;
1197 1071
1072 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1074 }
1200 1075
1201 \@paths 1076 \@paths
1202} 1077}
1203 1078
… …
1229package cf::map; 1104package cf::map;
1230 1105
1231use Fcntl; 1106use Fcntl;
1232use Coro::AIO; 1107use Coro::AIO;
1233 1108
1109use overload
1110 '""' => \&as_string;
1111
1234our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1236 1114
1237sub generate_random_map { 1115sub generate_random_map {
1238 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1239 1117
1240 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1119 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1128 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 )
1132}
1133
1134sub register {
1135 my (undef, $regex) = @_;
1136 my $pkg = caller;
1137
1138 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__;
1140
1141 $EXT_MAP{$pkg} = qr<$regex>;
1142}
1143
1144# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146
1147sub normalise {
1148 my ($path, $base) = @_;
1149
1150 # map plan:
1151 #
1152 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched
1154 # ?xxx/... are special absolute paths
1155 # ?random/... random maps
1156 # /... normal maps
1157 # ~user/... per-player map of a specific user
1158
1159 $path =~ s/$PATH_SEP/\//go;
1160
1161 # treat it as relative path if it starts with
1162 # something that looks reasonable
1163 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1164 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1165
1166 $base =~ s{[^/]+/?$}{};
1167 $path = "$base/$path";
1168 }
1169
1170 for ($path) {
1171 redo if s{//}{/};
1172 redo if s{/\.?/}{/};
1173 redo if s{/[^/]+/\.\./}{/};
1174 }
1175
1176 $path
1177}
1178
1179sub new_from_path {
1180 my (undef, $path, $base) = @_;
1181
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183
1184 $path = normalise $path, $base;
1185
1186 for my $pkg (keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) {
1188 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc.
1191 return $self;
1192 }
1193 }
1194
1195 Carp::carp "unable to resolve path '$path'.";
1196 ()
1197}
1198
1199sub init {
1200 my ($self) = @_;
1201
1202 $self
1203}
1204
1205sub as_string {
1206 my ($self) = @_;
1207
1208 "$self->{path}"
1209}
1210
1211# the displayed name, this is a one way mapping
1212sub visible_name {
1213 &as_string
1214}
1215
1216# the original (read-only) location
1217sub load_path {
1218 my ($self) = @_;
1219
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1221}
1222
1223# the temporary/swap location
1224sub save_path {
1225 my ($self) = @_;
1226
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1229}
1230
1231# the unique path, undef == no special unique path
1232sub uniq_path {
1233 my ($self) = @_;
1234
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1237}
1255 1238
1256# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1257# all maps in C++... 1240# all maps in C++...
1258sub change_all_map_light { 1241sub change_all_map_light {
… …
1260 1243
1261 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1263} 1246}
1264 1247
1248sub unlink_save {
1249 my ($self) = @_;
1250
1251 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1254}
1255
1265sub try_load_header($) { 1256sub load_header_from($) {
1266 my ($path) = @_; 1257 my ($self, $path) = @_;
1267 1258
1268 utf8::encode $path; 1259 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1270 or return; 1261 or return;
1271 1262
1272 my $map = cf::map::new 1263 $self->_load_header ($path)
1273 or return; 1264 or return;
1274 1265
1275 # for better error messages only, will be overwritten 1266 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1267
1278 $map->load_header ($path) 1268 1
1269}
1270
1271sub load_orig {
1272 my ($self) = @_;
1273
1274 $self->load_header_from ($self->load_path)
1275}
1276
1277sub load_temp {
1278 my ($self) = @_;
1279
1280 $self->load_header_from ($self->save_path)
1281}
1282
1283sub load_header {
1284 my ($self) = @_;
1285
1286 if ($self->load_temp) {
1287 $self->last_access ((delete $self->{last_access})
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else {
1293 $self->load_orig
1279 or return; 1294 or return;
1280 1295
1281 $map->{load_path} = $path; 1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 }
1282 1301
1283 $map 1302 1
1284} 1303}
1285 1304
1286sub find; 1305sub find;
1287sub find { 1306sub find {
1288 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1289 1308
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1310
1295 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1296 1312
1297 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1299 1315 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; 1316 or return;
1319 1317
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; 1318 $map->{last_save} = $cf::RUNTIME;
1332 1319
1333 Coro::cede; 1320 $map->load_header
1321 or return;
1334 1322
1335 if ($map->should_reset) { 1323 if ($map->should_reset) {
1336 $map->reset; 1324 $map->reset;
1337 undef $guard; 1325 undef $guard;
1338 $map = find $path 1326 $map = find $path
1339 or return; 1327 or return;
1340 } 1328 }
1341 1329
1342 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1343 } 1331 }
1344} 1332}
1345 1333
1346sub load { 1334sub load {
1347 my ($self) = @_; 1335 my ($self) = @_;
1348 1336
1349 my $path = $self->{path}; 1337 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1351 1339
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1341
1354 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1355 1343
1356 $self->alloc; 1344 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1346 or return;
1359 1347
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1362 1350
1363 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1352 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1354 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1368 } 1356 }
1369 } 1357 }
1370 1358
1371 Coro::cede; 1359 Coro::cede;
1372 1360
1373 # now do the right thing for maps 1361 # now do the right thing for maps
1374 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1375 1363
1376 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1365 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1383 $self->set_darkness_map; 1369 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1386 $self->activate; 1373 $self->activate;
1387 } 1374 }
1388 1375
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1376 $self->in_memory (cf::MAP_IN_MEMORY);
1377}
1378
1379sub customise_for {
1380 my ($self, $ob) = @_;
1381
1382 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player;
1384
1385 $self
1392} 1386}
1393 1387
1394# find and load all maps in the 3x3 area around a map 1388# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1389sub load_diag {
1396 my ($map) = @_; 1390 my ($map) = @_;
… …
1428} 1422}
1429 1423
1430our %MAP_PREFETCH; 1424our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1425our $MAP_PREFETCHER = Coro::async {
1432 while () { 1426 while () {
1433 while (%MAP_PREFETCH) { 1427 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 1428 my $map = find $path
1439 or next; 1429 or next;
1440 $map->load; 1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1441 } 1433 }
1442 Coro::schedule; 1434 Coro::schedule;
1443 } 1435 }
1444}; 1436};
1445 1437
1446sub find_async { 1438sub find_async {
1447 my ($path, $origin) = @_; 1439 my ($path, $origin) = @_;
1448 1440
1449 $path = new cf::path $path, $origin && $origin->path; 1441 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1442
1452 if (my $map = $cf::MAP{$key}) { 1443 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1445 }
1455 1446
1456 $MAP_PREFETCH{$key} = $path; 1447 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1448 $MAP_PREFETCHER->ready;
1458 1449
1459 () 1450 ()
1460} 1451}
1461 1452
… …
1466 1457
1467 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1468 1459
1469 return unless $self->dirty; 1460 return unless $self->dirty;
1470 1461
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1464
1474 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1475 1466
1476 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1477 1468
… …
1480 cf::async { 1471 cf::async {
1481 $_->contr->save for $self->players; 1472 $_->contr->save for $self->players;
1482 }; 1473 };
1483 1474
1484 if ($uniq) { 1475 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1478 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1479 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1480 }
1490} 1481}
1491 1482
1492sub swap_out { 1483sub swap_out {
1493 my ($self) = @_; 1484 my ($self) = @_;
… …
1507 1498
1508sub reset_at { 1499sub reset_at {
1509 my ($self) = @_; 1500 my ($self) = @_;
1510 1501
1511 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1513 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1514 1505
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1508
… …
1522 my ($self) = @_; 1513 my ($self) = @_;
1523 1514
1524 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1525} 1516}
1526 1517
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 { 1518sub rename {
1536 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1537 1520
1521 normalise $new_path;
1522
1538 $self->unlink_save; 1523 $self->unlink_save;
1539 1524
1540 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1544 1528
1545 $self->save; 1529 $self->save;
1546} 1530}
1547 1531
1548sub reset { 1532sub reset {
1549 my ($self) = @_; 1533 my ($self) = @_;
1550 1534
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1536
1553 return if $self->players; 1537 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1555 1539
1556 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1557 1541
1558 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1559 1546
1560 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1561 1548
1562 $self->unlink_save; 1549 $self->unlink_save;
1563 $self->destroy; 1550 $self->destroy;
… …
1572 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1575} 1562}
1576 1563
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 1564=item cf::map::unique_maps
1588 1565
1589Returns an arrayref of cf::path's of all shared maps that have 1566Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1567instantiated unique items. May block.
1591 1568
1592=cut 1569=cut
1593 1570
1594sub unique_maps() { 1571sub unique_maps() {
… …
1600 for (@$files) { 1577 for (@$files) {
1601 utf8::decode $_; 1578 utf8::decode $_;
1602 next if /\.pst$/; 1579 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1580 next unless /^$PATH_SEP/o;
1604 1581
1582 s/\.map$//;
1605 push @paths, new cf::path $_; 1583 push @paths, $_;
1606 } 1584 }
1607 1585
1608 \@paths 1586 \@paths
1609} 1587}
1610 1588
… …
1685 1663
1686=item $player_object->enter_link 1664=item $player_object->enter_link
1687 1665
1688Freezes the player and moves him/her to a special map (C<{link}>). 1666Freezes the player and moves him/her to a special map (C<{link}>).
1689 1667
1690The player should be reaosnably safe there for short amounts of time. You 1668The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1692 1670
1671Will never block.
1672
1693=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1694 1674
1695Moves the player out of the specila link map onto the given map. If the 1675Moves the player out of the special C<{link}> map onto the specified
1696map is not valid (or omitted), the player will be moved back to the 1676map. If the map is not valid (or omitted), the player will be moved back
1697location he/she was before the call to C<enter_link>, or, if that fails, 1677to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1678fails, to the emergency map position.
1699 1679
1700Might block. 1680Might block.
1701 1681
1702=cut 1682=cut
1683
1684sub link_map {
1685 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1688 $LINK_MAP->load;
1689 }
1690
1691 $LINK_MAP
1692}
1703 1693
1704sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1705 my ($self) = @_; 1695 my ($self) = @_;
1706 1696
1707 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1708 1698
1709 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1700
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1702 if $self->map;
1713 1703
1714 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1705}
1716 1706
1717sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1719 1709
… …
1783=cut 1773=cut
1784 1774
1785sub cf::object::player::goto { 1775sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1787 1777
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1778 $self->enter_link;
1791 1779
1792 (async { 1780 (async {
1793 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1795 1783
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1785# if $map;
1798 1786
… …
1863 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1852 unless (eval {
1865 prepare_random_map $exit 1853 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1867 1855
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1858
1871 1; 1859 1;
1872 }) { 1860 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
… …
2256 warn "enter emergency perl save\n"; 2244 warn "enter emergency perl save\n";
2257 2245
2258 cf::sync_job { 2246 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2247 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2248 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2249 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2250 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2251 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2252 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2253 $pl->valid or next;
2266 $pl->save; 2254 $pl->save;
… …
2314 warn "remove ext commands"; 2302 warn "remove ext commands";
2315 %EXTCMD = (); 2303 %EXTCMD = ();
2316 2304
2317 warn "unload/nuke all extensions"; 2305 warn "unload/nuke all extensions";
2318 for my $pkg (@EXTS) { 2306 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2307 warn "... unloading $pkg";
2320 2308
2321 if (my $cb = $pkg->can ("unload")) { 2309 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2310 eval {
2323 $cb->($pkg); 2311 $cb->($pkg);
2324 1 2312 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2313 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2314 }
2327 2315
2316 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2317 Symbol::delete_package $pkg;
2329 } 2318 }
2330 2319
2331 warn "unload all perl modules loaded from $LIBDIR"; 2320 warn "unload all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2321 while (my ($k, $v) = each %INC) {
… …
2379 exit 1; 2368 exit 1;
2380 } 2369 }
2381 2370
2382 warn "reloaded"; 2371 warn "reloaded";
2383}; 2372};
2384
2385#############################################################################
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2373
2428register_command "reload" => sub { 2374register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2430 2376
2431 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2441 reentrant => 0, 2387 reentrant => 0,
2442 prio => 0, 2388 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2445 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2446 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2449 2397
2450 $WAIT_FOR_TICK->broadcast; 2398 $WAIT_FOR_TICK->broadcast;
… …
2458 }, 2406 },
2459); 2407);
2460 2408
2461IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2462 2410
2463Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2464 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2465 poll => 'r', 2413 poll => 'r',
2466 prio => 5, 2414 prio => 5,
2467 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2469); 2417);
2470 2418
2471Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2472 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2473 after => 0, 2421 after => 0,
2474 interval => 10, 2422 interval => 10,
2475 cb => sub { 2423 cb => sub {
2476 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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