[EDF29150] : Add some dynamic traces + assign a more explicite name in perflog

[modules/yacs.git] / src / bases / YacsTrace.hxx

diff --git a/src/bases/YacsTrace.hxx b/src/bases/YacsTrace.hxx
index 37e13c91dbd763409159d175c8a94dd2357ee93b..922c358dd34e25aef24def30d4a5d05d918b0864 100644 (file)
--- a/src/bases/YacsTrace.hxx
+++ b/src/bases/YacsTrace.hxx
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __YACSTRACE_HXX__
-#define __YACSTRACE_HXX__
+#pragma once
 
 #include "YACSBasesExport.hxx"
 #include "Exception.hxx"
@@ -27,22 +26,36 @@
 #include <sstream>
 
 #ifdef _DEVDEBUG_
-#define DEBTRACE(msg) {std::cerr<<std::flush<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
+#define DEBTRACE(msg) { std::cerr << std::flush << __FILE__ << " [" << __LINE__ << "] : " << msg << std::endl << std::flush; }
 #else
 #define DEBTRACE(msg)
 #endif
 
-namespace YACS{
-extern YACSBASES_EXPORT int traceLevel;
+namespace YACS
+{
+  extern YACSBASES_EXPORT int traceLevel;
+  void AppendTimeClock(std::ostream& os);
 }
 
 //! YACSTRACE macro for dynamic trace: print only if YACS_TRACELEVEL environment variable is set and level is less than  its value
-#define YACSTRACE(level,msg) {if(YACS::traceLevel >=level)std::cerr<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl;}
+#define YACSTRACE(level,msg) { if(YACS::traceLevel >=level)                                  \
+  {                                                                                          \
+    AppendTimeClock(std::cerr);                                                              \
+    std::cerr << __FILE__ << " [" << __LINE__ << "] : " << msg << std::endl;                 \
+  } }
+
+#define ERROR_YACSTRACE(msg) YACSTRACE(0,msg)   
+   
+#define WARNING_YACSTRACE(msg) YACSTRACE(1,msg)
+
+#define INFO_YACSTRACE(msg) YACSTRACE(2,msg)
+
+#define DEBUG_YACSTRACE(msg) YACSTRACE(7,msg)
+
+#define GURU_YACSTRACE(msg) YACSTRACE(99,msg)
 
 //! YASSERT macro is always defined, used like assert, but throw a YACS::Exception instead of abort
 
-#define YASSERT(val) {if(!(val)){std::stringstream mess; mess<<__FILE__<<" ["<<__LINE__<<"] : assertion "<<#val<<" failed"; throw YACS::Exception(mess.str());}}
+#define YASSERT(val) { if( !(val) ) { std::ostringstream mess; mess << __FILE__ << " [" <<__LINE__<< "] : assertion " << #val << " failed"; throw YACS::Exception(mess.str()); } }
 
 void AttachDebugger();
-
-#endif