From 04a5e5b2d52e99a0adf30e42b993a8caf9797635 Mon Sep 17 00:00:00 2001
From: Jason Wang <wangr1@ornl.gov>
Date: Wed, 20 Sep 2017 15:01:03 -0400
Subject: [PATCH] made changes as requested
---
source/adios2/engine/dataman/DataManReader.cpp | 8 ++++----
source/adios2/engine/dataman/DataManWriter.tcc | 2 --
source/adios2/toolkit/transport/wan/WANZmq.cpp | 2 --
source/adios2/toolkit/transport/wan/WANZmq.h | 4 ++--
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/source/adios2/engine/dataman/DataManReader.cpp b/source/adios2/engine/dataman/DataManReader.cpp
index a4d661fd3..7d6a05359 100644
--- a/source/adios2/engine/dataman/DataManReader.cpp
+++ b/source/adios2/engine/dataman/DataManReader.cpp
@@ -108,10 +108,10 @@ void DataManReader::Init()
}
m_Man.OpenWANTransports("zmq", adios2::OpenMode::Read, para, true);
- std::string method_type;
- int num_channels = 0;
- lf_AssignString("method_type", method_type);
- lf_AssignInt("num_channels", num_channels);
+ std::string methodType;
+ int numChannels = 0;
+ lf_AssignString("method_type", methodType);
+ lf_AssignInt("num_channels", numChannels);
}
else
{
diff --git a/source/adios2/engine/dataman/DataManWriter.tcc b/source/adios2/engine/dataman/DataManWriter.tcc
index 05e1b816b..38b154ba8 100644
--- a/source/adios2/engine/dataman/DataManWriter.tcc
+++ b/source/adios2/engine/dataman/DataManWriter.tcc
@@ -40,7 +40,6 @@ void DataManWriter::DoWriteCommon(Variable<T> &variable, const T *values)
variable.m_Start.assign(variable.m_Count.size(), 0);
}
- std::cout << "DoWriteCommon begin" << std::endl;
nlohmann::json jmsg;
jmsg["doid"] = m_Name;
jmsg["var"] = variable.m_Name;
@@ -53,7 +52,6 @@ void DataManWriter::DoWriteCommon(Variable<T> &variable, const T *values)
std::accumulate(variable.m_Shape.begin(), variable.m_Shape.end(),
sizeof(T), std::multiplies<size_t>());
- std::cout << "DoWriteCommon end" << std::endl;
m_Man.WriteWAN(values, jmsg);
if (m_DoMonitor)
diff --git a/source/adios2/toolkit/transport/wan/WANZmq.cpp b/source/adios2/toolkit/transport/wan/WANZmq.cpp
index 7760f4bf7..9b4d38fa5 100644
--- a/source/adios2/toolkit/transport/wan/WANZmq.cpp
+++ b/source/adios2/toolkit/transport/wan/WANZmq.cpp
@@ -56,7 +56,6 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
m_Socket = zmq_socket(m_Context, ZMQ_REQ);
const std::string fullIP("tcp://" + m_IPAddress + ":" + m_Port);
- std::cout << "full IP = " << fullIP << std::endl;
int err = zmq_connect(m_Socket, fullIP.c_str());
if (m_Profiler.IsActive)
@@ -84,7 +83,6 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
m_Socket = zmq_socket(m_Context, ZMQ_REP);
const std::string fullIP("tcp://" + m_IPAddress + ":" + m_Port);
- std::cout << "full IP = " << fullIP << std::endl;
zmq_bind(m_Socket, fullIP.c_str());
if (m_Profiler.IsActive)
diff --git a/source/adios2/toolkit/transport/wan/WANZmq.h b/source/adios2/toolkit/transport/wan/WANZmq.h
index c24b3e70b..167814b4f 100644
--- a/source/adios2/toolkit/transport/wan/WANZmq.h
+++ b/source/adios2/toolkit/transport/wan/WANZmq.h
@@ -51,10 +51,10 @@ private:
std::string m_Port;
/** context handler created by zmq, thread safe */
- void *m_Context = NULL;
+ void *m_Context = nullptr;
/** socket handler created by zmq */
- void *m_Socket = NULL;
+ void *m_Socket = nullptr;
};
} // end namespace transport
--
GitLab