[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC

 from wherever your confdir points to.
 =item cf::wait_for_tick, cf::wait_for_tick_begin
 These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
-returns directly I<after> the tick processing (and consequently, can only wake one process
+returns directly I<after> the tick processing (and consequently, can only wake one thread
 per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
+=cut
+sub wait_for_tick();
+sub wait_for_tick_begin();
 =item @cf::INVOKE_RESULTS
 This array contains the results of the last C<invoke ()> call. When
 C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
 our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 sub encode_json($) { $json_coder->encode ($_[0]) }
 sub decode_json($) { $json_coder->decode ($_[0]) }
+=item $ref = cf::yaml_load $scalar
+Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
+=cut
+sub fork_call(&@);
+sub yaml_load($) {
+   fork_call { YAML::XS::Load $_[0] } @_
+}
 =item cf::post_init { BLOCK }
 Execute the given codeblock, I<after> all extensions have been (re-)loaded,
 but I<before> the server starts ticking again.
-The cdoeblock will have a single boolean argument to indicate whether this
+The codeblock will have a single boolean argument to indicate whether this
 is a reload or not.
 =cut
 sub post_init(&) {
    push @POST_INIT, shift;
+}
+sub _post_init {
+   trace "running post_init jobs";
+   # run them in parallel...
+   my @join;
+   while () {
+      push @join, map &Coro::async ($_, 0), @POST_INIT;
+      @POST_INIT = ();
+      @join or last;
+      (pop @join)->join;
+   }
 }
 =item cf::lock_wait $string
 Wait until the given lock is available. See cf::lock_acquire.
    $EXT_CORO{$coro+0} = $coro;
    $coro
 }
-=item fork_call { }, $args
+=item fork_call { }, @args
 Executes the given code block with the given arguments in a seperate
 process, returning the results. Everything must be serialisable with
 Coro::Storable. May, of course, block. Note that the executed sub may
 never block itself or use any form of event handling.
 =cut
+sub post_fork {
+   reset_signals;
+}
 sub fork_call(&@) {
    my ($cb, @args) = @_;
    # we seemingly have to make a local copy of the whole thing,
    # otherwise perl prematurely frees the stuff :/
    # TODO: investigate and fix (likely this will be rather laborious)
    my @res = Coro::Util::fork_eval {
-      reset_signals;
+      cf::post_fork;
       &$cb
-   }, @args;
+   } @args;
    wantarray ? @res : $res[-1]
 }
 sub objinfo {
    my $name = $pl->ob->name;
    $pl->{deny_save} = 1;
    $pl->password ("*"); # this should lock out the player until we have nuked the dir
-   $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
+   $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
    $pl->deactivate;
    my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
-   $pl->invoke (cf::EVENT_PLAYER_QUIT);
+   $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
+   ext::highscore::check ($pl->ob);
    $pl->ns->destroy if $pl->ns;
    my $path = playerdir $pl;
    my $temp = "$path~$cf::RUNTIME~deleting~";
    aio_rename $path, $temp;
       $base =~ s{[^/]+/?$}{};
       $path = "$base/$path";
    }
    for ($path) {
-      redo if s{//}{/};
       redo if s{/\.?/}{/};
       redo if s{/[^/]+/\.\./}{/};
    }
    $path
       $self->in_memory (cf::MAP_ACTIVE);
    }
    $self->post_load;
+   1
 }
 # customize the map for a given player, i.e.
 # return the _real_ map. used by e.g. per-player
 # maps to change the path to ~playername/mappath
    my $enc = JSON::XS->new->utf8->canonical->relaxed;
    trace "loading facedata from $path\n";
-   my $facedata;
-   0 < aio_load $path, $facedata
+   0 < aio_load $path, my $facedata
       or die "$path: $!";
    $facedata = Coro::Storable::thaw $facedata;
    $facedata->{version} == 2
 sub reload_treasures {
    load_resource_file "$DATADIR/treasures"
       or die "unable to load treasurelists\n";
 }
-sub reload_exp {
-   cf::init_experience;
-}
 sub reload_sound {
    trace "loading sound config from $DATADIR/sound\n";
    0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
       or die "$DATADIR/sound $!";
 }
 sub reload_resources {
    trace "reloading resource files...\n";
-   reload_exp;
+   reload_exp_table;
+   reload_materials;
    reload_facedata;
    reload_sound;
    reload_archetypes;
    reload_regions;
    reload_treasures;
 }
 sub reload_config {
    trace "reloading config file...\n";
-   open my $fh, "<:utf8", "$CONFDIR/config"
+   0 < aio_load "$CONFDIR/config", my $config
-      or return;
+      or die "$CONFDIR/config: $!";
-   local $/;
+   utf8::decode $config;
-   *CFG = YAML::XS::Load scalar <$fh>;
+   *CFG = yaml_load $config;
    $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
    $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};
          $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
             and die "WARNING: m(un)lockall failed: $!\n";
       };
       warn $@ if $@;
    }
-   trace "finished reloading resource files\n";
 }
 sub pidfile() {
    sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
       or die "$PIDFILE: $!";
       cf::init_anim;
       cf::init_attackmess;
       cf::init_dynamic;
       cf::load_settings;
-      cf::load_materials;
       reload_resources;
       reload_config;
       db_init;
       # no (long-running) fork's whatsoever before this point(!)
       use POSIX ();
       POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
-      (pop @POST_INIT)->(0) while @POST_INIT;
+      cf::_post_init 0;
    };
    cf::object::thawer::errors_are_fatal 0;
    info "parse errors in files are no longer fatal from this point on.\n";
    my $t1 = AE::time;
    while ($RELOAD) {
       cf::get_slot 0.1, -1, "reload_perl";
-      info "reloading...";
+      info "perl_reload: reloading...";
-      trace "entering sync_job";
+      trace "perl_reload: entering sync_job";
       cf::sync_job {
          #cf::emergency_save;
-         trace "cancelling all extension coros";
+         trace "perl_reload: cancelling all extension coros";
          $_->cancel for values %EXT_CORO;
          %EXT_CORO = ();
-         trace "removing commands";
+         trace "perl_reload: removing commands";
          %COMMAND = ();
-         trace "removing ext/exti commands";
+         trace "perl_reload: removing ext/exti commands";
          %EXTCMD  = ();
          %EXTICMD = ();
-         trace "unloading/nuking all extensions";
+         trace "perl_reload: unloading/nuking all extensions";
          for my $pkg (@EXTS) {
             trace "... unloading $pkg";
             if (my $cb = $pkg->can ("unload")) {
                eval {
             trace "... clearing $pkg";
             clear_package $pkg;
          }
-         trace "unloading all perl modules loaded from $LIBDIR";
+         trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
          while (my ($k, $v) = each %INC) {
             next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
             trace "... unloading $k";
             delete $INC{$k};
             }
             clear_package $k;
          }
-         trace "getting rid of safe::, as good as possible";
+         trace "perl_reload: getting rid of safe::, as good as possible";
          clear_package "safe::$_"
             for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
-         trace "unloading cf.pm \"a bit\"";
+         trace "perl_reload: unloading cf.pm \"a bit\"";
          delete $INC{"cf.pm"};
          delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
          # don't, removes xs symbols, too,
          # and global variables created in xs
          #clear_package __PACKAGE__;
-         info "unload completed, starting to reload now";
+         info "perl_reload: unload completed, starting to reload now";
-         trace "reloading cf.pm";
+         trace "perl_reload: reloading cf.pm";
          require cf;
          cf::_connect_to_perl_1;
-         trace "loading config and database again";
+         trace "perl_reload: loading config and database again";
          cf::reload_config;
-         trace "loading extensions";
+         trace "perl_reload: loading extensions";
          cf::load_extensions;
          if ($REATTACH_ON_RELOAD) {
-            trace "reattaching attachments to objects/players";
+            trace "perl_reload: reattaching attachments to objects/players";
             _global_reattach; # objects, sockets
-            trace "reattaching attachments to maps";
+            trace "perl_reload: reattaching attachments to maps";
             reattach $_ for values %MAP;
-            trace "reattaching attachments to players";
+            trace "perl_reload: reattaching attachments to players";
             reattach $_ for values %PLAYER;
          }
-         trace "running post_init jobs";
+         cf::_post_init 1;
-         (pop @POST_INIT)->(1) while @POST_INIT;
-         trace "leaving sync_job";
+         trace "perl_reload: leaving sync_job";
          1
       } or do {
          error $@;
-         cf::cleanup "error while reloading, exiting.";
+         cf::cleanup "perl_reload: error, exiting.";
       };
-      info "reloaded";
       --$RELOAD;
    }
    $t1 = AE::time - $t1;
-   info "reload completed in ${t1}s\n";
+   info "perl_reload: completed in ${t1}s\n";
 };
 our $RELOAD_WATCHER; # used only during reload
 sub reload_perl() {
 my $bug_warning = 0;
 our @WAIT_FOR_TICK;
 our @WAIT_FOR_TICK_BEGIN;
-sub wait_for_tick {
+sub wait_for_tick() {
    return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
    $signal->wait;
 }
-sub wait_for_tick_begin {
+sub wait_for_tick_begin() {
    return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;
    $signal->wait;
    IO::AIO::min_parallel 8;
    IO::AIO::max_poll_time $TICK * 0.1;
    undef $AnyEvent::AIO::WATCHER;
 }
-my $_log_backtrace;
+our $_log_backtrace;
+our $_log_backtrace_last;
 sub _log_backtrace {
    my ($msg, @addr) = @_;
-   $msg =~ s/\n//;
+   $msg =~ s/\n$//;
+   if ($_log_backtrace_last eq $msg) {
+      LOG llevInfo, "[ABT] $msg\n";
+      LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
    # limit the # of concurrent backtraces
-   if ($_log_backtrace < 2) {
+   } elsif ($_log_backtrace < 2) {
+      $_log_backtrace_last = $msg;
       ++$_log_backtrace;
       my $perl_bt = Carp::longmess $msg;
       async {
          $Coro::current->{desc} = "abt $msg";
          LOG llevInfo, "[ABT] $_\n" for @bt;
          --$_log_backtrace;
       };
    } else {
       LOG llevInfo, "[ABT] $msg\n";
-      LOG llevInfo, "[ABT] [suppressed]\n";
+      LOG llevInfo, "[ABT] [overload, suppressed]\n";
    }
 }
 # load additional modules
 require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC vs. Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC