Merge pull request #1 from williamfgc/zmq

Valgrind check on Zmq

source/adios2/engine/dataman/DataManReader.h

@@ -47,26 +47,6 @@ private:
     transportman::DataMan m_Man;
 
     void Init();
-
-    template <class T>
-    Variable<T> *InquireVariableCommon(const std::string name,
-                                       const bool readIn)
-    {
-        // int rank = 0;
-        // MPI_Comm_rank(m_MPIComm, &rank);
-
-        // std::cout << "I am hooked to the DataMan library\n";
-        // std::cout << "Hello DatamanReader from rank " << rank << "\n";
-        // std::cout << "Trying to read variable " << name
-        //        << " from one of the variables coming from a WAN transport\n";
-
-        // here read variable metadata (dimensions, type, etc.)...then create a
-        // Variable like below:
-        // Variable<T>& variable = m_ADIOS.DefineVariable<T>( m_Name + "/" +
-        // name, )
-        // return &variable; //return address if success
-        return nullptr; // on failure
-    }
 };
 
 } // end namespace adios

source/adios2/toolkit/transportman/dataman/DataMan.cpp

@@ -8,8 +8,9 @@
  *      Author: Jason Wang wangr1@ornl.gov
  */
 
-#include "adios2/toolkit/transportman/dataman/DataMan.h"
-#include "adios2/helper/adiosString.h"
+#include "DataMan.h"
+
+#include "adios2/helper/adiosFunctions.h"
 
 #ifdef ADIOS2_HAVE_ZEROMQ
 #include "adios2/toolkit/transport/wan/WANZmq.h"
@@ -24,6 +25,15 @@ DataMan::DataMan(MPI_Comm mpiComm, const bool debugMode)
 : TransportMan(mpiComm, debugMode)
 {
 }
+
+DataMan::~DataMan()
+{
+    for (auto &controlThread : m_ControlThreads)
+    {
+        controlThread.join();
+    }
+}
+
 void DataMan::OpenWANTransports(const std::string &name, const Mode mode,
                                 const std::vector<Params> &parametersVector,
                                 const bool profile)

source/adios2/toolkit/transportman/dataman/DataMan.h

@@ -27,7 +27,7 @@ class DataMan : public TransportMan
 public:
     DataMan(MPI_Comm mpiComm, const bool debugMode);
 
-    virtual ~DataMan() = default;
+    ~DataMan();
 
     void OpenWANTransports(const std::string &name, const Mode openMode,
                            const std::vector<Params> &parametersVector,