--- deliantra/server/lib/cf.pm 2007/01/04 00:08:08 1.130 +++ deliantra/server/lib/cf.pm 2007/01/11 01:01:56 1.163 @@ -17,24 +17,29 @@ use Coro::Semaphore; use Coro::AIO; +use Data::Dumper; use Digest::MD5; use Fcntl; -use IO::AIO 2.31 (); +use IO::AIO 2.32 (); use YAML::Syck (); use Time::HiRes; 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 (2); # run main coroutine ("the server") with very high priority - -sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload +$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 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"; @@ -49,11 +54,13 @@ our $UPTIME; $UPTIME ||= time; our $RUNTIME; -our %MAP; # all maps +our %PLAYER; # all users +our %MAP; # all maps our $LINK_MAP; # the special {link} map -our $FREEZE; our $RANDOM_MAPS = cf::localdir . "/random"; -our %EXT_CORO; + +our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; +our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; binmode STDOUT; binmode STDERR; @@ -73,8 +80,7 @@ # a special map that is always available our $LINK_MAP; - -our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37]; +our $EMERGENCY_POSITION; ############################################################################# @@ -109,6 +115,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 @@ -121,7 +134,7 @@ $msg .= "\n" unless $msg =~ /\n$/; - LOG llevError, "cfperl: $msg"; + LOG llevError, $msg; }; } @@ -149,16 +162,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 @@ -183,28 +213,6 @@ JSON::Syck::Dump $_[0] } -=item my $guard = cf::guard { BLOCK } - -Run the given callback when the guard object gets destroyed (useful for -coroutine cancellations). - -You can call C<< ->cancel >> on the guard object to stop the block from -being executed. - -=cut - -sub guard(&) { - bless \(my $cb = $_[0]), cf::guard::; -} - -sub cf::guard::cancel { - ${$_[0]} = sub { }; -} - -sub cf::guard::DESTROY { - ${$_[0]}->(); -} - =item cf::lock_wait $string Wait until the given lock is available. See cf::lock_acquire. @@ -212,12 +220,12 @@ =item my $lock = cf::lock_acquire $string Wait until the given lock is available and then acquires it and returns -a guard object. If the guard object gets destroyed (goes out of scope, +a Coro::guard object. If the guard object gets destroyed (goes out of scope, for example when the coroutine gets canceled), the lock is automatically returned. -Lock names should begin with a unique identifier (for example, find_map -uses map_find and load_map uses map_load). +Lock names should begin with a unique identifier (for example, cf::map::find +uses map_find and cf::map::load uses map_load). =cut @@ -241,27 +249,29 @@ $LOCK{$key} = []; - cf::guard { + Coro::guard { # wake up all waiters, to be on the safe side $_->ready for @{ delete $LOCK{$key} }; } } +sub freeze_mainloop { + return unless $TICK_WATCHER->is_active; + + my $guard = Coro::guard { $TICK_WATCHER->start }; + $TICK_WATCHER->stop; + $guard +} + =item cf::async { BLOCK } -Like C, but runs the given BLOCK in an eval and only logs the -error instead of exiting the server in case of a problem. +Currently the same as Coro::async_pool, meaning you cannot use +C, C or other gimmicks on these coroutines. The only +thing you are allowed to do is call C on it. =cut -sub async(&) { - my ($cb) = @_; - - Coro::async { - eval { $cb->() }; - warn $@ if $@; - } -} +BEGIN { *async = \&Coro::async_pool } =item cf::sync_job { BLOCK } @@ -285,20 +295,19 @@ # TODO: use suspend/resume instead # (but this is cancel-safe) - local $FREEZE = 1; + my $freeze_guard = freeze_mainloop; my $busy = 1; my @res; - (Coro::async { + (async { @res = eval { $job->() }; warn $@ if $@; undef $busy; })->prio (Coro::PRIO_MAX); while ($busy) { - Coro::cede_notself; - Event::one_event unless Coro::nready; + Coro::cede or Event::one_event; } wantarray ? @res : $res[0] @@ -309,17 +318,17 @@ } } -=item $coro = cf::coro { BLOCK } +=item $coro = cf::async_ext { BLOCK } -Creates and returns a new coro. This coro is automcatially being canceled -when the extension calling this is being unloaded. +Like async, but this coro is automatically being canceled when the +extension calling this is being unloaded. =cut -sub coro(&) { +sub async_ext(&) { my $cb = shift; - my $coro = &cf::async ($cb); + my $coro = &Coro::async ($cb); $coro->on_destroy (sub { delete $EXT_CORO{$coro+0}; @@ -359,14 +368,26 @@ 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) = @_; - $path = $path->as_string if ref $path; + return $path if ref $path; - my $self = bless { }, $class; + my $self = {}; - # {... are special paths that are not touched + # {... are special paths that are not being touched # ?xxx/... are special absolute paths # ?random/... random maps # /! non-realised random map exit @@ -374,13 +395,13 @@ # ~/... 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 - } 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{^~([^/]+)?}{}) { + # ~user $self->{user_rel} = 1; if (defined $1) { @@ -390,9 +411,17 @@ } 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"); } @@ -405,34 +434,47 @@ $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->{random} ? "?random/$self->{path}" + : $self->{ext} ? "?$self->{ext}/$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 -# } + &as_string } # escape the /'s in the path sub _escaped_path { - # ∕ is U+2215 - (my $path = $_[0]{path}) =~ s/\//∕/g; + (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; + $path } @@ -447,30 +489,33 @@ 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 + $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, might be eq to save_path +# the unique path, undef == no special unique path sub uniq_path { my ($self) = @_; - $self->{user_rel} || $self->{random} - ? undef - : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path + sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path +} + +# this is somewhat ugly, but style maps do need special treatment +sub is_style_map { + $_[0]{path} =~ m{^/styles/} } -# return random map parameters, or undef -sub random_map_params { +sub load_orig { my ($self) = @_; - $self->{random} + &cf::map::load_map_header ($self->load_path) } -# this is somewhat ugly, but style maps do need special treatment -sub is_style_map { - $_[0]{path} =~ m{^/styles/} +sub load_temp { + my ($self) = @_; + + &cf::map::load_map_header ($self->save_path) } package cf; @@ -930,10 +975,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 ( @@ -956,7 +998,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); } } @@ -968,12 +1010,6 @@ }, ); -sub register { - my ($base, $pkg) = @_; - - #TODO -} - sub load_extension { my ($path) = @_; @@ -983,7 +1019,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: $!"; @@ -998,50 +1034,7 @@ 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}; - } - } - - # 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 { @@ -1069,46 +1062,173 @@ cf::map->attach (prio => -10000, package => cf::mapsupport::); ############################################################################# -# load/save perl data associated with player->ob objects -sub all_objects(@) { - @_, map all_objects ($_->inv), @_ +=head2 CORE EXTENSIONS + +Functions and methods that extend core crossfire objects. + +=cut + +package cf::player; + +use Coro::AIO; + +=head3 cf::player + +=over 4 + +=item cf::player::find $login + +Returns the given player object, loading it if necessary (might block). + +=cut + +sub playerdir($) { + cf::localdir + . "/" + . cf::playerdir + . "/" + . (ref $_[0] ? $_[0]->ob->name : $_[0]) } -# TODO: compatibility cruft, remove when no longer needed -cf::player->attach ( - on_load => sub { - my ($pl, $path) = @_; +sub path($) { + my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; - for my $o (all_objects $pl->ob) { - if (my $value = $o->get_ob_key_value ("_perl_data")) { - $o->set_ob_key_value ("_perl_data"); + (playerdir $login) . "/$login.pl" +} - %$o = %{ Storable::thaw pack "H*", $value }; - } +sub find_active($) { + $cf::PLAYER{$_[0]} + and $cf::PLAYER{$_[0]}->active + and $cf::PLAYER{$_[0]} +} + +sub exists($) { + my ($login) = @_; + + $cf::PLAYER{$login} + or cf::sync_job { !aio_stat $login } +} + +sub find($) { + return $cf::PLAYER{$_[0]} || do { + my $login = $_[0]; + + my $guard = cf::lock_acquire "user_find:$login"; + + $cf::PLAYER{$_[0]} || do { + my $pl = load_pl path $login + or return; + $cf::PLAYER{$login} = $pl } - }, -); + } +} -############################################################################# +sub save($) { + my ($pl) = @_; -=head2 CORE EXTENSIONS + return if $pl->{deny_save}; -Functions and methods that extend core crossfire objects. + my $path = path $pl; + my $guard = cf::lock_acquire "user_save:$path"; -=head3 cf::player + return if $pl->{deny_save}; -=over 4 + aio_mkdir playerdir $pl, 0770; + $pl->{last_save} = $cf::RUNTIME; + + $pl->save_pl ($path); + Coro::cede; +} + +sub new($) { + my ($login) = @_; + + my $self = create; + + $self->ob->name ($login); + $self->{deny_save} = 1; + + $cf::PLAYER{$login} = $self; + + $self +} -=item cf::player::exists $login +=item $pl->quit_character -Returns true when the given account exists. +Nukes the player without looking back. If logged in, the connection will +be destroyed. May block for a long time. =cut -sub cf::player::exists($) { - cf::player::find $_[0] - or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; +sub quit_character { + my ($pl) = @_; + + $pl->{deny_save} = 1; + $pl->password ("*"); # this should lock out the player until we nuked the dir + + $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; + $pl->deactivate; + $pl->invoke (cf::EVENT_PLAYER_QUIT); + $pl->ns->destroy if $pl->ns; + + my $path = playerdir $pl; + my $temp = "$path~$cf::RUNTIME~deleting~"; + 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 cf::path's of all maps 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; + + push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; + } + + \@paths } =item $player->ext_reply ($msgid, $msgtype, %msg) @@ -1117,14 +1237,16 @@ =cut -sub cf::player::ext_reply($$$%) { +sub ext_reply($$$%) { my ($self, $id, %msg) = @_; $msg{msgid} = $id; - $self->send ("ext " . to_json \%msg); + $self->send ("ext " . cf::to_json \%msg); } +package cf; + =back @@ -1139,14 +1261,14 @@ use Fcntl; use Coro::AIO; -our $MAX_RESET = 7200; -our $DEFAULT_RESET = 3600; +our $MAX_RESET = 3600; +our $DEFAULT_RESET = 3000; sub generate_random_map { my ($path, $rmp) = @_; # mit "rum" bekleckern, nicht - cf::map::_create_random_map + cf::map::_create_random_map ( $path, $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, @@ -1158,7 +1280,8 @@ $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} + ) } # and all this just because we cannot iterate over @@ -1170,7 +1293,7 @@ for grep $_->outdoor, values %cf::MAP; } -sub try_load_header($) { +sub load_map_header($) { my ($path) = @_; utf8::encode $path; @@ -1180,6 +1303,9 @@ my $map = cf::map::new or return; + # for better error messages only, will be overwritten later + $map->path ($path); + $map->load_header ($path) or return; @@ -1188,11 +1314,11 @@ $map } -sub find_map; -sub find_map { +sub find; +sub find { my ($path, $origin) = @_; - #warn "find_map<$path,$origin>\n";#d# + #warn "find<$path,$origin>\n";#d# $path = new cf::path $path, $origin && $origin->path; my $key = $path->as_string; @@ -1203,23 +1329,23 @@ my $guard = cf::lock_acquire "map_find:$key"; # do it the slow way - my $map = try_load_header $path->save_path; + my $map = $path->load_temp; + + Coro::cede; 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; - } - - $map or return; + $map = $path->load_orig + or return; $map->{load_original} = 1; $map->{instantiate_time} = $cf::RUNTIME; + $map->last_access ($cf::RUNTIME); $map->instantiate; # per-player maps become, after loading, normal maps @@ -1229,12 +1355,13 @@ $map->path ($key); $map->{path} = $path; $map->{last_save} = $cf::RUNTIME; - $map->last_access ($cf::RUNTIME); + + Coro::cede; if ($map->should_reset) { $map->reset; undef $guard; - $map = find_map $path + $map = find $path or return; } @@ -1267,6 +1394,8 @@ } } + Coro::cede; + # now do the right thing for maps $self->link_multipart_objects; @@ -1283,25 +1412,84 @@ $self->activate; } + Coro::cede; + $self->in_memory (cf::MAP_IN_MEMORY); } -sub load_map_sync { +# 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) = @_; - #warn "load_map_sync<$path, $origin>\n";#d# + cf::sync_job { find $path, $origin } +} - cf::sync_job { - my $map = cf::map::find_map $path, $origin - or return; - $map->load; - $map +sub do_load_sync { + my ($map) = @_; + + cf::sync_job { $map->load }; +} + +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}; + + my $map = find $path + or next; + $map->load; + } + Coro::schedule; + } +}; + +sub find_async { + my ($path, $origin) = @_; + + $path = new cf::path $path, $origin && $origin->path; + my $key = $path->as_string; + + if (my $map = $cf::MAP{$key}) { + return $map if $map->in_memory == cf::MAP_IN_MEMORY; } + + $MAP_PREFETCH{$key} = $path; + $MAP_PREFETCHER->ready; + + () } sub save { my ($self) = @_; + my $lock = cf::lock_acquire "map_data:" . $self->path; + $self->{last_save} = $cf::RUNTIME; return unless $self->dirty; @@ -1313,6 +1501,12 @@ return if $self->{deny_save}; + local $self->{last_access} = $self->last_access;#d# + + cf::async { + $_->contr->save for $self->players; + }; + if ($uniq) { $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); $self->save_objects ($uniq, cf::IO_UNIQUES); @@ -1327,6 +1521,8 @@ # save first because save cedes $self->save; + my $lock = cf::lock_acquire "map_data:" . $self->path; + return if $self->players; return if $self->in_memory != cf::MAP_IN_MEMORY; return if $self->{deny_save}; @@ -1378,6 +1574,8 @@ sub reset { my ($self) = @_; + my $lock = cf::lock_acquire "map_data:" . $self->path; + return if $self->players; return if $self->{path}{user_rel};#d# @@ -1406,29 +1604,66 @@ my ($map, $ob) = @_; if ($map->per_player) { - return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; + return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; } $map } -sub emergency_save { - local $cf::FREEZE = 1; +=item cf::map::unique_maps - warn "enter emergency map save\n"; +Returns an arrayref of cf::path's of all shared maps that have +instantiated unique items. May block. - cf::sync_job { - warn "begin emergency map save\n"; - $_->save for values %cf::MAP; - }; +=cut - warn "end emergency map save\n"; +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; + + push @paths, new cf::path $_; + } + + \@paths } package cf; =back +=head3 cf::object + +=cut + +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 @@ -1513,11 +1748,11 @@ unless ($map) { # restore original map position ($map, $x, $y) = @{ $link_pos || [] }; - $map = cf::map::find_map $map; + $map = cf::map::find $map; unless ($map) { ($map, $x, $y) = @$EMERGENCY_POSITION; - $map = cf::map::find_map $map + $map = cf::map::find $map or die "FATAL: cannot load emergency map\n"; } } @@ -1530,7 +1765,9 @@ if $x <=0 && $y <= 0; $map->load; + $map->load_diag; + return unless $self->contr->active; $self->activate_recursive; $self->enter_map ($map, $x, $y); } @@ -1553,35 +1790,39 @@ # should happen only on crashes if ($pl->ob->{_link_pos}) { $pl->ob->enter_link; - cf::async { + (async { # we need this sleep as the login has a concurrent enter_exit running # and this sleep increases chances of the player not ending up in scorn + $pl->ob->reply (undef, + "There was an internal problem at your last logout, " + . "the server will try to bring you to your intended destination in a second.", + cf::NDI_RED); Coro::Timer::sleep 1; $pl->ob->leave_link; - }; + })->prio (2); } }, ); -=item $player_object->goto_map ($path, $x, $y) +=item $player_object->goto ($path, $x, $y) =cut -sub cf::object::player::goto_map { +sub cf::object::player::goto { my ($self, $path, $x, $y) = @_; - $self->enter_link; + $path = new cf::path $path; - (cf::async { - $path = new cf::path $path; + $self->enter_link; - my $map = cf::map::find_map $path->as_string; + (async { + my $map = cf::map::find $path->as_string; $map = $map->customise_for ($self) if $map; # warn "entering ", $map->path, " at ($x, $y)\n" # if $map; - $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); + $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); $self->leave_link ($map, $x, $y); })->prio (1); @@ -1644,19 +1885,20 @@ $self->enter_link; - (cf::async { + (async { + $self->deactivate_recursive; # just to be sure unless (eval { prepare_random_map $exit if $exit->slaying eq "/!"; my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; - $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); + $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: $@"; @@ -1734,7 +1976,7 @@ }, ); -=item $client->coro (\&cb) +=item $client->async (\&cb) Create a new coroutine, running the specified callback. The coroutine will be automatically cancelled when the client gets destroyed (e.g. on logout, @@ -1742,10 +1984,10 @@ =cut -sub cf::client::coro { +sub cf::client::async { my ($self, $cb) = @_; - my $coro = &cf::async ($cb); + my $coro = &Coro::async ($cb); $coro->on_destroy (sub { delete $self->{_coro}{$coro+0}; @@ -1990,15 +2232,26 @@ local $/; *CFG = YAML::Syck::Load <$fh>; + + $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; + + $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; + $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; + + if (exists $CFG{mlockall}) { + eval { + $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" + and die "WARNING: m(un)lockall failed: $!\n"; + }; + warn $@ if $@; + } } sub main { # we must not ever block the main coroutine local $Coro::idle = sub { Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# - (Coro::unblock_sub { - Event::one_event; - })->(); + async { Event::one_event }; }; cfg_load; @@ -2008,7 +2261,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 @@ -2019,28 +2314,48 @@ warn "reloading..."; - local $FREEZE = 1; + 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$/; @@ -2057,40 +2372,32 @@ 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; }; if ($@) { @@ -2099,7 +2406,7 @@ exit 1; } - warn "reloaded successfully"; + warn "reloaded"; }; ############################################################################# @@ -2116,7 +2423,7 @@ # dirty hack because... archetypes are not yet loaded Event->timer ( - after => 2, + after => 10, cb => sub { $_[0]->w->cancel; @@ -2145,8 +2452,6 @@ $cf::MAP{$LINK_MAP->path} = $LINK_MAP; } -register "", __PACKAGE__; - register_command "reload" => sub { my ($who, $arg) = @_; @@ -2165,13 +2470,15 @@ at => $NEXT_TICK || $TICK, data => WF_AUTOCANCEL, cb => sub { - unless ($FREEZE) { - cf::server_tick; # one server iteration - $RUNTIME += $TICK; - } + $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;