diff --git a/source/adios2/toolkit/format/bp1/BP1Base.cpp b/source/adios2/toolkit/format/bp1/BP1Base.cpp index 9b3f5eda065681aa7acbfe95d3a1fff372d853c5..9248115d4b77562ec0338bacc1639c010e628cb1 100644 --- a/source/adios2/toolkit/format/bp1/BP1Base.cpp +++ b/source/adios2/toolkit/format/bp1/BP1Base.cpp @@ -313,19 +313,19 @@ BP1Base::GetTransportIDs(const std::vector<std::string> &transportsTypes) const auto lf_GetTransportID = [](const std::string method) -> uint8_t { int id = METHOD_UNKNOWN; - if (method == "NULL") + if (method == "File_NULL") { id = METHOD_NULL; } - else if (method == "FileDescriptor") + else if (method == "File_POSIX") { id = METHOD_POSIX; } - else if (method == "FileStream") + else if (method == "File_fstream") { id = METHOD_FSTREAM; } - else if (method == "FilePointer") + else if (method == "File_stdio") { id = METHOD_FILE; } diff --git a/source/adios2/toolkit/format/bp1/BP1Writer.cpp b/source/adios2/toolkit/format/bp1/BP1Writer.cpp index f5ed8fd362739e9b36080112038b7bd540eb7682..bd9ab39889ba73e079c2dbf884d87d7b82f32c76 100644 --- a/source/adios2/toolkit/format/bp1/BP1Writer.cpp +++ b/source/adios2/toolkit/format/bp1/BP1Writer.cpp @@ -188,8 +188,12 @@ std::string BP1Writer::GetRankProfilingLog( "': { "); auto &profiler = m_Profiler; - rankLog += - "'bytes': " + std::to_string(profiler.Bytes.at("buffering")) + ", "; + + std::string timeDate(profiler.Timers.at("buffering").m_LocalTimeDate); + timeDate.pop_back(); + + rankLog += "'date_and_time': '" + timeDate + "', " + "'bytes': " + + std::to_string(profiler.Bytes.at("buffering")) + ", "; lf_WriterTimer(rankLog, profiler.Timers.at("buffering")); const size_t transportsSize = transportsTypes.size(); @@ -197,7 +201,7 @@ std::string BP1Writer::GetRankProfilingLog( for (unsigned int t = 0; t < transportsSize; ++t) { rankLog += "'transport_" + std::to_string(t) + "': { "; - rankLog += "'lib': '" + transportsTypes[t] + "', "; + rankLog += "'type': '" + transportsTypes[t] + "', "; for (const auto &transportTimerPair : transportsProfilers[t]->Timers) { diff --git a/source/adios2/toolkit/transport/file/FilePointer.cpp b/source/adios2/toolkit/transport/file/FilePointer.cpp index e637693ca8cacad55fa498748bb384bcce7ec742..51bd8aa047d7de549384bae7cb444ec0aa083bf6 100644 --- a/source/adios2/toolkit/transport/file/FilePointer.cpp +++ b/source/adios2/toolkit/transport/file/FilePointer.cpp @@ -20,7 +20,7 @@ namespace transport { FilePointer::FilePointer(MPI_Comm mpiComm, const bool debugMode) -: Transport("File", "C stdio.h", mpiComm, debugMode) +: Transport("File", "stdio", mpiComm, debugMode) { } diff --git a/source/adios2/toolkit/transportman/TransportMan.cpp b/source/adios2/toolkit/transportman/TransportMan.cpp index 7492922c102b83e0f58914e1690030d7a3f5a1b5..8045ce613a429911952828aeb00c4a896e5165a8 100644 --- a/source/adios2/toolkit/transportman/TransportMan.cpp +++ b/source/adios2/toolkit/transportman/TransportMan.cpp @@ -104,7 +104,7 @@ std::vector<std::string> TransportMan::GetTransportsTypes() noexcept for (const auto &transport : m_Transports) { - types.push_back(transport->m_Type); + types.push_back(transport->m_Type + "_" + transport->m_Library); } return types; }