Skip to content
Snippets Groups Projects
Commit 987b4659 authored by William F Godoy's avatar William F Godoy
Browse files

Debugging

parent 2cc88425
No related branches found
No related tags found
1 merge request!340for BP buffer over WAN
...@@ -187,8 +187,8 @@ ADIOS2_FOREACH_TYPE_1ARG(declare_type) ...@@ -187,8 +187,8 @@ ADIOS2_FOREACH_TYPE_1ARG(declare_type)
Operator &ADIOS::DefineCallBack( Operator &ADIOS::DefineCallBack(
const std::string name, const std::string name,
const std::function<void(void *, const std::string, const std::string, const std::function<void(void *, const std::string &, const std::string &,
const std::string, const Dims &)> &function, const std::string &, const Dims &)> &function,
const Params &parameters) const Params &parameters)
{ {
std::shared_ptr<Operator> callbackOperator = std::shared_ptr<Operator> callbackOperator =
......
...@@ -173,8 +173,9 @@ private: ...@@ -173,8 +173,9 @@ private:
/** define CallBack2 */ /** define CallBack2 */
Operator &DefineCallBack( Operator &DefineCallBack(
const std::string name, const std::string name,
const std::function<void(void *, const std::string, const std::string, const std::function<void(void *, const std::string &,
const std::string, const Dims &)> &function, const std::string &, const std::string &,
const Dims &)> &function,
const Params &parameters); const Params &parameters);
}; };
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
* Author: Jason Wang wangr1@ornl.gov * Author: Jason Wang wangr1@ornl.gov
*/ */
#include <fstream> //TODO go away
#include "DataMan.h" #include "DataMan.h"
#include "adios2/helper/adiosFunctions.h" #include "adios2/helper/adiosFunctions.h"
...@@ -161,8 +163,13 @@ void DataMan::WriteWAN(const void *buffer, size_t size) ...@@ -161,8 +163,13 @@ void DataMan::WriteWAN(const void *buffer, size_t size)
m_Transports[m_CurrentTransport]->Write( m_Transports[m_CurrentTransport]->Write(
reinterpret_cast<const char *>(buffer), size); reinterpret_cast<const char *>(buffer), size);
std::ofstream bpfile("datamanW.bp", std::ios_base::binary);
bpfile.write(reinterpret_cast<const char *>(buffer), size);
bpfile.close();
for (int i = 0; i < size / 4; i++) for (int i = 0; i < size / 4; i++)
{ {
std::cout << static_cast<const float *>(buffer)[i] << " "; std::cout << static_cast<const float *>(buffer)[i] << " ";
} }
} }
...@@ -225,21 +232,29 @@ void DataMan::ReadThread(std::shared_ptr<Transport> trans, ...@@ -225,21 +232,29 @@ void DataMan::ReadThread(std::shared_ptr<Transport> trans,
{ {
while (m_Listening) while (m_Listening)
{ {
char *buffer = new char[m_BufferSize]; // char *buffer = new char[m_BufferSize];
std::vector<char> buffer(m_BufferSize);
Transport::Status status; Transport::Status status;
trans->IRead(buffer, m_BufferSize, status); trans->IRead(buffer.data(), m_BufferSize, status);
if (status.Bytes > 0) if (status.Bytes > 0)
{ {
m_BP3Deserializer->m_Data.Resize( m_BP3Deserializer->m_Data.Resize(
status.Bytes, "in DataMan Streaming Listener"); status.Bytes, "in DataMan Streaming Listener");
std::memcpy(m_BP3Deserializer->m_Data.m_Buffer.data(), buffer, std::memcpy(m_BP3Deserializer->m_Data.m_Buffer.data(),
status.Bytes); buffer.data(), status.Bytes);
/* TODO: remove this part */ /* TODO: remove this part */
m_Callback->RunCallback2(buffer, "ss", "rr", "char", {128}); m_Callback->RunCallback2(buffer.data(), "ss", "rr", "char",
adios2::Dims{128});
std::ofstream bpfile("datamanR.bp", std::ios_base::binary);
bpfile.write(m_BP3Deserializer->m_Data.m_Buffer.data(),
m_BP3Deserializer->m_Data.m_Buffer.size());
bpfile.close();
m_BP3Deserializer->ParseMetadata(*m_IO); m_BP3Deserializer->ParseMetadata(*m_IO);
...@@ -258,7 +273,7 @@ void DataMan::ReadThread(std::shared_ptr<Transport> trans, ...@@ -258,7 +273,7 @@ void DataMan::ReadThread(std::shared_ptr<Transport> trans,
} }
*/ */
} }
delete[] buffer; // delete[] buffer;
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment