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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

 our @EVENT;
 our @REFLECT; # set by XS
 our %REFLECT; # set by us
 our $CONFDIR     = confdir;
 our $DATADIR     = datadir;
 our $LIBDIR      = "$DATADIR/ext";
 our $PODDIR      = "$DATADIR/pod";
 our $MAPDIR      = "$DATADIR/" . mapdir;
 our $LOCALDIR    = localdir;
 our $TMPDIR      = "$LOCALDIR/" . tmpdir;
 our $UNIQUEDIR   = "$LOCALDIR/" . uniquedir;
 our $PLAYERDIR   = "$LOCALDIR/" . playerdir;
 our $RANDOMDIR   = "$LOCALDIR/random";
 =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.
    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) if $pl->ns;
    ext::highscore::check ($pl->ob);
-   $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;
 sub generate_random_map {
    my ($self, $rmp) = @_;
    my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
-   # mit "rum" bekleckern, nicht
-   $self->_create_random_map (
+   $self->_create_random_map ($rmp);
-      $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
-      $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
-      $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
-      $rmp->{exit_on_final_map},
-      $rmp->{xsize}, $rmp->{ysize},
-      $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
-      $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
-      $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}), $rmp->{custom}
-   )
 }
 =item cf::map->register ($regex, $prio)
 Register a handler for the map path matching the given regex at the
       $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
          cf::face::set_visibility $idx, $info->{visibility};
          cf::face::set_magicmap   $idx, $info->{magicmap};
          cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
+         cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
          cf::cede_to_tick;
       }
       while (my ($face, $info) = each %$faces) {
       # 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() {
    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.548 by root, Mon May 10 21:40:22 2010 UTC vs. Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC