--- deliantra/server/lib/cf.pm 2007/01/08 22:32:10 1.152 +++ deliantra/server/lib/cf.pm 2007/01/14 02:00:37 1.170 @@ -17,6 +17,7 @@ use Coro::Semaphore; use Coro::AIO; +use Data::Dumper; use Digest::MD5; use Fcntl; use IO::AIO 2.32 (); @@ -25,22 +26,28 @@ use Event; $Event::Eval = 1; # no idea why this is required, but it is +sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload + # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? $YAML::Syck::ImplicitUnicode = 1; $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority -sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload - our %COMMAND = (); our %COMMAND_TIME = (); + +our @EXTS = (); # list of extension package names our %EXTCMD = (); +our %EXT_CORO = (); # coroutines bound to extensions +our %EXT_MAP = (); # pluggable maps our @EVENT; our $LIBDIR = datadir . "/ext"; our $TICK = MAX_TIME * 1e-6; our $TICK_WATCHER; +our $AIO_POLL_WATCHER; +our $WRITE_RUNTIME_WATCHER; our $NEXT_TICK; our $NOW; @@ -51,9 +58,14 @@ 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 %EXT_CORO; # coroutines bound to extensions + +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; @@ -71,8 +83,6 @@ mkdir cf::localdir . "/" . cf::uniquedir; mkdir $RANDOM_MAPS; -# a special map that is always available -our $LINK_MAP; our $EMERGENCY_POSITION; ############################################################################# @@ -108,6 +118,13 @@ Configuration for the server, loaded from C, or from wherever your confdir points to. +=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE + +These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) +or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick +processing has been done. Call C<< ->wait >> on them to maximise the +window of cpu time available, or simply to synchronise to the server tick. + =back =cut @@ -148,16 +165,33 @@ warn "error in event callback: @_"; }; -my %ext_pkg; -my @exts; -my @hook; - =head2 UTILITY FUNCTIONS =over 4 +=item dumpval $ref + =cut +sub dumpval { + eval { + local $SIG{__DIE__}; + my $d; + if (1) { + $d = new Data::Dumper([$_[0]], ["*var"]); + $d->Terse(1); + $d->Indent(2); + $d->Quotekeys(0); + $d->Useqq(1); + #$d->Bless(...); + $d->Seen($_[1]) if @_ > 1; + $d = $d->Dump(); + } + $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; + $d + } || "[unable to dump $_[0]: '$@']"; +} + use JSON::Syck (); # TODO# replace by JSON::PC once working =item $ref = cf::from_json $json @@ -227,7 +261,11 @@ sub freeze_mainloop { return unless $TICK_WATCHER->is_active; - my $guard = Coro::guard { $TICK_WATCHER->start }; + my $guard = Coro::guard { + $TICK_WATCHER->start; + $WRITE_RUNTIME_WATCHER->start; + }; + $WRITE_RUNTIME_WATCHER->stop; $TICK_WATCHER->stop; $guard } @@ -289,7 +327,7 @@ =item $coro = cf::async_ext { BLOCK } -Like async, but this coro is automcatially being canceled when the +Like async, but this coro is automatically being canceled when the extension calling this is being unloaded. =cut @@ -335,126 +373,6 @@ ############################################################################# -package cf::path; - -sub new { - my ($class, $path, $base) = @_; - - $path = $path->as_string if ref $path; - - my $self = bless { }, $class; - - # {... are special paths that are not 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 - - if ($path =~ /^{/) { - # fine as it is - } elsif ($path =~ s{^\?random/}{}) { - Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; - $self->{random} = cf::from_json $data; - } else { - if ($path =~ s{^~([^/]+)?}{}) { - $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 =~ /^\//) { - # already absolute - } else { - $base =~ s{[^/]+/?$}{}; - return $class->new ("$base/$path"); - } - - for ($path) { - redo if s{/\.?/}{/}; - redo if s{/[^/]+/\.\./}{/}; - } - } - - $self->{path} = $path; - - $self -} - -# the name / primary key / in-game path -sub as_string { - my ($self) = @_; - - $self->{user_rel} ? "~$self->{user}$self->{path}" - : $self->{random} ? "?random/$self->{path}" - : $self->{path} -} - -# the displayed name, this is a one way mapping -sub visible_name { - my ($self) = @_; - -# if (my $rmp = $self->{random}) { -# # todo: be more intelligent about this -# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}" -# } else { - $self->as_string -# } -} - -# escape the /'s in the path -sub _escaped_path { - # ∕ is U+2215 - (my $path = $_[0]{path}) =~ s/\//∕/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 - : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} - : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path -} - -# the unique path, might be eq to save_path -sub uniq_path { - my ($self) = @_; - - $self->{user_rel} || $self->{random} - ? undef - : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path -} - -# return random map parameters, or undef -sub random_map_params { - my ($self) = @_; - - $self->{random} -} - -# this is somewhat ugly, but style maps do need special treatment -sub is_style_map { - $_[0]{path} =~ m{^/styles/} -} - -package cf; - -############################################################################# - =head2 ATTACHABLE OBJECTS Many objects in crossfire are so-called attachable objects. That means you can @@ -587,6 +505,12 @@ my %attachment; +sub cf::attachable::thawer_merge { + # simply override everything except _meta + local $_[0]{_meta}; + %{$_[0]} = %{$_[1]}; +} + sub _attach_cb($$$$) { my ($registry, $event, $prio, $cb) = @_; @@ -768,6 +692,8 @@ # basically do the same as instantiate, without calling instantiate my ($obj) = @_; + bless $obj, ref $obj; # re-bless in case extensions have been reloaded + my $registry = $obj->registry; @$registry = (); @@ -908,10 +834,7 @@ sub register_extcmd { my ($name, $cb) = @_; - my $caller = caller; - #warn "registering extcmd '$name' to '$caller'"; - - $EXTCMD{$name} = [$cb, $caller]; + $EXTCMD{$name} = $cb; } cf::player->attach ( @@ -934,7 +857,7 @@ if (ref $msg) { if (my $cb = $EXTCMD{$msg->{msgtype}}) { - if (my %reply = $cb->[0]->($pl, $msg)) { + if (my %reply = $cb->($pl, $msg)) { $pl->ext_reply ($msg->{msgid}, %reply); } } @@ -946,12 +869,6 @@ }, ); -sub register { - my ($base, $pkg) = @_; - - #TODO -} - sub load_extension { my ($path) = @_; @@ -961,7 +878,7 @@ $pkg =~ s/[^[:word:]]/_/g; $pkg = "ext::$pkg"; - warn "loading '$path' into '$pkg'\n"; + warn "... loading '$path' into '$pkg'\n"; open my $fh, "<:utf8", $path or die "$path: $!"; @@ -972,54 +889,18 @@ . (do { local $/; <$fh> }) . "\n};\n1"; - eval $source - or die $@ ? "$path: $@\n" - : "extension disabled.\n"; - - push @exts, $pkg; - $ext_pkg{$base} = $pkg; - -# no strict 'refs'; -# @{"$pkg\::ISA"} = ext::; - - register $base, $pkg; -} - -sub unload_extension { - my ($pkg) = @_; - - warn "removing extension $pkg\n"; - - # remove hooks - #TODO -# for my $idx (0 .. $#PLUGIN_EVENT) { -# delete $hook[$idx]{$pkg}; -# } - - # remove commands - for my $name (keys %COMMAND) { - my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} }; - - if (@cb) { - $COMMAND{$name} = \@cb; - } else { - delete $COMMAND{$name}; + 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 $@; } - # remove extcmds - for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) { - delete $EXTCMD{$name}; - } - - if (my $cb = $pkg->can ("unload")) { - eval { - $cb->($pkg); - 1 - } or warn "$pkg unloaded, but with errors: $@"; - } - - Symbol::delete_package $pkg; + push @EXTS, $pkg; } sub load_extensions { @@ -1033,42 +914,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::); - -############################################################################# -# load/save perl data associated with player->ob objects - -sub all_objects(@) { - @_, map all_objects ($_->inv), @_ -} - -# TODO: compatibility cruft, remove when no longer needed -cf::player->attach ( - on_load => sub { - my ($pl, $path) = @_; - - for my $o (all_objects $pl->ob) { - if (my $value = $o->get_ob_key_value ("_perl_data")) { - $o->set_ob_key_value ("_perl_data"); - - %$o = %{ Storable::thaw pack "H*", $value }; - } - } - }, -); - -############################################################################# =head2 CORE EXTENSIONS @@ -1078,6 +923,8 @@ package cf::player; +use Coro::AIO; + =head3 cf::player =over 4 @@ -1139,7 +986,7 @@ return if $pl->{deny_save}; - Coro::AIO::aio_mkdir playerdir $pl, 0770; + aio_mkdir playerdir $pl, 0770; $pl->{last_save} = $cf::RUNTIME; $pl->save_pl ($path); @@ -1159,6 +1006,13 @@ $self } +=item $pl->quit_character + +Nukes the player without looking back. If logged in, the connection will +be destroyed. May block for a long time. + +=cut + sub quit_character { my ($pl) = @_; @@ -1172,12 +1026,64 @@ my $path = playerdir $pl; my $temp = "$path~$cf::RUNTIME~deleting~"; - Coro::AIO::aio_rename $path, $temp; + aio_rename $path, $temp; delete $cf::PLAYER{$pl->ob->name}; $pl->destroy; IO::AIO::aio_rmtree $temp; } +=item cf::player::list_logins + +Returns am arrayref of all valid playernames in the system, can take a +while and may block, so not sync_job-capable, ever. + +=cut + +sub list_logins { + my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir + or return []; + + my @logins; + + for my $login (@$dirs) { + my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; + aio_read $fh, 0, 512, my $buf, 0 or next; + $buf !~ /^password -------------$/m or next; # official not-valid tag + + utf8::decode $login; + push @logins, $login; + } + + \@logins +} + +=item $player->maps + +Returns an arrayref of map paths that are private for this +player. May block. + +=cut + +sub maps($) { + my ($pl) = @_; + + my $files = aio_readdir playerdir $pl + or return; + + my @paths; + + for (@$files) { + utf8::decode $_; + next if /\.(?:pl|pst)$/; + next unless /^$PATH_SEP/o; + + s/\.map$//; + push @paths, "~" . $pl->ob->name . "/" . $_; + } + + \@paths +} + =item $player->ext_reply ($msgid, $msgtype, %msg) Sends an ext reply to the player. @@ -1208,15 +1114,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}, @@ -1227,7 +1135,122 @@ $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, - (cf::region::find $rmp->{region}) + (cf::region::find $rmp->{region}), $rmp->{custom} + ) +} + +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 thawer_merge { + # we have to keep some variables in memory intact + local $_[0]{path}; + local $_[0]{deny_save}; + local $_[0]{deny_reset}; + + $_[0]->SUPER::thawer_merge ($_[1]); +} + +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 @@ -1239,75 +1262,80 @@ for grep $_->outdoor, values %cf::MAP; } -sub try_load_header($) { - my ($path) = @_; +sub unlink_save { + my ($self) = @_; + + utf8::encode (my $save = $self->save_path); + IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; + IO::AIO::aioreq_pri 4; Coro::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 - $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) = @_; - - #warn "find<$path,$origin>\n";#d# +sub load_temp { + my ($self) = @_; - $path = new cf::path $path, $origin && $origin->path; - my $key = $path->as_string; + $self->load_header_from ($self->save_path) +} - cf::lock_wait "map_find:$key"; +sub load_header { + my ($self) = @_; - $cf::MAP{$key} || do { - my $guard = cf::lock_acquire "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; - # do it the slow way - my $map = try_load_header $path->save_path; + $self->{load_original} = 1; + $self->{instantiate_time} = $cf::RUNTIME; + $self->last_access ($cf::RUNTIME); + $self->instantiate; + } - Coro::cede; + 1 +} - 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 { - if (my $rmp = $path->random_map_params) { - $map = generate_random_map $key, $rmp; - } else { - $map = try_load_header $path->load_path; - } +sub find; +sub find { + my ($path, $origin) = @_; - $map 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; @@ -1316,7 +1344,7 @@ or return; } - $cf::MAP{$key} = $map + $cf::MAP{$path} = $map } } @@ -1324,24 +1352,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); } } @@ -1350,28 +1378,58 @@ # 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 { - $self->fix_auto_apply; + 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) = @_; + + my @diag; # diagonal neighbours + + for (0 .. 3) { + my $neigh = $map->tile_path ($_) + or next; + $neigh = find $neigh, $map + or next; + $neigh->load; + + push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], + [$neigh->tile_path (($_ + 1) % 4), $neigh]; + } + + for (@diag) { + my $neigh = find @$_ + or next; + $neigh->load; + } +} + sub find_sync { my ($path, $origin) = @_; - cf::sync_job { cf::map::find $path, $origin } + cf::sync_job { find $path, $origin } } sub do_load_sync { @@ -1380,6 +1438,35 @@ cf::sync_job { $map->load }; } +our %MAP_PREFETCH; +our $MAP_PREFETCHER = Coro::async { + while () { + for my $path (keys %MAP_PREFETCH) { + my $map = find $path + or next; + $map->load; + + delete $MAP_PREFETCH{$path}; + } + Coro::schedule; + } +}; + +sub find_async { + my ($path, $origin) = @_; + + $path = normalise $path, $origin && $origin->{path}; + + if (my $map = $cf::MAP{$path}) { + return $map if $map->in_memory == cf::MAP_IN_MEMORY; + } + + $MAP_PREFETCH{$path} = 0; + $MAP_PREFETCHER->ready; + + () +} + sub save { my ($self) = @_; @@ -1389,8 +1476,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; @@ -1403,10 +1490,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); } } @@ -1430,7 +1517,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");#d# return 1e99 if $self->{deny_reset}; my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; @@ -1445,22 +1532,15 @@ $self->reset_at <= $cf::RUNTIME } -sub unlink_save { - my ($self) = @_; - - utf8::encode (my $save = $self->{path}->save_path); - aioreq_pri 3; IO::AIO::aio_unlink $save; - aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; -} - sub rename { my ($self, $new_path) = @_; + 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; @@ -1469,15 +1549,18 @@ 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->unlink_save; @@ -1495,39 +1578,62 @@ $self->reset; # polite request, might not happen } -sub customise_for { - my ($map, $ob) = @_; +=item cf::map::unique_maps + +Returns an arrayref of paths of all shared maps that have +instantiated unique items. May block. + +=cut + +sub unique_maps() { + my $files = aio_readdir cf::localdir . "/" . cf::uniquedir + or return; + + my @paths; + + for (@$files) { + utf8::decode $_; + next if /\.pst$/; + next unless /^$PATH_SEP/o; - if ($map->per_player) { - return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; + s/\.map$//; + push @paths, $_; } - $map + \@paths } -sub emergency_save { - my $freeze_guard = cf::freeze_mainloop; +package cf; - warn "enter emergency perl save\n"; +=back - cf::sync_job { - warn "begin emergency player save\n"; - $_->save for values %cf::PLAYER; - warn "end emergency player save\n"; +=head3 cf::object - warn "begin emergency map save\n"; - $_->save for values %cf::MAP; - warn "end emergency map save\n"; - }; +=cut - warn "leave emergency perl save\n"; +package cf::object; + +=over 4 + +=item $ob->inv_recursive + +Returns the inventory of the object _and_ their inventories, recursively. + +=cut + +sub inv_recursive_; +sub inv_recursive_ { + map { $_, inv_recursive_ $_->inv } @_ +} + +sub inv_recursive { + inv_recursive_ inv $_[0] } package cf; =back - =head3 cf::object::player =over 4 @@ -1576,31 +1682,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 { @@ -1628,6 +1746,7 @@ if $x <=0 && $y <= 0; $map->load; + $map->load_diag; return unless $self->contr->active; $self->activate_recursive; @@ -1676,15 +1795,12 @@ $self->enter_link; (async { - $path = new cf::path $path; - - my $map = cf::map::find $path->as_string; + my $map = cf::map::find $path; $map = $map->customise_for ($self) if $map; # warn "entering ", $map->path, " at ($x, $y)\n" # if $map; - $map or Carp::cluck ("oy");#d# $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); $self->leave_link ($map, $x, $y); @@ -1754,14 +1870,14 @@ 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; }) { $self->message ("Something went wrong deep within the crossfire server. " . "I'll try to bring you back to the map you were before. " - . "Please report this to the dungeon master", + . "Please report this to the dungeon master!", cf::NDI_UNIQUE | cf::NDI_RED); warn "ERROR in enter_exit: $@"; @@ -2124,7 +2240,49 @@ } ############################################################################# -# initialisation +# initialisation and cleanup + +# install some emergency cleanup handlers +BEGIN { + for my $signal (qw(INT HUP TERM)) { + Event->signal ( + data => WF_AUTOCANCEL, + signal => $signal, + cb => sub { + cf::cleanup "SIG$signal"; + }, + ); + } +} + +sub emergency_save() { + my $freeze_guard = cf::freeze_mainloop; + + warn "enter emergency perl save\n"; + + 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. + warn "begin emergency player save\n"; + for my $login (keys %cf::PLAYER) { + my $pl = $cf::PLAYER{$login} or next; + $pl->valid or next; + $pl->save; + } + warn "end emergency player save\n"; + + warn "begin emergency map save\n"; + for my $path (keys %cf::MAP) { + my $map = $cf::MAP{$path} or next; + $map->valid or next; + $map->save; + } + warn "end emergency map save\n"; + }; + + warn "leave emergency perl save\n"; +} sub reload() { # can/must only be called in main @@ -2135,28 +2293,48 @@ warn "reloading..."; + warn "freezing server"; my $guard = freeze_mainloop; cf::emergency_save; + warn "sync database to disk"; + cf::db_sync; + IO::AIO::flush; + eval { # if anything goes wrong in here, we should simply crash as we already saved - # cancel all watchers + warn "cancel all watchers"; for (Event::all_watchers) { $_->cancel if $_->data & WF_AUTOCANCEL; } - # cancel all extension coros + warn "cancel all extension coros"; $_->cancel for values %EXT_CORO; %EXT_CORO = (); - # unload all extensions - for (@exts) { - warn "unloading <$_>"; - unload_extension $_; + warn "remove commands"; + %COMMAND = (); + + warn "remove ext commands"; + %EXTCMD = (); + + warn "unload/nuke all extensions"; + for my $pkg (@EXTS) { + warn "... unloading $pkg"; + + if (my $cb = $pkg->can ("unload")) { + eval { + $cb->($pkg); + 1 + } or warn "$pkg unloaded, but with errors: $@"; + } + + warn "... nuking $pkg"; + Symbol::delete_package $pkg; } - # unload all modules loaded from $LIBDIR + warn "unload all perl modules loaded from $LIBDIR"; while (my ($k, $v) = each %INC) { next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; @@ -2173,40 +2351,31 @@ Symbol::delete_package $k; } - # sync database to disk - cf::db_sync; - IO::AIO::flush; - - # get rid of safe::, as good as possible + warn "get rid of safe::, as good as possible"; Symbol::delete_package "safe::$_" for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); - # remove register_script_function callbacks - # TODO - - # unload cf.pm "a bit" + warn "unload cf.pm \"a bit\""; delete $INC{"cf.pm"}; # don't, removes xs symbols, too, # and global variables created in xs #Symbol::delete_package __PACKAGE__; - # reload cf.pm warn "reloading cf.pm"; require cf; cf::_connect_to_perl; # nominally unnecessary, but cannot hurt - # load config and database again + warn "load config and database again"; cf::cfg_load; cf::db_load; - # load extensions warn "load extensions"; cf::load_extensions; - # reattach attachments to objects - warn "reattach"; + warn "reattach attachments to objects/players"; _global_reattach; + warn "reattach attachments to maps"; reattach $_ for values %MAP; }; @@ -2216,54 +2385,9 @@ exit 1; } - warn "reloaded successfully"; + 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 "", __PACKAGE__; - register_command "reload" => sub { my ($who, $arg) = @_; @@ -2282,10 +2406,15 @@ at => $NEXT_TICK || $TICK, data => WF_AUTOCANCEL, cb => sub { + $NOW = Event::time; + cf::server_tick; # one server iteration $RUNTIME += $TICK; $NEXT_TICK += $TICK; + $WAIT_FOR_TICK->broadcast; + $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; + # if we are delayed by four ticks or more, skip them all $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; @@ -2296,7 +2425,7 @@ IO::AIO::max_poll_time $TICK * 0.2; -Event->io ( +$AIO_POLL_WATCHER = Event->io ( fd => IO::AIO::poll_fileno, poll => 'r', prio => 5, @@ -2304,7 +2433,7 @@ cb => \&IO::AIO::poll_cb, ); -Event->timer ( +$WRITE_RUNTIME_WATCHER = Event->timer ( data => WF_AUTOCANCEL, after => 0, interval => 10,