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.168 by root, Sun Jan 14 00:37:14 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
… …
1027 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 882 . "\n};\n1";
1031 883
1032 eval $source 884 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
1034 : "extension disabled.\n"; 886 : "extension disabled.\n";
887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
888 warn $@;
889 warn "mandatory extension failed to load, exiting.\n";
890 exit 1;
891 }
892 die $@;
893 }
1035 894
1036 push @EXTS, $pkg; 895 push @EXTS, $pkg;
1037} 896}
1038 897
1039sub load_extensions { 898sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1046 } 905 }
1047} 906}
1048 907
1049############################################################################# 908#############################################################################
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 909
1065=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1066 911
1067Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1068 913
… …
1204 \@logins 1049 \@logins
1205} 1050}
1206 1051
1207=item $player->maps 1052=item $player->maps
1208 1053
1209Returns an arrayref of cf::path's of all maps that are private for this 1054Returns an arrayref of map paths that are private for this
1210player. May block. 1055player. May block.
1211 1056
1212=cut 1057=cut
1213 1058
1214sub maps($) { 1059sub maps($) {
… …
1222 for (@$files) { 1067 for (@$files) {
1223 utf8::decode $_; 1068 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1069 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1070 next unless /^$PATH_SEP/o;
1226 1071
1072 s/\.map$//;
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1228 } 1074 }
1229 1075
1230 \@paths 1076 \@paths
1231} 1077}
1232 1078
… …
1258package cf::map; 1104package cf::map;
1259 1105
1260use Fcntl; 1106use Fcntl;
1261use Coro::AIO; 1107use Coro::AIO;
1262 1108
1109use overload
1110 '""' => \&as_string;
1111
1263our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1265 1114
1266sub generate_random_map { 1115sub generate_random_map {
1267 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1268 1117
1269 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1119 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1128 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 )
1132}
1133
1134sub register {
1135 my (undef, $regex) = @_;
1136 my $pkg = caller;
1137
1138 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__;
1140
1141 $EXT_MAP{$pkg} = qr<$regex>;
1142}
1143
1144# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146
1147sub normalise {
1148 my ($path, $base) = @_;
1149
1150 # map plan:
1151 #
1152 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched
1154 # ?xxx/... are special absolute paths
1155 # ?random/... random maps
1156 # /... normal maps
1157 # ~user/... per-player map of a specific user
1158
1159 $path =~ s/$PATH_SEP/\//go;
1160
1161 # treat it as relative path if it starts with
1162 # something that looks reasonable
1163 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1164 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1165
1166 $base =~ s{[^/]+/?$}{};
1167 $path = "$base/$path";
1168 }
1169
1170 for ($path) {
1171 redo if s{//}{/};
1172 redo if s{/\.?/}{/};
1173 redo if s{/[^/]+/\.\./}{/};
1174 }
1175
1176 $path
1177}
1178
1179sub new_from_path {
1180 my (undef, $path, $base) = @_;
1181
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183
1184 $path = normalise $path, $base;
1185
1186 for my $pkg (keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) {
1188 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc.
1191 return $self;
1192 }
1193 }
1194
1195 Carp::carp "unable to resolve path '$path'.";
1196 ()
1197}
1198
1199sub init {
1200 my ($self) = @_;
1201
1202 $self
1203}
1204
1205sub as_string {
1206 my ($self) = @_;
1207
1208 "$self->{path}"
1209}
1210
1211# the displayed name, this is a one way mapping
1212sub visible_name {
1213 &as_string
1214}
1215
1216# the original (read-only) location
1217sub load_path {
1218 my ($self) = @_;
1219
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1221}
1222
1223# the temporary/swap location
1224sub save_path {
1225 my ($self) = @_;
1226
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1229}
1230
1231# the unique path, undef == no special unique path
1232sub uniq_path {
1233 my ($self) = @_;
1234
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1283} 1237}
1284 1238
1285# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1286# all maps in C++... 1240# all maps in C++...
1287sub change_all_map_light { 1241sub change_all_map_light {
… …
1289 1243
1290 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1292} 1246}
1293 1247
1248sub unlink_save {
1249 my ($self) = @_;
1250
1251 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1254}
1255
1294sub load_map_header($) { 1256sub load_header_from($) {
1295 my ($path) = @_; 1257 my ($self, $path) = @_;
1296 1258
1297 utf8::encode $path; 1259 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1299 or return; 1261 or return;
1300 1262
1301 my $map = cf::map::new 1263 $self->_load_header ($path)
1302 or return; 1264 or return;
1303 1265
1304 # for better error messages only, will be overwritten later 1266 $self->{load_path} = $path;
1305 $map->path ($path);
1306 1267
1307 $map->load_header ($path) 1268 1
1269}
1270
1271sub load_orig {
1272 my ($self) = @_;
1273
1274 $self->load_header_from ($self->load_path)
1275}
1276
1277sub load_temp {
1278 my ($self) = @_;
1279
1280 $self->load_header_from ($self->save_path)
1281}
1282
1283sub load_header {
1284 my ($self) = @_;
1285
1286 if ($self->load_temp) {
1287 $self->last_access ((delete $self->{last_access})
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else {
1293 $self->load_orig
1308 or return; 1294 or return;
1309 1295
1310 $map->{load_path} = $path; 1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 }
1311 1301
1312 $map 1302 1
1313} 1303}
1314 1304
1315sub find; 1305sub find;
1316sub find { 1306sub find {
1317 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1318 1308
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1310
1324 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1325 1312
1326 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1328 1315 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; 1316 or return;
1343 1317
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; 1318 $map->{last_save} = $cf::RUNTIME;
1356 1319
1357 Coro::cede; 1320 $map->load_header
1321 or return;
1358 1322
1359 if ($map->should_reset) { 1323 if ($map->should_reset) {
1360 $map->reset; 1324 $map->reset;
1361 undef $guard; 1325 undef $guard;
1362 $map = find $path 1326 $map = find $path
1363 or return; 1327 or return;
1364 } 1328 }
1365 1329
1366 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1367 } 1331 }
1368} 1332}
1369 1333
1370sub load { 1334sub load {
1371 my ($self) = @_; 1335 my ($self) = @_;
1372 1336
1373 my $path = $self->{path}; 1337 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1375 1339
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1341
1378 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1379 1343
1380 $self->alloc; 1344 $self->alloc;
1381 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1346 or return;
1383 1347
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1386 1350
1387 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1352 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1354 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1392 } 1356 }
1393 } 1357 }
1394 1358
1395 Coro::cede; 1359 Coro::cede;
1396 1360
1397 # now do the right thing for maps 1361 # now do the right thing for maps
1398 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1399 1363
1400 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1365 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1407 $self->set_darkness_map; 1369 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1410 $self->activate; 1373 $self->activate;
1411 } 1374 }
1412 1375
1413 Coro::cede;
1414
1415 $self->in_memory (cf::MAP_IN_MEMORY); 1376 $self->in_memory (cf::MAP_IN_MEMORY);
1377}
1378
1379sub customise_for {
1380 my ($self, $ob) = @_;
1381
1382 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player;
1384
1385 $self
1416} 1386}
1417 1387
1418# find and load all maps in the 3x3 area around a map 1388# find and load all maps in the 3x3 area around a map
1419sub load_diag { 1389sub load_diag {
1420 my ($map) = @_; 1390 my ($map) = @_;
… …
1452} 1422}
1453 1423
1454our %MAP_PREFETCH; 1424our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1425our $MAP_PREFETCHER = Coro::async {
1456 while () { 1426 while () {
1457 while (%MAP_PREFETCH) { 1427 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 1428 my $map = find $path
1463 or next; 1429 or next;
1464 $map->load; 1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1465 } 1433 }
1466 Coro::schedule; 1434 Coro::schedule;
1467 } 1435 }
1468}; 1436};
1469 1437
1470sub find_async { 1438sub find_async {
1471 my ($path, $origin) = @_; 1439 my ($path, $origin) = @_;
1472 1440
1473 $path = new cf::path $path, $origin && $origin->path; 1441 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1442
1476 if (my $map = $cf::MAP{$key}) { 1443 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1445 }
1479 1446
1480 $MAP_PREFETCH{$key} = $path; 1447 $MAP_PREFETCH{$path} = 0;
1481 $MAP_PREFETCHER->ready; 1448 $MAP_PREFETCHER->ready;
1482 1449
1483 () 1450 ()
1484} 1451}
1485 1452
… …
1490 1457
1491 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1492 1459
1493 return unless $self->dirty; 1460 return unless $self->dirty;
1494 1461
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1464
1498 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1499 1466
1500 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1501 1468
… …
1504 cf::async { 1471 cf::async {
1505 $_->contr->save for $self->players; 1472 $_->contr->save for $self->players;
1506 }; 1473 };
1507 1474
1508 if ($uniq) { 1475 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1478 } else {
1512 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1479 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1513 } 1480 }
1514} 1481}
1515 1482
1516sub swap_out { 1483sub swap_out {
1517 my ($self) = @_; 1484 my ($self) = @_;
… …
1531 1498
1532sub reset_at { 1499sub reset_at {
1533 my ($self) = @_; 1500 my ($self) = @_;
1534 1501
1535 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1537 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1538 1505
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541 1508
… …
1546 my ($self) = @_; 1513 my ($self) = @_;
1547 1514
1548 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1549} 1516}
1550 1517
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 { 1518sub rename {
1560 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1561 1520
1521 normalise $new_path;
1522
1562 $self->unlink_save; 1523 $self->unlink_save;
1563 1524
1564 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1568 1528
1569 $self->save; 1529 $self->save;
1570} 1530}
1571 1531
1572sub reset { 1532sub reset {
1573 my ($self) = @_; 1533 my ($self) = @_;
1574 1534
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1536
1577 return if $self->players; 1537 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1579 1539
1580 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1581 1541
1582 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1583 1546
1584 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1585 1548
1586 $self->unlink_save; 1549 $self->unlink_save;
1587 $self->destroy; 1550 $self->destroy;
… …
1596 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1598 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1599} 1562}
1600 1563
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 1564=item cf::map::unique_maps
1612 1565
1613Returns an arrayref of cf::path's of all shared maps that have 1566Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1567instantiated unique items. May block.
1615 1568
1616=cut 1569=cut
1617 1570
1618sub unique_maps() { 1571sub unique_maps() {
… …
1624 for (@$files) { 1577 for (@$files) {
1625 utf8::decode $_; 1578 utf8::decode $_;
1626 next if /\.pst$/; 1579 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1580 next unless /^$PATH_SEP/o;
1628 1581
1582 s/\.map$//;
1629 push @paths, new cf::path $_; 1583 push @paths, $_;
1630 } 1584 }
1631 1585
1632 \@paths 1586 \@paths
1633} 1587}
1634 1588
… …
1709 1663
1710=item $player_object->enter_link 1664=item $player_object->enter_link
1711 1665
1712Freezes the player and moves him/her to a special map (C<{link}>). 1666Freezes the player and moves him/her to a special map (C<{link}>).
1713 1667
1714The player should be reaosnably safe there for short amounts of time. You 1668The player should be reasonably safe there for short amounts of time. You
1715I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1716 1670
1671Will never block.
1672
1717=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1718 1674
1719Moves the player out of the specila link map onto the given map. If the 1675Moves the player out of the special C<{link}> map onto the specified
1720map is not valid (or omitted), the player will be moved back to the 1676map. If the map is not valid (or omitted), the player will be moved back
1721location he/she was before the call to C<enter_link>, or, if that fails, 1677to the location he/she was before the call to C<enter_link>, or, if that
1722to the emergency map position. 1678fails, to the emergency map position.
1723 1679
1724Might block. 1680Might block.
1725 1681
1726=cut 1682=cut
1683
1684sub link_map {
1685 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1688 $LINK_MAP->load;
1689 }
1690
1691 $LINK_MAP
1692}
1727 1693
1728sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1729 my ($self) = @_; 1695 my ($self) = @_;
1730 1696
1731 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1732 1698
1733 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1700
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1702 if $self->map;
1737 1703
1738 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1739} 1705}
1740 1706
1741sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1743 1709
… …
1807=cut 1773=cut
1808 1774
1809sub cf::object::player::goto { 1775sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1811 1777
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1778 $self->enter_link;
1815 1779
1816 (async { 1780 (async {
1817 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1819 1783
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1821# if $map; 1785# if $map;
1822 1786
… …
1887 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1852 unless (eval {
1889 prepare_random_map $exit 1853 prepare_random_map $exit
1890 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1891 1855
1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1858
1895 1; 1859 1;
1896 }) { 1860 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
… …
2280 warn "enter emergency perl save\n"; 2244 warn "enter emergency perl save\n";
2281 2245
2282 cf::sync_job { 2246 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2247 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2248 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2249 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2250 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2251 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2252 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2253 $pl->valid or next;
2290 $pl->save; 2254 $pl->save;
… …
2405 } 2369 }
2406 2370
2407 warn "reloaded"; 2371 warn "reloaded";
2408}; 2372};
2409 2373
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 { 2374register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2455 2376
2456 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2378 $who->message ("start of reload.");
… …
2466 reentrant => 0, 2387 reentrant => 0,
2467 prio => 0, 2388 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2470 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2471 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2474 2397
2475 $WAIT_FOR_TICK->broadcast; 2398 $WAIT_FOR_TICK->broadcast;
… …
2483 }, 2406 },
2484); 2407);
2485 2408
2486IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2487 2410
2488Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2489 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2413 poll => 'r',
2491 prio => 5, 2414 prio => 5,
2492 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2494); 2417);
2495 2418
2496Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2497 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2498 after => 0, 2421 after => 0,
2499 interval => 10, 2422 interval => 10,
2500 cb => sub { 2423 cb => sub {
2501 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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