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.173 by root, Sun Jan 14 18:00:34 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
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 504our @CB_MAP = ();
624 505
625my %attachment; 506my %attachment;
626 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
627sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
629 516
630 use sort 'stable'; 517 use sort 'stable';
631 518
… …
802# object support 689# object support
803 690
804sub reattach { 691sub reattach {
805 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 696
808 my $registry = $obj->registry; 697 my $registry = $obj->registry;
809 698
810 @$registry = (); 699 @$registry = ();
811 700
… …
998 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 890 . "\n};\n1";
1002 891
1003 eval $source 892 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
1006 902
1007 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1008} 904}
1009 905
1010sub load_extensions { 906sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1017 } 913 }
1018} 914}
1019 915
1020############################################################################# 916#############################################################################
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 917
1036=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1037 919
1038Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1039 921
… …
1175 \@logins 1057 \@logins
1176} 1058}
1177 1059
1178=item $player->maps 1060=item $player->maps
1179 1061
1180Returns an arrayref of cf::path's of all maps that are private for this 1062Returns an arrayref of map paths that are private for this
1181player. May block. 1063player. May block.
1182 1064
1183=cut 1065=cut
1184 1066
1185sub maps($) { 1067sub maps($) {
… …
1193 for (@$files) { 1075 for (@$files) {
1194 utf8::decode $_; 1076 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1197 1079
1080 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1082 }
1200 1083
1201 \@paths 1084 \@paths
1202} 1085}
1203 1086
… …
1229package cf::map; 1112package cf::map;
1230 1113
1231use Fcntl; 1114use Fcntl;
1232use Coro::AIO; 1115use Coro::AIO;
1233 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1234our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1236 1123
1237sub generate_random_map { 1124sub generate_random_map {
1238 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1239 1126
1240 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1128 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1168sub normalise {
1169 my ($path, $base) = @_;
1170
1171 # map plan:
1172 #
1173 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched
1175 # ?xxx/... are special absolute paths
1176 # ?random/... random maps
1177 # /... normal maps
1178 # ~user/... per-player map of a specific user
1179
1180 $path =~ s/$PATH_SEP/\//go;
1181
1182 # treat it as relative path if it starts with
1183 # something that looks reasonable
1184 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1185 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1186
1187 $base =~ s{[^/]+/?$}{};
1188 $path = "$base/$path";
1189 }
1190
1191 for ($path) {
1192 redo if s{//}{/};
1193 redo if s{/\.?/}{/};
1194 redo if s{/[^/]+/\.\./}{/};
1195 }
1196
1197 $path
1198}
1199
1200sub new_from_path {
1201 my (undef, $path, $base) = @_;
1202
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204
1205 $path = normalise $path, $base;
1206
1207 for my $pkg (keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) {
1209 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc.
1212 return $self;
1213 }
1214 }
1215
1216 Carp::carp "unable to resolve path '$path'.";
1217 ()
1218}
1219
1220sub init {
1221 my ($self) = @_;
1222
1223 $self
1224}
1225
1226sub as_string {
1227 my ($self) = @_;
1228
1229 "$self->{path}"
1230}
1231
1232# the displayed name, this is a one way mapping
1233sub visible_name {
1234 &as_string
1235}
1236
1237# the original (read-only) location
1238sub load_path {
1239 my ($self) = @_;
1240
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1242}
1243
1244# the temporary/swap location
1245sub save_path {
1246 my ($self) = @_;
1247
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1250}
1251
1252# the unique path, undef == no special unique path
1253sub uniq_path {
1254 my ($self) = @_;
1255
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1258}
1255 1259
1256# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1257# all maps in C++... 1261# all maps in C++...
1258sub change_all_map_light { 1262sub change_all_map_light {
… …
1260 1264
1261 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1263} 1267}
1264 1268
1269sub unlink_save {
1270 my ($self) = @_;
1271
1272 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1275}
1276
1265sub try_load_header($) { 1277sub load_header_from($) {
1266 my ($path) = @_; 1278 my ($self, $path) = @_;
1267 1279
1268 utf8::encode $path; 1280 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1270 or return; 1282 or return;
1271 1283
1272 my $map = cf::map::new 1284 $self->_load_header ($path)
1273 or return; 1285 or return;
1274 1286
1275 # for better error messages only, will be overwritten 1287 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1288
1278 $map->load_header ($path) 1289 1
1290}
1291
1292sub load_orig {
1293 my ($self) = @_;
1294
1295 $self->load_header_from ($self->load_path)
1296}
1297
1298sub load_temp {
1299 my ($self) = @_;
1300
1301 $self->load_header_from ($self->save_path)
1302}
1303
1304sub load_header {
1305 my ($self) = @_;
1306
1307 if ($self->load_temp) {
1308 $self->last_access ((delete $self->{last_access})
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else {
1314 $self->load_orig
1279 or return; 1315 or return;
1280 1316
1281 $map->{load_path} = $path; 1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 }
1282 1322
1283 $map 1323 1
1284} 1324}
1285 1325
1286sub find; 1326sub find;
1287sub find { 1327sub find {
1288 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1289 1329
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1331
1295 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1296 1333
1297 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1299 1336 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; 1337 or return;
1319 1338
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; 1339 $map->{last_save} = $cf::RUNTIME;
1332 1340
1333 Coro::cede; 1341 $map->load_header
1342 or return;
1334 1343
1335 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1346 $map->reset;
1337 undef $guard; 1347 undef $guard;
1338 $map = find $path 1348 $map = find $path
1339 or return; 1349 or return;
1340 } 1350 }
1341 1351
1342 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1343 } 1353 }
1344} 1354}
1345 1355
1346sub load { 1356sub load {
1347 my ($self) = @_; 1357 my ($self) = @_;
1348 1358
1349 my $path = $self->{path}; 1359 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1351 1361
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1363
1354 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1355 1365
1356 $self->alloc; 1366 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1368 or return;
1359 1369
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1362 1372
1363 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1374 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1376 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1368 } 1378 }
1369 } 1379 }
1370 1380
1371 Coro::cede; 1381 Coro::cede;
1372 1382
1373 # now do the right thing for maps 1383 # now do the right thing for maps
1374 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1375 1385
1376 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1387 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1383 $self->set_darkness_map; 1391 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1386 $self->activate; 1395 $self->activate;
1387 } 1396 }
1388 1397
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1398 $self->in_memory (cf::MAP_IN_MEMORY);
1399}
1400
1401sub customise_for {
1402 my ($self, $ob) = @_;
1403
1404 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player;
1406
1407 $self
1392} 1408}
1393 1409
1394# find and load all maps in the 3x3 area around a map 1410# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1411sub load_diag {
1396 my ($map) = @_; 1412 my ($map) = @_;
… …
1428} 1444}
1429 1445
1430our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = Coro::async {
1432 while () { 1448 while () {
1433 while (%MAP_PREFETCH) { 1449 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 1450 my $map = find $path
1439 or next; 1451 or next;
1440 $map->load; 1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1441 } 1455 }
1442 Coro::schedule; 1456 Coro::schedule;
1443 } 1457 }
1444}; 1458};
1445 1459
1446sub find_async { 1460sub find_async {
1447 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1448 1462
1449 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1464
1452 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1467 }
1455 1468
1456 $MAP_PREFETCH{$key} = $path; 1469 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER->ready;
1458 1471
1459 () 1472 ()
1460} 1473}
1461 1474
… …
1466 1479
1467 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1468 1481
1469 return unless $self->dirty; 1482 return unless $self->dirty;
1470 1483
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1486
1474 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1475 1488
1476 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1477 1490
… …
1480 cf::async { 1493 cf::async {
1481 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1482 }; 1495 };
1483 1496
1484 if ($uniq) { 1497 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1500 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1502 }
1490} 1503}
1491 1504
1492sub swap_out { 1505sub swap_out {
1493 my ($self) = @_; 1506 my ($self) = @_;
… …
1507 1520
1508sub reset_at { 1521sub reset_at {
1509 my ($self) = @_; 1522 my ($self) = @_;
1510 1523
1511 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1514 1527
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1530
… …
1522 my ($self) = @_; 1535 my ($self) = @_;
1523 1536
1524 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1525} 1538}
1526 1539
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 { 1540sub rename {
1536 my ($self, $new_path) = @_; 1541 my ($self, $new_path) = @_;
1537 1542
1543 normalise $new_path;
1544
1538 $self->unlink_save; 1545 $self->unlink_save;
1539 1546
1540 delete $cf::MAP{$self->path}; 1547 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1548 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1549 $cf::MAP{$self->path} = $self;
1544 1550
1545 $self->save; 1551 $self->save;
1546} 1552}
1547 1553
1548sub reset { 1554sub reset {
1549 my ($self) = @_; 1555 my ($self) = @_;
1550 1556
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1557 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1558
1553 return if $self->players; 1559 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1560 return if $self->isa ("ext::map_per_player");#d#
1555 1561
1556 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1557 1563
1558 delete $cf::MAP{$self->path}; 1564 delete $cf::MAP{$self->path};
1565
1566 $self->in_memory (cf::MAP_SWAPPED);
1567 $self->clear;
1559 1568
1560 $_->clear_links_to ($self) for values %cf::MAP; 1569 $_->clear_links_to ($self) for values %cf::MAP;
1561 1570
1562 $self->unlink_save; 1571 $self->unlink_save;
1563 $self->destroy; 1572 $self->destroy;
… …
1572 $self->reset_timeout (1); 1581 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1582 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1583 $self->reset; # polite request, might not happen
1575} 1584}
1576 1585
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 1586=item cf::map::unique_maps
1588 1587
1589Returns an arrayref of cf::path's of all shared maps that have 1588Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1589instantiated unique items. May block.
1591 1590
1592=cut 1591=cut
1593 1592
1594sub unique_maps() { 1593sub unique_maps() {
… …
1600 for (@$files) { 1599 for (@$files) {
1601 utf8::decode $_; 1600 utf8::decode $_;
1602 next if /\.pst$/; 1601 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1602 next unless /^$PATH_SEP/o;
1604 1603
1604 s/\.map$//;
1605 push @paths, new cf::path $_; 1605 push @paths, $_;
1606 } 1606 }
1607 1607
1608 \@paths 1608 \@paths
1609} 1609}
1610 1610
… …
1685 1685
1686=item $player_object->enter_link 1686=item $player_object->enter_link
1687 1687
1688Freezes the player and moves him/her to a special map (C<{link}>). 1688Freezes the player and moves him/her to a special map (C<{link}>).
1689 1689
1690The player should be reaosnably safe there for short amounts of time. You 1690The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1691I<MUST> call C<leave_link> as soon as possible, though.
1692 1692
1693Will never block.
1694
1693=item $player_object->leave_link ($map, $x, $y) 1695=item $player_object->leave_link ($map, $x, $y)
1694 1696
1695Moves the player out of the specila link map onto the given map. If the 1697Moves 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 1698map. 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, 1699to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1700fails, to the emergency map position.
1699 1701
1700Might block. 1702Might block.
1701 1703
1702=cut 1704=cut
1705
1706sub link_map {
1707 unless ($LINK_MAP) {
1708 $LINK_MAP = cf::map::find "{link}"
1709 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1710 $LINK_MAP->load;
1711 }
1712
1713 $LINK_MAP
1714}
1703 1715
1704sub cf::object::player::enter_link { 1716sub cf::object::player::enter_link {
1705 my ($self) = @_; 1717 my ($self) = @_;
1706 1718
1707 $self->deactivate_recursive; 1719 $self->deactivate_recursive;
1708 1720
1709 return if $self->map == $LINK_MAP; 1721 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1722
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1723 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1724 if $self->map;
1713 1725
1714 $self->enter_map ($LINK_MAP, 20, 20); 1726 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1727}
1716 1728
1717sub cf::object::player::leave_link { 1729sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1730 my ($self, $map, $x, $y) = @_;
1719 1731
… …
1783=cut 1795=cut
1784 1796
1785sub cf::object::player::goto { 1797sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1798 my ($self, $path, $x, $y) = @_;
1787 1799
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1800 $self->enter_link;
1791 1801
1792 (async { 1802 (async {
1793 my $map = cf::map::find $path->as_string; 1803 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1804 $map = $map->customise_for ($self) if $map;
1795 1805
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1806# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1807# if $map;
1798 1808
… …
1863 $self->deactivate_recursive; # just to be sure 1873 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1874 unless (eval {
1865 prepare_random_map $exit 1875 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1876 if $exit->slaying eq "/!";
1867 1877
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1878 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1879 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1880
1871 1; 1881 1;
1872 }) { 1882 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1883 $self->message ("Something went wrong deep within the crossfire server. "
… …
2256 warn "enter emergency perl save\n"; 2266 warn "enter emergency perl save\n";
2257 2267
2258 cf::sync_job { 2268 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2269 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2270 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2271 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2272 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2273 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2274 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2275 $pl->valid or next;
2266 $pl->save; 2276 $pl->save;
… …
2381 } 2391 }
2382 2392
2383 warn "reloaded"; 2393 warn "reloaded";
2384}; 2394};
2385 2395
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 { 2396register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2397 my ($who, $arg) = @_;
2431 2398
2432 if ($who->flag (FLAG_WIZ)) { 2399 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2400 $who->message ("start of reload.");
… …
2442 reentrant => 0, 2409 reentrant => 0,
2443 prio => 0, 2410 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2411 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2412 data => WF_AUTOCANCEL,
2446 cb => sub { 2413 cb => sub {
2414 $NOW = Event::time;
2415
2447 cf::server_tick; # one server iteration 2416 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2417 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2418 $NEXT_TICK += $TICK;
2450 2419
2451 $WAIT_FOR_TICK->broadcast; 2420 $WAIT_FOR_TICK->broadcast;
… …
2459 }, 2428 },
2460); 2429);
2461 2430
2462IO::AIO::max_poll_time $TICK * 0.2; 2431IO::AIO::max_poll_time $TICK * 0.2;
2463 2432
2464Event->io ( 2433$AIO_POLL_WATCHER = Event->io (
2465 fd => IO::AIO::poll_fileno, 2434 fd => IO::AIO::poll_fileno,
2466 poll => 'r', 2435 poll => 'r',
2467 prio => 5, 2436 prio => 5,
2468 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb, 2438 cb => \&IO::AIO::poll_cb,
2470); 2439);
2471 2440
2472Event->timer ( 2441$WRITE_RUNTIME_WATCHER = Event->timer (
2473 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2474 after => 0, 2443 after => 0,
2475 interval => 10, 2444 interval => 10,
2476 cb => sub { 2445 cb => sub {
2477 (Coro::unblock_sub { 2446 (Coro::unblock_sub {

Diff Legend

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