From e7d8bf1508ad8f63a92bed41982bcd8c609788a2 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 6 Jan 2023 17:19:02 +0100 Subject: [PATCH] LocalTraceCollector also sensible to SALOME_VERBOSE env var --- src/SALOMELocalTrace/LocalTraceCollector.cxx | 47 +++++++++++--------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/SALOMELocalTrace/LocalTraceCollector.cxx b/src/SALOMELocalTrace/LocalTraceCollector.cxx index 85f3a7e67..ab3f4e034 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.cxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.cxx @@ -25,13 +25,15 @@ // Module : KERNEL // $Header$ // + +#include "LocalTraceCollector.hxx" +#include "libSALOMELog.hxx" + #include #include #include #include -#include "LocalTraceCollector.hxx" - // ============================================================================ /*! * This class is for use without CORBA, inside or outside SALOME. @@ -98,37 +100,42 @@ void* LocalTraceCollector::run(void* /*bid*/) myTraceBuffer->retrieve(myTrace); if (myTrace.traceType == ABORT_MESS) { - std::cout << std::flush ; + if( SALOME::VerbosityActivated() ) + { + std::cout << std::flush ; #ifndef WIN32 - std::cerr << "INTERRUPTION from thread " << myTrace.threadId - << " : " << myTrace.trace; + std::cerr << "INTERRUPTION from thread " << myTrace.threadId + << " : " << myTrace.trace; #else - std::cerr << "INTERRUPTION from thread " << (void*)(&myTrace.threadId) - << " : " << myTrace.trace; + std::cerr << "INTERRUPTION from thread " << (void*)(&myTrace.threadId) + << " : " << myTrace.trace; #endif - std::cerr << std::flush ; + std::cerr << std::flush ; + } exit(1); } else if (myTrace.traceType == NORMAL_MESS) { - std::cout << std::flush ; + if( SALOME::VerbosityActivated() ) + { + std::cout << std::flush ; #ifndef WIN32 - std::cerr << "th. " << myTrace.threadId << " " << myTrace.trace; + std::cerr << "th. " << myTrace.threadId << " " << myTrace.trace; #else - std::cerr << "th. " << (void*)(&myTrace.threadId) - << " " << myTrace.trace; + std::cerr << "th. " << (void*)(&myTrace.threadId) + << " " << myTrace.trace; #endif - std::cerr << std::flush ; + std::cerr << std::flush ; + } } else { - std::cout << std::flush ; -#ifndef WIN32 - std::cerr << myTrace.trace; -#else - std::cerr << myTrace.trace; -#endif - std::cerr << std::flush ; + if( SALOME::VerbosityActivated() ) + { + std::cout << std::flush ; + std::cerr << myTrace.trace; + std::cerr << std::flush ; + } } } pthread_exit(NULL); -- 2.39.2