Changeset 1232

Timestamp:

Oct 23, 2010, 4:06:06 PM (11 years ago)

Author:

Peter Johansson

Message:

refs #476. Reset stats when it's no longer needed (to save
memory). Added a new class TinyStats? that holds information about the
latest revision and is created from the CollectionStats?.

Location:

branches/visitor/lib

Files:

• CopyrightVisitor.cc (modified) (1 diff)
• Directory.cc (modified) (3 diffs)
• Directory.h (modified) (1 diff)
• File.cc (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Node.cc (modified) (5 diffs)
• Node.h (modified) (5 diffs)
• SvndigestVisitor.cc (modified) (2 diffs)
• TinyStats.cc (added)
• TinyStats.h (added)

branches/visitor/lib/CopyrightVisitor.cc

@@ -57 +57 @@
     file.parse(verbose_, ignore_cache_);
     file.print_copyright(alias_, verbose_, year2rev_);
+    file.stats().reset();
   }
 

branches/visitor/lib/Directory.cc

@@ -30 +30 @@
 #include "SVN.h"
 #include "SVNlog.h"
+#include "TinyStats.h"
 #include "utility.h"
 
@@ -101 +102 @@
 
 
-  bool Directory::dir(void) const
-  {
-    return true;
-  }
-
-
   void Directory::gather_stats(void)
   {
     stats_.reset();
     for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); ++i)
-      if (!(*i)->ignore())
+      if (!(*i)->ignore()) {
         stats_ += (*i)->stats();
+        (*i)->stats().reset();
+      }
+  }
+
+
+  bool Directory::dir(void) const
+  {
+    return true;
   }
 
@@ -151 +154 @@
   {
     stats_.reset();
+    assert(0 && "we are not using this function, are we?");
     /*
     for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); ++i)

branches/visitor/lib/Directory.h

@@ -61 +61 @@
     ~Directory(void);
 
+    /**
+       Collect stats from daughter nodes and reset stats in daughter
+       nodes.
+     */
+    void collect_stats(void);
+
     ///
     /// @return true
     ///
     bool dir(void) const;
-
-    /**
-       Collect stats from daughter nodes.
-     */
-    void gather_stats(void);
 
     ///

branches/visitor/lib/File.cc

@@ -34 +34 @@
 #include "SVNblame.h"
 #include "SVNlog.h"
+#include "TinyStats.h"
 
 #include <algorithm>

branches/visitor/lib/Makefile.am

@@ -39 +39 @@
   Stats.h StatsCollection.h subversion_info.h \
   SvndigestVisitor.h SVN.h SVNblame.h \
-  SVNdiff.h SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h Vector.h
+  SVNdiff.h SVNinfo.h SVNlog.h SVNproperty.h TinyStats.h \
+  Trac.h utility.h Vector.h
 
 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
@@ -50 +51 @@
   rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \
   SVNblame.cc SVNdiff.cc SvndigestVisitor.cc SVNinfo.cc \
-  SVNlog.cc SVNproperty.cc \
+  SVNlog.cc SVNproperty.cc TinyStats.cc \
   Trac.cc utility.cc Vector.cc
 

branches/visitor/lib/Node.cc

@@ -27 +27 @@
 #include "HtmlStream.h"
 #include "html_utility.h"
+#include "LineTypeParser.h"
 #include "SVNlog.h"
 #include "SVNproperty.h"
@@ -95 +96 @@
                            const std::string& user) const
   {
-    const Stats& stats = stats_[stats_type];
     os << "<tr class=\"" << css_class << "\">\n"
        << "<td class=\"" << node_type() << "\">";
@@ -105 +105 @@
       os << name() << " (<i>link</i>)";
     // there is no output for nodes when user has zero contribution
-    else if (user!="all" && !stats.lines(user))
+    else if (user!="all" && !tiny_stats_(stats_type,user,LineTypeParser::total))
       os << name();
     else if (!Configuration::instance().output_file() && !this->dir())
@@ -112 +112 @@
       os << anchor(href(), name()); 
     os << "</td>\n"; 
-    if (user=="all") {
-      os << "<td>" << stats.lines() << "</td>\n"
-         << "<td>" << stats.code() << "</td>\n"
-         << "<td>" << stats.comments() << "</td>\n"
-         << "<td>" << stats.empty() << "</td>\n";
-    }
-    else {
-      os << "<td>" << stats.lines(user); 
-      if (stats.lines(user)) 
-        os << " (" << percent(stats.lines(user),stats.lines()) << "%)"; 
-      os << "</td>\n";
-      os << "<td>" << stats.code(user); 
-      if (stats.code(user)) 
-        os << " (" << percent(stats.code(user),stats.code()) << "%)"; 
-      os << "</td>\n";
-      os << "<td>" << stats.comments(user); 
-      if (stats.comments(user)) 
-        os << " (" << percent(stats.comments(user),stats.comments()) << "%)"; 
-      os << "</td>\n";
-      os << "<td>" << stats.empty(user); 
-      if (stats.empty(user)) 
-        os << " (" << percent(stats.empty(user),stats.empty()) << "%)"; 
-      os << "</td>\n";
-
-    }
-
+
+    std::cerr << "table row: " << path() << std::endl;
+
+    html_tabletd(os, stats_type, user, LineTypeParser::total);
+    html_tabletd(os, stats_type, user, LineTypeParser::code);
+    html_tabletd(os, stats_type, user, LineTypeParser::comment);
+    html_tabletd(os, stats_type, user, LineTypeParser::other);
+    
     os << "<td>" << trac_revision(last_changed_rev()) << "</td>\n"
        << "<td>" << author() << "</td>\n"
        << "</tr>\n";
+  }
+
+
+  void Node::html_tabletd(std::ostream& os, const std::string& stats_type, 
+                          const std::string& user, 
+                          LineTypeParser::line_type lt) const
+  {
+    os << "<td>" << tiny_stats_(stats_type, user, lt); 
+    if (user!="all" && tiny_stats_(stats_type, user, lt)) 
+      os << " (" << percent(tiny_stats_(stats_type, user, lt), 
+                            tiny_stats_(stats_type, "all", lt)) << "%)"; 
+    os << "</td>\n";
+  }
+  
+
+  void Node::init_tiny_stats(void)
+  {
+    tiny_stats_.init(stats_);
   }
 
@@ -333 +333 @@
 
 
+  StatsCollection& Node::stats(void)
+  {
+    return stats_;
+  }
+
+
   bool Node::svncopyright_ignore(void) const
   {

branches/visitor/lib/Node.h

@@ -26 +26 @@
 
 #include "html_utility.h"
+#include "LineTypeParser.h"
 #include "StatsCollection.h"
 #include "SVNinfo.h"
 #include "SVNlog.h"
+#include "TinyStats.h"
 #include "utility.h"
 
@@ -109 +111 @@
     { return binary_ || svndigest_ignore_ || link_; }
 
+    /**
+       Create the TinyStats based on the stored CollectionStats
+     */
+    void init_tiny_stats(void);
+
     ///
     /// @brief Get the revision number of the latest commit.
@@ -203 +210 @@
      */
     const StatsCollection& stats(void) const;
+
+    StatsCollection& stats(void);
 
     /**
@@ -228 +237 @@
     static std::string project_;
     StatsCollection stats_;
+    TinyStats tiny_stats_;
 
   private:
@@ -234 +244 @@
     ///
     Node(const Node&);
+
+    void html_tabletd(std::ostream&, const std::string& stats_type, 
+                      const std::string& user, 
+                      LineTypeParser::line_type lt) const;
 
     virtual void log_core(SVNlog&) const=0;

branches/visitor/lib/SvndigestVisitor.cc

@@ -46 +46 @@
   {
     if (report_) {
-      dir.gather_stats();
+      dir.collect_stats();
+      dir.init_tiny_stats();
       dir.print(verbose_);
     }
@@ -54 +55 @@
   void SvndigestVisitor::visit(File& file)
   {
-    if (file.ignore())
-      return;
-    file.parse(verbose_, ignore_cache_);
-    if (report_)
-      file.print(verbose_);
+    if (!file.ignore())
+      file.parse(verbose_, ignore_cache_);
+    if (report_) {
+      file.init_tiny_stats();
+      if (!file.ignore())
+        file.print(verbose_);
+    }
   }