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.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.171 by root, Sun Jan 14 12:24:48 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
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 373
531############################################################################# 374#############################################################################
532 375
533=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
534 377
… …
660our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 504our @CB_MAP = ();
662 505
663my %attachment; 506my %attachment;
664 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
665sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
667 516
668 use sort 'stable'; 517 use sort 'stable';
669 518
… …
840# object support 689# object support
841 690
842sub reattach { 691sub reattach {
843 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 696
846 my $registry = $obj->registry; 697 my $registry = $obj->registry;
847 698
848 @$registry = (); 699 @$registry = ();
849 700
… …
1036 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 890 . "\n};\n1";
1040 891
1041 eval $source 892 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1043 : "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 }
1044 902
1045 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1046} 904}
1047 905
1048sub load_extensions { 906sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1055 } 913 }
1056} 914}
1057 915
1058############################################################################# 916#############################################################################
1059# load/save/clean perl data associated with a map
1060
1061*cf::mapsupport::on_clean = sub {
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 917
1074=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1075 919
1076Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1077 921
… …
1213 \@logins 1057 \@logins
1214} 1058}
1215 1059
1216=item $player->maps 1060=item $player->maps
1217 1061
1218Returns 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
1219player. May block. 1063player. May block.
1220 1064
1221=cut 1065=cut
1222 1066
1223sub maps($) { 1067sub maps($) {
… …
1231 for (@$files) { 1075 for (@$files) {
1232 utf8::decode $_; 1076 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1235 1079
1080 s/\.map$//;
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1237 } 1082 }
1238 1083
1239 \@paths 1084 \@paths
1240} 1085}
1241 1086
… …
1267package cf::map; 1112package cf::map;
1268 1113
1269use Fcntl; 1114use Fcntl;
1270use Coro::AIO; 1115use Coro::AIO;
1271 1116
1117use overload
1118 '""' => \&as_string;
1119
1272our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1274 1122
1275sub generate_random_map { 1123sub generate_random_map {
1276 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1277 1125
1278 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1139 )
1293} 1140}
1294 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
1295# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1296# all maps in C++... 1257# all maps in C++...
1297sub change_all_map_light { 1258sub change_all_map_light {
1298 my ($change) = @_; 1259 my ($change) = @_;
1299 1260
1300 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1302} 1263}
1303 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
1304sub load_map_header($) { 1273sub load_header_from($) {
1305 my ($path) = @_; 1274 my ($self, $path) = @_;
1306 1275
1307 utf8::encode $path; 1276 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1309 or return; 1278 or return;
1310 1279
1311 my $map = cf::map::new 1280 $self->_load_header ($path)
1312 or return; 1281 or return;
1313 1282
1314 # for better error messages only, will be overwritten later 1283 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1284
1317 $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
1318 or return; 1311 or return;
1319 1312
1320 $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 }
1321 1318
1322 $map 1319 1
1323} 1320}
1324 1321
1325sub find; 1322sub find;
1326sub find { 1323sub find {
1327 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1328 1325
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1327
1334 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1335 1329
1336 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1338 1332 my $map = new_from_path cf::map $path
1339 # do it the slow way
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1333 or return;
1353 1334
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1335 $map->{last_save} = $cf::RUNTIME;
1366 1336
1367 Coro::cede; 1337 $map->load_header
1338 or return;
1368 1339
1369 if ($map->should_reset) { 1340 if ($map->should_reset) {
1341 $cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1342 $map->reset;
1371 undef $guard; 1343 undef $guard;
1372 $map = find $path 1344 $map = find $path
1373 or return; 1345 or return;
1374 } 1346 }
1375 1347
1376 $cf::MAP{$key} = $map 1348 $cf::MAP{$path} = $map
1377 } 1349 }
1378} 1350}
1379 1351
1380sub load { 1352sub load {
1381 my ($self) = @_; 1353 my ($self) = @_;
1382 1354
1383 my $path = $self->{path}; 1355 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1356 my $guard = cf::lock_acquire "map_load:$path";
1385 1357
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1358 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1359
1388 $self->in_memory (cf::MAP_LOADING); 1360 $self->in_memory (cf::MAP_LOADING);
1389 1361
1390 $self->alloc; 1362 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1363 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1364 or return;
1393 1365
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1367 if delete $self->{load_original};
1396 1368
1397 if (my $uniq = $path->uniq_path) { 1369 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1370 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1371 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1372 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1373 $self->_load_objects ($uniq, 0);
1402 } 1374 }
1403 } 1375 }
1404 1376
1405 Coro::cede; 1377 Coro::cede;
1406 1378
1407 # now do the right thing for maps 1379 # now do the right thing for maps
1408 $self->link_multipart_objects; 1380 $self->link_multipart_objects;
1409 1381
1410 if ($self->{path}->is_style_map) { 1382 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1383 $self->decay_objects;
1415 $self->fix_auto_apply; 1384 $self->fix_auto_apply;
1416 $self->update_buttons; 1385 $self->update_buttons;
1386 Coro::cede;
1417 $self->set_darkness_map; 1387 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1388 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1389 unless $self->difficulty;
1390 Coro::cede;
1420 $self->activate; 1391 $self->activate;
1421 } 1392 }
1422 1393
1423 Coro::cede;
1424
1425 $self->in_memory (cf::MAP_IN_MEMORY); 1394 $self->in_memory (cf::MAP_IN_MEMORY);
1395}
1396
1397sub customise_for {
1398 my ($self, $ob) = @_;
1399
1400 return find "~" . $ob->name . "/" . $self->{path}
1401 if $self->per_player;
1402
1403 $self
1426} 1404}
1427 1405
1428# find and load all maps in the 3x3 area around a map 1406# find and load all maps in the 3x3 area around a map
1429sub load_diag { 1407sub load_diag {
1430 my ($map) = @_; 1408 my ($map) = @_;
… …
1462} 1440}
1463 1441
1464our %MAP_PREFETCH; 1442our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1443our $MAP_PREFETCHER = Coro::async {
1466 while () { 1444 while () {
1467 while (%MAP_PREFETCH) { 1445 for my $path (keys %MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path 1446 my $map = find $path
1473 or next; 1447 or next;
1474 $map->load; 1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1475 } 1451 }
1476 Coro::schedule; 1452 Coro::schedule;
1477 } 1453 }
1478}; 1454};
1479 1455
1480sub find_async { 1456sub find_async {
1481 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
1482 1458
1483 $path = new cf::path $path, $origin && $origin->path; 1459 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1460
1486 if (my $map = $cf::MAP{$key}) { 1461 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1463 }
1489 1464
1490 $MAP_PREFETCH{$key} = $path; 1465 $MAP_PREFETCH{$path} = 0;
1491 $MAP_PREFETCHER->ready; 1466 $MAP_PREFETCHER->ready;
1492 1467
1493 () 1468 ()
1494} 1469}
1495 1470
… …
1500 1475
1501 $self->{last_save} = $cf::RUNTIME; 1476 $self->{last_save} = $cf::RUNTIME;
1502 1477
1503 return unless $self->dirty; 1478 return unless $self->dirty;
1504 1479
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1480 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1481 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1482
1508 $self->{load_path} = $save; 1483 $self->{load_path} = $save;
1509 1484
1510 return if $self->{deny_save}; 1485 return if $self->{deny_save};
1511 1486
… …
1514 cf::async { 1489 cf::async {
1515 $_->contr->save for $self->players; 1490 $_->contr->save for $self->players;
1516 }; 1491 };
1517 1492
1518 if ($uniq) { 1493 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1494 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1495 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1496 } else {
1522 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1523 } 1498 }
1524} 1499}
1525 1500
1526sub swap_out { 1501sub swap_out {
1527 my ($self) = @_; 1502 my ($self) = @_;
… …
1541 1516
1542sub reset_at { 1517sub reset_at {
1543 my ($self) = @_; 1518 my ($self) = @_;
1544 1519
1545 # TODO: safety, remove and allow resettable per-player maps 1520 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1521 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1522 return 1e99 if $self->{deny_reset};
1548 1523
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1524 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1525 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1551 1526
… …
1559} 1534}
1560 1535
1561sub rename { 1536sub rename {
1562 my ($self, $new_path) = @_; 1537 my ($self, $new_path) = @_;
1563 1538
1539 normalise $new_path;
1540
1564 $self->{path}->unlink_save; 1541 $self->unlink_save;
1565 1542
1566 delete $cf::MAP{$self->path}; 1543 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path; 1544 $self->{path} = $new_path; $self->path ($self->{path});
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self; 1545 $cf::MAP{$self->path} = $self;
1570 1546
1571 $self->save; 1547 $self->save;
1572} 1548}
1573 1549
1574sub reset { 1550sub reset {
1575 my ($self) = @_; 1551 my ($self) = @_;
1576 1552
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1553 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1554
1579 return if $self->players; 1555 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1556 return if $self->isa ("ext::map_per_player");#d#
1581 1557
1582 warn "resetting map ", $self->path;#d# 1558 warn "resetting map ", $self->path;#d#
1583 1559
1584 delete $cf::MAP{$self->path}; 1560 delete $cf::MAP{$self->path};
1585 1561
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear;
1564
1586 $_->clear_links_to ($self) for values %cf::MAP; 1565 $_->clear_links_to ($self) for values %cf::MAP;
1587 1566
1588 $self->{path}->unlink_save; 1567 $self->unlink_save;
1589 $self->destroy; 1568 $self->destroy;
1590} 1569}
1591 1570
1592my $nuke_counter = "aaaa"; 1571my $nuke_counter = "aaaa";
1593 1572
… …
1598 $self->reset_timeout (1); 1577 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1578 $self->rename ("{nuke}/" . ($nuke_counter++));
1600 $self->reset; # polite request, might not happen 1579 $self->reset; # polite request, might not happen
1601} 1580}
1602 1581
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 1582=item cf::map::unique_maps
1614 1583
1615Returns an arrayref of cf::path's of all shared maps that have 1584Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1585instantiated unique items. May block.
1617 1586
1618=cut 1587=cut
1619 1588
1620sub unique_maps() { 1589sub unique_maps() {
… …
1626 for (@$files) { 1595 for (@$files) {
1627 utf8::decode $_; 1596 utf8::decode $_;
1628 next if /\.pst$/; 1597 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1598 next unless /^$PATH_SEP/o;
1630 1599
1600 s/\.map$//;
1631 push @paths, new cf::path $_; 1601 push @paths, $_;
1632 } 1602 }
1633 1603
1634 \@paths 1604 \@paths
1635} 1605}
1636 1606
… …
1711 1681
1712=item $player_object->enter_link 1682=item $player_object->enter_link
1713 1683
1714Freezes the player and moves him/her to a special map (C<{link}>). 1684Freezes the player and moves him/her to a special map (C<{link}>).
1715 1685
1716The player should be reaosnably safe there for short amounts of time. You 1686The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1687I<MUST> call C<leave_link> as soon as possible, though.
1718 1688
1689Will never block.
1690
1719=item $player_object->leave_link ($map, $x, $y) 1691=item $player_object->leave_link ($map, $x, $y)
1720 1692
1721Moves the player out of the specila link map onto the given map. If the 1693Moves 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 1694map. 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, 1695to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1696fails, to the emergency map position.
1725 1697
1726Might block. 1698Might block.
1727 1699
1728=cut 1700=cut
1701
1702sub link_map {
1703 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1706 $LINK_MAP->load;
1707 }
1708
1709 $LINK_MAP
1710}
1729 1711
1730sub cf::object::player::enter_link { 1712sub cf::object::player::enter_link {
1731 my ($self) = @_; 1713 my ($self) = @_;
1732 1714
1733 $self->deactivate_recursive; 1715 $self->deactivate_recursive;
1734 1716
1735 return if $self->map == $LINK_MAP; 1717 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1718
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1720 if $self->map;
1739 1721
1740 $self->enter_map ($LINK_MAP, 20, 20); 1722 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1723}
1742 1724
1743sub cf::object::player::leave_link { 1725sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1726 my ($self, $map, $x, $y) = @_;
1745 1727
… …
1809=cut 1791=cut
1810 1792
1811sub cf::object::player::goto { 1793sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1794 my ($self, $path, $x, $y) = @_;
1813 1795
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1796 $self->enter_link;
1817 1797
1818 (async { 1798 (async {
1819 my $map = cf::map::find $path->as_string; 1799 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1800 $map = $map->customise_for ($self) if $map;
1821 1801
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1802# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1803# if $map;
1824 1804
… …
1889 $self->deactivate_recursive; # just to be sure 1869 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1870 unless (eval {
1891 prepare_random_map $exit 1871 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1872 if $exit->slaying eq "/!";
1893 1873
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1876
1897 1; 1877 1;
1898 }) { 1878 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1879 $self->message ("Something went wrong deep within the crossfire server. "
… …
2282 warn "enter emergency perl save\n"; 2262 warn "enter emergency perl save\n";
2283 2263
2284 cf::sync_job { 2264 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2265 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2266 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2267 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2268 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2269 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2270 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2271 $pl->valid or next;
2292 $pl->save; 2272 $pl->save;
… …
2406 exit 1; 2386 exit 1;
2407 } 2387 }
2408 2388
2409 warn "reloaded"; 2389 warn "reloaded";
2410}; 2390};
2411
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 2391
2455register_command "reload" => sub { 2392register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2393 my ($who, $arg) = @_;
2457 2394
2458 if ($who->flag (FLAG_WIZ)) { 2395 if ($who->flag (FLAG_WIZ)) {
… …
2487 }, 2424 },
2488); 2425);
2489 2426
2490IO::AIO::max_poll_time $TICK * 0.2; 2427IO::AIO::max_poll_time $TICK * 0.2;
2491 2428
2492Event->io ( 2429$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2430 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2431 poll => 'r',
2495 prio => 5, 2432 prio => 5,
2496 data => WF_AUTOCANCEL, 2433 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2434 cb => \&IO::AIO::poll_cb,
2498); 2435);
2499 2436
2500Event->timer ( 2437$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2438 data => WF_AUTOCANCEL,
2502 after => 0, 2439 after => 0,
2503 interval => 10, 2440 interval => 10,
2504 cb => sub { 2441 cb => sub {
2505 (Coro::unblock_sub { 2442 (Coro::unblock_sub {

Diff Legend

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