From 5a1b9ed0aa3a0c240b667dbe504b61b2b68e4d16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 15 Dec 2011 16:19:53 +0000
Subject: * Refactoring: move sink/source buffering into separate classes. *
 Buffer the HashSink.  This speeds up hashing a bit because it   prevents lots
 of calls to the hash update functions (e.g. nix-hash   went from 9.3s to 8.7s
 of user time on the closure of my   /var/run/current-system).

---
 src/libstore/local-store.cc  | 9 +++------
 src/libstore/references.cc   | 4 ++--
 src/libstore/remote-store.cc | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/libstore')

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 5107a93de299..525e5fc7bbe3 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1103,16 +1103,14 @@ struct HashAndWriteSink : Sink
     HashAndWriteSink(Sink & writeSink) : writeSink(writeSink), hashSink(htSHA256)
     {
     }
-    virtual void operator ()
-        (const unsigned char * data, unsigned int len)
+    virtual void operator () (const unsigned char * data, size_t len)
     {
         writeSink(data, len);
         hashSink(data, len);
     }
     Hash currentHash()
     {
-        HashSink hashSinkClone(hashSink);
-        return hashSinkClone.finish().first;
+        return hashSink.currentHash().first;
     }
 };
 
@@ -1201,8 +1199,7 @@ struct HashAndReadSource : Source
     {
         hashing = true;
     }
-    virtual void operator ()
-        (unsigned char * data, unsigned int len)
+    virtual void operator () (unsigned char * data, size_t len)
     {
         readSource(data, len);
         if (hashing) hashSink(data, len);
diff --git a/src/libstore/references.cc b/src/libstore/references.cc
index ade9c9aa20e3..c1f9e3ba7711 100644
--- a/src/libstore/references.cc
+++ b/src/libstore/references.cc
@@ -57,11 +57,11 @@ struct RefScanSink : Sink
 
     RefScanSink() : hashSink(htSHA256) { }
     
-    void operator () (const unsigned char * data, unsigned int len);
+    void operator () (const unsigned char * data, size_t len);
 };
 
 
-void RefScanSink::operator () (const unsigned char * data, unsigned int len)
+void RefScanSink::operator () (const unsigned char * data, size_t len)
 {
     hashSink(data, len);
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 8269b6a83168..7bf0ad7bd4c7 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -374,7 +374,7 @@ Path RemoteStore::importPath(bool requireSignature, Source & source)
     openConnection();
     writeInt(wopImportPath, to);
     /* We ignore requireSignature, since the worker forces it to true
-       anyway. */    
+       anyway. */
     processStderr(0, &source);
     return readStorePath(from);
 }
-- 
cgit 1.4.1