Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/InputFileReader.cpp

1 files changed, 47 insertions, 35 deletions

diff --git a/src/Flowgraph.cpp b/src/Flowgraph.cpp
index dd9c68b..3844e86 100644
--- a/src/Flowgraph.cpp
+++ b/src/Flowgraph.cpp
@@ -1,6 +1,11 @@
 /*
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty
    the Queen in Right of Canada (Communications Research Center Canada)
+
+   Copyright (C) 2015
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+    http://opendigitalradio.org
  */
 /*
    This file is part of ODR-DabMod.
@@ -38,16 +43,18 @@
 #include <sys/time.h>
 #endif
 
+using namespace boost;
 
-typedef std::vector<Node*>::iterator NodeIterator;
-typedef std::vector<Edge*>::iterator EdgeIterator;
+typedef std::vector<shared_ptr<Node> >::iterator NodeIterator;
+typedef std::vector<shared_ptr<Edge> >::iterator EdgeIterator;
 
 
-Node::Node(ModPlugin* plugin) :
+Node::Node(shared_ptr<ModPlugin> plugin) :
     myPlugin(plugin),
     myProcessTime(0)
 {
-    PDEBUG("Node::Node(plugin(%s): %p) @ %p\n", plugin->name(), plugin, this);
+    PDEBUG("Node::Node(plugin(%s): %p) @ %p\n",
+            plugin->name(), plugin.get(), this);
 
 }
 
@@ -56,24 +63,21 @@ Node::~Node()
 {
     PDEBUG("Node::~Node() @ %p\n", this);
 
-    if (myPlugin != NULL) {
-        delete myPlugin;
-    }
     assert(myInputBuffers.size() == 0);
     assert(myOutputBuffers.size() == 0);
 }
 
 
-Edge::Edge(Node* srcNode, Node* dstNode) :
+Edge::Edge(shared_ptr<Node>& srcNode, shared_ptr<Node>& dstNode) :
     mySrcNode(srcNode),
     myDstNode(dstNode)
 {
     PDEBUG("Edge::Edge(srcNode(%s): %p, dstNode(%s): %p) @ %p\n",
-            srcNode->plugin()->name(), srcNode,
-            dstNode->plugin()->name(), dstNode,
+            srcNode->plugin()->name(), srcNode.get(),
+            dstNode->plugin()->name(), dstNode.get(),
             this);
 
-    myBuffer = new Buffer();
+    myBuffer = shared_ptr<Buffer>(new Buffer());
     srcNode->myOutputBuffers.push_back(myBuffer);
     dstNode->myInputBuffers.push_back(myBuffer);
 }
@@ -83,7 +87,7 @@ Edge::~Edge()
 {
     PDEBUG("Edge::~Edge() @ %p\n", this);
 
-    std::vector<Buffer*>::iterator buffer;
+    std::vector<shared_ptr<Buffer> >::iterator buffer;
     if (myBuffer != NULL) {
         for (buffer = mySrcNode->myOutputBuffers.begin();
                 buffer != mySrcNode->myOutputBuffers.end();
@@ -102,7 +106,6 @@ Edge::~Edge()
                 break;
             }
         }
-        delete myBuffer;
     }
 }
 
@@ -110,9 +113,26 @@ Edge::~Edge()
 int Node::process()
 {
     PDEBUG("Edge::process()\n");
-    PDEBUG(" Plugin name: %s (%p)\n", myPlugin->name(), myPlugin);
+    PDEBUG(" Plugin name: %s (%p)\n", myPlugin->name(), myPlugin.get());
+
+    // the plugin process() still wants vector<Buffer*>
+    // arguments.
+    std::vector<Buffer*> inBuffers;
+    std::vector<shared_ptr<Buffer> >::iterator buffer;
+    for (buffer = myInputBuffers.begin();
+         buffer != myInputBuffers.end();
+         ++buffer) {
+        inBuffers.push_back(buffer->get());
+    }
 
-    return myPlugin->process(myInputBuffers, myOutputBuffers);
+    std::vector<Buffer*> outBuffers;
+    for (buffer = myOutputBuffers.begin();
+         buffer != myOutputBuffers.end();
+         ++buffer) {
+        outBuffers.push_back(buffer->get());
+    }
+
+    return myPlugin->process(inBuffers, outBuffers);
 }
 
 
@@ -128,35 +148,26 @@ Flowgraph::~Flowgraph()
 {
     PDEBUG("Flowgraph::~Flowgraph() @ %p\n", this);
 
-    std::vector<Edge*>::const_iterator edge;
-    for (edge = edges.begin(); edge != edges.end(); ++edge) {
-        delete *edge;
-    }
-
     if (myProcessTime) {
         fprintf(stderr, "Process time:\n");
-    }
-    std::vector<Node*>::const_iterator node;
-    for (node = nodes.begin(); node != nodes.end(); ++node) {
-        if (myProcessTime) {
+
+        std::vector<shared_ptr<Node> >::const_iterator node;
+        for (node = nodes.begin(); node != nodes.end(); ++node) {
             fprintf(stderr, "  %30s: %10u us (%2.2f %%)\n",
                     (*node)->plugin()->name(),
                     (unsigned)(*node)->processTime(),
                     (*node)->processTime() * 100.0 / myProcessTime);
         }
-        delete *node;
-    }
-    if (myProcessTime) {
+
         fprintf(stderr, "  %30s: %10u us (100.00 %%)\n", "total",
                 (unsigned)myProcessTime);
     }
 }
 
-
-void Flowgraph::connect(ModPlugin* input, ModPlugin* output)
+void Flowgraph::connect(shared_ptr<ModPlugin> input, shared_ptr<ModPlugin> output)
 {
     PDEBUG("Flowgraph::connect(input(%s): %p, output(%s): %p)\n",
-            input->name(), input, output->name(), output);
+            input->name(), input.get(), output->name(), output.get());
 
     NodeIterator inputNode;
     NodeIterator outputNode;
@@ -167,7 +178,7 @@ void Flowgraph::connect(ModPlugin* input, ModPlugin* output)
         }
     }
     if (inputNode == nodes.end()) {
-        inputNode = nodes.insert(nodes.end(), new Node(input));
+        inputNode = nodes.insert(nodes.end(), shared_ptr<Node>(new Node(input)));
     }
 
     for (outputNode = nodes.begin(); outputNode != nodes.end(); ++outputNode) {
@@ -176,14 +187,14 @@ void Flowgraph::connect(ModPlugin* input, ModPlugin* output)
         }
     }
     if (outputNode == nodes.end()) {
-        outputNode = nodes.insert(nodes.end(), new Node(output));
+        outputNode = nodes.insert(nodes.end(), shared_ptr<Node>(new Node(output)));
         for (inputNode = nodes.begin(); inputNode != nodes.end(); ++inputNode) {
             if ((*inputNode)->plugin() == input) {
                 break;
             }
         }
     } else if (inputNode > outputNode) {
-        Node* node = *outputNode;
+        shared_ptr<Node> node = *outputNode;
         nodes.erase(outputNode);
         outputNode = nodes.insert(nodes.end(), node);
         for (inputNode = nodes.begin(); inputNode != nodes.end(); ++inputNode) {
@@ -196,7 +207,7 @@ void Flowgraph::connect(ModPlugin* input, ModPlugin* output)
     assert((*inputNode)->plugin() == input);
     assert((*outputNode)->plugin() == output);
 
-    edges.push_back(new Edge(*inputNode, *outputNode));
+    edges.push_back(shared_ptr<Edge>(new Edge(*inputNode, *outputNode)));
 }
 
 
@@ -204,7 +215,7 @@ bool Flowgraph::run()
 {
     PDEBUG("Flowgraph::run()\n");
 
-    std::vector<Node*>::const_iterator node;
+    std::vector<shared_ptr<Node> >::const_iterator node;
     timeval start, stop;
     time_t diff;
 
@@ -224,3 +235,4 @@ bool Flowgraph::run()
     }
     return true;
 }
+