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.173 by root, Sun Jan 14 18:00:34 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 fallback => 1;
1120
1263our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1265 1123
1266sub generate_random_map { 1124sub generate_random_map {
1267 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1268 1126
1269 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1128 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $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},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (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
1283} 1258}
1284 1259
1285# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1286# all maps in C++... 1261# all maps in C++...
1287sub change_all_map_light { 1262sub change_all_map_light {
… …
1289 1264
1290 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1292} 1267}
1293 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
1294sub load_map_header($) { 1277sub load_header_from($) {
1295 my ($path) = @_; 1278 my ($self, $path) = @_;
1296 1279
1297 utf8::encode $path; 1280 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1299 or return; 1282 or return;
1300 1283
1301 my $map = cf::map::new 1284 $self->_load_header ($path)
1302 or return; 1285 or return;
1303 1286
1304 # for better error messages only, will be overwritten later 1287 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1288
1307 $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
1308 or return; 1315 or return;
1309 1316
1310 $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 }
1311 1322
1312 $map 1323 1
1313} 1324}
1314 1325
1315sub find; 1326sub find;
1316sub find { 1327sub find {
1317 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1318 1329
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1331
1324 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1325 1333
1326 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1328 1336 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; 1337 or return;
1343 1338
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; 1339 $map->{last_save} = $cf::RUNTIME;
1356 1340
1357 Coro::cede; 1341 $map->load_header
1342 or return;
1358 1343
1359 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1360 $map->reset; 1346 $map->reset;
1361 undef $guard; 1347 undef $guard;
1362 $map = find $path 1348 $map = find $path
1363 or return; 1349 or return;
1364 } 1350 }
1365 1351
1366 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1367 } 1353 }
1368} 1354}
1369 1355
1370sub load { 1356sub load {
1371 my ($self) = @_; 1357 my ($self) = @_;
1372 1358
1373 my $path = $self->{path}; 1359 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1375 1361
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1363
1378 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1379 1365
1380 $self->alloc; 1366 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1368 or return;
1383 1369
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1386 1372
1387 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1374 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1376 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1392 } 1378 }
1393 } 1379 }
1394 1380
1395 Coro::cede; 1381 Coro::cede;
1396 1382
1397 # now do the right thing for maps 1383 # now do the right thing for maps
1398 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1399 1385
1400 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1387 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1407 $self->set_darkness_map; 1391 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1410 $self->activate; 1395 $self->activate;
1411 } 1396 }
1412 1397
1413 Coro::cede;
1414
1415 $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
1416} 1408}
1417 1409
1418# 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
1419sub load_diag { 1411sub load_diag {
1420 my ($map) = @_; 1412 my ($map) = @_;
… …
1452} 1444}
1453 1445
1454our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = Coro::async {
1456 while () { 1448 while () {
1457 while (%MAP_PREFETCH) { 1449 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 1450 my $map = find $path
1463 or next; 1451 or next;
1464 $map->load; 1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1465 } 1455 }
1466 Coro::schedule; 1456 Coro::schedule;
1467 } 1457 }
1468}; 1458};
1469 1459
1470sub find_async { 1460sub find_async {
1471 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1472 1462
1473 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1464
1476 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1467 }
1479 1468
1480 $MAP_PREFETCH{$key} = $path; 1469 $MAP_PREFETCH{$path} = 0;
1481 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER->ready;
1482 1471
1483 () 1472 ()
1484} 1473}
1485 1474
… …
1490 1479
1491 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1492 1481
1493 return unless $self->dirty; 1482 return unless $self->dirty;
1494 1483
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1486
1498 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1499 1488
1500 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1501 1490
… …
1504 cf::async { 1493 cf::async {
1505 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1506 }; 1495 };
1507 1496
1508 if ($uniq) { 1497 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1500 } else {
1512 $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);
1513 } 1502 }
1514} 1503}
1515 1504
1516sub swap_out { 1505sub swap_out {
1517 my ($self) = @_; 1506 my ($self) = @_;
… …
1531 1520
1532sub reset_at { 1521sub reset_at {
1533 my ($self) = @_; 1522 my ($self) = @_;
1534 1523
1535 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1538 1527
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1530
… …
1546 my ($self) = @_; 1535 my ($self) = @_;
1547 1536
1548 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1549} 1538}
1550 1539
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 { 1540sub rename {
1560 my ($self, $new_path) = @_; 1541 my ($self, $new_path) = @_;
1561 1542
1543 normalise $new_path;
1544
1562 $self->unlink_save; 1545 $self->unlink_save;
1563 1546
1564 delete $cf::MAP{$self->path}; 1547 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path; 1548 $self->{path} = $new_path; $self->path ($self->{path});
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self; 1549 $cf::MAP{$self->path} = $self;
1568 1550
1569 $self->save; 1551 $self->save;
1570} 1552}
1571 1553
1572sub reset { 1554sub reset {
1573 my ($self) = @_; 1555 my ($self) = @_;
1574 1556
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1557 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1558
1577 return if $self->players; 1559 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1560 return if $self->isa ("ext::map_per_player");#d#
1579 1561
1580 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1581 1563
1582 delete $cf::MAP{$self->path}; 1564 delete $cf::MAP{$self->path};
1565
1566 $self->in_memory (cf::MAP_SWAPPED);
1567 $self->clear;
1583 1568
1584 $_->clear_links_to ($self) for values %cf::MAP; 1569 $_->clear_links_to ($self) for values %cf::MAP;
1585 1570
1586 $self->unlink_save; 1571 $self->unlink_save;
1587 $self->destroy; 1572 $self->destroy;
… …
1596 $self->reset_timeout (1); 1581 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1582 $self->rename ("{nuke}/" . ($nuke_counter++));
1598 $self->reset; # polite request, might not happen 1583 $self->reset; # polite request, might not happen
1599} 1584}
1600 1585
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 1586=item cf::map::unique_maps
1612 1587
1613Returns an arrayref of cf::path's of all shared maps that have 1588Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1589instantiated unique items. May block.
1615 1590
1616=cut 1591=cut
1617 1592
1618sub unique_maps() { 1593sub unique_maps() {
… …
1624 for (@$files) { 1599 for (@$files) {
1625 utf8::decode $_; 1600 utf8::decode $_;
1626 next if /\.pst$/; 1601 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1602 next unless /^$PATH_SEP/o;
1628 1603
1604 s/\.map$//;
1629 push @paths, new cf::path $_; 1605 push @paths, $_;
1630 } 1606 }
1631 1607
1632 \@paths 1608 \@paths
1633} 1609}
1634 1610
… …
1709 1685
1710=item $player_object->enter_link 1686=item $player_object->enter_link
1711 1687
1712Freezes 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}>).
1713 1689
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1691I<MUST> call C<leave_link> as soon as possible, though.
1716 1692
1693Will never block.
1694
1717=item $player_object->leave_link ($map, $x, $y) 1695=item $player_object->leave_link ($map, $x, $y)
1718 1696
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1700fails, to the emergency map position.
1723 1701
1724Might block. 1702Might block.
1725 1703
1726=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}
1727 1715
1728sub cf::object::player::enter_link { 1716sub cf::object::player::enter_link {
1729 my ($self) = @_; 1717 my ($self) = @_;
1730 1718
1731 $self->deactivate_recursive; 1719 $self->deactivate_recursive;
1732 1720
1733 return if $self->map == $LINK_MAP; 1721 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1722
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1723 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1724 if $self->map;
1737 1725
1738 $self->enter_map ($LINK_MAP, 20, 20); 1726 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1727}
1740 1728
1741sub cf::object::player::leave_link { 1729sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1730 my ($self, $map, $x, $y) = @_;
1743 1731
… …
1807=cut 1795=cut
1808 1796
1809sub cf::object::player::goto { 1797sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1798 my ($self, $path, $x, $y) = @_;
1811 1799
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1800 $self->enter_link;
1815 1801
1816 (async { 1802 (async {
1817 my $map = cf::map::find $path->as_string; 1803 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1804 $map = $map->customise_for ($self) if $map;
1819 1805
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1806# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1807# if $map;
1822 1808
… …
1887 $self->deactivate_recursive; # just to be sure 1873 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1874 unless (eval {
1889 prepare_random_map $exit 1875 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1876 if $exit->slaying eq "/!";
1891 1877
1892 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;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1879 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1880
1895 1; 1881 1;
1896 }) { 1882 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1883 $self->message ("Something went wrong deep within the crossfire server. "
… …
2280 warn "enter emergency perl save\n"; 2266 warn "enter emergency perl save\n";
2281 2267
2282 cf::sync_job { 2268 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2269 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2270 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2271 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2272 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2273 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2274 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2275 $pl->valid or next;
2290 $pl->save; 2276 $pl->save;
… …
2405 } 2391 }
2406 2392
2407 warn "reloaded"; 2393 warn "reloaded";
2408}; 2394};
2409 2395
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 { 2396register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2397 my ($who, $arg) = @_;
2455 2398
2456 if ($who->flag (FLAG_WIZ)) { 2399 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2400 $who->message ("start of reload.");
… …
2466 reentrant => 0, 2409 reentrant => 0,
2467 prio => 0, 2410 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2411 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2412 data => WF_AUTOCANCEL,
2470 cb => sub { 2413 cb => sub {
2414 $NOW = Event::time;
2415
2471 cf::server_tick; # one server iteration 2416 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2417 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2418 $NEXT_TICK += $TICK;
2474 2419
2475 $WAIT_FOR_TICK->broadcast; 2420 $WAIT_FOR_TICK->broadcast;
… …
2483 }, 2428 },
2484); 2429);
2485 2430
2486IO::AIO::max_poll_time $TICK * 0.2; 2431IO::AIO::max_poll_time $TICK * 0.2;
2487 2432
2488Event->io ( 2433$AIO_POLL_WATCHER = Event->io (
2489 fd => IO::AIO::poll_fileno, 2434 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2435 poll => 'r',
2491 prio => 5, 2436 prio => 5,
2492 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2438 cb => \&IO::AIO::poll_cb,
2494); 2439);
2495 2440
2496Event->timer ( 2441$WRITE_RUNTIME_WATCHER = Event->timer (
2497 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2498 after => 0, 2443 after => 0,
2499 interval => 10, 2444 interval => 10,
2500 cb => sub { 2445 cb => sub {
2501 (Coro::unblock_sub { 2446 (Coro::unblock_sub {

Diff Legend

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