Merge pull request #7945 from pieterlexis/syncres-CNAME-cache-cleanup

[thirdparty/pdns.git] / pdns / signingpipe.hh

diff --git a/pdns/signingpipe.hh b/pdns/signingpipe.hh
index 99884982cafd46884c9a12de3f1ced1c57a3ac66..06b53b67783bb850886e9499f48dd768b62cd48b 100644 (file)
--- a/pdns/signingpipe.hh
+++ b/pdns/signingpipe.hh
@@ -21,34 +21,38 @@
  */
 #ifndef PDNS_SIGNINGPIPE
 #define PDNS_SIGNINGPIPE
-#include <vector>
-#include <pthread.h>
 #include <stdio.h>
+#include <thread>
+#include <vector>
+
 #include "dnsseckeeper.hh"
 #include "dns.hh"
 
 void writeLStringToSocket(int fd, const string& msg);
 bool readLStringFromSocket(int fd, string& msg);
 
-/** input: DNSResourceRecords ordered in qname,qtype (we emit a signature chunk on a break)
- *  output: "chunks" of those very same DNSResourceRecords, interleaved with signatures
+/** input: DNSZoneRecords ordered in qname,qtype (we emit a signature chunk on a break)
+ *  output: "chunks" of those very same DNSZoneRecords, interleaved with signatures
  */
 
 class ChunkedSigningPipe
 {
 public:
-  typedef vector<DNSResourceRecord> rrset_t; 
+  typedef vector<DNSZoneRecord> rrset_t; 
   typedef rrset_t chunk_t; // for now
   
-  ChunkedSigningPipe(const DNSName& signerName, bool mustSign, /* FIXME servers is unused? */ const string& servers=string(), unsigned int numWorkers=3);
+  ChunkedSigningPipe(const ChunkedSigningPipe&) = delete;
+  void operator=(const ChunkedSigningPipe&) = delete;
+  ChunkedSigningPipe(const DNSName& signerName, bool mustSign, unsigned int numWorkers=3);
   ~ChunkedSigningPipe();
-  bool submit(const DNSResourceRecord& rr);
+  bool submit(const DNSZoneRecord& rr);
   chunk_t getChunk(bool final=false);
+  unsigned int getReady() const;
 
   std::atomic<unsigned long> d_signed;
-  int d_queued;
-  int d_outstanding;
-  unsigned int getReady();
+  unsigned int d_queued;
+  unsigned int d_outstanding;
+
 private:
   void flushToSign();  
   void dedupRRSet();
@@ -56,22 +60,23 @@ private:
   void addSignedToChunks(chunk_t* signedChunk);
   pair<vector<int>, vector<int> > waitForRW(bool rd, bool wr, int seconds);
 
-  void worker(int n, int fd);
-  
-  static void* helperWorker(void* p);
+  static void* helperWorker(ChunkedSigningPipe* csp, int fd);
+  void worker(int fd);
 
   unsigned int d_numworkers;
-  int d_submitted;
+  unsigned int d_submitted;
 
   rrset_t* d_rrsetToSign;
-  std::deque< std::vector<DNSResourceRecord> > d_chunks;
+  std::deque< std::vector<DNSZoneRecord> > d_chunks;
   DNSName d_signer;
   
   chunk_t::size_type d_maxchunkrecords;
   
   std::vector<int> d_sockets;
   std::set<int> d_eof;
-  vector<pthread_t> d_tids;
+  std::map<int,int> d_outstandings;
+
+  vector<std::thread> d_threads;
   bool d_mustSign;
   bool d_final;
 };