Shrink ChunkedSigningPipe from 240 to 232 bytes

diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 0240b8edc26b4fca0c9311d40fd34c03bb9a2450..e3f4f634d9e48ac2b5e9009616ae13096d96be9f 100644 (file)
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -71,8 +71,8 @@ catch(...) {
 }
 
 ChunkedSigningPipe::ChunkedSigningPipe(const string& signerName, bool mustSign, const string& servers, unsigned int workers)
-  : d_queued(0), d_outstanding(0), d_signer(signerName), d_maxchunkrecords(100), d_numworkers(workers), d_tids(d_numworkers),
-    d_mustSign(mustSign), d_final(false), d_submitted(0)
+  : d_queued(0), d_outstanding(0), d_numworkers(workers), d_submitted(0), d_signer(signerName),
+    d_maxchunkrecords(100), d_tids(d_numworkers), d_mustSign(mustSign), d_final(false)
 {
   d_rrsetToSign = new rrset_t;
   d_chunks.push_back(vector<DNSResourceRecord>()); // load an empty chunk

diff --git a/pdns/signingpipe.hh b/pdns/signingpipe.hh
index 8cb5a2bf31476600b3f61f9b7f81e4533451dece..b7f906477f0aaf14884c83c3f2b58cba05abc596 100644 (file)
--- a/pdns/signingpipe.hh
+++ b/pdns/signingpipe.hh
@@ -23,8 +23,9 @@ public:
   ~ChunkedSigningPipe();
   bool submit(const DNSResourceRecord& rr);
   chunk_t getChunk(bool final=false);
-  int d_queued;
+
   AtomicCounter d_signed;
+  int d_queued;
   int d_outstanding;
   unsigned int getReady();
 private:
@@ -37,6 +38,10 @@ private:
   void worker(int n, int fd);
   
   static void* helperWorker(void* p);
+
+  unsigned int d_numworkers;
+  int d_submitted;
+
   rrset_t* d_rrsetToSign;
   std::deque< std::vector<DNSResourceRecord> > d_chunks;
   string d_signer;
@@ -45,11 +50,9 @@ private:
   
   std::vector<int> d_sockets;
   std::set<int> d_eof;
-  unsigned int d_numworkers;
   vector<pthread_t> d_tids;
   bool d_mustSign;
   bool d_final;
-  int d_submitted;
 };
 
 #endif