Trace management

diff --git a/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx b/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
index 713df9253ea566619de7932a8b7f19d92ee271d2..b97e300828652bf69cf0eaec0bf48dccdbbec993 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
@@ -35,7 +35,7 @@ using namespace std;
 using namespace CORBA ;
 
 
-
+#define DynInvokeTrace 0
 void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
                                      const char *method , 
                                      ServicesAnyData * inParams , int nInParams ,
@@ -51,55 +51,60 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
   int n_in  = nInParams ;
   int n_out = nOutParams ;
 
-//  char * aComponent = ObjectToString( objComponent ) ;
+#if DynInvokeTrace
+  cdebug << ThreadNo() << "InNode::DynInvoke " << Name() << " method " << method
+         << " objComponent " << objComponent << " " << ObjectToString( objComponent )
+         << endl ;
+#endif
 //  MESSAGE( aComponent << "->" << method ) ;
   for ( i = 0 ; i < n_in ; i++ ) {
     CORBA::Any & data = inParams[i].Value ;
     ArgName           = inParams[i].Name.c_str() ;
     Type              = data.type()->kind() ;
     arguments->add_value( ArgName , data , CORBA::ARG_IN ) ;
-#if 0
+#if DynInvokeTrace
     switch ( Type ) {
     case CORBA::tk_string : {
       char * t ;
       data >>= t ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << t << " (string)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << t << " (string)" 
+             << endl ;
       break ;
     }
     case CORBA::tk_boolean : {
       bool b ;
       data >>= (CORBA::Any::to_boolean ) b ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << b << " (boolean)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << b << " (boolean)" << endl ;
       break ;
     }
     case CORBA::tk_char : {
       unsigned char c ;
       data >>= (CORBA::Any::to_char ) c ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << (int ) c << " (char)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << (int ) c << " (char)" << endl ;
       break ;
     }
     case CORBA::tk_short : {
       short s ;
       data >>= s ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << s << " (short)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << s << " (short)" << endl ;
       break ;
     }
     case CORBA::tk_long : {
       long l ;
       data >>= l ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << l << " (long)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << l << " (long)" << endl ;
       break ;
     }
     case CORBA::tk_float : {
       float f ;
       data >>= f ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << f << " (float)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << f << " (float)" << endl ;
       break ;
     }
     case CORBA::tk_double : {
       double d ;
       data >>= d ;
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << d << " (double)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << d << " (double)" << endl ;
       break ;
     }
     case CORBA::tk_objref : {
@@ -111,14 +116,14 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       }
       catch( ... ) {
       }
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << retstr << "(object reference)" ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << retstr << "(object reference)" << endl ;
       break ;
     }
     default : {
-      MESSAGE( "ArgIn" << i << " : " << ArgName << " Value " << "(other ERROR) kind " << Type ) ;
+      cdebug << "ArgIn" << i << " : " << ArgName << " Value " << "(other ERROR) kind " << Type << endl ;
     }
     }
-    MESSAGE("") ;
+    cdebug << "" << endl ;
 #endif
   }
 
@@ -127,48 +132,48 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
     ArgName           = outParams[i].Name.c_str() ;
     Type              = data.type()->kind() ;
     arguments->add_value( ArgName , data , CORBA::ARG_OUT ) ;
-#if 0
+#if DynInvokeTrace
     switch ( Type ) {
     case CORBA::tk_string : {
       char * t ;
       data >>= t ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << t << " (string)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << t << " (string)" << endl ;
       break ;
     }
     case CORBA::tk_boolean : {
       bool b ;
       data >>= (CORBA::Any::to_boolean ) b ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << b << " (boolean)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << b << " (boolean)" << endl ;
       break ;
     }
     case CORBA::tk_char : {
       unsigned char c ;
       data >>= (CORBA::Any::to_char ) c ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << (int ) c << " (char)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << (int ) c << " (char)" << endl ;
       break ;
     }
     case CORBA::tk_short : {
       short s ;
       data >>= s ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << s << " (short)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << s << " (short)" << endl ;
       break ;
     }
     case CORBA::tk_long : {
       long l ;
       data >>= l ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << l << " (long)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << l << " (long)" << endl ;
       break ;
     }
     case CORBA::tk_float : {
       float f ;
       data >>= f ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << f << " (float)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << f << " (float)" << endl ;
       break ;
     }
     case CORBA::tk_double : {
       double d ;
       data >>= d ;
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << d << " (double)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << d << " (double)" << endl ;
       break ;
     }
     case CORBA::tk_objref : {
@@ -180,14 +185,14 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       }
       catch( ... ) {
       }
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << retstr << "(object reference)" ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << retstr << "(object reference)" << endl ;
       break ;
     }
     default : {
-      MESSAGE( "ArgOut" << i << " : " << ArgName << " Value " << "(other ERROR) kind " << Type ) ;
+      cdebug << "ArgOut" << i << " : " << ArgName << " Value " << "(other ERROR) kind " << Type << endl ;
     }
     }
-    MESSAGE("") ;
+    cdebug << "" << endl ;
 #endif
   }