--- deliantra/server/lib/cf.pm 2007/01/12 22:09:22 1.165 +++ deliantra/server/lib/cf.pm 2007/01/13 23:32:43 1.167 @@ -56,12 +56,15 @@ our %PLAYER; # all users our %MAP; # all maps -our $LINK_MAP; # the special {link} map +our $LINK_MAP; # the special {link} map, which is always available our $RANDOM_MAPS = cf::localdir . "/random"; our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; +# used to convert map paths into valid unix filenames by replacing / by ∕ +our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons + binmode STDOUT; binmode STDERR; @@ -78,8 +81,6 @@ mkdir cf::localdir . "/" . cf::uniquedir; mkdir $RANDOM_MAPS; -# a special map that is always available -our $LINK_MAP; our $EMERGENCY_POSITION; ############################################################################# @@ -339,6 +340,8 @@ } sub write_runtime { + return unless $TICK_WATCHER->is_active; + my $runtime = cf::localdir . "/runtime"; my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 @@ -366,182 +369,6 @@ ############################################################################# -package cf::path; - -use overload - '""' => \&as_string; - -# used to convert map paths into valid unix filenames by repalcing / by ∕ -our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons - -sub register { - my ($pkg, $prefix) = @_; - - $EXT_MAP{$prefix} = $pkg; -} - -sub new { - my ($class, $path, $base) = @_; - - return $path if ref $path; - - my $self = {}; - - # {... are special paths that are not being touched - # ?xxx/... are special absolute paths - # ?random/... random maps - # /! non-realised random map exit - # /... normal maps - # ~/... per-player maps without a specific player (DO NOT USE) - # ~user/... per-player map of a specific user - - $path =~ s/$PATH_SEP/\//go; - - if ($path =~ /^{/) { - # fine as it is - } else { - if ($path =~ s{^~([^/]+)?}{}) { - # ~user - $self->{user_rel} = 1; - - if (defined $1) { - $self->{user} = $1; - } elsif ($base =~ m{^~([^/]+)/}) { - $self->{user} = $1; - } else { - warn "cannot resolve user-relative path without user <$path,$base>\n"; - } - } elsif ($path =~ s{^\?([^/]+)/}{}) { - # ?... - $self->{ext} = $1; - if (my $ext = $EXT_MAP{$1}) { - bless $self, $ext; - } - } elsif ($path =~ /^\//) { - # /... - # already absolute - } else { - # relative - $base =~ s{[^/]+/?$}{}; - return $class->new ("$base/$path"); - } - - for ($path) { - redo if s{/\.?/}{/}; - redo if s{/[^/]+/\.\./}{/}; - } - } - - $self->{path} = $path; - - if ("HASH" eq ref $self) { - bless $self, $class; - } else { - $self->init; - } - - for my $ext (values %EXT_MAP) { - if (my $subst = $ext->substitute ($self)) { - return $subst; - } - } - - $self -} - -sub init { - # nop -} - -sub substitute { - () -} - -# the name / primary key / in-game path -sub as_string { - my ($self) = @_; - - $self->{user_rel} ? "~$self->{user}$self->{path}" - : $self->{ext} ? "?$self->{ext}/$self->{path}" - : $self->{path} -} - -# the displayed name, this is a one way mapping -sub visible_name { - &as_string -} - -# escape the /'s in the path -sub _escaped_path { - (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; - - $path -} - -# the original (read-only) location -sub load_path { - my ($self) = @_; - - sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} -} - -# the temporary/swap location -sub save_path { - my ($self) = @_; - - $self->{user_rel} - ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path - : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path -} - -# the unique path, undef == no special unique path -sub uniq_path { - my ($self) = @_; - - $self->{user_rel} || $self->{ext} - ? undef - : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path -} - -sub customise_for { - my ($self, $map, $ob) = @_; - - if ($map->per_player) { - return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path}); - } - - $map -} - -# this is somewhat ugly, but style maps do need special treatment -sub is_style_map { - $_[0]{path} =~ m{^/styles/} -} - -sub load_orig { - my ($self) = @_; - - &cf::map::load_map_header ($self->load_path) -} - -sub load_temp { - my ($self) = @_; - - &cf::map::load_map_header ($self->save_path) -} - -sub unlink_save { - my ($self) = @_; - - utf8::encode (my $save = $self->save_path); - IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; - IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; -} - -package cf; - -############################################################################# - =head2 ATTACHABLE OBJECTS Many objects in crossfire are so-called attachable objects. That means you can @@ -1050,9 +877,16 @@ . (do { local $/; <$fh> }) . "\n};\n1"; - eval $source - or die $@ ? "$path: $@\n" - : "extension disabled.\n"; + unless (eval $source) { + my $msg = $@ ? "$path: $@\n" + : "extension disabled.\n"; + if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match + warn $@; + warn "mandatory extension failed to load, exiting.\n"; + exit 1; + } + die $@; + } push @EXTS, $pkg; } @@ -1068,20 +902,6 @@ } ############################################################################# -# load/save/clean perl data associated with a map - -*cf::mapsupport::on_clean = sub { - my ($map) = @_; - - my $path = $map->tmpname; - defined $path or return; - - unlink "$path.pst"; -}; - -cf::map->attach (prio => -10000, package => cf::mapsupport::); - -############################################################################# =head2 CORE EXTENSIONS @@ -1227,7 +1047,7 @@ =item $player->maps -Returns an arrayref of cf::path's of all maps that are private for this +Returns an arrayref of map paths that are private for this player. May block. =cut @@ -1245,7 +1065,8 @@ next if /\.(?:pl|pst)$/; next unless /^$PATH_SEP/o; - push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; + s/\.map$//; + push @paths, "~" . $pl->ob->name . "/" . $_; } \@paths @@ -1281,15 +1102,17 @@ use Fcntl; use Coro::AIO; +use overload + '""' => \&as_string; + our $MAX_RESET = 3600; our $DEFAULT_RESET = 3000; sub generate_random_map { - my ($path, $rmp) = @_; + my ($self, $rmp) = @_; # mit "rum" bekleckern, nicht - cf::map::_create_random_map ( - $path, + $self->_create_random_map ( $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, @@ -1304,6 +1127,111 @@ ) } +sub register { + my (undef, $regex) = @_; + my $pkg = caller; + + no strict; + push @{"$pkg\::ISA"}, __PACKAGE__; + + $EXT_MAP{$pkg} = qr<$regex>; +} + +# also paths starting with '/' +$EXT_MAP{"cf::map"} = qr{^(?=/)}; + +sub normalise { + my ($path, $base) = @_; + + # map plan: + # + # /! non-realised random map exit (special hack!) + # {... are special paths that are not being touched + # ?xxx/... are special absolute paths + # ?random/... random maps + # /... normal maps + # ~user/... per-player map of a specific user + + $path =~ s/$PATH_SEP/\//go; + + # treat it as relative path if it starts with + # something that looks reasonable + if ($path =~ m{^(?:\./|\.\./|\w)}) { + $base or Carp::carp "normalise called with relative path and no base: '$path'"; + + $base =~ s{[^/]+/?$}{}; + $path = "$base/$path"; + } + + for ($path) { + redo if s{//}{/}; + redo if s{/\.?/}{/}; + redo if s{/[^/]+/\.\./}{/}; + } + + $path +} + +sub new_from_path { + my (undef, $path, $base) = @_; + + return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object + + $path = normalise $path, $base; + + for my $pkg (keys %EXT_MAP) { + if ($path =~ $EXT_MAP{$pkg}) { + my $self = bless cf::map::new, $pkg; + $self->{path} = $path; $self->path ($path); + $self->init; # pass $1 etc. + return $self; + } + } + + Carp::carp "unable to resolve path '$path'."; + () +} + +sub init { + my ($self) = @_; + + $self +} + +sub as_string { + my ($self) = @_; + + "$self->{path}" +} + +# the displayed name, this is a one way mapping +sub visible_name { + &as_string +} + +# the original (read-only) location +sub load_path { + my ($self) = @_; + + sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} +} + +# the temporary/swap location +sub save_path { + my ($self) = @_; + + (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; + sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path +} + +# the unique path, undef == no special unique path +sub uniq_path { + my ($self) = @_; + + (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; + sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path +} + # and all this just because we cannot iterate over # all maps in C++... sub change_all_map_light { @@ -1313,70 +1241,80 @@ for grep $_->outdoor, values %cf::MAP; } -sub load_map_header($) { - my ($path) = @_; +sub unlink_save { + my ($self) = @_; + + utf8::encode (my $save = $self->save_path); + IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; + IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; +} + +sub load_header_from($) { + my ($self, $path) = @_; utf8::encode $path; aio_open $path, O_RDONLY, 0 or return; - my $map = cf::map::new + $self->_load_header ($path) or return; - # for better error messages only, will be overwritten later - $map->path ($path); + $self->{load_path} = $path; - $map->load_header ($path) - or return; + 1 +} - $map->{load_path} = $path; +sub load_orig { + my ($self) = @_; - $map + $self->load_header_from ($self->load_path) } -sub find; -sub find { - my ($path, $origin) = @_; +sub load_temp { + my ($self) = @_; - #warn "find<$path,$origin>\n";#d# + $self->load_header_from ($self->save_path) +} - $path = new cf::path $path, $origin && $origin->path; - my $key = $path->as_string; +sub load_header { + my ($self) = @_; - cf::lock_wait "map_find:$key"; + if ($self->load_temp) { + $self->last_access ((delete $self->{last_access}) + || $cf::RUNTIME); #d# + # safety + $self->{instantiate_time} = $cf::RUNTIME + if $self->{instantiate_time} > $cf::RUNTIME; + } else { + $self->load_orig + or return; - $cf::MAP{$key} || do { - my $guard = cf::lock_acquire "map_find:$key"; + $self->{load_original} = 1; + $self->{instantiate_time} = $cf::RUNTIME; + $self->last_access ($cf::RUNTIME); + $self->instantiate; + } - # do it the slow way - my $map = $path->load_temp; + 1 +} - Coro::cede; +sub find; +sub find { + my ($path, $origin) = @_; - if ($map) { - $map->last_access ((delete $map->{last_access}) - || $cf::RUNTIME); #d# - # safety - $map->{instantiate_time} = $cf::RUNTIME - if $map->{instantiate_time} > $cf::RUNTIME; - } else { - $map = $path->load_orig - or return; + $path = normalise $path, $origin && $origin->path; - $map->{load_original} = 1; - $map->{instantiate_time} = $cf::RUNTIME; - $map->last_access ($cf::RUNTIME); - $map->instantiate; + cf::lock_wait "map_find:$path"; - # per-player maps become, after loading, normal maps - $map->per_player (0) if $path->{user_rel}; - } + $cf::MAP{$path} || do { + my $guard = cf::lock_acquire "map_find:$path"; + my $map = new_from_path cf::map $path + or return; - $map->path ($key); - $map->{path} = $path; $map->{last_save} = $cf::RUNTIME; - Coro::cede; + $map->load_header + or return; if ($map->should_reset) { $map->reset; @@ -1385,7 +1323,7 @@ or return; } - $cf::MAP{$key} = $map + $cf::MAP{$path} = $map } } @@ -1393,24 +1331,24 @@ my ($self) = @_; my $path = $self->{path}; - my $guard = cf::lock_acquire "map_load:" . $path->as_string; + my $guard = cf::lock_acquire "map_load:$path"; return if $self->in_memory != cf::MAP_SWAPPED; $self->in_memory (cf::MAP_LOADING); $self->alloc; - $self->load_objects ($self->{load_path}, 1) + $self->_load_objects ($self->{load_path}, 1) or return; $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; - if (my $uniq = $path->uniq_path) { + if (my $uniq = $self->uniq_path) { utf8::encode $uniq; if (aio_open $uniq, O_RDONLY, 0) { $self->clear_unique_items; - $self->load_objects ($uniq, 0); + $self->_load_objects ($uniq, 0); } } @@ -1419,24 +1357,30 @@ # now do the right thing for maps $self->link_multipart_objects; - if ($self->{path}->is_style_map) { - $self->{deny_save} = 1; - $self->{deny_reset} = 1; - } else { + unless ($self->{deny_activate}) { $self->decay_objects; $self->fix_auto_apply; $self->update_buttons; + Coro::cede; $self->set_darkness_map; $self->difficulty ($self->estimate_difficulty) unless $self->difficulty; + Coro::cede; $self->activate; } - Coro::cede; - $self->in_memory (cf::MAP_IN_MEMORY); } +sub customise_for { + my ($self, $ob) = @_; + + return find "~" . $ob->name . "/" . $self->{path} + if $self->per_player; + + $self +} + # find and load all maps in the 3x3 area around a map sub load_diag { my ($map) = @_; @@ -1476,14 +1420,12 @@ our %MAP_PREFETCH; our $MAP_PREFETCHER = Coro::async { while () { - while (%MAP_PREFETCH) { - my $key = each %MAP_PREFETCH - or next; - my $path = delete $MAP_PREFETCH{$key}; - + for my $path (keys %MAP_PREFETCH) { my $map = find $path or next; $map->load; + + delete $MAP_PREFETCH{$path}; } Coro::schedule; } @@ -1492,14 +1434,13 @@ sub find_async { my ($path, $origin) = @_; - $path = new cf::path $path, $origin && $origin->path; - my $key = $path->as_string; + $path = normalise $path, $origin && $origin->{path}; - if (my $map = $cf::MAP{$key}) { + if (my $map = $cf::MAP{$path}) { return $map if $map->in_memory == cf::MAP_IN_MEMORY; } - $MAP_PREFETCH{$key} = $path; + $MAP_PREFETCH{$path} = 0; $MAP_PREFETCHER->ready; () @@ -1514,8 +1455,8 @@ return unless $self->dirty; - my $save = $self->{path}->save_path; utf8::encode $save; - my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; + my $save = $self->save_path; utf8::encode $save; + my $uniq = $self->uniq_path; utf8::encode $uniq; $self->{load_path} = $save; @@ -1528,10 +1469,10 @@ }; if ($uniq) { - $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); - $self->save_objects ($uniq, cf::IO_UNIQUES); + $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); + $self->_save_objects ($uniq, cf::IO_UNIQUES); } else { - $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); + $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); } } @@ -1555,7 +1496,7 @@ my ($self) = @_; # TODO: safety, remove and allow resettable per-player maps - return 1e99 if $self->{path}{user_rel}; + return 1e99 if $self->isa ("ext::map_per_player"); return 1e99 if $self->{deny_reset}; my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; @@ -1573,11 +1514,12 @@ sub rename { my ($self, $new_path) = @_; - $self->{path}->unlink_save; + normalise $new_path; + + $self->unlink_save; delete $cf::MAP{$self->path}; - $self->{path} = new cf::path $new_path; - $self->path ($self->{path}->as_string); + $self->{path} = $new_path; $self->path ($self->{path}); $cf::MAP{$self->path} = $self; $self->save; @@ -1586,18 +1528,21 @@ sub reset { my ($self) = @_; - my $lock = cf::lock_acquire "map_data:" . $self->path; + my $lock = cf::lock_acquire "map_data:$self->{path}"; return if $self->players; - return if $self->{path}{user_rel};#d# + return if $self->isa ("ext::map_per_player");#d# warn "resetting map ", $self->path;#d# delete $cf::MAP{$self->path}; + $self->in_memory (cf::MAP_SWAPPED); + $self->clear; + $_->clear_links_to ($self) for values %cf::MAP; - $self->{path}->unlink_save; + $self->unlink_save; $self->destroy; } @@ -1614,7 +1559,7 @@ =item cf::map::unique_maps -Returns an arrayref of cf::path's of all shared maps that have +Returns an arrayref of paths of all shared maps that have instantiated unique items. May block. =cut @@ -1630,7 +1575,8 @@ next if /\.pst$/; next unless /^$PATH_SEP/o; - push @paths, new cf::path $_; + s/\.map$//; + push @paths, $_; } \@paths @@ -1715,31 +1661,43 @@ Freezes the player and moves him/her to a special map (C<{link}>). -The player should be reaosnably safe there for short amounts of time. You +The player should be reasonably safe there for short amounts of time. You I call C as soon as possible, though. +Will never block. + =item $player_object->leave_link ($map, $x, $y) -Moves the player out of the specila link map onto the given map. If the -map is not valid (or omitted), the player will be moved back to the -location he/she was before the call to C, or, if that fails, -to the emergency map position. +Moves the player out of the special C<{link}> map onto the specified +map. If the map is not valid (or omitted), the player will be moved back +to the location he/she was before the call to C, or, if that +fails, to the emergency map position. Might block. =cut +sub link_map { + unless ($LINK_MAP) { + $LINK_MAP = cf::map::find "{link}" + or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; + $LINK_MAP->load; + } + + $LINK_MAP +} + sub cf::object::player::enter_link { my ($self) = @_; $self->deactivate_recursive; - return if $self->map == $LINK_MAP; + return if UNIVERSAL::isa $self->map, "ext::map_link"; $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] if $self->map; - $self->enter_map ($LINK_MAP, 20, 20); + $self->enter_map ($LINK_MAP || link_map, 20, 20); } sub cf::object::player::leave_link { @@ -1813,13 +1771,11 @@ sub cf::object::player::goto { my ($self, $path, $x, $y) = @_; - $path = new cf::path $path; - $self->enter_link; (async { - my $map = cf::map::find $path->as_string; - $map = $map->{path}->customise_for ($map, $self) if $map; + my $map = cf::map::find $path; + $map = $map->customise_for ($self) if $map; # warn "entering ", $map->path, " at ($x, $y)\n" # if $map; @@ -1893,7 +1849,7 @@ prepare_random_map $exit if $exit->slaying eq "/!"; - my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; + my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path; $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1; @@ -2286,7 +2242,7 @@ cf::sync_job { # use a peculiar iteration method to avoid tripping on perl # refcount bugs in for. also avoids problems with players - # and maps saved/Destroyed asynchronously. + # and maps saved/destroyed asynchronously. warn "begin emergency player save\n"; for my $login (keys %cf::PLAYER) { my $pl = $cf::PLAYER{$login} or next; @@ -2411,49 +2367,6 @@ warn "reloaded"; }; -############################################################################# - -unless ($LINK_MAP) { - $LINK_MAP = cf::map::new; - - $LINK_MAP->width (41); - $LINK_MAP->height (41); - $LINK_MAP->alloc; - $LINK_MAP->path ("{link}"); - $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; - $LINK_MAP->in_memory (MAP_IN_MEMORY); - - # dirty hack because... archetypes are not yet loaded - Event->timer ( - after => 10, - cb => sub { - $_[0]->w->cancel; - - # provide some exits "home" - my $exit = cf::object::new "exit"; - - $exit->slaying ($EMERGENCY_POSITION->[0]); - $exit->stats->hp ($EMERGENCY_POSITION->[1]); - $exit->stats->sp ($EMERGENCY_POSITION->[2]); - - $LINK_MAP->insert ($exit->clone, 19, 19); - $LINK_MAP->insert ($exit->clone, 19, 20); - $LINK_MAP->insert ($exit->clone, 19, 21); - $LINK_MAP->insert ($exit->clone, 20, 19); - $LINK_MAP->insert ($exit->clone, 20, 21); - $LINK_MAP->insert ($exit->clone, 21, 19); - $LINK_MAP->insert ($exit->clone, 21, 20); - $LINK_MAP->insert ($exit->clone, 21, 21); - - $exit->destroy; - }); - - $LINK_MAP->{deny_save} = 1; - $LINK_MAP->{deny_reset} = 1; - - $cf::MAP{$LINK_MAP->path} = $LINK_MAP; -} - register_command "reload" => sub { my ($who, $arg) = @_;