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.170 by root, Sun Jan 14 02:00:37 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
1234our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1236 1122
1237sub generate_random_map { 1123sub generate_random_map {
1238 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1239 1125
1240 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1127 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 # we have to keep some variables in memory intact
1157 local $_[0]{path};
1158 local $_[0]{deny_save};
1159 local $_[0]{deny_reset};
1160
1161 $_[0]->SUPER::thawer_merge ($_[1]);
1162}
1163
1164sub normalise {
1165 my ($path, $base) = @_;
1166
1167 # map plan:
1168 #
1169 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched
1171 # ?xxx/... are special absolute paths
1172 # ?random/... random maps
1173 # /... normal maps
1174 # ~user/... per-player map of a specific user
1175
1176 $path =~ s/$PATH_SEP/\//go;
1177
1178 # treat it as relative path if it starts with
1179 # something that looks reasonable
1180 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1181 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1182
1183 $base =~ s{[^/]+/?$}{};
1184 $path = "$base/$path";
1185 }
1186
1187 for ($path) {
1188 redo if s{//}{/};
1189 redo if s{/\.?/}{/};
1190 redo if s{/[^/]+/\.\./}{/};
1191 }
1192
1193 $path
1194}
1195
1196sub new_from_path {
1197 my (undef, $path, $base) = @_;
1198
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200
1201 $path = normalise $path, $base;
1202
1203 for my $pkg (keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) {
1205 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc.
1208 return $self;
1209 }
1210 }
1211
1212 Carp::carp "unable to resolve path '$path'.";
1213 ()
1214}
1215
1216sub init {
1217 my ($self) = @_;
1218
1219 $self
1220}
1221
1222sub as_string {
1223 my ($self) = @_;
1224
1225 "$self->{path}"
1226}
1227
1228# the displayed name, this is a one way mapping
1229sub visible_name {
1230 &as_string
1231}
1232
1233# the original (read-only) location
1234sub load_path {
1235 my ($self) = @_;
1236
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1238}
1239
1240# the temporary/swap location
1241sub save_path {
1242 my ($self) = @_;
1243
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1246}
1247
1248# the unique path, undef == no special unique path
1249sub uniq_path {
1250 my ($self) = @_;
1251
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1254}
1255 1255
1256# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1257# all maps in C++... 1257# all maps in C++...
1258sub change_all_map_light { 1258sub change_all_map_light {
… …
1260 1260
1261 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1263} 1263}
1264 1264
1265sub unlink_save {
1266 my ($self) = @_;
1267
1268 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1270 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1271}
1272
1265sub try_load_header($) { 1273sub load_header_from($) {
1266 my ($path) = @_; 1274 my ($self, $path) = @_;
1267 1275
1268 utf8::encode $path; 1276 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1270 or return; 1278 or return;
1271 1279
1272 my $map = cf::map::new 1280 $self->_load_header ($path)
1273 or return; 1281 or return;
1274 1282
1275 # for better error messages only, will be overwritten 1283 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1284
1278 $map->load_header ($path) 1285 1
1286}
1287
1288sub load_orig {
1289 my ($self) = @_;
1290
1291 $self->load_header_from ($self->load_path)
1292}
1293
1294sub load_temp {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->save_path)
1298}
1299
1300sub load_header {
1301 my ($self) = @_;
1302
1303 if ($self->load_temp) {
1304 $self->last_access ((delete $self->{last_access})
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else {
1310 $self->load_orig
1279 or return; 1311 or return;
1280 1312
1281 $map->{load_path} = $path; 1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 }
1282 1318
1283 $map 1319 1
1284} 1320}
1285 1321
1286sub find; 1322sub find;
1287sub find { 1323sub find {
1288 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1289 1325
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1327
1295 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1296 1329
1297 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1299 1332 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; 1333 or return;
1319 1334
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; 1335 $map->{last_save} = $cf::RUNTIME;
1332 1336
1333 Coro::cede; 1337 $map->load_header
1338 or return;
1334 1339
1335 if ($map->should_reset) { 1340 if ($map->should_reset) {
1336 $map->reset; 1341 $map->reset;
1337 undef $guard; 1342 undef $guard;
1338 $map = find $path 1343 $map = find $path
1339 or return; 1344 or return;
1340 } 1345 }
1341 1346
1342 $cf::MAP{$key} = $map 1347 $cf::MAP{$path} = $map
1343 } 1348 }
1344} 1349}
1345 1350
1346sub load { 1351sub load {
1347 my ($self) = @_; 1352 my ($self) = @_;
1348 1353
1349 my $path = $self->{path}; 1354 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1355 my $guard = cf::lock_acquire "map_load:$path";
1351 1356
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1357 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1358
1354 $self->in_memory (cf::MAP_LOADING); 1359 $self->in_memory (cf::MAP_LOADING);
1355 1360
1356 $self->alloc; 1361 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1362 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1363 or return;
1359 1364
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1366 if delete $self->{load_original};
1362 1367
1363 if (my $uniq = $path->uniq_path) { 1368 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1369 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1370 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1371 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1372 $self->_load_objects ($uniq, 0);
1368 } 1373 }
1369 } 1374 }
1370 1375
1371 Coro::cede; 1376 Coro::cede;
1372 1377
1373 # now do the right thing for maps 1378 # now do the right thing for maps
1374 $self->link_multipart_objects; 1379 $self->link_multipart_objects;
1375 1380
1376 if ($self->{path}->is_style_map) { 1381 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1382 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1383 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1384 $self->update_buttons;
1385 Coro::cede;
1383 $self->set_darkness_map; 1386 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1387 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1388 unless $self->difficulty;
1389 Coro::cede;
1386 $self->activate; 1390 $self->activate;
1387 } 1391 }
1388 1392
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1393 $self->in_memory (cf::MAP_IN_MEMORY);
1394}
1395
1396sub customise_for {
1397 my ($self, $ob) = @_;
1398
1399 return find "~" . $ob->name . "/" . $self->{path}
1400 if $self->per_player;
1401
1402 $self
1392} 1403}
1393 1404
1394# find and load all maps in the 3x3 area around a map 1405# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1406sub load_diag {
1396 my ($map) = @_; 1407 my ($map) = @_;
… …
1428} 1439}
1429 1440
1430our %MAP_PREFETCH; 1441our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1442our $MAP_PREFETCHER = Coro::async {
1432 while () { 1443 while () {
1433 while (%MAP_PREFETCH) { 1444 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 1445 my $map = find $path
1439 or next; 1446 or next;
1440 $map->load; 1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1441 } 1450 }
1442 Coro::schedule; 1451 Coro::schedule;
1443 } 1452 }
1444}; 1453};
1445 1454
1446sub find_async { 1455sub find_async {
1447 my ($path, $origin) = @_; 1456 my ($path, $origin) = @_;
1448 1457
1449 $path = new cf::path $path, $origin && $origin->path; 1458 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1459
1452 if (my $map = $cf::MAP{$key}) { 1460 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1462 }
1455 1463
1456 $MAP_PREFETCH{$key} = $path; 1464 $MAP_PREFETCH{$path} = 0;
1457 $MAP_PREFETCHER->ready; 1465 $MAP_PREFETCHER->ready;
1458 1466
1459 () 1467 ()
1460} 1468}
1461 1469
… …
1466 1474
1467 $self->{last_save} = $cf::RUNTIME; 1475 $self->{last_save} = $cf::RUNTIME;
1468 1476
1469 return unless $self->dirty; 1477 return unless $self->dirty;
1470 1478
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1479 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1480 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1481
1474 $self->{load_path} = $save; 1482 $self->{load_path} = $save;
1475 1483
1476 return if $self->{deny_save}; 1484 return if $self->{deny_save};
1477 1485
… …
1480 cf::async { 1488 cf::async {
1481 $_->contr->save for $self->players; 1489 $_->contr->save for $self->players;
1482 }; 1490 };
1483 1491
1484 if ($uniq) { 1492 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1494 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1495 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1496 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1497 }
1490} 1498}
1491 1499
1492sub swap_out { 1500sub swap_out {
1493 my ($self) = @_; 1501 my ($self) = @_;
… …
1507 1515
1508sub reset_at { 1516sub reset_at {
1509 my ($self) = @_; 1517 my ($self) = @_;
1510 1518
1511 # TODO: safety, remove and allow resettable per-player maps 1519 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1520 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1521 return 1e99 if $self->{deny_reset};
1514 1522
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1523 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1524 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1525
… …
1522 my ($self) = @_; 1530 my ($self) = @_;
1523 1531
1524 $self->reset_at <= $cf::RUNTIME 1532 $self->reset_at <= $cf::RUNTIME
1525} 1533}
1526 1534
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 { 1535sub rename {
1536 my ($self, $new_path) = @_; 1536 my ($self, $new_path) = @_;
1537 1537
1538 normalise $new_path;
1539
1538 $self->unlink_save; 1540 $self->unlink_save;
1539 1541
1540 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path; 1543 $self->{path} = $new_path; $self->path ($self->{path});
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self; 1544 $cf::MAP{$self->path} = $self;
1544 1545
1545 $self->save; 1546 $self->save;
1546} 1547}
1547 1548
1548sub reset { 1549sub reset {
1549 my ($self) = @_; 1550 my ($self) = @_;
1550 1551
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1552 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1553
1553 return if $self->players; 1554 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1555 return if $self->isa ("ext::map_per_player");#d#
1555 1556
1556 warn "resetting map ", $self->path;#d# 1557 warn "resetting map ", $self->path;#d#
1557 1558
1558 delete $cf::MAP{$self->path}; 1559 delete $cf::MAP{$self->path};
1560
1561 $self->in_memory (cf::MAP_SWAPPED);
1562 $self->clear;
1559 1563
1560 $_->clear_links_to ($self) for values %cf::MAP; 1564 $_->clear_links_to ($self) for values %cf::MAP;
1561 1565
1562 $self->unlink_save; 1566 $self->unlink_save;
1563 $self->destroy; 1567 $self->destroy;
… …
1572 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->rename ("{nuke}/" . ($nuke_counter++));
1574 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1575} 1579}
1576 1580
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 1581=item cf::map::unique_maps
1588 1582
1589Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1584instantiated unique items. May block.
1591 1585
1592=cut 1586=cut
1593 1587
1594sub unique_maps() { 1588sub unique_maps() {
… …
1600 for (@$files) { 1594 for (@$files) {
1601 utf8::decode $_; 1595 utf8::decode $_;
1602 next if /\.pst$/; 1596 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1604 1598
1599 s/\.map$//;
1605 push @paths, new cf::path $_; 1600 push @paths, $_;
1606 } 1601 }
1607 1602
1608 \@paths 1603 \@paths
1609} 1604}
1610 1605
… …
1685 1680
1686=item $player_object->enter_link 1681=item $player_object->enter_link
1687 1682
1688Freezes the player and moves him/her to a special map (C<{link}>). 1683Freezes the player and moves him/her to a special map (C<{link}>).
1689 1684
1690The player should be reaosnably safe there for short amounts of time. You 1685The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1692 1687
1688Will never block.
1689
1693=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1694 1691
1695Moves the player out of the specila link map onto the given map. If the 1692Moves the player out of the special C<{link}> map onto the specified
1696map is not valid (or omitted), the player will be moved back to the 1693map. If the map is not valid (or omitted), the player will be moved back
1697location he/she was before the call to C<enter_link>, or, if that fails, 1694to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1695fails, to the emergency map position.
1699 1696
1700Might block. 1697Might block.
1701 1698
1702=cut 1699=cut
1700
1701sub link_map {
1702 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1705 $LINK_MAP->load;
1706 }
1707
1708 $LINK_MAP
1709}
1703 1710
1704sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1705 my ($self) = @_; 1712 my ($self) = @_;
1706 1713
1707 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1708 1715
1709 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1717
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1719 if $self->map;
1713 1720
1714 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1722}
1716 1723
1717sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1719 1726
… …
1783=cut 1790=cut
1784 1791
1785sub cf::object::player::goto { 1792sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1787 1794
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1795 $self->enter_link;
1791 1796
1792 (async { 1797 (async {
1793 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1795 1800
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1802# if $map;
1798 1803
… …
1863 $self->deactivate_recursive; # just to be sure 1868 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1869 unless (eval {
1865 prepare_random_map $exit 1870 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1871 if $exit->slaying eq "/!";
1867 1872
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1875
1871 1; 1876 1;
1872 }) { 1877 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1878 $self->message ("Something went wrong deep within the crossfire server. "
… …
2256 warn "enter emergency perl save\n"; 2261 warn "enter emergency perl save\n";
2257 2262
2258 cf::sync_job { 2263 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2264 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2265 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2266 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2267 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2268 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2269 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2270 $pl->valid or next;
2266 $pl->save; 2271 $pl->save;
… …
2381 } 2386 }
2382 2387
2383 warn "reloaded"; 2388 warn "reloaded";
2384}; 2389};
2385 2390
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 { 2391register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2392 my ($who, $arg) = @_;
2431 2393
2432 if ($who->flag (FLAG_WIZ)) { 2394 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2395 $who->message ("start of reload.");
… …
2442 reentrant => 0, 2404 reentrant => 0,
2443 prio => 0, 2405 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2406 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2407 data => WF_AUTOCANCEL,
2446 cb => sub { 2408 cb => sub {
2409 $NOW = Event::time;
2410
2447 cf::server_tick; # one server iteration 2411 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2412 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2413 $NEXT_TICK += $TICK;
2450 2414
2451 $WAIT_FOR_TICK->broadcast; 2415 $WAIT_FOR_TICK->broadcast;
… …
2459 }, 2423 },
2460); 2424);
2461 2425
2462IO::AIO::max_poll_time $TICK * 0.2; 2426IO::AIO::max_poll_time $TICK * 0.2;
2463 2427
2464Event->io ( 2428$AIO_POLL_WATCHER = Event->io (
2465 fd => IO::AIO::poll_fileno, 2429 fd => IO::AIO::poll_fileno,
2466 poll => 'r', 2430 poll => 'r',
2467 prio => 5, 2431 prio => 5,
2468 data => WF_AUTOCANCEL, 2432 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb, 2433 cb => \&IO::AIO::poll_cb,
2470); 2434);
2471 2435
2472Event->timer ( 2436$WRITE_RUNTIME_WATCHER = Event->timer (
2473 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2474 after => 0, 2438 after => 0,
2475 interval => 10, 2439 interval => 10,
2476 cb => sub { 2440 cb => sub {
2477 (Coro::unblock_sub { 2441 (Coro::unblock_sub {

Diff Legend

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