From 2dd6f38296feac3332099c3d236b87c7092c52cc Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Mon, 13 Nov 2023 09:18:13 -0700 Subject: [PATCH 1/2] Cleanup server output a bit --- source/adios2/toolkit/remote/remote_server.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/adios2/toolkit/remote/remote_server.cpp b/source/adios2/toolkit/remote/remote_server.cpp index 47240ec03e..3351e80b80 100644 --- a/source/adios2/toolkit/remote/remote_server.cpp +++ b/source/adios2/toolkit/remote/remote_server.cpp @@ -272,7 +272,7 @@ static void GetRequestHandler(CManager cm, CMConnection conn, void *vevent, void Response.ReadResponseCondition = GetMsg->GetResponseCondition; \ Response.Dest = GetMsg->Dest; /* final data destination in client memory space */ \ if (verbose >= 2) \ - std::cout << "Returning " << Response.Size << " " << readable_size(Response.Size) \ + std::cout << "Returning " << readable_size(Response.Size) \ << " for Get<" << TypeOfVar << ">(" << VarName << ")" << b << std::endl; \ f->m_BytesSent += Response.Size; \ f->m_OperationCount++; \ @@ -458,7 +458,7 @@ static atom_t CM_IP_PORT = -1; static bool server_timeout(void *CMvoid, int time_since_service) { CManager cm = (CManager)CMvoid; - if (verbose) + if (verbose && (time_since_service > 90)) std::cout << time_since_service << " seconds since last service.\n"; if (time_since_service > 600) { @@ -584,7 +584,6 @@ int main(int argc, char **argv) ServerRegisterHandlers(ev_state); - std::cout << "doing Run Network" << std::endl; CMrun_network(cm); return 0; } From c26fd10eb9e31992b27a9d966e8a5147ffe658b3 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Mon, 13 Nov 2023 09:32:53 -0700 Subject: [PATCH 2/2] clang-format --- source/adios2/toolkit/remote/remote_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adios2/toolkit/remote/remote_server.cpp b/source/adios2/toolkit/remote/remote_server.cpp index 3351e80b80..98ff1bcdcd 100644 --- a/source/adios2/toolkit/remote/remote_server.cpp +++ b/source/adios2/toolkit/remote/remote_server.cpp @@ -272,8 +272,8 @@ static void GetRequestHandler(CManager cm, CMConnection conn, void *vevent, void Response.ReadResponseCondition = GetMsg->GetResponseCondition; \ Response.Dest = GetMsg->Dest; /* final data destination in client memory space */ \ if (verbose >= 2) \ - std::cout << "Returning " << readable_size(Response.Size) \ - << " for Get<" << TypeOfVar << ">(" << VarName << ")" << b << std::endl; \ + std::cout << "Returning " << readable_size(Response.Size) << " for Get<" << TypeOfVar \ + << ">(" << VarName << ")" << b << std::endl; \ f->m_BytesSent += Response.Size; \ f->m_OperationCount++; \ TotalGetBytesSent += Response.Size; \