From d17c32c28ca3a3810fde93889bfbdc5133ab1bf3 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 30 May 2015 17:33:13 +0200
Subject: Use shared_ptr in FIRFilter

---
 src/FIRFilter.cpp | 21 ++++++++++-----------
 src/FIRFilter.h   |  7 ++++---
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/FIRFilter.cpp b/src/FIRFilter.cpp
index 805c6d2..b1ce618 100644
--- a/src/FIRFilter.cpp
+++ b/src/FIRFilter.cpp
@@ -36,6 +36,8 @@
 #include <iostream>
 #include <fstream>
 
+#include <boost/make_shared.hpp>
+
 #ifdef __AVX__
 #   include <immintrin.h>
 #else
@@ -58,11 +60,10 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd)
     // the incoming buffer
 
     while(running) {
-        Buffer* dataIn;
+        boost::shared_ptr<Buffer> dataIn;
         fwd->input_queue.wait_and_pop(dataIn);
 
-        Buffer* dataOut;
-        dataOut = new Buffer();
+        boost::shared_ptr<Buffer> dataOut = boost::make_shared<Buffer>();
         dataOut->setLength(dataIn->getLength());
 
         PDEBUG("FIRFilterWorker: dataIn->getLength() %zu\n", dataIn->getLength());
@@ -91,7 +92,7 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd)
             fprintf(stderr, "FIRFilterWorker: out not aligned %p ", out);
             throw std::runtime_error("FIRFilterWorker: out not aligned");
         }
-            
+
         clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time_start);
 
         __m256 AVXout;
@@ -141,7 +142,7 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd)
             fprintf(stderr, "FIRFilterWorker: out not aligned %p ", out);
             throw std::runtime_error("FIRFilterWorker: out not aligned");
         }
-            
+
         clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time_start);
 
         __m128 SSEout;
@@ -290,11 +291,10 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd)
             }
         }
 #endif
-        
+
         calculationTime += (time_end.tv_sec - time_start.tv_sec) * 1000000000L +
             time_end.tv_nsec - time_start.tv_nsec;
         fwd->output_queue.push(dataOut);
-        delete dataIn;
     }
 }
 
@@ -393,17 +393,16 @@ int FIRFilter::process(Buffer* const dataIn, Buffer* dataOut)
     // This thread creates the dataIn buffer, and deletes
     // the outgoing buffer
 
-    Buffer* inbuffer = new Buffer(dataIn->getLength(), dataIn->getData());
+    boost::shared_ptr<Buffer> inbuffer =
+        boost::make_shared<Buffer>(dataIn->getLength(), dataIn->getData());
 
     firwd.input_queue.push(inbuffer);
 
     if (number_of_runs > 2) {
-        Buffer* outbuffer;
+        boost::shared_ptr<Buffer> outbuffer;
         firwd.output_queue.wait_and_pop(outbuffer);
 
         dataOut->setData(outbuffer->getData(), outbuffer->getLength());
-
-        delete outbuffer;
     }
     else {
         dataOut->setLength(dataIn->getLength());
diff --git a/src/FIRFilter.h b/src/FIRFilter.h
index 0ecae3e..05627d4 100644
--- a/src/FIRFilter.h
+++ b/src/FIRFilter.h
@@ -30,6 +30,7 @@
 #endif
 
 #include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
 #include "ThreadsafeQueue.h"
 
 #include "RemoteControl.h"
@@ -52,8 +53,8 @@ struct FIRFilterWorkerData {
     /* Thread-safe queues to give data to and get data from
      * the worker
      */
-    ThreadsafeQueue<Buffer*> input_queue;
-    ThreadsafeQueue<Buffer*> output_queue;
+    ThreadsafeQueue<boost::shared_ptr<Buffer> > input_queue;
+    ThreadsafeQueue<boost::shared_ptr<Buffer> > output_queue;
 
     /* Remote-control can change the taps while the filter
      * runs. This lock makes sure nothing bad happens when
@@ -127,5 +128,5 @@ protected:
     struct FIRFilterWorkerData firwd;
 };
 
-
 #endif //FIRFILTER_H
+
-- 
cgit v1.2.3