Changeset 759

Timestamp:

Jan 29, 2009, 12:51:35 PM (15 years ago)

Author:

Peter Johansson

Message:

Change container in SVNlog to be std::set<Commitment>, in order to
avoid copying in SVNlog::operator+=. Previously we had vector, but the
index had no meaning, in other words, the random access was not used.

refs #74

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/Node.cc (modified) (3 diffs)
• lib/SVNlog.cc (modified) (6 diffs)
• lib/SVNlog.h (modified) (5 diffs)
• lib/first_page.cc (modified) (4 diffs)

trunk/bin/svndigest.cc

@@ -166 +166 @@
       std::vector<std::string> dates;
       dates.reserve(log.commits().size());
-      for (size_t i=0; i<log.commits().size(); ++i) {
-        assert(static_cast<svn_revnum_t>(i)==log.commits()[i].revision());
-        dates.push_back(log.commits()[i].date());
+      size_t rev = 0;
+      for (SVNlog::container::const_iterator iter=log.commits().begin();
+           iter!=log.commits().end(); ++iter) {
+        assert(static_cast<svn_revnum_t>(rev)==iter->revision());
+        assert(++rev);
+        dates.push_back(iter->date());
       }
-      GnuplotFE::instance()->set_dates(dates);
     }
     if (chdir(option->targetdir().c_str()) ) {

trunk/lib/Node.cc

@@ -78 +78 @@
       return svninfo_.last_changed_author(); 
     assert(log().commits().size());
-    return log().commits().back().author();
+    return log().latest_commit().author();
   }
 
@@ -145 +145 @@
       return svninfo_.last_changed_rev();
     assert(log().commits().size());
-    return log().commits().back().revision();
+    return log().latest_commit().revision();
   }
 
@@ -318 +318 @@
     std::map<int, svn_revnum_t> year2rev;
     SVNlog log(path());
-    typedef std::vector<Commitment>::const_iterator LogIterator;
-    for (LogIterator i=log.commits().begin(); i<log.commits().end(); ++i){
+    typedef SVNlog::container::const_iterator LogIterator;
+    for (LogIterator i=log.commits().begin(); i!=log.commits().end(); ++i){
       time_t sec = str2time(i->date());
       tm* timeinfo = gmtime(&sec);

trunk/lib/SVNlog.cc

@@ -30 +30 @@
 #include <sstream>
 #include <string>
-#include <vector>
 
 namespace theplu {
@@ -56 +55 @@
   {
     
-    std::vector<Commitment>::const_reverse_iterator iter = commits().rbegin();
+    SVNlog::container::const_reverse_iterator iter = commits().rbegin();
     for ( ; iter!= commits().rend(); ++iter)
       if (iter->author() == name)
@@ -67 +66 @@
   {
     assert(commits().size());
-    return commits().back();
+    return *commits().rbegin();
   }
 
@@ -73 +72 @@
   const Commitment& SVNlog::latest_commit(std::string name) const
   {
-    std::vector<Commitment>::const_reverse_iterator iter = commits().rbegin();
+    SVNlog::container::const_reverse_iterator iter = commits().rbegin();
     for ( ; iter!= commits().rend(); ++iter)
       if (iter->author() == name)
@@ -100 +99 @@
     if (msg)
       message = msg;
-    lb->commits.push_back(Commitment(a, date, message, rev));
+    lb->commits.insert(lb->commits.end(), Commitment(a, date, message, rev));
     return SVN_NO_ERROR;
   }
@@ -113 +112 @@
   SVNlog& operator+=(SVNlog& lhs, const SVNlog& rhs)
   {
-    SVNlog log;
-    log.commits().reserve(std::max(lhs.commits().size(), rhs.commits().size()));
-    std::set_union(lhs.commits().begin(), lhs.commits().end(),
-                   rhs.commits().begin(), rhs.commits().end(),
-                   std::back_inserter(log.commits()), LessRevision());
-    lhs.swap(log);
+    lhs.commits().insert(rhs.commits().begin(), rhs.commits().end());
     return lhs;
   }

trunk/lib/SVNlog.h

@@ -28 +28 @@
 
 #include <string>
-#include <vector>
+#include <set>
 
 #include <subversion-1/svn_client.h>
@@ -44 +44 @@
   class SVNlog {
   public:
+    /**
+       container used to store log
+     */
+    typedef std::set<Commitment, LessRevision> container;
+
     /**
        Default constructor. Creates empty log.
@@ -65 +70 @@
        \return Commitments
     */
-    inline const std::vector<Commitment>& commits(void) const
+    inline const container& commits(void) const
     { return lb_.commits; }
 
@@ -71 +76 @@
        \return Commitments
     */
-    inline std::vector<Commitment>& commits(void)
+    inline container& commits(void)
     { return lb_.commits; }
 
@@ -110 +115 @@
     */
     struct log_receiver_baton {
-      std::vector<Commitment> commits;
+      container commits;
     } lb_;
 

trunk/lib/first_page.cc

@@ -84 +84 @@
   { 
     assert(log.commits().size());
-    Date begin(log.commits()[0].date());
-    Date end(log.commits().back().date());
+    Date begin(log.commits().begin()->date());    
+    Date end(log.latest_commit().date());
     std::string timefmt("%a %b %e %H:%M:%S %Y");
 
@@ -102 +102 @@
     os << end.difftime(begin);
     os << "</td></tr>\n"
-       << "<tr><td>Smallest Revision:</td><td>" << log.commits()[0].revision() 
-       << "</td></tr>\n"
-       << "<tr><td>Largest Revision:</td><td>" <<log.commits().back().revision() 
+       << "<tr><td>Smallest Revision:</td><td>" 
+       << log.commits().begin()->revision() 
+       << "</td></tr>\n"
+       << "<tr><td>Largest Revision:</td><td>" << log.latest_commit().revision() 
        << "</td></tr>\n"
        << "<tr><td>Revision Count:</td><td>" << log.commits().size() 
@@ -175 +176 @@
     const size_t maxlength = 80;
     const Configuration& conf = Configuration::instance();
-    typedef std::vector<Commitment>::const_reverse_iterator iter;
+    typedef SVNlog::container::const_reverse_iterator iter;
+    size_t count = 0;
     for (iter i=log.commits().rbegin(); 
-         i < std::min(log.commits().rbegin()+10,log.commits().rend()); ++i) {
+         i != log.commits().rend() && count<10; ++i) {
       os << "<tr><td>" 
          << anchor(std::string("classic/")+i->author()+"/total/index.html",
@@ -216 +218 @@
 
       os << "</td></tr>\n";
+      ++count;
     }
     os << "</table></div>\n";