ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.170 by root, Sun Jan 14 02:00:37 2007 UTC

… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
54our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 57our $RUNTIME;
56 58
57our %PLAYER; # all users 59our %PLAYER; # all users
58our %MAP; # all maps 60our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
61 63
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 69
65binmode STDOUT; 70binmode STDOUT;
66binmode STDERR; 71binmode STDERR;
67 72
68# read virtual server time, if available 73# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
80 85
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
84 87
85############################################################################# 88#############################################################################
86 89
87=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
256} 259}
257 260
258sub freeze_mainloop { 261sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
260 263
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
263 $guard 270 $guard
264} 271}
265 272
266=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
361} 368}
362 369
363=back 370=back
364 371
365=cut 372=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 373
522############################################################################# 374#############################################################################
523 375
524=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
525 377
… …
651our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
652our @CB_MAP = (); 504our @CB_MAP = ();
653 505
654my %attachment; 506my %attachment;
655 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
656sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
657 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
658 516
659 use sort 'stable'; 517 use sort 'stable';
660 518
… …
831# object support 689# object support
832 690
833sub reattach { 691sub reattach {
834 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 696
837 my $registry = $obj->registry; 697 my $registry = $obj->registry;
838 698
839 @$registry = (); 699 @$registry = ();
840 700
… …
1027 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 890 . "\n};\n1";
1031 891
1032 eval $source 892 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1034 : "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 }
1035 902
1036 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1037} 904}
1038 905
1039sub load_extensions { 906sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1046 } 913 }
1047} 914}
1048 915
1049############################################################################# 916#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 917
1065=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1066 919
1067Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1068 921
… …
1204 \@logins 1057 \@logins
1205} 1058}
1206 1059
1207=item $player->maps 1060=item $player->maps
1208 1061
1209Returns 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
1210player. May block. 1063player. May block.
1211 1064
1212=cut 1065=cut
1213 1066
1214sub maps($) { 1067sub maps($) {
… …
1222 for (@$files) { 1075 for (@$files) {
1223 utf8::decode $_; 1076 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1226 1079
1080 s/\.map$//;
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1228 } 1082 }
1229 1083
1230 \@paths 1084 \@paths
1231} 1085}
1232 1086
… …
1258package cf::map; 1112package cf::map;
1259 1113
1260use Fcntl; 1114use Fcntl;
1261use Coro::AIO; 1115use Coro::AIO;
1262 1116
1117use overload
1118 '""' => \&as_string;
1119
1263our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1265 1122
1266sub generate_random_map { 1123sub generate_random_map {
1267 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1268 1125
1269 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1127 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $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},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (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
1283} 1254}
1284 1255
1285# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1286# all maps in C++... 1257# all maps in C++...
1287sub change_all_map_light { 1258sub change_all_map_light {
… …
1289 1260
1290 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1292} 1263}
1293 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
1294sub load_map_header($) { 1273sub load_header_from($) {
1295 my ($path) = @_; 1274 my ($self, $path) = @_;
1296 1275
1297 utf8::encode $path; 1276 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1299 or return; 1278 or return;
1300 1279
1301 my $map = cf::map::new 1280 $self->_load_header ($path)
1302 or return; 1281 or return;
1303 1282
1304 # for better error messages only, will be overwritten later 1283 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1284
1307 $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
1308 or return; 1311 or return;
1309 1312
1310 $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 }
1311 1318
1312 $map 1319 1
1313} 1320}
1314 1321
1315sub find; 1322sub find;
1316sub find { 1323sub find {
1317 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1318 1325
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1327
1324 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1325 1329
1326 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1328 1332 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1333 or return;
1343 1334
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1335 $map->{last_save} = $cf::RUNTIME;
1356 1336
1357 Coro::cede; 1337 $map->load_header
1338 or return;
1358 1339
1359 if ($map->should_reset) { 1340 if ($map->should_reset) {
1360 $map->reset; 1341 $map->reset;
1361 undef $guard; 1342 undef $guard;
1362 $map = find $path 1343 $map = find $path
1363 or return; 1344 or return;
1364 } 1345 }
1365 1346
1366 $cf::MAP{$key} = $map 1347 $cf::MAP{$path} = $map
1367 } 1348 }
1368} 1349}
1369 1350
1370sub load { 1351sub load {
1371 my ($self) = @_; 1352 my ($self) = @_;
1372 1353
1373 my $path = $self->{path}; 1354 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1355 my $guard = cf::lock_acquire "map_load:$path";
1375 1356
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1357 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1358
1378 $self->in_memory (cf::MAP_LOADING); 1359 $self->in_memory (cf::MAP_LOADING);
1379 1360
1380 $self->alloc; 1361 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1362 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1363 or return;
1383 1364
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1366 if delete $self->{load_original};
1386 1367
1387 if (my $uniq = $path->uniq_path) { 1368 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1369 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1370 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1371 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1372 $self->_load_objects ($uniq, 0);
1392 } 1373 }
1393 } 1374 }
1394 1375
1395 Coro::cede; 1376 Coro::cede;
1396 1377
1397 # now do the right thing for maps 1378 # now do the right thing for maps
1398 $self->link_multipart_objects; 1379 $self->link_multipart_objects;
1399 1380
1400 if ($self->{path}->is_style_map) { 1381 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1382 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1383 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1384 $self->update_buttons;
1385 Coro::cede;
1407 $self->set_darkness_map; 1386 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1387 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1388 unless $self->difficulty;
1389 Coro::cede;
1410 $self->activate; 1390 $self->activate;
1411 } 1391 }
1412 1392
1413 Coro::cede;
1414
1415 $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
1416} 1403}
1417 1404
1418# 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
1419sub load_diag { 1406sub load_diag {
1420 my ($map) = @_; 1407 my ($map) = @_;
… …
1452} 1439}
1453 1440
1454our %MAP_PREFETCH; 1441our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1442our $MAP_PREFETCHER = Coro::async {
1456 while () { 1443 while () {
1457 while (%MAP_PREFETCH) { 1444 for my $path (keys %MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path 1445 my $map = find $path
1463 or next; 1446 or next;
1464 $map->load; 1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1465 } 1450 }
1466 Coro::schedule; 1451 Coro::schedule;
1467 } 1452 }
1468}; 1453};
1469 1454
1470sub find_async { 1455sub find_async {
1471 my ($path, $origin) = @_; 1456 my ($path, $origin) = @_;
1472 1457
1473 $path = new cf::path $path, $origin && $origin->path; 1458 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1459
1476 if (my $map = $cf::MAP{$key}) { 1460 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1462 }
1479 1463
1480 $MAP_PREFETCH{$key} = $path; 1464 $MAP_PREFETCH{$path} = 0;
1481 $MAP_PREFETCHER->ready; 1465 $MAP_PREFETCHER->ready;
1482 1466
1483 () 1467 ()
1484} 1468}
1485 1469
… …
1490 1474
1491 $self->{last_save} = $cf::RUNTIME; 1475 $self->{last_save} = $cf::RUNTIME;
1492 1476
1493 return unless $self->dirty; 1477 return unless $self->dirty;
1494 1478
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1479 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1480 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1481
1498 $self->{load_path} = $save; 1482 $self->{load_path} = $save;
1499 1483
1500 return if $self->{deny_save}; 1484 return if $self->{deny_save};
1501 1485
… …
1504 cf::async { 1488 cf::async {
1505 $_->contr->save for $self->players; 1489 $_->contr->save for $self->players;
1506 }; 1490 };
1507 1491
1508 if ($uniq) { 1492 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1494 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1495 } else {
1512 $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);
1513 } 1497 }
1514} 1498}
1515 1499
1516sub swap_out { 1500sub swap_out {
1517 my ($self) = @_; 1501 my ($self) = @_;
… …
1531 1515
1532sub reset_at { 1516sub reset_at {
1533 my ($self) = @_; 1517 my ($self) = @_;
1534 1518
1535 # TODO: safety, remove and allow resettable per-player maps 1519 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1520 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1521 return 1e99 if $self->{deny_reset};
1538 1522
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1523 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1525
… …
1546 my ($self) = @_; 1530 my ($self) = @_;
1547 1531
1548 $self->reset_at <= $cf::RUNTIME 1532 $self->reset_at <= $cf::RUNTIME
1549} 1533}
1550 1534
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename { 1535sub rename {
1560 my ($self, $new_path) = @_; 1536 my ($self, $new_path) = @_;
1561 1537
1538 normalise $new_path;
1539
1562 $self->unlink_save; 1540 $self->unlink_save;
1563 1541
1564 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path; 1543 $self->{path} = $new_path; $self->path ($self->{path});
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self; 1544 $cf::MAP{$self->path} = $self;
1568 1545
1569 $self->save; 1546 $self->save;
1570} 1547}
1571 1548
1572sub reset { 1549sub reset {
1573 my ($self) = @_; 1550 my ($self) = @_;
1574 1551
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1552 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1553
1577 return if $self->players; 1554 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1555 return if $self->isa ("ext::map_per_player");#d#
1579 1556
1580 warn "resetting map ", $self->path;#d# 1557 warn "resetting map ", $self->path;#d#
1581 1558
1582 delete $cf::MAP{$self->path}; 1559 delete $cf::MAP{$self->path};
1560
1561 $self->in_memory (cf::MAP_SWAPPED);
1562 $self->clear;
1583 1563
1584 $_->clear_links_to ($self) for values %cf::MAP; 1564 $_->clear_links_to ($self) for values %cf::MAP;
1585 1565
1586 $self->unlink_save; 1566 $self->unlink_save;
1587 $self->destroy; 1567 $self->destroy;
… …
1596 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->rename ("{nuke}/" . ($nuke_counter++));
1598 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1599} 1579}
1600 1580
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1581=item cf::map::unique_maps
1612 1582
1613Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1584instantiated unique items. May block.
1615 1585
1616=cut 1586=cut
1617 1587
1618sub unique_maps() { 1588sub unique_maps() {
… …
1624 for (@$files) { 1594 for (@$files) {
1625 utf8::decode $_; 1595 utf8::decode $_;
1626 next if /\.pst$/; 1596 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1628 1598
1599 s/\.map$//;
1629 push @paths, new cf::path $_; 1600 push @paths, $_;
1630 } 1601 }
1631 1602
1632 \@paths 1603 \@paths
1633} 1604}
1634 1605
… …
1709 1680
1710=item $player_object->enter_link 1681=item $player_object->enter_link
1711 1682
1712Freezes 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}>).
1713 1684
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1716 1687
1688Will never block.
1689
1717=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1718 1691
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1695fails, to the emergency map position.
1723 1696
1724Might block. 1697Might block.
1725 1698
1726=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}
1727 1710
1728sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1729 my ($self) = @_; 1712 my ($self) = @_;
1730 1713
1731 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1732 1715
1733 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1717
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1719 if $self->map;
1737 1720
1738 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1722}
1740 1723
1741sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1743 1726
… …
1807=cut 1790=cut
1808 1791
1809sub cf::object::player::goto { 1792sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1811 1794
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1795 $self->enter_link;
1815 1796
1816 (async { 1797 (async {
1817 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1819 1800
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1802# if $map;
1822 1803
… …
1887 $self->deactivate_recursive; # just to be sure 1868 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1869 unless (eval {
1889 prepare_random_map $exit 1870 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1871 if $exit->slaying eq "/!";
1891 1872
1892 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;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1875
1895 1; 1876 1;
1896 }) { 1877 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1878 $self->message ("Something went wrong deep within the crossfire server. "
… …
2280 warn "enter emergency perl save\n"; 2261 warn "enter emergency perl save\n";
2281 2262
2282 cf::sync_job { 2263 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2264 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2265 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2266 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2267 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2268 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2269 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2270 $pl->valid or next;
2290 $pl->save; 2271 $pl->save;
… …
2405 } 2386 }
2406 2387
2407 warn "reloaded"; 2388 warn "reloaded";
2408}; 2389};
2409 2390
2410#############################################################################
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452
2453register_command "reload" => sub { 2391register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2392 my ($who, $arg) = @_;
2455 2393
2456 if ($who->flag (FLAG_WIZ)) { 2394 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2395 $who->message ("start of reload.");
… …
2466 reentrant => 0, 2404 reentrant => 0,
2467 prio => 0, 2405 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2406 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2407 data => WF_AUTOCANCEL,
2470 cb => sub { 2408 cb => sub {
2409 $NOW = Event::time;
2410
2471 cf::server_tick; # one server iteration 2411 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2412 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2413 $NEXT_TICK += $TICK;
2474 2414
2475 $WAIT_FOR_TICK->broadcast; 2415 $WAIT_FOR_TICK->broadcast;
… …
2483 }, 2423 },
2484); 2424);
2485 2425
2486IO::AIO::max_poll_time $TICK * 0.2; 2426IO::AIO::max_poll_time $TICK * 0.2;
2487 2427
2488Event->io ( 2428$AIO_POLL_WATCHER = Event->io (
2489 fd => IO::AIO::poll_fileno, 2429 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2430 poll => 'r',
2491 prio => 5, 2431 prio => 5,
2492 data => WF_AUTOCANCEL, 2432 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2433 cb => \&IO::AIO::poll_cb,
2494); 2434);
2495 2435
2496Event->timer ( 2436$WRITE_RUNTIME_WATCHER = Event->timer (
2497 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2498 after => 0, 2438 after => 0,
2499 interval => 10, 2439 interval => 10,
2500 cb => sub { 2440 cb => sub {
2501 (Coro::unblock_sub { 2441 (Coro::unblock_sub {

Diff Legend

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