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.162 by root, Thu Jan 11 00:41:08 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
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 373
523############################################################################# 374#############################################################################
524 375
525=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
526 377
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 504our @CB_MAP = ();
654 505
655my %attachment; 506my %attachment;
656 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
657sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
659 516
660 use sort 'stable'; 517 use sort 'stable';
661 518
… …
832# object support 689# object support
833 690
834sub reattach { 691sub reattach {
835 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 696
838 my $registry = $obj->registry; 697 my $registry = $obj->registry;
839 698
840 @$registry = (); 699 @$registry = ();
841 700
… …
1028 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 890 . "\n};\n1";
1032 891
1033 eval $source 892 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1035 : "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 }
1036 902
1037 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1038} 904}
1039 905
1040sub load_extensions { 906sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1047 } 913 }
1048} 914}
1049 915
1050############################################################################# 916#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 917
1066=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1067 919
1068Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1069 921
… …
1205 \@logins 1057 \@logins
1206} 1058}
1207 1059
1208=item $player->maps 1060=item $player->maps
1209 1061
1210Returns 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
1211player. May block. 1063player. May block.
1212 1064
1213=cut 1065=cut
1214 1066
1215sub maps($) { 1067sub maps($) {
… …
1223 for (@$files) { 1075 for (@$files) {
1224 utf8::decode $_; 1076 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1227 1079
1080 s/\.map$//;
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1229 } 1082 }
1230 1083
1231 \@paths 1084 \@paths
1232} 1085}
1233 1086
… …
1259package cf::map; 1112package cf::map;
1260 1113
1261use Fcntl; 1114use Fcntl;
1262use Coro::AIO; 1115use Coro::AIO;
1263 1116
1117use overload
1118 '""' => \&as_string;
1119
1264our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1266 1122
1267sub generate_random_map { 1123sub generate_random_map {
1268 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1269 1125
1270 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1139 )
1285} 1140}
1286 1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 # we have to keep some variables in memory intact
1157 local $_[0]{path};
1158 local $_[0]{deny_save};
1159 local $_[0]{deny_reset};
1160
1161 $_[0]->SUPER::thawer_merge ($_[1]);
1162}
1163
1164sub normalise {
1165 my ($path, $base) = @_;
1166
1167 # map plan:
1168 #
1169 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched
1171 # ?xxx/... are special absolute paths
1172 # ?random/... random maps
1173 # /... normal maps
1174 # ~user/... per-player map of a specific user
1175
1176 $path =~ s/$PATH_SEP/\//go;
1177
1178 # treat it as relative path if it starts with
1179 # something that looks reasonable
1180 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1181 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1182
1183 $base =~ s{[^/]+/?$}{};
1184 $path = "$base/$path";
1185 }
1186
1187 for ($path) {
1188 redo if s{//}{/};
1189 redo if s{/\.?/}{/};
1190 redo if s{/[^/]+/\.\./}{/};
1191 }
1192
1193 $path
1194}
1195
1196sub new_from_path {
1197 my (undef, $path, $base) = @_;
1198
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200
1201 $path = normalise $path, $base;
1202
1203 for my $pkg (keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) {
1205 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc.
1208 return $self;
1209 }
1210 }
1211
1212 Carp::carp "unable to resolve path '$path'.";
1213 ()
1214}
1215
1216sub init {
1217 my ($self) = @_;
1218
1219 $self
1220}
1221
1222sub as_string {
1223 my ($self) = @_;
1224
1225 "$self->{path}"
1226}
1227
1228# the displayed name, this is a one way mapping
1229sub visible_name {
1230 &as_string
1231}
1232
1233# the original (read-only) location
1234sub load_path {
1235 my ($self) = @_;
1236
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1238}
1239
1240# the temporary/swap location
1241sub save_path {
1242 my ($self) = @_;
1243
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1246}
1247
1248# the unique path, undef == no special unique path
1249sub uniq_path {
1250 my ($self) = @_;
1251
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254}
1255
1287# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1288# all maps in C++... 1257# all maps in C++...
1289sub change_all_map_light { 1258sub change_all_map_light {
1290 my ($change) = @_; 1259 my ($change) = @_;
1291 1260
1292 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1294} 1263}
1295 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
1296sub load_map_header($) { 1273sub load_header_from($) {
1297 my ($path) = @_; 1274 my ($self, $path) = @_;
1298 1275
1299 utf8::encode $path; 1276 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1301 or return; 1278 or return;
1302 1279
1303 my $map = cf::map::new 1280 $self->_load_header ($path)
1304 or return; 1281 or return;
1305 1282
1306 # for better error messages only, will be overwritten later 1283 $self->{load_path} = $path;
1307 $map->path ($path);
1308 1284
1309 $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
1310 or return; 1311 or return;
1311 1312
1312 $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 }
1313 1318
1314 $map 1319 1
1315} 1320}
1316 1321
1317sub find; 1322sub find;
1318sub find { 1323sub find {
1319 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1320 1325
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1327
1326 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1327 1329
1328 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1330 1332 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1333 or return;
1345 1334
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1335 $map->{last_save} = $cf::RUNTIME;
1358 1336
1359 Coro::cede; 1337 $map->load_header
1338 or return;
1360 1339
1361 if ($map->should_reset) { 1340 if ($map->should_reset) {
1362 $map->reset; 1341 $map->reset;
1363 undef $guard; 1342 undef $guard;
1364 $map = find $path 1343 $map = find $path
1365 or return; 1344 or return;
1366 } 1345 }
1367 1346
1368 $cf::MAP{$key} = $map 1347 $cf::MAP{$path} = $map
1369 } 1348 }
1370} 1349}
1371 1350
1372sub load { 1351sub load {
1373 my ($self) = @_; 1352 my ($self) = @_;
1374 1353
1375 my $path = $self->{path}; 1354 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1355 my $guard = cf::lock_acquire "map_load:$path";
1377 1356
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1357 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1358
1380 $self->in_memory (cf::MAP_LOADING); 1359 $self->in_memory (cf::MAP_LOADING);
1381 1360
1382 $self->alloc; 1361 $self->alloc;
1383 $self->load_objects ($self->{load_path}, 1) 1362 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1363 or return;
1385 1364
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1366 if delete $self->{load_original};
1388 1367
1389 if (my $uniq = $path->uniq_path) { 1368 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1369 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1370 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1371 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1372 $self->_load_objects ($uniq, 0);
1394 } 1373 }
1395 } 1374 }
1396 1375
1397 Coro::cede; 1376 Coro::cede;
1398 1377
1399 # now do the right thing for maps 1378 # now do the right thing for maps
1400 $self->link_multipart_objects; 1379 $self->link_multipart_objects;
1401 1380
1402 if ($self->{path}->is_style_map) { 1381 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1382 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1383 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1384 $self->update_buttons;
1385 Coro::cede;
1409 $self->set_darkness_map; 1386 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1387 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1388 unless $self->difficulty;
1389 Coro::cede;
1412 $self->activate; 1390 $self->activate;
1413 } 1391 }
1414 1392
1415 Coro::cede;
1416
1417 $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
1418} 1403}
1419 1404
1420# 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
1421sub load_diag { 1406sub load_diag {
1422 my ($map) = @_; 1407 my ($map) = @_;
… …
1454} 1439}
1455 1440
1456our %MAP_PREFETCH; 1441our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1442our $MAP_PREFETCHER = Coro::async {
1458 while () { 1443 while () {
1459 while (%MAP_PREFETCH) { 1444 for my $path (keys %MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path 1445 my $map = find $path
1465 or next; 1446 or next;
1466 $map->load; 1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1467 } 1450 }
1468 Coro::schedule; 1451 Coro::schedule;
1469 } 1452 }
1470}; 1453};
1471 1454
1472sub find_async { 1455sub find_async {
1473 my ($path, $origin) = @_; 1456 my ($path, $origin) = @_;
1474 1457
1475 $path = new cf::path $path, $origin && $origin->path; 1458 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1459
1478 if (my $map = $cf::MAP{$key}) { 1460 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1462 }
1481 1463
1482 $MAP_PREFETCH{$key} = $path; 1464 $MAP_PREFETCH{$path} = 0;
1483 $MAP_PREFETCHER->ready; 1465 $MAP_PREFETCHER->ready;
1484 1466
1485 () 1467 ()
1486} 1468}
1487 1469
… …
1492 1474
1493 $self->{last_save} = $cf::RUNTIME; 1475 $self->{last_save} = $cf::RUNTIME;
1494 1476
1495 return unless $self->dirty; 1477 return unless $self->dirty;
1496 1478
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1479 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1480 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1481
1500 $self->{load_path} = $save; 1482 $self->{load_path} = $save;
1501 1483
1502 return if $self->{deny_save}; 1484 return if $self->{deny_save};
1503 1485
… …
1506 cf::async { 1488 cf::async {
1507 $_->contr->save for $self->players; 1489 $_->contr->save for $self->players;
1508 }; 1490 };
1509 1491
1510 if ($uniq) { 1492 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1494 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1495 } else {
1514 $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);
1515 } 1497 }
1516} 1498}
1517 1499
1518sub swap_out { 1500sub swap_out {
1519 my ($self) = @_; 1501 my ($self) = @_;
… …
1533 1515
1534sub reset_at { 1516sub reset_at {
1535 my ($self) = @_; 1517 my ($self) = @_;
1536 1518
1537 # TODO: safety, remove and allow resettable per-player maps 1519 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1520 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1521 return 1e99 if $self->{deny_reset};
1540 1522
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1523 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 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;
1543 1525
… …
1548 my ($self) = @_; 1530 my ($self) = @_;
1549 1531
1550 $self->reset_at <= $cf::RUNTIME 1532 $self->reset_at <= $cf::RUNTIME
1551} 1533}
1552 1534
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename { 1535sub rename {
1562 my ($self, $new_path) = @_; 1536 my ($self, $new_path) = @_;
1563 1537
1538 normalise $new_path;
1539
1564 $self->unlink_save; 1540 $self->unlink_save;
1565 1541
1566 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path; 1543 $self->{path} = $new_path; $self->path ($self->{path});
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self; 1544 $cf::MAP{$self->path} = $self;
1570 1545
1571 $self->save; 1546 $self->save;
1572} 1547}
1573 1548
1574sub reset { 1549sub reset {
1575 my ($self) = @_; 1550 my ($self) = @_;
1576 1551
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1552 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1553
1579 return if $self->players; 1554 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1555 return if $self->isa ("ext::map_per_player");#d#
1581 1556
1582 warn "resetting map ", $self->path;#d# 1557 warn "resetting map ", $self->path;#d#
1583 1558
1584 delete $cf::MAP{$self->path}; 1559 delete $cf::MAP{$self->path};
1560
1561 $self->in_memory (cf::MAP_SWAPPED);
1562 $self->clear;
1585 1563
1586 $_->clear_links_to ($self) for values %cf::MAP; 1564 $_->clear_links_to ($self) for values %cf::MAP;
1587 1565
1588 $self->unlink_save; 1566 $self->unlink_save;
1589 $self->destroy; 1567 $self->destroy;
… …
1598 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->rename ("{nuke}/" . ($nuke_counter++));
1600 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1601} 1579}
1602 1580
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1581=item cf::map::unique_maps
1614 1582
1615Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1584instantiated unique items. May block.
1617 1585
1618=cut 1586=cut
1619 1587
1620sub unique_maps() { 1588sub unique_maps() {
… …
1626 for (@$files) { 1594 for (@$files) {
1627 utf8::decode $_; 1595 utf8::decode $_;
1628 next if /\.pst$/; 1596 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1630 1598
1599 s/\.map$//;
1631 push @paths, new cf::path $_; 1600 push @paths, $_;
1632 } 1601 }
1633 1602
1634 \@paths 1603 \@paths
1635} 1604}
1636 1605
… …
1711 1680
1712=item $player_object->enter_link 1681=item $player_object->enter_link
1713 1682
1714Freezes 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}>).
1715 1684
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1718 1687
1688Will never block.
1689
1719=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1720 1691
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1695fails, to the emergency map position.
1725 1696
1726Might block. 1697Might block.
1727 1698
1728=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}
1729 1710
1730sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1731 my ($self) = @_; 1712 my ($self) = @_;
1732 1713
1733 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1734 1715
1735 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1717
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1719 if $self->map;
1739 1720
1740 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1722}
1742 1723
1743sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1745 1726
… …
1809=cut 1790=cut
1810 1791
1811sub cf::object::player::goto { 1792sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1813 1794
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1795 $self->enter_link;
1817 1796
1818 (async { 1797 (async {
1819 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1821 1800
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1802# if $map;
1824 1803
… …
1889 $self->deactivate_recursive; # just to be sure 1868 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1869 unless (eval {
1891 prepare_random_map $exit 1870 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1871 if $exit->slaying eq "/!";
1893 1872
1894 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;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1875
1897 1; 1876 1;
1898 }) { 1877 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1878 $self->message ("Something went wrong deep within the crossfire server. "
… …
2282 warn "enter emergency perl save\n"; 2261 warn "enter emergency perl save\n";
2283 2262
2284 cf::sync_job { 2263 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2264 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2265 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2266 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2267 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2268 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2269 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2270 $pl->valid or next;
2292 $pl->save; 2271 $pl->save;
… …
2407 } 2386 }
2408 2387
2409 warn "reloaded"; 2388 warn "reloaded";
2410}; 2389};
2411 2390
2412#############################################################################
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454
2455register_command "reload" => sub { 2391register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2392 my ($who, $arg) = @_;
2457 2393
2458 if ($who->flag (FLAG_WIZ)) { 2394 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2395 $who->message ("start of reload.");
… …
2468 reentrant => 0, 2404 reentrant => 0,
2469 prio => 0, 2405 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2406 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2407 data => WF_AUTOCANCEL,
2472 cb => sub { 2408 cb => sub {
2409 $NOW = Event::time;
2410
2473 cf::server_tick; # one server iteration 2411 cf::server_tick; # one server iteration
2474 $RUNTIME += $TICK; 2412 $RUNTIME += $TICK;
2475 $NEXT_TICK += $TICK; 2413 $NEXT_TICK += $TICK;
2476 2414
2477 $WAIT_FOR_TICK->broadcast; 2415 $WAIT_FOR_TICK->broadcast;
… …
2485 }, 2423 },
2486); 2424);
2487 2425
2488IO::AIO::max_poll_time $TICK * 0.2; 2426IO::AIO::max_poll_time $TICK * 0.2;
2489 2427
2490Event->io ( 2428$AIO_POLL_WATCHER = Event->io (
2491 fd => IO::AIO::poll_fileno, 2429 fd => IO::AIO::poll_fileno,
2492 poll => 'r', 2430 poll => 'r',
2493 prio => 5, 2431 prio => 5,
2494 data => WF_AUTOCANCEL, 2432 data => WF_AUTOCANCEL,
2495 cb => \&IO::AIO::poll_cb, 2433 cb => \&IO::AIO::poll_cb,
2496); 2434);
2497 2435
2498Event->timer ( 2436$WRITE_RUNTIME_WATCHER = Event->timer (
2499 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2500 after => 0, 2438 after => 0,
2501 interval => 10, 2439 interval => 10,
2502 cb => sub { 2440 cb => sub {
2503 (Coro::unblock_sub { 2441 (Coro::unblock_sub {

Diff Legend

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