Skip to content
Snippets Groups Projects
Commit 0f0a550e authored by John Romein's avatar John Romein
Browse files

BugID: 225

Removed redundant and annoying progress messages; replaced by timer that only
prints output when the compute core is actually used.
parent 4e677fc3
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <lofar_config.h> #include <lofar_config.h>
#include <Common/lofar_iostream.h> #include <Common/lofar_iostream.h>
#include <Common/Timer.h>
#include <CS1_BGLProc/AH_BGL_Processing.h> #include <CS1_BGLProc/AH_BGL_Processing.h>
#include <CS1_BGLProc/WH_BGL_Processing.h> #include <CS1_BGLProc/WH_BGL_Processing.h>
...@@ -215,20 +214,11 @@ void AH_BGL_Processing::init() ...@@ -215,20 +214,11 @@ void AH_BGL_Processing::init()
void AH_BGL_Processing::run(int steps) { void AH_BGL_Processing::run(int steps) {
LOG_TRACE_FLOW_STR("Start AH_BGL_Processing::run() " ); LOG_TRACE_FLOW_STR("Start AH_BGL_Processing::run() " );
for (int i = 0; i < steps; i++) { for (int i = 0; i < steps; i++) {
char timer_name[32];
sprintf(timer_name, "baseProcess(%d)", i);
class NSTimer timer(timer_name, true);
LOG_TRACE_LOOP_STR("processing run " << i ); LOG_TRACE_LOOP_STR("processing run " << i );
std::clog << "run " << i << " of " << steps << std::endl;
timer.start();
for (uint j = 0; j < itsWHs.size(); j ++) { for (uint j = 0; j < itsWHs.size(); j ++) {
itsWHs[j]->baseProcess(); itsWHs[j]->baseProcess();
} }
timer.stop();
std::clog << "run " << i << " of " << steps << " done" << std::endl;
} }
LOG_TRACE_FLOW_STR("Finished AH_BGL_Processing::run() " ); LOG_TRACE_FLOW_STR("Finished AH_BGL_Processing::run() " );
} }
......
...@@ -1771,6 +1771,9 @@ void WH_BGL_Processing::doCorrelate() ...@@ -1771,6 +1771,9 @@ void WH_BGL_Processing::doCorrelate()
void WH_BGL_Processing::process() void WH_BGL_Processing::process()
{ {
NSTimer totalTimer("total", true);
totalTimer.start();
#if defined HAVE_MPI #if defined HAVE_MPI
std::clog.precision(15); std::clog.precision(15);
std::clog << "core " << TH_MPI::getCurrentRank() << ": start reading at " << MPI_Wtime() << '\n'; std::clog << "core " << TH_MPI::getCurrentRank() << ": start reading at " << MPI_Wtime() << '\n';
...@@ -1820,6 +1823,8 @@ void WH_BGL_Processing::process() ...@@ -1820,6 +1823,8 @@ void WH_BGL_Processing::process()
#if defined HAVE_MPI #if defined HAVE_MPI
std::clog << "core " << TH_MPI::getCurrentRank() << ": start idling at " << MPI_Wtime() << '\n'; std::clog << "core " << TH_MPI::getCurrentRank() << ": start idling at " << MPI_Wtime() << '\n';
#endif #endif
totalTimer.stop();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment