Index: src/consumers/ascii_writer/tsp_ascii_writer.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/ascii_writer/tsp_ascii_writer.c,v
retrieving revision 1.31
diff -u -r1.31 tsp_ascii_writer.c
--- src/consumers/ascii_writer/tsp_ascii_writer.c	12 May 2007 22:10:41 -0000	1.31
+++ src/consumers/ascii_writer/tsp_ascii_writer.c	3 Feb 2008 19:38:41 -0000
@@ -49,7 +49,6 @@
 #include <tsp_ascii_writer.h>
 #include <tsp_consumer.h>
 #include <tsp_common.h>
-#include <tsp_simple_trace.h>
 #include <tsp_const_def.h>
 #include <tsp_time.h>
 /*#include <macsim_fmt.h>*/
@@ -142,7 +141,7 @@
 
   retcode = TSP_consumer_init(argc, argv);
   if (TSP_STATUS_OK!=retcode) {
-    STRACE_ERROR(("TSP init failed"));    
+    STRACE_ERROR("TSP init failed");
   } 
   return retcode;
 }  /* end of tsp_ascii_writer_initialise */
@@ -164,7 +163,7 @@
     /* increment first since initialised to -1 */
     ++tsp_ascii_writer_current_var;
     g_tsp_symbols[tsp_ascii_writer_current_var].name = strdup(symbol_name);
-    STRACE_INFO(("Added var <%s>",symbol_name));
+    STRACE_INFO("Added var <%s>",symbol_name);
     retcode =0;
   }
   return retcode;
@@ -174,7 +173,7 @@
 tsp_ascii_writer_add_var_period(int32_t period) {
   if (NULL != g_tsp_symbols) {
     g_tsp_symbols[tsp_ascii_writer_current_var].period = period;
-    STRACE_INFO(("Period <%d>",period));
+    STRACE_INFO("Period <%d>",period);
   }
   return 0;
 } /* tsp_ascii_writer_add_var_period */
@@ -199,15 +198,15 @@
   yyin = fopen(conffilename,"r");
   if (((FILE*)(NULL)) == yyin) {    
     strncpy(syserr,strerror(errno),TSP_MAX_SYSMSG_SIZE);
-    STRACE_ERROR(("Cannot open config file <%s> (%s)",conffilename,syserr));
+    STRACE_ERROR("Cannot open config file <%s> (%s)",conffilename,syserr);
     retcode = TSP_STATUS_ERROR_AW_CONFIG_FILE_INVALID;
   }
   /* Lets parse the config file */
   if (TSP_STATUS_OK == retcode) {    
-    STRACE_INFO(("Parsing config file..."));
+    STRACE_INFO("Parsing config file...");
     /* First parse used for COUNTING requested symbols */
     yyparse();
-    STRACE_INFO(("<%d> variables requested...",tsp_ascii_writer_nb_var));
+    STRACE_INFO("<%d> variables requested...",tsp_ascii_writer_nb_var);
     if (0!=tsp_ascii_writer_parse_error) {
       retcode = TSP_STATUS_ERROR_AW_CONFIG_FILE_PARSE_ERROR;
     }
@@ -321,13 +320,13 @@
     myprovider = TSP_consumer_connect_url(tsp_provider_url);
     /* Verify if the provider was reached */
     if (0==myprovider) {
-      STRACE_ERROR(("Unreachable or no TSP provider running at TSP URL <%s> ?!?",tsp_provider_url));
+      STRACE_ERROR("Unreachable or no TSP provider running at TSP URL <%s> ?!?",tsp_provider_url);
       retcode = TSP_STATUS_ERROR_PROVIDER_UNREACHABLE;
       return retcode;
     } else  {
       retcode =TSP_consumer_request_open(myprovider, 0, 0 );
       if (TSP_STATUS_OK!=retcode) {
-	STRACE_ERROR(("TSP_request_open to TSP URL <%s> FAILED",tsp_provider_url));
+	STRACE_ERROR("TSP_request_open to TSP URL <%s> FAILED",tsp_provider_url);
 	return retcode;
       }
     }
@@ -366,9 +365,9 @@
     for (i=0;i<TSP_SSIList_getSize(current_requestedSSIL);++i) { 
       
       currentSymbol = TSP_SSIList_getSSI(current_requestedSSIL,i);
-      STRACE_INFO(("Examining symbol <%s> of pgi <%d>",
+      STRACE_INFO("Examining symbol <%s> of pgi <%d>",
 		   currentSymbol->name,
-		   currentSymbol->provider_global_index));
+		   currentSymbol->provider_global_index);
 
       if (currentSymbol->provider_global_index == -1)  {
 	my_logMsg("Checking for symbol like <%s> on provider side.\n",currentSymbol->name);
@@ -439,7 +438,7 @@
       if (currentSymbol->phase >= 0) {
 	TSP_SSI_copy(TSP_SSIList_getSSI(*validatedSSIL,valid_index),
 		     *currentSymbol);
-	STRACE_DEBUG(("Asking for TSP var = <%s>",currentSymbol->name));
+	STRACE_DEBUG("Asking for TSP var = <%s>",currentSymbol->name);
 	++valid_index;
       } /* end if tsp_symbols[i].phase >= 0 */
     } /* loop over nb_symbols */
@@ -454,7 +453,7 @@
     retcode = TSP_consumer_request_sample(myprovider,validatedSSIL);
     if (TSP_STATUS_OK!=retcode) {
       TSP_consumer_print_invalid_symbols(stderr,validatedSSIL,tsp_provider_url);
-      STRACE_ERROR(("(final) TSP request sample refused by the provider?huh?..."));
+      STRACE_ERROR("(final) TSP request sample refused by the provider?huh?...");
       return retcode;
     }
   }
@@ -473,7 +472,7 @@
 
     retcode = TSP_consumer_request_extended_information(myprovider, pgis, pgis_len);
     if (TSP_STATUS_OK!=retcode) {
-      STRACE_ERROR(("TSP request extended information refused by the provider?huh?..."));
+      STRACE_ERROR("TSP request extended information refused by the provider?huh?...");
       free(pgis);
     }
     free(pgis);
@@ -720,12 +719,12 @@
 
   /* Demarrage des sample au niveau provider */
   if(TSP_STATUS_OK!=TSP_consumer_request_sample_init(myprovider,0,0)) {
-    STRACE_ERROR(("Sample init refused by the provider??..."));
+    STRACE_ERROR("Sample init refused by the provider??...");
     retcode = -1;
   }
 
   tsp_ascii_writer_sample_running = 1;
-  STRACE_DEBUG(("Begin sample read...\n"));
+  STRACE_DEBUG("Begin sample read...");
   if (0 == retcode) 
   {
     nb_sample_item    = 0;
@@ -811,11 +810,11 @@
   if (NULL != myprovider) {
     if (tsp_ascii_writer_sample_running) {
 	    if (TSP_STATUS_OK!=(retcode=TSP_consumer_request_sample_destroy(myprovider))) {
-		    STRACE_ERROR(("TSP_request_sample_destroy ERROR: %s",TSP_status_string(retcode)));
+		    STRACE_ERROR("TSP_request_sample_destroy ERROR: %s",TSP_status_string(retcode));
       }  
     }
     if (TSP_STATUS_OK!=(retcode=TSP_consumer_request_close(myprovider))) {
-	    STRACE_ERROR(("TSP_request_close ERROR: %s",TSP_status_string(retcode)));
+	    STRACE_ERROR("TSP_request_close ERROR: %s",TSP_status_string(retcode));
     }
   }
   TSP_consumer_end();
Index: src/consumers/generic/generic_consumer_main.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/generic/generic_consumer_main.c,v
retrieving revision 1.13
diff -u -r1.13 generic_consumer_main.c
--- src/consumers/generic/generic_consumer_main.c	8 Dec 2007 13:56:41 -0000	1.13
+++ src/consumers/generic/generic_consumer_main.c	3 Feb 2008 19:38:41 -0000
@@ -124,7 +124,7 @@
 #endif
 
   if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
-      STRACE_ERROR(("TSP init failed"));
+      STRACE_ERROR("TSP init failed");
       return -1;
   }
 
Index: src/consumers/res_writer/client_res.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/res_writer/client_res.c,v
retrieving revision 1.19
diff -u -r1.19 client_res.c
--- src/consumers/res_writer/client_res.c	29 Mar 2007 20:42:53 -0000	1.19
+++ src/consumers/res_writer/client_res.c	3 Feb 2008 19:38:41 -0000
@@ -86,12 +86,12 @@
 {
   stop = TRUE;
 
-  STRACE_TEST(("Waiting eol and saving file..."));
+  STRACE_TEST("Waiting eol and saving file...");
 }
 
 void usage (char *txt)
 {
-  STRACE_ERROR(("USAGE : %s -f: [-u:] [-tmdh]", txt));
+  STRACE_ERROR("USAGE : %s -f: [-u:] [-tmdh]", txt);
   printf("\t -f filename   : output RES format filename\n");
   printf("\t[-u serverURL] : TSP Universal Resource Locator\n\n");
   printf(TSP_URL_FORMAT_USAGE);
@@ -139,11 +139,11 @@
   MySignal(SIGINT, catch_ctrl_c);
 
 
-  STRACE_INFO(("Autodetect CPU : %d bits", sizeof(long)*8));
+  STRACE_INFO("Autodetect CPU : %d bits", sizeof(long)*8);
 
   /* TSP Init */
   if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
-    STRACE_ERROR(("TSP init failed"));
+    STRACE_ERROR("TSP init failed");
     return -1;
   }
       
@@ -160,7 +160,7 @@
 	    nb_providers++;
 	  else
 	    {
-	      STRACE_ERROR(("Cannot connect to %s", optarg));
+	      STRACE_ERROR("Cannot connect to %s", optarg);
 	    }
 	  break;
 	case 'f':   out_file_res = optarg;      break;
@@ -180,7 +180,7 @@
       providers[nb_providers++] = TSP_consumer_connect_url(NULL);
       if(!providers[0])
         {
-          STRACE_ERROR(("Cannot connect to a TSP provider on local host"));
+          STRACE_ERROR("Cannot connect to a TSP provider on local host");
           usage(argv[0]);
 	 }
     }
@@ -191,7 +191,7 @@
       /* Open requested provider */
       /*-------------------------*/ 
       if (TSP_STATUS_OK!=TSP_consumer_request_open(providers[provider], 0, 0 )) {
-	STRACE_ERROR(("TSP_request_provider_open failed"));
+	STRACE_ERROR("TSP_request_provider_open failed");
 	return -1;
       }
  
@@ -203,7 +203,7 @@
 	{
 	  if(TSP_STATUS_OK!=TSP_consumer_request_information(providers[provider]))
 	    {
-	      STRACE_ERROR(("TSP_request_provider_information failed"));
+	      STRACE_ERROR("TSP_request_provider_information failed");
 	      return -1;
 	    }
 	  
@@ -219,7 +219,7 @@
       
       for( i = 0 ; i< symbols[provider].TSP_sample_symbol_info_list_t_len ; i++)
 	{
-	  STRACE_INFO(("Id=%d Sym='%s'",i, information->symbols.TSP_sample_symbol_info_list_t_val[i].name));
+	  STRACE_INFO("Id=%d Sym='%s'",i, information->symbols.TSP_sample_symbol_info_list_t_val[i].name);
 	  symbols[provider].TSP_sample_symbol_info_list_t_val[i].name = information->symbols.TSP_sample_symbol_info_list_t_val[i].name;
 	  symbols[provider].TSP_sample_symbol_info_list_t_val[i].period = period;
 	  symbols[provider].TSP_sample_symbol_info_list_t_val[i].phase = 0;
@@ -245,7 +245,7 @@
 	  symbols[provider].TSP_sample_symbol_info_list_t_len = 10;
 	  break;
 	default:
-	  STRACE_ERROR(("Unknown test number"));
+	  STRACE_ERROR("Unknown test number");
 	  return -1;
 	}
 
@@ -260,7 +260,7 @@
       /* Ask for sample list */
       /*---------------------*/ 
       if(TSP_STATUS_OK!=TSP_consumer_request_sample(providers[provider],&symbols[provider])) {
-	STRACE_ERROR(("TSP_request_provider_sample failed"));
+	STRACE_ERROR("TSP_request_provider_sample failed");
 	return -1;
       }
     }
@@ -273,7 +273,7 @@
     /* Start sampling */
     /*----------------*/ 
     if (TSP_STATUS_OK!=TSP_consumer_request_sample_init(providers[provider],0,0)) {
-	STRACE_ERROR(("TSP_request_provider_sample_init failed"));
+	STRACE_ERROR("TSP_request_provider_sample_init failed");
 	return -1;
       }
   }
@@ -283,7 +283,7 @@
   /* Loop on data read */
   /*-------------------*/ 
   
-  STRACE_INFO(("file=%s", out_file_res));
+  STRACE_INFO("file=%s", out_file_res);
   d_wopen(out_file_res);
   d_wcom(""); /* No comment */
 
Index: src/consumers/stdout/client_stdout.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/stdout/client_stdout.c,v
retrieving revision 1.17
diff -u -r1.17 client_stdout.c
--- src/consumers/stdout/client_stdout.c	30 Nov 2007 15:42:01 -0000	1.17
+++ src/consumers/stdout/client_stdout.c	3 Feb 2008 19:38:41 -0000
@@ -194,7 +194,7 @@
   
   if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
     retcode=1;
-    STRACE_ERROR(("TSP init failed"));
+    STRACE_ERROR("TSP init failed");
     return retcode;
   }
 
@@ -204,23 +204,23 @@
   provider = TSP_consumer_connect_url(provider_url);
   if (provider) {
     const char* info = TSP_consumer_get_connected_name(provider) ;
-    STRACE_INFO(("Server %s, info = '%s'", provider_url, info));
+    STRACE_INFO("Server %s, info = '%s'", provider_url, info);
     
     /* Check name */
     if(test_mode && !strstr(info, "StubbedServer")) {
-      STRACE_ERROR(("Serveur name corrupted"));
+      STRACE_ERROR("Server name corrupted");
       retcode=2;
-      STRACE_TEST(("STAGE 001 | STEP 001 : FAILED"));
+      STRACE_TEST("STAGE 001 | STEP 001 : FAILED");
       return retcode;
     }	  
   }
   else {
     retcode = 3;
-    STRACE_ERROR(("Unable to find any provider for host"));
+    STRACE_ERROR("Unable to find any provider for host");
     return retcode;
   }
   
-  STRACE_TEST(("STAGE 001 | STEP 001 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 001 : PASSED");
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 002 */
@@ -228,26 +228,26 @@
   /* Request Open on the [found] provider */
 
   if(TSP_STATUS_OK!=TSP_consumer_request_open(provider, 0, NULL)) {
-    STRACE_ERROR(("TSP_request_provider_open failed"));
-    STRACE_TEST(("STAGE 001 | STEP 002 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_open failed");
+    STRACE_TEST("STAGE 001 | STEP 002 : FAILED");
     return -1;
   }
   
-  STRACE_TEST(("STAGE 001 | STEP 002 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 002 : PASSED");
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 003 */
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_information(provider)) {
-    STRACE_ERROR(("TSP_request_provider_information failed"));
-    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_information failed");
+    STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
     return -1;
   }
   
   /* be wild, ask twice to try to trigger mem leak  */
   if(TSP_STATUS_OK!=TSP_consumer_request_information(provider)) {
-    STRACE_ERROR(("TSP_request_provider_information failed"));
-    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_information failed");
+    STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
     return -1;
   }
 
@@ -256,8 +256,8 @@
   if ((TSP_SSIList_getSize(information->symbols) < 1 ) ||
       (TSP_SSIList_getSize(information->symbols) > 999999)
       ) {
-    STRACE_ERROR(("The total number of symbols should be fair, and not %d",TSP_SSIList_getSize(information->symbols)));
-    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    STRACE_ERROR("The total number of symbols should be fair, and not %d",TSP_SSIList_getSize(information->symbols));
+    STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
     return -1;      
   }
 
@@ -267,14 +267,14 @@
       sprintf(symbol_buf, "Symbol%d",i);
       if(strcmp(symbol_buf, TSP_SSIList_getSSI(information->symbols,i)->name)) {
 	printf("%s != %s\n", symbol_buf, TSP_SSIList_getSSI(information->symbols,i)->name);
-	STRACE_ERROR(("Symbol name corrupted"));
-	STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+	STRACE_ERROR("Symbol name corrupted");
+	STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
 	return -1;
       }
     }
   }
       
-  STRACE_TEST(("STAGE 001 | STEP 003 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 003 : PASSED");
   
   /* Initialize symbols list */
   TSP_SSIList_initialize(&symbols,nb_symbols);
@@ -292,28 +292,28 @@
   /* TEST : STAGE 001 | STEP 004 */
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols)) {
-    STRACE_ERROR(("TSP_request_provider_sample failed"));
-    STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_sample failed");
+    STRACE_TEST("STAGE 001 | STEP 004 : FAILED");
     return -1;
   }
   
   /* be wild, ask twice to try to trigger mem leak  */
   if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols)) {
-    STRACE_ERROR(("TSP_request_provider_sample failed"));
-    STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_sample failed");
+    STRACE_TEST("STAGE 001 | STEP 004 : FAILED");
     return -1;
   }
 
-  STRACE_TEST(("STAGE 001 | STEP 004 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 004 : PASSED");
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 005 */
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_sample_init(provider, 0, 0)) {
-    STRACE_ERROR(("TSP_request_provider_sample_init failed"));
-    STRACE_TEST(("STAGE 001 | STEP 005 : FAILED"));
+    STRACE_ERROR("TSP_request_provider_sample_init failed");
+    STRACE_TEST("STAGE 001 | STEP 005 : FAILED");
     return -1;
   }
-  STRACE_TEST(("STAGE 001 | STEP 005 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 005 : PASSED");
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 006 */
@@ -353,7 +353,7 @@
 	    /* pgi == 0 is t so don't check for t*/
 	    if(sample.provider_global_index != 0) {
 	      if( (ABS(sample.uvalue.double_value - calc) > 1e-7) && (t == (sample.time - 1)) ) {
-		STRACE_ERROR(("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample.time,i,sample.uvalue.double_value,calc ));
+		STRACE_ERROR("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample.time,i,sample.uvalue.double_value,calc);
 		all_data_ok = FALSE;
 	      }
 	    }	  
@@ -367,18 +367,18 @@
 	    if(all_data_ok) {
 	      
 	      printf("\n");
-	      STRACE_TEST(("STAGE 001 | STEP 006 : PASSED" ));			
+	      STRACE_TEST("STAGE 001 | STEP 006 : PASSED");
 	      
 	      /* --------------- */
 	      /* Close providers */
 	      /* --------------- */
 	      if(TSP_STATUS_OK!=TSP_consumer_request_sample_destroy(provider)) {
-		STRACE_ERROR(("Function TSP_consumer_request_sample_destroy failed" ));	 
+		STRACE_ERROR("Function TSP_consumer_request_sample_destroy failed");
 	      }
 	      TSP_SSIList_finalize(&symbols);
 		  
 	      if(TSP_STATUS_OK!=TSP_consumer_request_close(provider)) {
-		STRACE_ERROR(("Function TSP_consumer_request_close failed" ));			    
+		STRACE_ERROR("Function TSP_consumer_request_close failed");
 	      }
 		  
 	      TSP_consumer_disconnect_one(provider);	      
@@ -399,7 +399,7 @@
 	}
       }
       else {
-	STRACE_ERROR(("TSP_read_sample failed"));
+	STRACE_ERROR("TSP_read_sample failed");
       }
     } while(new_sample);
     
Index: src/consumers/stdout_callback/client_callback_stdout.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/stdout_callback/client_callback_stdout.c,v
retrieving revision 1.6
diff -u -r1.6 client_callback_stdout.c
--- src/consumers/stdout_callback/client_callback_stdout.c	30 Aug 2007 08:27:46 -0000	1.6
+++ src/consumers/stdout_callback/client_callback_stdout.c	3 Feb 2008 19:38:42 -0000
@@ -83,7 +83,7 @@
     {
       if((ABS(sample->uvalue.double_value - calc ) > 1e-7) || (0 != strncmp((char*)user_data, USER_DATA, strlen(USER_DATA))))
         {
-          STRACE_ERROR(("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample->time,i,sample->uvalue.double_value,calc ));			
+          STRACE_ERROR("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample->time,i,sample->uvalue.double_value,calc);
           all_data_ok = FALSE;
         }
     }
@@ -117,7 +117,7 @@
   printf ("#===========================================================================#\n");
  
   if (TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
-    STRACE_ERROR(("TSP init failed"));
+    STRACE_ERROR("TSP init failed");
     return -1;
   }
 
@@ -132,7 +132,7 @@
     }
   else
     {
-      STRACE_ERROR(("USAGE %s : server period <test_mode>\n", argv[0]));
+      STRACE_ERROR("USAGE %s : server period <test_mode>", argv[0]);
       return -1;
     }
 
@@ -147,13 +147,13 @@
       for( i = 0 ; i<nb_providers ; i++)
 	{
 	  const char* info = TSP_consumer_get_connected_name(providers[i]) ;
-	  STRACE_INFO(("Server Nb %d, info = '%s'", i, info));
+	  STRACE_INFO("Server Nb %d, info = '%s'", i, info);
 	  
 	  /* Check name */
 	  if(strcmp(info, "StubbedServer"))
 	    {
-	      STRACE_ERROR(("Serveur name corrupted"));
-	      STRACE_TEST(("STAGE 001 | STEP 001 : FAILED"));
+	      STRACE_ERROR("Server name corrupted");
+	      STRACE_TEST("STAGE 001 | STEP 001 : FAILED");
 	      return -1;
 	    }
 	  
@@ -161,11 +161,11 @@
     }
   else
     {
-      STRACE_ERROR(("Unable to find any provider for host"));
+      STRACE_ERROR("Unable to find any provider for host");
       return -1;
     }
 
-  STRACE_TEST(("STAGE 001 | STEP 001 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 001 : PASSED");
 
 
   /*-------------------------------------------------------------------------------------------------------*/ 
@@ -175,28 +175,28 @@
 
   if(TSP_STATUS_OK!=TSP_consumer_request_open(providers[0], 0, 0))
     {
-      STRACE_ERROR(("TSP_request_provider_open failed"));
-      STRACE_TEST(("STAGE 001 | STEP 002 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_open failed");
+      STRACE_TEST("STAGE 001 | STEP 002 : FAILED");
       return -1;
     }
   
-  STRACE_TEST(("STAGE 001 | STEP 002 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 002 : PASSED");
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 003 */
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_information(providers[0]))
     {
-      STRACE_ERROR(("TSP_request_provider_information failed"));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_information failed");
+      STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
       return -1;
     }
   
   /* be wild, ask twice to try to trigger mem leak  */
   if(TSP_STATUS_OK!=TSP_consumer_request_information(providers[0]))
     {
-      STRACE_ERROR(("TSP_request_provider_information failed"));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_information failed");
+      STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
       return -1;
     }
 
@@ -206,8 +206,8 @@
   /* Check total symbol number */
   if(1000 !=  information->symbols.TSP_sample_symbol_info_list_t_len )
     {
-      STRACE_ERROR(("The total number of symbols should be 1000"));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+      STRACE_ERROR("The total number of symbols should be 1000");
+      STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
       return -1;      
     }
 
@@ -217,14 +217,14 @@
       sprintf(symbol_buf, "Symbol%d",i);
       if(strcmp(symbol_buf,  information->symbols.TSP_sample_symbol_info_list_t_val[i].name))
 	{
-	  STRACE_ERROR(("Symbol name corrupted"));
-	  STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+	  STRACE_ERROR("Symbol name corrupted");
+	  STRACE_TEST("STAGE 001 | STEP 003 : FAILED");
 	  return -1;
 	}
       
     }
       
-  STRACE_TEST(("STAGE 001 | STEP 003 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 003 : PASSED");
 
   symbols.TSP_sample_symbol_info_list_t_val = (TSP_sample_symbol_info_t*)calloc(information->symbols.TSP_sample_symbol_info_list_t_len, sizeof(TSP_sample_symbol_info_t));
   TSP_CHECK_ALLOC(symbols.TSP_sample_symbol_info_list_t_val, -1);
@@ -241,31 +241,31 @@
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_sample(providers[0], &symbols))
     {
-      STRACE_ERROR(("TSP_request_provider_sample failed"));
-      STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_sample failed");
+      STRACE_TEST("STAGE 001 | STEP 004 : FAILED");
       return -1;
     }
   /* be wild, ask twice to try to trigger mem leak  */
   if(TSP_STATUS_OK!=TSP_consumer_request_sample(providers[0], &symbols))
     {
-      STRACE_ERROR(("TSP_request_provider_sample failed"));
-      STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_sample failed");
+      STRACE_TEST("STAGE 001 | STEP 004 : FAILED");
       return -1;
     }
 
   free(symbols.TSP_sample_symbol_info_list_t_val);
 
-  STRACE_TEST(("STAGE 001 | STEP 004 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 004 : PASSED");
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 005 */
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_sample_init(providers[0], test_callback, (void*)(USER_DATA) ))
     {
-      STRACE_ERROR(("TSP_request_provider_sample_init failed"));
-      STRACE_TEST(("STAGE 001 | STEP 005 : FAILED"));
+      STRACE_ERROR("TSP_request_provider_sample_init failed");
+      STRACE_TEST("STAGE 001 | STEP 005 : FAILED");
       return -1;
     }
-  STRACE_TEST(("STAGE 001 | STEP 005 : PASSED"));
+  STRACE_TEST("STAGE 001 | STEP 005 : PASSED");
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 006 */
@@ -279,7 +279,7 @@
           if(all_data_ok)
             {
               
-              STRACE_TEST(("STAGE 001 | STEP 006 : PASSED" ));			
+              STRACE_TEST("STAGE 001 | STEP 006 : PASSED" );
               
               /* If test mode, the return code is the number of opened providers */
               /* --------------- */
@@ -287,12 +287,12 @@
               /* --------------- */
               if(TSP_STATUS_OK!=TSP_consumer_request_sample_destroy(providers[0]))
                 {
-                  STRACE_ERROR(("Function TSP_consumer_request_sample_destroy failed" ));	 
+                  STRACE_ERROR("Function TSP_consumer_request_sample_destroy failed");
                 }
               
               if(TSP_STATUS_OK!=TSP_consumer_request_close(providers[0]))
                 {
-                  STRACE_ERROR(("Function TSP_consumer_request_close failed" ));			    
+                  STRACE_ERROR("Function TSP_consumer_request_close failed");
                 }
               
               TSP_consumer_disconnect_all(providers);
Index: src/consumers/test_group/client_group.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/test_group/client_group.c,v
retrieving revision 1.8
diff -u -r1.8 client_group.c
--- src/consumers/test_group/client_group.c	9 Nov 2007 18:25:32 -0000	1.8
+++ src/consumers/test_group/client_group.c	3 Feb 2008 19:38:42 -0000
@@ -140,7 +140,7 @@
 
   if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv))
     {
-      STRACE_ERROR(("TSP init failed"));
+      STRACE_ERROR("TSP init failed");
       return -1;
     }
 
@@ -153,7 +153,7 @@
     }
   else
     {
-      STRACE_ERROR(("USAGE %s : server period\n", argv[0]));
+      STRACE_ERROR("USAGE %s : server period", argv[0]);
       return -1;
     }
 
@@ -167,12 +167,12 @@
       for( i = 0 ; i<nb_providers ; i++)
 	{
 	  const char* info = TSP_consumer_get_connected_name(providers[i]) ;
-	  STRACE_INFO(("Server Nb %d, info = '%s'", i,info));
+	  STRACE_INFO("Server Nb %d, info = '%s'", i,info);
 	  
 	  /* Check name */
 	  if(strcmp(info, "StubbedServer"))
 	    {
-	      STRACE_ERROR(("Serveur name corrupted"));
+	      STRACE_ERROR("Server name corrupted");
 	      return -1;
 	    }
 	  
@@ -180,7 +180,7 @@
     }
   else
     {
-      STRACE_ERROR(("Unable to find any provider for host"));
+      STRACE_ERROR("Unable to find any provider for host");
       return -1;
     }
 
@@ -193,7 +193,7 @@
   /* Le 1er provider existe puisqu'il y en a au moins 1 */
 
   if(TSP_STATUS_OK!=TSP_consumer_request_open(providers[0], 0, 0)) {
-    STRACE_ERROR(("TSP_request_provider_open failed"));
+    STRACE_ERROR("TSP_request_provider_open failed");
     return -1;
   }
   
@@ -203,13 +203,13 @@
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_information(providers[0]))
     {
-      STRACE_ERROR(("TSP_request_provider_information failed"));
+      STRACE_ERROR("TSP_request_provider_information failed");
       return -1;
     }
   
   /* How many symbols do we want to send ? */
   for(requested_nb = 0; data_test[requested_nb].index != (-2); requested_nb++);
-  STRACE_INFO(("Total number of requested symbols = %d", requested_nb));
+  STRACE_INFO("Total number of requested symbols = %d", requested_nb);
 
 
   symbols.TSP_sample_symbol_info_list_t_len = requested_nb;
@@ -227,7 +227,7 @@
   /*-------------------------------------------------------------------------------------------------------*/ 
   if(TSP_STATUS_OK!=TSP_consumer_request_sample(providers[0], &symbols))
     {
-      STRACE_ERROR(("TSP_request_provider_sample failed"));
+      STRACE_ERROR("TSP_request_provider_sample failed");
       return -1;
     }
 
@@ -241,7 +241,7 @@
 
   if( group_nb != groups->table_len )
     {
-      STRACE_ERROR(("Wrong groups total number"));
+      STRACE_ERROR("Wrong groups total number");
       return -1;
     }
 
@@ -254,7 +254,7 @@
 	for(size = 0; group_test[i].index[size] != (-1); size++);
 	if ( size != groups->groups[i].group_len )
 	  {
-	    STRACE_ERROR(("Wrong groups size"));
+	    STRACE_ERROR("Wrong groups size");
 	    return -1;
 	  }
       }
@@ -268,13 +268,13 @@
 	{
 	  if (  group_test[i].index[j] != groups->groups[i].items[j].provider_global_index )
 	    {
-	      STRACE_ERROR(("Wrong provider global index"));
+	      STRACE_ERROR("Wrong provider global index");
 	      return -1;
 	    }
 	}
     }
 
-  STRACE_TEST(("STAGE 002 | STEP 001 : PASSED"));
+  STRACE_TEST("STAGE 002 | STEP 001 : PASSED");
   printf ("#=========================================================#\n");
   printf ("# End <test_group> OK #\n");
   printf ("#=========================================================#\n");
Index: src/consumers/tspfs/tspfs.c
===================================================================
RCS file: /sources/tsp/tsp/src/consumers/tspfs/tspfs.c,v
retrieving revision 1.14
diff -u -r1.14 tspfs.c
--- src/consumers/tspfs/tspfs.c	25 Mar 2007 21:32:29 -0000	1.14
+++ src/consumers/tspfs/tspfs.c	3 Feb 2008 19:38:42 -0000
@@ -244,11 +244,11 @@
 		free(tspfs.idx_to_pgi);
 
 	if (tspfs.sync && (TSP_STATUS_OK!=TSP_consumer_request_sample_destroy(tspfs.provider))) {
-		STRACE_ERROR(("Function TSP_consumer_request_sample_destroy failed"));
+		STRACE_ERROR("Function TSP_consumer_request_sample_destroy failed");
 	}
 
 	if (TSP_STATUS_OK!=TSP_consumer_request_close(tspfs.provider)) {
-		STRACE_ERROR(("Function TSP_consumer_request_close failed"));
+		STRACE_ERROR("Function TSP_consumer_request_close failed");
 	}
 
 	TSP_consumer_end();
Index: src/core/CMakeLists.txt
===================================================================
RCS file: /sources/tsp/tsp/src/core/CMakeLists.txt,v
retrieving revision 1.16
diff -u -r1.16 CMakeLists.txt
--- src/core/CMakeLists.txt	29 Aug 2007 21:21:36 -0000	1.16
+++ src/core/CMakeLists.txt	3 Feb 2008 19:38:42 -0000
@@ -10,7 +10,6 @@
   include/tsp_abs_types.h
   include/tsp_const_def.h
   include/tsp_glu.h
-  include/tsp_simple_trace.h
   include/tsp_sys_headers.h
   rpc/tsp_datastruct.h)
 TSP_XINCLUDE(${INCLUDE_CORE_FILE})
@@ -65,6 +64,7 @@
   common/tsp_common_ssei
   common/tsp_common_as
   common/tsp_common_status
+  common/tsp_common_trace
   common/tsp_encoder
   common/tsp_decoder)
 
Index: src/core/common/tsp_common.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common.c,v
retrieving revision 1.10
diff -u -r1.10 tsp_common.c
--- src/core/common/tsp_common.c	30 Nov 2007 15:42:01 -0000	1.10
+++ src/core/common/tsp_common.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,6 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
 #include <tsp_const_def.h>
 #define TSP_COMMON_C
 #include <tsp_common.h>
Index: src/core/common/tsp_common_as.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common_as.c,v
retrieving revision 1.3
diff -u -r1.3 tsp_common_as.c
--- src/core/common/tsp_common_as.c	30 Nov 2007 15:42:01 -0000	1.3
+++ src/core/common/tsp_common_as.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,6 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
 #include <tsp_const_def.h>
 #include <tsp_common_macros.h>
 #define TSP_COMMON_AS_C
Index: src/core/common/tsp_common_request.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common_request.c,v
retrieving revision 1.3
diff -u -r1.3 tsp_common_request.c
--- src/core/common/tsp_common_request.c	30 Nov 2007 15:42:01 -0000	1.3
+++ src/core/common/tsp_common_request.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,6 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
 #include <tsp_const_def.h>
 #define TSP_COMMON_REQUEST_C
 #include <tsp_common_request.h>
Index: src/core/common/tsp_common_ssei.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common_ssei.c,v
retrieving revision 1.11
diff -u -r1.11 tsp_common_ssei.c
--- src/core/common/tsp_common_ssei.c	30 Nov 2007 15:42:01 -0000	1.11
+++ src/core/common/tsp_common_ssei.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,7 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 #include <tsp_const_def.h>
 #define TSP_COMMON_SSEI_C
 #include <tsp_common_ssei.h>
Index: src/core/common/tsp_common_ssi.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common_ssi.c,v
retrieving revision 1.8
diff -u -r1.8 tsp_common_ssi.c
--- src/core/common/tsp_common_ssi.c	18 Oct 2006 09:58:48 -0000	1.8
+++ src/core/common/tsp_common_ssi.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,7 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 #include <tsp_const_def.h>
 #define TSP_COMMON_SSI_C
 #include <tsp_common_ssi.h>
@@ -114,7 +114,7 @@
     ssi->name                 = strdup(name);
     if (NULL==ssi->name) {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",name));
+      STRACE_ERROR("Cannot strdup <%s>",name);
     }
   } else {
     ssi->name                 = NULL;
@@ -251,7 +251,10 @@
   int32_t retcode = TSP_STATUS_OK;
   int32_t i;
   assert(ssil);
-  
+
+  STRACE_INFO("hi");
+
+
   ssil->TSP_sample_symbol_info_list_t_len = nbSSI;
   ssil->TSP_sample_symbol_info_list_t_val = (TSP_sample_symbol_info_t*) calloc (nbSSI,sizeof(TSP_sample_symbol_info_t));
   TSP_CHECK_ALLOC(ssil->TSP_sample_symbol_info_list_t_val,TSP_STATUS_ERROR_MEMORY_ALLOCATION);
Index: src/core/common/tsp_common_status.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_common_status.c,v
retrieving revision 1.5
diff -u -r1.5 tsp_common_status.c
--- src/core/common/tsp_common_status.c	30 Nov 2007 15:42:01 -0000	1.5
+++ src/core/common/tsp_common_status.c	3 Feb 2008 19:38:42 -0000
@@ -39,7 +39,7 @@
 #include <tsp_sys_headers.h>
 #include <tsp_abs_types.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 #include <tsp_const_def.h>
 #include <tsp_common_macros.h>
 #define TSP_COMMON_STATUS_C
Index: src/core/common/tsp_common_trace.c
===================================================================
RCS file: src/core/common/tsp_common_trace.c
diff -N src/core/common/tsp_common_trace.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/core/common/tsp_common_trace.c	3 Feb 2008 19:38:42 -0000
@@ -0,0 +1,108 @@
+/*
+
+$Id$
+
+-----------------------------------------------------------------------
+
+TSP Library - core components for a generic Transport Sampling Protocol.
+
+Copyright (c) 2008 Robert de Vries
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+-----------------------------------------------------------------------
+
+Project    : TSP
+Maintainer : tsp@astrium.eads.net
+Component  : common
+
+-----------------------------------------------------------------------
+
+Purpose   : Tracing and error/warning message generation
+
+-----------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "tsp_common_trace.h"
+
+static const char *level_name(int level)
+{
+    switch(level) {
+    case STRACE_LEVEL_ERROR:
+	return "ERRROR";
+    case STRACE_LEVEL_WARNING:
+	return "Warning";
+    case STRACE_LEVEL_INFO:
+	return "Info";
+    case STRACE_LEVEL_REQUEST:
+	return "Request";
+    case STRACE_LEVEL_DEBUG:
+	return "Debug";
+    case STRACE_LEVEL_DEBUG_MORE:
+	return "Debug More";
+    case STRACE_LEVEL_TEST:
+	return "Test";
+    }
+    return "???";
+}
+
+
+static void default_trace_func(int level, const char *name, const char *file, const char *func, int line, const char *format, va_list args)
+{
+    fprintf(stderr, "%7s||%s##%s##%d: ", name, file, func, line);
+    vfprintf(stderr, format, args);
+    putc('\n', stderr);
+    fflush(stderr);
+}
+
+static long int strace_debug_level = 0;
+static TSP_trace_func trace = default_trace_func;
+
+void TSP_trace(int level, const char *file, const char *func, int line, const char *format, ...)
+{
+    static bool first_time = true;
+
+    if (first_time) {
+	first_time = false;
+	char *strace_env = getenv("STRACE_DEBUG");
+	if (strace_env != NULL) {
+	    char *end;
+	    int new_level = strtol(strace_env, &end, 0);
+	    assert(errno != EINVAL); /* programming error, base contains an unsupported value */
+	    if (*end != 0) {
+		fprintf(stderr, "STRACE_DEBUG environment variable has trailing garbage\n");
+	    }
+	    else if (errno == ERANGE) {
+		fprintf(stderr, "STRACE_DEBUG environment variable value out of range\n");
+	    }
+	    else {
+		strace_debug_level = new_level;
+	    }
+	}
+    }
+    if ((0==level) || (strace_debug_level & level) ) {
+	va_list args;
+	va_start(args, format);
+	trace(level, level_name(level), file, func, line, format, args);
+	va_end(args);
+    }		    
+}
Index: src/core/common/tsp_common_trace.h
===================================================================
RCS file: src/core/common/tsp_common_trace.h
diff -N src/core/common/tsp_common_trace.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/core/common/tsp_common_trace.h	3 Feb 2008 19:38:42 -0000
@@ -0,0 +1,80 @@
+/*
+
+$Id$
+
+-----------------------------------------------------------------------
+
+TSP Library - core components for a generic Transport Sampling Protocol.
+
+Copyright (c) 2008 Robert de Vries
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+-----------------------------------------------------------------------
+
+Project    : TSP
+Maintainer : tsp@astrium.eads.net
+Component  : common
+
+-----------------------------------------------------------------------
+
+Purpose   : Tracing and error/warning message generation
+
+-----------------------------------------------------------------------
+ */
+
+#ifndef _TSP_COMMON_TRACE_H
+#define _TSP_COMMON_TRACE_H
+
+#include <stdarg.h>
+
+typedef void (*TSP_trace_func)(int level, const char *source, const char *file, const char *func, int line, const char *format, va_list args);
+
+void TSP_trace(int level, const char *file, const char *func, int line, const char *format, ...);
+
+void TSP_trace_install(TSP_trace_func trace_func);
+
+#if defined(__GNUC__) || defined(_MSC_VER)
+#define __func__ __FUNCTION__
+#else
+#define __func__ "where?"
+#endif
+
+#define STRACE_LEVEL_ERROR       (0)
+#define STRACE_LEVEL_WARNING     (1)
+#define STRACE_LEVEL_INFO        (2)
+#define STRACE_LEVEL_REQUEST     (4)
+#define STRACE_LEVEL_DEBUG       (8)
+#define STRACE_LEVEL_DEBUG_MORE (16)
+#define STRACE_LEVEL_TEST       (32)
+
+#ifdef  USE_STRACE
+# define STRACE_TEST(...)	TSP_trace(STRACE_LEVEL_TEST,       __FILE__, __func__, __LINE__, __VA_ARGS__)
+# define STRACE_DEBUG_MORE(...)	TSP_trace(STRACE_LEVEL_DEBUG_MORE, __FILE__, __func__, __LINE__, __VA_ARGS__)
+# define STRACE_DEBUG(...)	TSP_trace(STRACE_LEVEL_DEBUG,      __FILE__, __func__, __LINE__, __VA_ARGS__)
+# define STRACE_REQUEST( ...)	TSP_trace(STRACE_LEVEL_REQUEST,    __FILE__, __func__, __LINE__, __VA_ARGS__)
+# define STRACE_INFO(...)	TSP_trace(STRACE_LEVEL_INFO,       __FILE__, __func__, __LINE__, __VA_ARGS__)
+#else
+# define STRACE_TEST(...)
+# define STRACE_DEBUG_MORE(...)
+# define STRACE_DEBUG(...)
+# define STRACE_REQUEST(...)
+# define STRACE_INFO(...)
+#endif
+
+#define STRACE_WARNING(...)	 TSP_trace(STRACE_LEVEL_WARNING, __FILE__, __func__, __LINE__, __VA_ARGS__)
+#define STRACE_ERROR(...)	 TSP_trace(STRACE_LEVEL_ERROR,   __FILE__, __func__, __LINE__, __VA_ARGS__)
+
+#endif	/* _TSP_COMMON_TRACE_H */
Index: src/core/common/tsp_decoder.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_decoder.c,v
retrieving revision 1.8
diff -u -r1.8 tsp_decoder.c
--- src/core/common/tsp_decoder.c	30 Nov 2007 15:42:01 -0000	1.8
+++ src/core/common/tsp_decoder.c	3 Feb 2008 19:38:43 -0000
@@ -41,7 +41,6 @@
  
 #include <tsp_const_def.h>
 #include <tsp_datastruct.h>
-#include <tsp_simple_trace.h>
 #include <tsp_decoder.h>
 
 #if defined(sun) || defined(__sun)
@@ -69,7 +68,7 @@
   {
     if( xdr_double(&xhandle, (double*)out_double+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_double failed"));
+      STRACE_ERROR("Function xdr_double failed");
       return FALSE;
     }
     else
@@ -83,7 +82,7 @@
   for(i=0;i<dimension;++i)
   {
     ((uint64_t*)out_double)[i] = TSP_DECODE_DOUBLE_TO_UINT64(in_buf+(i*TSP_SIZEOF_ENCODED_DOUBLE));   
-    STRACE_DEBUG_MORE(("decoded DOUBLE = %f, (received) encoded DOUBLE=0x%08llx",((double*)out_double)[i],((uint64_t*)in_buf)[i]));
+    STRACE_DEBUG_MORE("decoded DOUBLE = %f, (received) encoded DOUBLE=0x%08llx",((double*)out_double)[i],((uint64_t*)in_buf)[i]);
   }
 #endif
 
@@ -105,7 +104,7 @@
   {
     if( xdr_float(&xhandle, (float*)out_float+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_float failed"));
+      STRACE_ERROR("Function xdr_float failed");
       return FALSE;
     }
     else
@@ -182,7 +181,7 @@
   {
     if( xdr_int(&xhandle, (int32_t*)out_int32+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_float failed"));
+      STRACE_ERROR("Function xdr_float failed");
       return FALSE;
     }
     else
@@ -217,7 +216,7 @@
   {
     if( xdr_hyper(&xhandle, (int64_t*)out_int64+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_float failed"));
+      STRACE_ERROR("Function xdr_float failed");
       return FALSE;
     }
     else
@@ -292,7 +291,7 @@
   {
     if( xdr_int(&xhandle, (uint32_t*)out_uint32+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_float failed"));
+      STRACE_ERROR("Function xdr_float failed");
       return FALSE;
     }
     else
@@ -327,7 +326,7 @@
   {
     if( xdr_hyper(&xhandle, (uint64_t*)out_uint64+i) != TRUE)
     {
-      STRACE_ERROR(("Function xdr_float failed"));
+      STRACE_ERROR("Function xdr_float failed");
       return FALSE;
     }
     else
@@ -508,9 +507,8 @@
     return TSP_SIZEOF_ENCODED_USER;
         
   default:
-    STRACE_ERROR(("Unknown TSP Type <%d>",type))
+    STRACE_ERROR("Unknown TSP Type <%d>",type);
     return 0;
-
   }
 }
 
Index: src/core/common/tsp_encoder.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/common/tsp_encoder.c,v
retrieving revision 1.12
diff -u -r1.12 tsp_encoder.c
--- src/core/common/tsp_encoder.c	30 Nov 2007 15:42:01 -0000	1.12
+++ src/core/common/tsp_encoder.c	3 Feb 2008 19:38:43 -0000
@@ -40,7 +40,7 @@
 #include <rpc/xdr.h>
 
 #include <tsp_const_def.h>
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 #include <tsp_datastruct.h>
 #include <tsp_encoder.h>
 #include <tsp_decoder.h>
@@ -80,7 +80,7 @@
   }
   
   if (size  < taille ) {
-    STRACE_ERROR(("buffer is too small"));
+    STRACE_ERROR("buffer is too small");
     return 0;
   }
   
@@ -94,7 +94,7 @@
   {
     if( xdr_double(&xhandle, pt_double+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_double failed"));
+       STRACE_ERROR("Function xdr_double failed");
        return 0;
     }
   }
@@ -106,7 +106,7 @@
    
   for (i=0;i<dimension;++i) {
     ((uint64_t*)out_buf)[i] = TSP_ENCODE_DOUBLE_TO_UINT64(pt_double+i);
-    STRACE_DEBUG_MORE(("DOUBLE = %f, encoded DOUBLE=0x%08llx",*pt_double,((uint64_t*)out_buf)[i]));
+    STRACE_DEBUG_MORE("DOUBLE = %f, encoded DOUBLE=0x%08llx",*pt_double,((uint64_t*)out_buf)[i]);
   } 
   
   return (uint32_t)(taille);
@@ -140,7 +140,7 @@
   }
 
   if (size  < taille ) {
-    STRACE_ERROR(("buffer is too small"));
+    STRACE_ERROR("buffer is too small");
     return 0;
   }
 
@@ -154,7 +154,7 @@
   {
     if( xdr_float(&xhandle, pt_float+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_float failed"));
+       STRACE_ERROR("Function xdr_float failed");
        return 0;
     }
   }
@@ -252,7 +252,7 @@
   }
 
   if (size  < taille) {
-    STRACE_ERROR(("buffer is too small"));
+    STRACE_ERROR("buffer is too small");
     return 0;
   }
 
@@ -266,7 +266,7 @@
   {
     if( xdr_int(&xhandle, pt_int32+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_int failed"));
+       STRACE_ERROR("Function xdr_int failed");
        return 0;
     }
   }
@@ -309,7 +309,7 @@
   }
 
   if (size  < taille ) {
-     STRACE_ERROR(("buffer is too small"));
+     STRACE_ERROR("buffer is too small");
      return 0;
   }
 
@@ -323,7 +323,7 @@
   {
     if( xdr_hyper(&xhandle, pt_int64+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_hyper failed"));
+       STRACE_ERROR("Function xdr_hyper failed");
        return 0;
     }
   }
@@ -417,7 +417,7 @@
   }
 
   if (size  < taille) {
-    STRACE_ERROR(("buffer is too small"));
+    STRACE_ERROR("buffer is too small");
     return 0;
   }
 
@@ -431,7 +431,7 @@
   {
     if( xdr_int(&xhandle, pt_uint32+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_int failed"));
+       STRACE_ERROR("Function xdr_int failed");
        return 0;
     }
   }
@@ -476,7 +476,7 @@
   }
 
   if (size  < taille) {
-    STRACE_ERROR(("buffer is too small"));
+    STRACE_ERROR("buffer is too small");
     return 0;
   }
 
@@ -490,7 +490,7 @@
   {
     if( xdr_hyper(&xhandle, pt_uint64+i) != TRUE)
     {
-       STRACE_ERROR(("Function xdr_long failed"));
+       STRACE_ERROR("Function xdr_long failed");
        return 0;
     }
   }
Index: src/core/ctrl/tsp_data_sender.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_data_sender.c,v
retrieving revision 1.30
diff -u -r1.30 tsp_data_sender.c
--- src/core/ctrl/tsp_data_sender.c	30 Nov 2007 15:42:00 -0000	1.30
+++ src/core/ctrl/tsp_data_sender.c	3 Feb 2008 19:38:43 -0000
@@ -91,7 +91,7 @@
   sender->fifo_full   = FALSE;
   sender->buffer_size = TSP_DATA_STREAM_MAX_BUFFER_SIZE(group_max_byte_size);
 
-  STRACE_DEBUG(("Data Sender buffer size is: <%d> byte(s)",sender->buffer_size));
+  STRACE_DEBUG("Data Sender buffer size is: <%d> byte(s)",sender->buffer_size);
   /* Create the sender stream with its fifo size*/
   sender->stream_sender = (TSP_data_sender_t)TSP_stream_sender_create(fifo_size, sender->buffer_size);
   if (sender->stream_sender) {      
@@ -109,7 +109,7 @@
     }
   }
   else {
-    STRACE_ERROR(("Function TSP_stream_sender_create failed"));
+    STRACE_ERROR("Function TSP_stream_sender_create failed");
     free(sender);
     sender = NULL;
   }
@@ -201,7 +201,7 @@
       if(!TSP_stream_sender_send(data_sender->stream_sender,
 				 TSP_STREAM_SENDER_ITEM_BUF(tosend),
 				 tosend->len) ) {
-	  STRACE_WARNING(("Function TSP_stream_sender_send failed "));
+	  STRACE_WARNING("Function TSP_stream_sender_send failed ");
 	  ret = FALSE;
 	}  
     }
@@ -242,7 +242,7 @@
       tsp_reserved_group = TSP_RESERVED_GROUP_CONSUMER_DATA_LOST;
       break;
     default:
-      STRACE_ERROR(("We should not be there..."));
+      STRACE_ERROR("We should not be there...");
       assert(0);
       return FALSE;
     }
@@ -323,8 +323,8 @@
 	   * FIXME : we cannot STRACE_DEBUG value simply due
 	   * to multi-type handling 
 	   */
-	  /* STRACE_DEBUG(("Gr=%d V=%f", group_index, *(double*)(group->items[i].data))); */
-	  STRACE_DEBUG_MORE(("Gr=%d Ne=%d", group_index, group->items[i].nelem));
+	  /* STRACE_DEBUG("Gr=%d V=%f", group_index, *(double*)(group->items[i].data)); */
+	  STRACE_DEBUG_MORE("Gr=%d Ne=%d", group_index, group->items[i].nelem);
 	  
 	  /* Call encode function */
 	  assert(group->items[i].data_encoder);
@@ -333,7 +333,7 @@
 						buf_char,
 						data_sender->buffer_size - ( buf_char - buf_main) );
 	  if ( 0 == size ) {
-	    STRACE_ERROR(("data_encoder failed"));	    
+	    STRACE_ERROR("data_encoder failed");
 	    ret = FALSE;
 	    break;
 	  }
Index: src/core/ctrl/tsp_datapool.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_datapool.c,v
retrieving revision 1.33
diff -u -r1.33 tsp_datapool.c
--- src/core/ctrl/tsp_datapool.c	30 Nov 2007 15:42:00 -0000	1.33
+++ src/core/ctrl/tsp_datapool.c	3 Feb 2008 19:38:43 -0000
@@ -71,7 +71,7 @@
 { \
 	if( (index) >= (obj).size ) \
 	{ \
-		STRACE_ERROR(("ERROR :-->OUT : provider_global_index %d does not exist !",(index))) \
+		STRACE_ERROR("ERROR :-->OUT : provider_global_index %d does not exist !",(index)); \
 		return ret; \
 	} \
 }
@@ -114,25 +114,25 @@
     
   case GLU_GET_EOF :
     TSP_session_all_session_send_msg_ctrl(TSP_MSG_CTRL_EOF);
-    STRACE_INFO(("GLU sent EOF"));
+    STRACE_INFO("GLU sent EOF");
     /* End of flow. Our datapool is dead */
     datapool->terminated = TRUE;
     break;
     
   case GLU_GET_RECONF :
     TSP_session_all_session_send_msg_ctrl(TSP_MSG_CTRL_RECONF);
-    STRACE_INFO(("GLU sent RECONF"));
+    STRACE_INFO("GLU sent RECONF");
     /* End of flow. Our datapool is dead */
     datapool->terminated = TRUE;
     break;
     
   case GLU_GET_DATA_LOST :
     TSP_session_all_session_send_msg_ctrl(TSP_MSG_CTRL_GLU_DATA_LOST);
-    STRACE_INFO(("GLU sent DATA_LOST"));
+    STRACE_INFO("GLU sent DATA_LOST");
     break;
     
   default:
-    STRACE_ERROR(("?"));
+    STRACE_ERROR("?");
     assert(0);
   }    
   return 0;  
Index: src/core/ctrl/tsp_default_glu.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_default_glu.c,v
retrieving revision 1.22
diff -u -r1.22 tsp_default_glu.c
--- src/core/ctrl/tsp_default_glu.c	30 Nov 2007 15:42:00 -0000	1.22
+++ src/core/ctrl/tsp_default_glu.c	3 Feb 2008 19:38:43 -0000
@@ -197,7 +197,7 @@
 	pg_indexes[i]=looked_for->provider_global_index;
       }
       if(found) {
-	STRACE_INFO(("Found symbol <%s> pgi=<%d> ",  looked_for->name, looked_for->provider_global_index));	   
+	STRACE_INFO("Found symbol <%s> pgi=<%d> ",  looked_for->name, looked_for->provider_global_index);
 	break;
       }
       
@@ -205,7 +205,7 @@
     if(!found) {
       retcode = FALSE;
       pg_indexes[i]= -1;
-      STRACE_INFO(("Unable to find symbol '%s'",  looked_for->name));	   
+      STRACE_INFO("Unable to find symbol '%s'",  looked_for->name);
     }
     
     found = FALSE;     
@@ -213,7 +213,7 @@
     
     if(!found) {
       retcode = FALSE;
-      STRACE_INFO(("No good data in symbol '%s'",  looked_for->name));	   
+      STRACE_INFO("No good data in symbol '%s'",  looked_for->name);
     }
   }
   return retcode;
@@ -251,7 +251,7 @@
 
   switch (filter_kind) {
   case TSP_FILTER_SIMPLE:
-    STRACE_INFO(("Requested filter kind <%d>, filter string = <%s>",filter_kind,filter_string));
+    STRACE_INFO("Requested filter kind <%d>, filter string = <%s>",filter_kind,filter_string);
     /* first loop to count matching symbols */
     nb_match      = 0;
     matched_index = calloc(complete_symbol_list.TSP_sample_symbol_info_list_t_len,sizeof(int32_t));
@@ -261,13 +261,13 @@
 	nb_match++;	
       }
     }
-    STRACE_INFO(("Nb Match(es) is <%d>",nb_match));
+    STRACE_INFO("Nb Match(es) is <%d>",nb_match);
     /* second loop if nb_match > 0 */
     if (nb_match>0) {
       TSP_SSIList_finalize(&(answer_sample->symbols));
       TSP_SSIList_initialize(&(answer_sample->symbols),nb_match);
       for (i=0;i<nb_match;i++) {
-	STRACE_DEBUG(("Adding <%s> to answer_sample...",complete_symbol_list.TSP_sample_symbol_info_list_t_val[matched_index[i]].name));
+	STRACE_DEBUG("Adding <%s> to answer_sample...",complete_symbol_list.TSP_sample_symbol_info_list_t_val[matched_index[i]].name);
 	TSP_SSI_copy(&(answer_sample->symbols.TSP_sample_symbol_info_list_t_val[i]),
 		     complete_symbol_list.TSP_sample_symbol_info_list_t_val[matched_index[i]]);
       }
@@ -307,7 +307,7 @@
     }
     else {
       SSI_list->TSP_sample_symbol_info_list_t_val[i].provider_global_index=-1;      
-      STRACE_INFO(("Unable to find symbol '%s'",  SSI_list->TSP_sample_symbol_info_list_t_val[i].name));      
+      STRACE_INFO("Unable to find symbol '%s'",  SSI_list->TSP_sample_symbol_info_list_t_val[i].name);
       ret=TSP_STATUS_ERROR_SYMBOLS;      
     }
   }
@@ -372,14 +372,14 @@
   if(looked_for->period < 1) 
   {
     *pg_indexes=-1;
-    STRACE_DEBUG(("Invalid period"));
+    STRACE_DEBUG("Invalid period");
     return FALSE;
   }
 
   if(looked_for->phase < 0) 
   {
     *pg_indexes=-1;
-    STRACE_DEBUG(("Invalid phase"));
+    STRACE_DEBUG("Invalid phase");
     return FALSE;
   }
 	  
@@ -389,7 +389,7 @@
     if(looked_for->type != compared->type)
     {
       *pg_indexes=-1;
-       STRACE_DEBUG(("Invalid type"));
+       STRACE_DEBUG("Invalid type");
       return FALSE;
 
     }
@@ -405,7 +405,7 @@
     if(looked_for->offset >= compared->dimension)
     {
       *pg_indexes=-1;
-      STRACE_DEBUG(("Invalid offset"));
+      STRACE_DEBUG("Invalid offset");
       return FALSE;
     }
  }
@@ -415,7 +415,7 @@
     if((looked_for->offset + looked_for->nelem - 1) >= compared->dimension)
     {
       *pg_indexes=-1;
-      STRACE_DEBUG(("Invalid nelem"));
+      STRACE_DEBUG("Invalid nelem");
       return FALSE;
     }
  }
@@ -430,7 +430,7 @@
     if(looked_for->dimension != compared->dimension)
     {
       *pg_indexes=-1;
-      STRACE_DEBUG(("Invalid dimension"));
+      STRACE_DEBUG("Invalid dimension");
       return FALSE;
     }
  }
Index: src/core/ctrl/tsp_group_algo.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_group_algo.c,v
retrieving revision 1.26
diff -u -r1.26 tsp_group_algo.c
--- src/core/ctrl/tsp_group_algo.c	30 Nov 2007 15:38:22 -0000	1.26
+++ src/core/ctrl/tsp_group_algo.c	3 Feb 2008 19:38:43 -0000
@@ -101,14 +101,14 @@
     
     /* We calculate the LCM for the period of all symbols */
     int ppcm = (symbols->TSP_sample_symbol_info_list_t_val[0].period);
-    STRACE_DEBUG(("Frequency_ratio No0= %d", ppcm));
+    STRACE_DEBUG("Frequency_ratio No0= %d", ppcm);
     
     for( i = 1 ; i < nb_symbols ; i++) {	
       
       int frequency_ratio =
 	(symbols->TSP_sample_symbol_info_list_t_val[i].period);
       
-      STRACE_DEBUG(("Frequency_ratio No%u= %d", i, frequency_ratio));
+      STRACE_DEBUG("Frequency_ratio No%u= %d", i, frequency_ratio);
       
       /* LCM */         
       PPCM(ppcm,frequency_ratio, ppcm); 
@@ -118,9 +118,9 @@
     
   }
   else {
-    STRACE_WARNING(("No symbols in list !"));    
+    STRACE_WARNING("No symbols in list !");
   }
-  STRACE_INFO(("Found <%d> group(s) for request with <%d> symbol(s)",nb_groups,nb_symbols));
+  STRACE_INFO("Found <%d> group(s) for request with <%d> symbol(s)",nb_groups,nb_symbols);
   return nb_groups;    
 }
 
@@ -155,7 +155,7 @@
       }      
     }
     
-  STRACE_INFO(("Group_size for group[%d] is %d", group_id, group_size));    
+  STRACE_INFO("Group_size for group[%d] is %d", group_id, group_size);
   return group_size;
 }
 
@@ -180,7 +180,7 @@
     groups_summed_size += TSP_group_algo_get_group_size(symbols, group_id,&group_byte_size); 
   }
     
-  STRACE_INFO(("Groups_summed_size is %d", groups_summed_size));
+  STRACE_INFO("Groups_summed_size is %d", groups_summed_size);
     
   return groups_summed_size;
 } /* end of TSP_group_algo_get_groups_summed_size */
@@ -253,8 +253,8 @@
 
     }
 
-  STRACE_INFO(("Max group size      = %d", table->max_group_len));  
-  STRACE_INFO(("Group max byte size = %d", table->group_max_byte_size));
+  STRACE_INFO("Max group size      = %d", table->max_group_len);
+  STRACE_INFO("Group max byte size = %d", table->group_max_byte_size);
   return table;
 } /* TSP_group_algo_allocate_group_table */
                                                              
@@ -320,7 +320,7 @@
       /* Does - it belong to the group */
       if (BELONGS_TO_GROUP(in_info->period, in_info->phase , group_id) ) {		
 	/*Yes, we add it*/
-	STRACE_DEBUG(("Adding provider_global_index %d at group %d and rank %d",in_info->provider_global_index,group_id,rank));
+	STRACE_DEBUG("Adding provider_global_index %d at group %d and rank %d",in_info->provider_global_index,group_id,rank);
 	/* 1 - In the out group table */
 	
 	/* find the encoder of the data type */
Index: src/core/ctrl/tsp_provider.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_provider.c,v
retrieving revision 1.57
diff -u -r1.57 tsp_provider.c
--- src/core/ctrl/tsp_provider.c	30 Nov 2007 15:42:01 -0000	1.57
+++ src/core/ctrl/tsp_provider.c	3 Feb 2008 19:38:44 -0000
@@ -98,14 +98,14 @@
   int32_t retval = TSP_STATUS_OK;
 
   if (version_id != TSP_PROTOCOL_VERSION) {
-    STRACE_ERROR(("TSP version ERROR. Requested=%d Current=%d",version_id, TSP_PROTOCOL_VERSION ));    
+    STRACE_ERROR("TSP version ERROR. Requested=%d Current=%d",version_id, TSP_PROTOCOL_VERSION);
     retval = TSP_STATUS_ERROR_VERSION;
   }
 
   if ((TSP_STATUS_OK==retval) && (NULL!=glu)) {
     *glu = TSP_session_get_GLU_by_channel(channel_id);
     if (NULL==*glu) {
-      STRACE_ERROR(("TSP channel id ERROR. Trying to use Channel Id=%d ",channel_id));
+      STRACE_ERROR("TSP channel id ERROR. Trying to use Channel Id=%d ",channel_id);
       retval=TSP_STATUS_ERROR_INVALID_CHANNEL_ID;
     }
   }
@@ -144,13 +144,13 @@
       if(p && (p == (*argv)[i] ))
 	{
 	  /* TSP Arg */
-	  STRACE_INFO(("Tsp ARG : '%s'", (*argv)[i]));
+	  STRACE_INFO("Tsp ARG : '%s'", (*argv)[i]);
 
 	  /* First we must not be looking for a argument */
 	  if(found_server_number_flag)
 	    {
 	      /* Error we are expecting an arguement not a TSP option*/
-	      STRACE_WARNING(("Unexpected %s", (*argv)[i]));
+	      STRACE_WARNING("Unexpected %s", (*argv)[i]);
 	      ret = FALSE;
 	    }
 	  /* Look for start flag */
@@ -169,7 +169,7 @@
 		}
 	      else
 		{
-		  STRACE_WARNING(("Unexpected "TSP_ARG_STREAM_INIT_START));
+		  STRACE_WARNING("Unexpected "TSP_ARG_STREAM_INIT_START);
 		  ret = FALSE;
 		}
 	    }
@@ -181,7 +181,7 @@
 		}
 	      else
 		{
-		  STRACE_WARNING(("Unexpected "TSP_ARG_STREAM_INIT_STOP));
+		  STRACE_WARNING("Unexpected "TSP_ARG_STREAM_INIT_STOP);
 		  ret = FALSE;
 		}
 	    }
@@ -190,14 +190,14 @@
 	      found_server_number_flag = TRUE;
 	      if(found_stream_start && !found_stream_stop)		
 		{
-		  STRACE_WARNING(("Unexpected "TSP_ARG_SERVER_NUMBER));
+		  STRACE_WARNING("Unexpected "TSP_ARG_SERVER_NUMBER);
 		  ret = FALSE;
 		}
 	    }
 	  else
 	    {
 	      /* Unkown option */
-	      STRACE_WARNING(("Unknown TSP option : '%s'",(*argv)[i] ))
+	      STRACE_WARNING("Unknown TSP option : '%s'",(*argv)[i]);
 	      ret = FALSE;
 	    }
 	}
@@ -213,7 +213,7 @@
 	      /* Found arg for server number option */
 	      found_server_number_flag = FALSE;
 	      X_server_base_number = atoi((*argv)[i]);
-	      STRACE_INFO(("Server base number = %d", X_server_base_number));
+	      STRACE_INFO("Server base number = %d", X_server_base_number);
 	    }
 	  else
 	    {	      
@@ -228,13 +228,13 @@
   
   if( found_stream_start && !found_stream_stop )
     {
-      STRACE_WARNING(("A " TSP_ARG_STREAM_INIT_STOP " flag was expected"));
+      STRACE_WARNING("A " TSP_ARG_STREAM_INIT_STOP " flag was expected");
       ret = FALSE;
     }
 
   if( found_server_number_flag )
     {
-      STRACE_WARNING(("An argument was expected after " TSP_ARG_SERVER_NUMBER));
+      STRACE_WARNING("An argument was expected after " TSP_ARG_SERVER_NUMBER);
       ret = FALSE;
     }
 
@@ -245,13 +245,13 @@
   /* Display usage */
   if(!ret)
     {
-      STRACE_WARNING((TSP_ARG_PROVIDER_USAGE));
+      STRACE_WARNING(TSP_ARG_PROVIDER_USAGE);
     }
   else
     {
       if (! X_glu_argc )
 	{
-	  STRACE_INFO(("No GLU stream init provided on command line"));
+	  STRACE_INFO("No GLU stream init provided on command line");
 	}
     }
 
@@ -282,7 +282,7 @@
   char* error_info;
   int i;
 
-  STRACE_REQUEST(("OPEN"));
+  STRACE_REQUEST("OPEN");
 	
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);
 
@@ -293,11 +293,11 @@
 
   if (req_open->argv.TSP_argv_t_len) {
     for( i = 0; i< req_open->argv.TSP_argv_t_len ;i++) {
-      STRACE_DEBUG(("arg %d is '%s'", i,  req_open->argv.TSP_argv_t_val[i]));
+      STRACE_DEBUG("arg %d is '%s'", i,  req_open->argv.TSP_argv_t_val[i]);
     }
   }
   else {
-    STRACE_DEBUG(("No custom args from consumer"));
+    STRACE_DEBUG("No custom args from consumer");
   }
 
   /*  
@@ -333,15 +333,15 @@
 	ans_open->status      = TSP_STATUS_OK;
       }
       else {
-	STRACE_ERROR(("TSP version ERROR. Requested=%d Current=%d",req_open->version_id, TSP_PROTOCOL_VERSION ));
+	STRACE_ERROR("TSP version ERROR. Requested=%d Current=%d",req_open->version_id, TSP_PROTOCOL_VERSION);
 	ans_open->status = TSP_STATUS_ERROR_VERSION;
       }
     }
     else {
-      STRACE_ERROR(("TSP_add_session failed"));
+      STRACE_ERROR("TSP_add_session failed");
     }
   } else {
-    STRACE_INFO(("Unable to get first GLU instance"));
+    STRACE_INFO("Unable to get first GLU instance");
     ans_open->status = TSP_STATUS_ERROR_SEE_STRING;
     ans_open->status_str = error_info;
   }  
@@ -358,7 +358,7 @@
 void 
 TSP_provider_request_close(const TSP_request_close_t* req_close) {
 
-  STRACE_REQUEST(("CLOSE channel_id=<%d>",req_close->channel_id));
+  STRACE_REQUEST("CLOSE channel_id=<%d>",req_close->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);
   
   if (TSP_STATUS_OK==TSP_provider_checkVersionAndChannelId(req_close->version_id,
@@ -377,9 +377,9 @@
 void  
 TSP_provider_request_information(TSP_request_information_t* req_info, 
 				 TSP_answer_sample_t* ans_sample) {
-  STRACE_REQUEST(("INFORMATIONS channel_id=<%d>",req_info->channel_id));
+  STRACE_REQUEST("INFORMATIONS channel_id=<%d>",req_info->channel_id);
   TSP_provider_request_filtered_information(req_info,TSP_FILTER_NONE,NULL,ans_sample);  
-  STRACE_DEBUG(("Nb symbol = %d",ans_sample->symbols.TSP_sample_symbol_info_list_t_len));
+  STRACE_DEBUG("Nb symbol = %d",ans_sample->symbols.TSP_sample_symbol_info_list_t_len);
 } /* End of TSP_provider_request_information */
 
 void TSP_provider_update_answer_with_minimalinfo(int32_t version_id, int32_t channel_id,
@@ -411,7 +411,7 @@
 
   GLU_handle_t* myGLU = NULL;
 
-  STRACE_REQUEST(("FILTERED INFORMATIONS channel_id=<%d>",req_info->channel_id));
+  STRACE_REQUEST("FILTERED INFORMATIONS channel_id=<%d>",req_info->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);
   
   /* fill-in minimal info in answer_sample */
@@ -423,15 +423,15 @@
     /* switch case for filter_kind */
     switch (filter_kind) {
     case TSP_FILTER_NONE:
-      STRACE_INFO(("Requested filter NONE"));
+      STRACE_INFO("Requested filter NONE");
       TSP_filter_symbol_none(req_info,filter_string,ans_sample);
       break;
     case TSP_FILTER_MINIMAL:
-      STRACE_INFO(("Requested filter MINIMAL, filter string = <%s>",filter_string));
+      STRACE_INFO("Requested filter MINIMAL, filter string = <%s>",filter_string);
       TSP_filter_symbol_minimal(req_info,filter_string,ans_sample);
       break;
     default:
-      STRACE_INFO(("Requested filter kind <%d>, filter string = <%s>",filter_kind,filter_string));
+      STRACE_INFO("Requested filter kind <%d>, filter string = <%s>",filter_kind,filter_string);
       /* 
        * Forward other filtered request directly to GLU 
        * such that even non anticipated filtering method could
@@ -453,7 +453,7 @@
 
   GLU_handle_t* myGLU;
   
-  STRACE_REQUEST(("SAMPLE channel_id=<%d>",req_sample->channel_id));
+  STRACE_REQUEST("SAMPLE channel_id=<%d>",req_sample->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);	
   
   /* Always re-init answer_sample */
@@ -463,7 +463,7 @@
 					      ans_sample,
 					      &myGLU);
   
-  STRACE_INFO(("Consumer No %d asked for %d symbols",req_sample->channel_id,req_sample->symbols.TSP_sample_symbol_info_list_t_len  ));
+  STRACE_INFO("Consumer No %d asked for %d symbols",req_sample->channel_id,req_sample->symbols.TSP_sample_symbol_info_list_t_len);
 
   if (0>=req_sample->symbols.TSP_sample_symbol_info_list_t_len) {
     ans_sample->status = TSP_STATUS_ERROR_EMPTY_REQUEST_SAMPLE;
@@ -475,7 +475,7 @@
       ans_sample->status =
 	TSP_session_create_symbols_table_by_channel(req_sample, ans_sample);
       if (TSP_STATUS_OK!= ans_sample->status) {
-	STRACE_ERROR(("Function TSP_session_create_symbols_table_by_channel failed"));
+	STRACE_ERROR("Function TSP_session_create_symbols_table_by_channel failed");
       }  else {
 	TSP_session_change_stateTo_byChannel(req_sample->channel_id,TSP_SESSION_STATE_REQUEST_SAMPLE_OK);
       }
@@ -484,7 +484,7 @@
        * Start It only upon request_sample_init request.
        */      
     } else {
-      STRACE_WARNING(("Function TSP_session_get_symbols_global_index_by_channel failed"));
+      STRACE_WARNING("Function TSP_session_get_symbols_global_index_by_channel failed");
       ans_sample->status = TSP_STATUS_ERROR_SYMBOLS;
       /* 
        * Now we shall update answer_sample->symbols in order to indicates
@@ -494,7 +494,7 @@
 		       req_sample->symbols);
     }
   } else {
-    STRACE_WARNING(("TSP ERROR"));
+    STRACE_WARNING("TSP ERROR");
   }
 
   TSP_UNLOCK_MUTEX(&X_tsp_request_mutex,);
@@ -505,7 +505,7 @@
 				 TSP_answer_sample_init_t* ans_sample_init) {  
   GLU_handle_t* myGLU;
 
-  STRACE_REQUEST(("SAMPLE_INIT channel_id=<%d>",req_sample_init->channel_id));
+  STRACE_REQUEST("SAMPLE_INIT channel_id=<%d>",req_sample_init->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);
     
   ans_sample_init->status = TSP_provider_checkVersionAndChannelId(req_sample_init->version_id,
@@ -519,12 +519,12 @@
       TSP_session_create_data_sender_by_channel(req_sample_init->channel_id);
     
     if (TSP_STATUS_OK!=ans_sample_init->status) {
-      STRACE_ERROR(("TSP_data_sender_create failed"));
+      STRACE_ERROR("TSP_data_sender_create failed");
     } else {      
       /* send data address to client */
       ans_sample_init->data_address =
 	(char*)TSP_session_get_data_address_string_by_channel(req_sample_init->channel_id);  
-      STRACE_DEBUG(("ANSWER SAMPLE INIT data_address = '%s'", ans_sample_init->data_address));
+      STRACE_DEBUG("ANSWER SAMPLE INIT data_address = '%s'", ans_sample_init->data_address);
       TSP_session_change_stateTo_byChannel(req_sample_init->channel_id,TSP_SESSION_STATE_REQUEST_SAMPLE_INIT_OK);
     }
   }
@@ -535,7 +535,7 @@
 static 
 void TSP_provider_request_sample_destroy_priv(channel_id_t channel_id) {
   if(TSP_STATUS_OK!=TSP_session_destroy_data_sender_by_channel(channel_id)) {
-    STRACE_ERROR(("TSP_session_destroy_data_sender_by_channel failed"));
+    STRACE_ERROR("TSP_session_destroy_data_sender_by_channel failed");
   }
   TSP_session_change_stateTo_byChannel(channel_id,TSP_SESSION_STATE_REQUEST_SAMPLE_DESTROY_OK);
 }
@@ -544,7 +544,7 @@
 TSP_provider_request_sample_destroy(TSP_request_sample_destroy_t* req_sample_destroy, 
 				    TSP_answer_sample_destroy_t*  ans_sample_destroy) {
 
-  STRACE_REQUEST(("SAMPLE DESTROY channel_id=<%d>",req_sample_destroy->channel_id));
+  STRACE_REQUEST("SAMPLE DESTROY channel_id=<%d>",req_sample_destroy->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);
 
   ans_sample_destroy->status = TSP_provider_checkVersionAndChannelId(req_sample_destroy->version_id,
@@ -572,7 +572,7 @@
      while(TRUE==TSP_session_get_garbage_session(&channel_id)) {
        /* get the state of the garbage session */
        state = TSP_session_get_state(channel_id);
-       STRACE_INFO(("Will garbage collect session channel_id <%d> in state <%d>",channel_id,state));
+       STRACE_INFO("Will garbage collect session channel_id <%d> in state <%d>",channel_id,state);
        /* 
 	* If the session is garbage this means that the consumer
 	* did not close the session properly so do it.
@@ -581,7 +581,7 @@
        /* Simulate request sample destroy */       
        if ((TSP_SESSION_STATE_SAMPLING          == state) ||
 	   (TSP_SESSION_STATE_BROKEN_LINK       == state)) {
-	 STRACE_INFO(("Sending missing SAMPLE DESTROY to channel_id <%d> in state <%d>",channel_id,state));
+	 STRACE_INFO("Sending missing SAMPLE DESTROY to channel_id <%d> in state <%d>",channel_id,state);
 	 TSP_provider_request_sample_destroy_priv(channel_id);
 	 /* update state */
 	 state = TSP_session_get_state(channel_id);
@@ -589,10 +589,10 @@
 
        /* Simulate request close if consumer did not send it */
        if (TSP_SESSION_STATE_REQUEST_SAMPLE_DESTROY_OK == state) {
-	 STRACE_INFO(("Sending missing REQUEST CLOSE to channel_id <%d> in state <%d>",channel_id,state));
+	 STRACE_INFO("Sending missing REQUEST CLOSE to channel_id <%d> in state <%d>",channel_id,state);
 	 TSP_provider_request_close_priv(channel_id);
        }
-       STRACE_INFO(("Session No %d 'garbage-collected'", channel_id));
+       STRACE_INFO("Session No %d 'garbage-collected'", channel_id);
      }
      tsp_usleep(TSP_GARBAGE_COLLECTOR_POLL_TIME_US);
    }
@@ -628,7 +628,7 @@
   }
 
   if (TSP_STATUS_OK!=retcode) {
-    STRACE_INFO(("TSP private init error"));
+    STRACE_INFO("TSP private init error");
     X_tsp_provider_init_ok = FALSE;
   } else {
     X_tsp_provider_init_ok = TRUE;
@@ -654,7 +654,7 @@
     }
     /* Start GLU now since it is an ACTIVE one */
     if (0!=firstGLU->start(firstGLU)) {
-      STRACE_ERROR(("Cannot start GLU (ACTIVE case)"));
+      STRACE_ERROR("Cannot start GLU (ACTIVE case)");
       retcode = TSP_STATUS_ERROR_GLU_START;
     }	
     retcode = TSP_STATUS_OK;
@@ -670,15 +670,15 @@
 TSP_provider_request_async_sample_write(TSP_async_sample_t* async_sample_write) {
   int32_t ret = TSP_STATUS_OK;
 
-  STRACE_REQUEST(("ASYNC WRITE")); 
-  STRACE_DEBUG(("TSP_PROVIDER Before async_write: pgi %d value %s return %d ",async_sample_write->provider_global_index,async_sample_write->data.data_val,ret ));
+  STRACE_REQUEST("ASYNC WRITE"); 
+  STRACE_DEBUG("TSP_PROVIDER Before async_write: pgi %d value %s return %d ",async_sample_write->provider_global_index,async_sample_write->data.data_val,ret);
 
   /* FIXME should check channel id and get GLU from session object */
   ret = firstGLU->async_write(firstGLU,
 			      async_sample_write->provider_global_index,
   			      async_sample_write->data.data_val,async_sample_write->data.data_len);
 
-  STRACE_DEBUG(("TSP_PROVIDER After async_write: pgi %d value %s return %d ",async_sample_write->provider_global_index,async_sample_write->data.data_val,ret ));
+  STRACE_DEBUG("TSP_PROVIDER After async_write: pgi %d value %s return %d ",async_sample_write->provider_global_index,async_sample_write->data.data_val,ret);
   
   return ret;
 
@@ -689,8 +689,8 @@
 TSP_provider_request_async_sample_read(TSP_async_sample_t* async_sample_read) {
   int32_t ret = TSP_STATUS_OK;
 
-  STRACE_REQUEST(("ASYNC READ")); 
-  STRACE_DEBUG(("TSP_PROVIDER Before async_read: pgi %d value %s return %d ",async_sample_read->provider_global_index,async_sample_read->data.data_val,ret ));
+  STRACE_REQUEST("ASYNC READ"); 
+  STRACE_DEBUG("TSP_PROVIDER Before async_read: pgi %d value %s return %d ",async_sample_read->provider_global_index,async_sample_read->data.data_val,ret);
   
   /* FIXME should check channel id and get GLU from session object */
 
@@ -699,7 +699,7 @@
 			     (async_sample_read->data.data_val),
 			     &(async_sample_read->data.data_len));
 
-  STRACE_DEBUG(("TSP_PROVIDER After async_read: pgi %d value %f return %d ",async_sample_read->provider_global_index,*((double*)(async_sample_read->data.data_val)),ret ));
+  STRACE_DEBUG("TSP_PROVIDER After async_read: pgi %d value %f return %d ",async_sample_read->provider_global_index,*((double*)(async_sample_read->data.data_val)),ret);
   
   return ret;
 
@@ -710,7 +710,7 @@
 TSP_provider_request_extended_information(TSP_request_extended_information_t* req_extinfo, 
 					  TSP_answer_extended_information_t* ans_extinfo) {
   GLU_handle_t* myGLU;
-  STRACE_REQUEST(("EXTENDED INFORMATION channel_id=<%d>",req_extinfo->channel_id));
+  STRACE_REQUEST("EXTENDED INFORMATION channel_id=<%d>",req_extinfo->channel_id);
   TSP_LOCK_MUTEX(&X_tsp_request_mutex,);  
 
   ans_extinfo->status= TSP_provider_checkVersionAndChannelId(req_extinfo->version_id,
Index: src/core/ctrl/tsp_request_handler.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_request_handler.c,v
retrieving revision 1.8
diff -u -r1.8 tsp_request_handler.c
--- src/core/ctrl/tsp_request_handler.c	30 Nov 2007 15:42:00 -0000	1.8
+++ src/core/ctrl/tsp_request_handler.c	3 Feb 2008 19:38:44 -0000
@@ -80,7 +80,7 @@
   TSP_provider_request_handler_t*  retval = NULL;
 
   if ((rank<0) || (rank>TSP_provider_rqh_manager_get_max_nb())) {
-    STRACE_ERROR(("Invalid request handler RANK=%d, max=%d",rank,TSP_provider_rqh_manager_get_max_nb()));
+    STRACE_ERROR("Invalid request handler RANK=%d, max=%d",rank,TSP_provider_rqh_manager_get_max_nb());
   }
   else {
     retval = &rqh_manager_if.request_handlers[rank];
@@ -116,13 +116,13 @@
   else {
     /* Verify the adressed rqh was not already installed */
     if (rqh_p->status != TSP_RQH_STATUS_NOTINSTALLED) {
-      STRACE_ERROR(("Could not replace an installed request handler"));
+      STRACE_ERROR("Could not replace an installed request handler");
       retval = FALSE;
     }
     else {
        /* Really install handler */
       if (!rqh_constructor(rqh_p)) {
-	STRACE_ERROR(("Invalid request handler constructor"));
+	STRACE_ERROR("Invalid request handler constructor");
 	retval = FALSE;
       }
     } /* (rqh_p->status == TSP_RQH_STATUS_RUNNING) [else] */
@@ -211,11 +211,11 @@
 		    {
 		      rqh_manager_if.nb_running_rhq++;
 		      /*FIXME: should not reference rpc explicitely */
-		      /*STRACE_INFO(("Request handler # %d started with URL %s", rank, TSP_rpc_request_url(rqh_p)));*/
+		      /*STRACE_INFO("Request handler # %d started with URL %s", rank, TSP_rpc_request_url(rqh_p));*/
 		    }
 		  else
 		    {
-		      STRACE_ERROR(("Request handler # %d could not start properly", rank));
+		      STRACE_ERROR("Request handler # %d could not start properly", rank);
 		    }
 		}
 	    }
@@ -261,7 +261,7 @@
 
 	  if(rqh_p->status != TSP_RQH_STATUS_STOPPED)
 	    {
-	      STRACE_ERROR(("Could not stop handler # %d, canceling", rank));
+	      STRACE_ERROR("Could not stop handler # %d, canceling", rank);
 	      pthread_cancel(rqh_p->tid);
 	    }
 	  rqh_manager_if.nb_running_rhq--;
@@ -281,5 +281,5 @@
     pthread_cond_wait(&rqh_manager_if.cond,&rqh_manager_if.mutex);
   }
   TSP_UNLOCK_MUTEX(&rqh_manager_if.mutex,);
-  STRACE_DEBUG(("No more Request Hanndler running -->terminate"));
+  STRACE_DEBUG("No more Request Hanndler running -->terminate");
 } /* end of TSP_provider_rqh_manager_waitend */
Index: src/core/ctrl/tsp_session.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_session.c,v
retrieving revision 1.39
diff -u -r1.39 tsp_session.c
--- src/core/ctrl/tsp_session.c	25 Jan 2008 16:00:35 -0000	1.39
+++ src/core/ctrl/tsp_session.c	3 Feb 2008 19:38:44 -0000
@@ -58,7 +58,7 @@
   {									\
     if( NULL == (session = TSP_get_session(channel_id) ) )		\
       {									\
-	STRACE_ERROR(("Unable to get session for channel_id=%u",channel_id)); \
+	STRACE_ERROR("Unable to get session for channel_id=%u",channel_id); \
 	TSP_UNLOCK_MUTEX(&X_session_list_mutex,ret);			\
       }									\
   }
@@ -114,7 +114,7 @@
 	
   for( i = 0 ;  i < X_session_nb ; i++) {
     if( X_session_t[i].channel_id == channel_id ) {
-      STRACE_DEBUG(("Channel_id = <%d> is session Idx <%d>", channel_id,i));
+      STRACE_DEBUG("Channel_id = <%d> is session Idx <%d>", channel_id,i);
       assert(X_session_t[i].session_data);
       session = &(X_session_t[i]);
       break;			
@@ -122,7 +122,7 @@
   }
   
   if( NULL == session ) { 
-    STRACE_ERROR(("No session found for channel_id=%u", channel_id));    
+    STRACE_ERROR("No session found for channel_id=%u", channel_id);
   }
 	
   return session ;
@@ -144,11 +144,11 @@
   case TSP_SESSION_STATE_REQUEST_SAMPLE_DESTROY_OK:
   case TSP_SESSION_STATE_BROKEN_LINK:
   case TSP_SESSION_STATE_CLOSE_ON_EOF:
-    STRACE_INFO(("Session was in state <%d> goes to <%d>",session->state,newState))
+    STRACE_INFO("Session was in state <%d> goes to <%d>",session->state,newState);
     session->state = newState;
     break;
   default:
-    STRACE_ERROR(("Unknown transition from state <%d> to <%d> IGNORED.",session->state,newState));
+    STRACE_ERROR("Unknown transition from state <%d> to <%d> IGNORED.",session->state,newState);
     retcode = TSP_STATUS_ERROR_UNKNOWN; 
     break;
   }
@@ -161,7 +161,7 @@
 TSP_session_close_session(channel_id_t channel_id) {
   int ret = FALSE;
   TSP_session_t* session = NULL;
-  STRACE_DEBUG(("Request Closing session channel_id = %d", channel_id));
+  STRACE_DEBUG("Request Closing session channel_id = %d", channel_id);
   session = TSP_get_session(channel_id);
   if (NULL != session) {
     assert(session->session_data);
@@ -170,12 +170,12 @@
     /* Fill the hole with latest element */
     *session = X_session_t[X_session_nb - 1];
     X_session_nb--;
-    STRACE_DEBUG(("X_session_nb now = %d.", X_session_nb));
+    STRACE_DEBUG("X_session_nb now = %d.", X_session_nb);
     ret = TRUE;
   }
 
   if(!ret) {
-    STRACE_WARNING(("Unable to find session number %d", channel_id));
+    STRACE_WARNING("Unable to find session number %d", channel_id);
   }
 
 } /* end of TSP_session_close_session */
@@ -257,7 +257,7 @@
 
   /* Is there room left for the new session ? */
   if( X_session_nb == TSP_MAX_CLIENT_NUMBER) {
-    STRACE_ERROR(("Max session number reached : %d", TSP_MAX_CLIENT_NUMBER));
+    STRACE_ERROR("Max session number reached : %d", TSP_MAX_CLIENT_NUMBER);
     /* do not forget to unlock!! */
     TSP_UNLOCK_MUTEX(&X_session_list_mutex,TSP_STATUS_ERROR_UNKNOWN);
     return TSP_STATUS_ERROR_NO_MORE_SESSION;
@@ -266,7 +266,7 @@
   /* Create a new channel Id*/
   *new_channel_id = X_count_channel_id++;
   
-  STRACE_DEBUG(("I've found room in X_session_t for the new session. Id in X_session_t is %d", X_session_nb));
+  STRACE_DEBUG("I've found room in X_session_t for the new session. Id in X_session_t is %d", X_session_nb);
   
   /* The position is always X_session_nb, 
    * 'coz' any holes in array are filled during session removal 
@@ -288,7 +288,7 @@
   /* OK, there's a new session*/
   X_session_nb++;
   
-  STRACE_INFO(("New consumer registered with TSP channel_id=%u", *new_channel_id ));
+  STRACE_INFO("New consumer registered with TSP channel_id=%u", *new_channel_id);
   	
   TSP_UNLOCK_MUTEX(&X_session_list_mutex,FALSE);
 
@@ -355,7 +355,7 @@
       TSP_group_algo_get_group_number(session->session_data->groups);
   }
   else {
-    STRACE_ERROR(("Function TSP_group_algo_create_symbols_table failed"));    
+    STRACE_ERROR("Function TSP_group_algo_create_symbols_table failed");
   }
     
   TSP_UNLOCK_MUTEX(&X_session_list_mutex,FALSE);
@@ -404,7 +404,7 @@
       ) {
 
     if(!TSP_data_sender_send_msg_ctrl(session->session_data->sender, msg_ctrl)) {
-      STRACE_WARNING(("Data link broken for session No %d",channel_id ));
+      STRACE_WARNING("Data link broken for session No %d",channel_id);
       session->state = TSP_SESSION_STATE_BROKEN_LINK;
     }
   } else {
@@ -440,13 +440,13 @@
       while (1==waitconsumer) {
 
 	if (TSP_SESSION_STATE_BROKEN_LINK==currentSession->state) {
-	  STRACE_DEBUG(("Data link broken (during wait loop) for session = %d / idx = %d.",currentSession->channel_id,i));
+	  STRACE_DEBUG("Data link broken (during wait loop) for session = %d / idx = %d.",currentSession->channel_id,i);
 	  waitconsumer = 0;
 	  continue;
 	}
 	
 	if (TSP_SESSION_STATE_CLOSED==currentSession->state) {
-	  STRACE_DEBUG(("Session closed (during wait loop) for session = %d / idx = %d.",currentSession->channel_id,i));
+	  STRACE_DEBUG("Session closed (during wait loop) for session = %d / idx = %d.",currentSession->channel_id,i);
 	  waitconsumer = 0;
 	  continue;
 	}
@@ -462,7 +462,7 @@
 	tsp_usleep(500000);	
 	TSP_LOCK_MUTEX(&X_session_list_mutex,);
 
-	STRACE_DEBUG(("Waiting session (session = %d / idx = %d) to reach SAMPLING state now %d...",currentSession->channel_id,i,currentSession->state));
+	STRACE_DEBUG("Waiting session (session = %d / idx = %d) to reach SAMPLING state now %d...",currentSession->channel_id,i,currentSession->state);
 
 	if (TSP_SESSION_STATE_REQUEST_SAMPLE_INIT_OK == currentSession->state) {
 	  if (TRUE==TSP_data_sender_is_consumer_connected(currentSession->session_data->sender)) {
@@ -481,7 +481,7 @@
 				 X_session_t[i].session_data->groups, 
 				 t))
 	  {
-	    STRACE_WARNING(("Data link broken for session No %d",X_session_t[i].channel_id ));
+	    STRACE_WARNING("Data link broken for session No %d",X_session_t[i].channel_id);
 	    X_session_t[i].state = TSP_SESSION_STATE_BROKEN_LINK;		  
 	  }
       }
@@ -504,7 +504,7 @@
       {
 	
 	if(!TSP_data_sender_send_msg_ctrl(X_session_t[i].session_data->sender, msg_ctrl)) {
-	  STRACE_WARNING(("Data link broken for session No %d",X_session_t[i].channel_id ));
+	  STRACE_WARNING("Data link broken for session No %d",X_session_t[i].channel_id);
 	  X_session_t[i].state = TSP_SESSION_STATE_BROKEN_LINK;	      
 	} else if (TSP_MSG_CTRL_EOF==msg_ctrl) {
 	  /* terminate session on EOF (passive GLU case) please */
@@ -556,12 +556,12 @@
     if ( base_frequency > 0.0 ) {
       ringbuf_size = TSP_STREAM_SENDER_RINGBUF_SIZE * base_frequency;
       
-      STRACE_DEBUG(("Stream sender ringbuf size will be : %d items (i.e. %d seconds)",
-		    ringbuf_size,
-		    TSP_STREAM_SENDER_RINGBUF_SIZE));
+      STRACE_DEBUG("Stream sender ringbuf size will be : %d items (i.e. %d seconds)",
+		   ringbuf_size,
+		   TSP_STREAM_SENDER_RINGBUF_SIZE);
     }
     else {
-      STRACE_ERROR(("GLU return base frequency = %f", base_frequency));
+      STRACE_ERROR("GLU return base frequency = %f", base_frequency);
       retcode = TSP_STATUS_ERROR_UNKNOWN;
     }
   }
@@ -571,10 +571,10 @@
   /*--------------------*/
   if (TSP_STATUS_OK==retcode) {
     uint32_t max_group_size = TSP_group_algo_get_biggest_group_size(session->session_data->groups);
-    STRACE_DEBUG(("Channel Id <%d> has Max TSP Group Size <%d> byte(s)",
-		  channel_id,max_group_size));
-    STRACE_DEBUG(("Using RINBUF size of <%d> byte(s)",
-		  ringbuf_size));
+    STRACE_DEBUG("Channel Id <%d> has Max TSP Group Size <%d> byte(s)",
+		  channel_id,max_group_size);
+    STRACE_DEBUG("Using RINBUF size of <%d> byte(s)",
+		  ringbuf_size);
     session->session_data->sender = TSP_data_sender_create(ringbuf_size, max_group_size);      
     if(NULL != session->session_data->sender) {
       /* If there's no fifo, 
@@ -589,16 +589,16 @@
 	 */
 	if (0!=(session->session_data->glu_h->start(session->session_data->glu_h))) {
 	  retcode = TSP_STATUS_ERROR_GLU_START;
-	  STRACE_ERROR(("Unable to start GLU (PASSIVE case)"));
+	  STRACE_ERROR("Unable to start GLU (PASSIVE case)");
 	} else {
-	  STRACE_DEBUG(("PASSIVE GLU started."));
+	  STRACE_DEBUG("PASSIVE GLU started.");
 	  retcode = TSP_STATUS_OK;
 	}
       }
     }
     else {
       retcode = TSP_STATUS_ERROR_UNKNOWN;
-      STRACE_ERROR(("function TSP_data_sender_create failed"));      
+      STRACE_ERROR("function TSP_data_sender_create failed");
     }
   }
   
@@ -647,7 +647,7 @@
     
   TSP_UNLOCK_MUTEX(&X_session_list_mutex,FALSE);
 
-  STRACE_DEBUG_MORE(("data_address='%s'",data_address ));
+  STRACE_DEBUG_MORE("data_address='%s'",data_address);
 
     
   return data_address;
@@ -684,7 +684,7 @@
     TSP_GET_SESSION(session, channel_id, FALSE);    
     
     if (pg_indexes == NULL) {
-      STRACE_ERROR(("Unable to allocate memory for global provider index"));
+      STRACE_ERROR("Unable to allocate memory for global provider index");
       ret = FALSE;
       goto out;
     }
@@ -692,7 +692,7 @@
     /* Get global provider indexes */
     myGLU = session->session_data->glu_h;
     if (myGLU->get_pgi(myGLU,symbol_list,pg_indexes) == FALSE) {
-      STRACE_ERROR(("Some symbols have not been found"));
+      STRACE_ERROR("Some symbols have not been found");
       ret=FALSE;
     }
      
@@ -724,7 +724,7 @@
     /* Garbage collect Data link broken session */
     if (X_session_t[i].state == TSP_SESSION_STATE_BROKEN_LINK ) {
       found = TRUE;
-      STRACE_INFO(("Garbage Collector thread found broken link session <%d>",X_session_t[i].channel_id));
+      STRACE_INFO("Garbage Collector thread found broken link session <%d>",X_session_t[i].channel_id);
       *channel_id = X_session_t[i].channel_id;
       break;
     } 
@@ -754,7 +754,7 @@
 	     (TSP_SESSION_STATE_REQUEST_SAMPLE_DESTROY_OK == X_session_t[i].state)
 	     )
 	    ){
-	  STRACE_INFO(("Garbage Collector thread found Datapool TERMINATED for session <%d>",X_session_t[i].channel_id));
+	  STRACE_INFO("Garbage Collector thread found Datapool TERMINATED for session <%d>",X_session_t[i].channel_id);
 	  found = TRUE;
 	  *channel_id = X_session_t[i].channel_id;
 	}
Index: src/core/ctrl/tsp_stream_sender.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl/tsp_stream_sender.c,v
retrieving revision 1.24
diff -u -r1.24 tsp_stream_sender.c
--- src/core/ctrl/tsp_stream_sender.c	30 Nov 2007 15:42:01 -0000	1.24
+++ src/core/ctrl/tsp_stream_sender.c	3 Feb 2008 19:38:44 -0000
@@ -167,13 +167,13 @@
      
   /* Wait for consumer connection before we send data */  
 
-  STRACE_DEBUG(("Thread stream sender created : waiting for client to connect..."));
+  STRACE_DEBUG("Thread stream sender created : waiting for client to connect...");
   while(!sock->client_is_connected)
     {
       tsp_usleep(TSP_STREAM_SENDER_CONNECTION_POLL_TIME);
      
     }
-  STRACE_DEBUG(("Client connected ! Send loop starts !"));
+  STRACE_DEBUG("Client connected ! Send loop starts !");
 
   item = RINGBUF_PTR_GETBYADDR(sock->out_ringbuf);
   /* FIXME : gerer l'arret */
@@ -194,10 +194,10 @@
 
   if(!sock->is_stopped)
     {
-      STRACE_DEBUG(("Connection with client was lost ! "));
+      STRACE_DEBUG("Connection with client was lost ! ");
     }
 
-  STRACE_DEBUG(("End of fifo thread stream sender"));
+  STRACE_DEBUG("End of fifo thread stream sender");
   return &status;
 }
 
@@ -241,7 +241,7 @@
   strcat(sock->data_address, ":");    
   strcat(sock->data_address, strPort);
     
-  STRACE_DEBUG_MORE(("address='%s'", sock->data_address));
+  STRACE_DEBUG_MORE("address='%s'", sock->data_address);
 }
 
 static void* TSP_streamer_sender_connector(void* arg)
@@ -256,7 +256,7 @@
   pthread_detach(pthread_self());
     
   /* Accept connection on socket */
-  STRACE_DEBUG(("Thread acceptor started waiting for client to connect %d", sock->hClient));
+  STRACE_DEBUG("Thread acceptor started waiting for client to connect %d", sock->hClient);
 #if defined (_WIN32)  
   sock->hClient = accept(sock->socketId, NULL, NULL);
 #else
@@ -267,10 +267,10 @@
   if(sock->hClient > 0) {
     /* OK, the client is connected */
     sock->client_is_connected = TRUE;
-    STRACE_DEBUG(("New connection accepted on socket client socket %d", sock->hClient));
+    STRACE_DEBUG("New connection accepted on socket client socket %d", sock->hClient);
   }
   else {
-    STRACE_ERROR(("Accept error"));
+    STRACE_ERROR("Accept error");
     close(sock->socketId);
     return 0;
   }
@@ -283,7 +283,7 @@
     
   TSP_socket_t* sock = (TSP_socket_t*)sender;
     
-  STRACE_INFO(("-->address='%s'", sock->data_address));
+  STRACE_INFO("-->address='%s'", sock->data_address);
 
   return sock->data_address;
 }
@@ -307,19 +307,19 @@
 #else
   /* First disable SIGPIPE signal to avoir being crashed by a disconnected client*/
   if( SIG_ERR == MySignal(SIGPIPE, SIG_IGN)) {
-    STRACE_ERROR(("Unable to disable SIGPIPE signal"));
+    STRACE_ERROR("Unable to disable SIGPIPE signal");
     return 0;
   }
 #endif
   if( -1 == gethostname(host, TSP_MAXHOSTNAMELEN))
     {
-      STRACE_ERROR(("gethostname error"));
+      STRACE_ERROR("gethostname error");
 
       return 0;
     }
   myhost = gethostbyname(host);
   if (myhost == NULL) {
-    STRACE_ERROR(("Cannot gethostbyname '(hostname --> @IP)' for host <%s> check your /etc/hosts file.\n",host));
+    STRACE_ERROR("Cannot gethostbyname '(hostname --> @IP)' for host <%s> check your /etc/hosts file.",host);
     /* be tolerant we keep going with hostname but... consumer may not handle this properly */    
   } else {
      /* 
@@ -352,7 +352,7 @@
       status = setsockopt(sock->socketId, SOL_SOCKET, SO_SNDBUF, (void * )&OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("Probleme with set socket size"));
+	  STRACE_ERROR("Problem with set socket size");
 
 	  close(sock->socketId);
 	  return 0;
@@ -365,7 +365,7 @@
 			  (void *) &OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-          STRACE_ERROR(("pb set local address reuse"));
+          STRACE_ERROR("pb set local address reuse");
 	  close(sock->socketId);
 	  return 0;
 	}
@@ -376,7 +376,7 @@
 			  (void *) &OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb set periodic state control"));
+	  STRACE_ERROR("pb set periodic state control");
 
 	  close(sock->socketId);
 	  return 0;
@@ -388,7 +388,7 @@
 			  sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb set TCP no delay"));
+	  STRACE_ERROR("pb set TCP no delay");
 
 	  close(sock->socketId);
 	  return 0;
@@ -423,7 +423,7 @@
 	      }
 	    else
 	      {
-		STRACE_ERROR(("getsockname failed"));
+		STRACE_ERROR("getsockname failed");
 		  
 		close(sock->socketId);
 		return 0;
@@ -431,7 +431,7 @@
 	  }
 	else
 	  {
-	    STRACE_ERROR(("pb bind to socket"));
+	    STRACE_ERROR("pb bind to socket");
 	    
 	    close(sock->socketId);
 	    return 0;
@@ -443,7 +443,7 @@
       status = listen (sock->socketId, SOMAXCONN);
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb listening to socket"));
+	  STRACE_ERROR("pb listening to socket");
 
 	  close(sock->socketId);
 	  return 0;
@@ -455,7 +455,7 @@
 	{
 	  if(!TSP_stream_sender_init_bufferized(sock))
 	    {
-	      STRACE_ERROR(("Function TSP_stream_sender_init_bufferized failed"));
+	      STRACE_ERROR("Function TSP_stream_sender_init_bufferized failed");
 	      close(sock->socketId);	  
 	      return 0;
 	    }
@@ -542,9 +542,9 @@
 	}
 	else {		  
 #ifdef _WIN32
-     STRACE_DEBUG(("send failed with errno = %d : <%s>",WSAGetLastError(),strerror(errno)));   
+	  STRACE_DEBUG("send failed with errno = %d : <%s>",WSAGetLastError(),strerror(errno));
 #else
-	  STRACE_ERROR(("send failed with errno = %d : <%s>",errno,strerror(errno)));
+	  STRACE_ERROR("send failed with errno = %d : <%s>",errno,strerror(errno));
 #endif
 	  sock->connection_ok = FALSE;
 	  return FALSE;
@@ -554,7 +554,7 @@
       bufferLen -= nwrite;
     } /* end while buffer not written fully */ 
   } else {
-    STRACE_ERROR(("identSocket = %d",identSocket));
+    STRACE_ERROR("identSocket = %d",identSocket);
     return (FALSE);
   }
 
Index: src/core/ctrl_init/tsp_provider_init.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/ctrl_init/tsp_provider_init.c,v
retrieving revision 1.22
diff -u -r1.22 tsp_provider_init.c
--- src/core/ctrl_init/tsp_provider_init.c	30 Nov 2007 15:42:02 -0000	1.22
+++ src/core/ctrl_init/tsp_provider_init.c	3 Feb 2008 19:38:44 -0000
@@ -125,7 +125,7 @@
       }
     }
   else {
-    STRACE_ERROR(("Call TSP_provider_init first, and then call TSP_provider_run ! "));
+    STRACE_ERROR("Call TSP_provider_init first, and then call TSP_provider_run ! ");
     retcode = TSP_STATUS_ERROR_UNKNOWN;
   }
   
@@ -191,11 +191,11 @@
 
 	      if(pub_mode & TSP_PUBLISH_URLS_SNMP)
 		/* TODO */
-		STRACE_ERROR(("SNMP publication of TSP URLs not yet implemented\n"));
+		STRACE_ERROR("SNMP publication of TSP URLs not yet implemented");
 	    }
 	  else
 	    {
-	      STRACE_ERROR(("Request Handler #%d did not provided an URL", rank));
+	      STRACE_ERROR("Request Handler #%d did not provided an URL", rank);
 	      urls[rank] = strdup("");
 	    }
 	}
Index: src/core/driver/tsp_consumer.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/driver/tsp_consumer.c,v
retrieving revision 1.64
diff -u -r1.64 tsp_consumer.c
--- src/core/driver/tsp_consumer.c	30 Nov 2007 15:42:00 -0000	1.64
+++ src/core/driver/tsp_consumer.c	3 Feb 2008 19:38:45 -0000
@@ -46,7 +46,6 @@
 #include <tsp_datastruct.h>
 #include <tsp_time.h>
 #include <tsp_common.h>
-#include <tsp_simple_trace.h>
 
 /* Pool time for network data read (�s) */
 #define TSP_RECEIVER_THREAD_WAIT_FIFO_FULL (2e5)
@@ -58,12 +57,12 @@
 	{ \
 		if (0 == session) \
 		{  \
-			STRACE_ERROR(("The session object is NULL !")) \
+			STRACE_ERROR("The session object is NULL !");	\
 			return (ret); \
 		} \
 		if( TSP_UNDEFINED_CHANNEL_ID == session->channel_id) \
 		{  \
-			STRACE_ERROR(("No Channel Id available, the session need to be opened first !")) \
+			STRACE_ERROR("No Channel Id available, the session need to be opened first !"); \
 			return (ret); \
 		} \
 	}
@@ -163,7 +162,7 @@
 	assert(retcode);	
 	assert(otsp);
 	
-	STRACE_WARNING(("Unable to communicate with provider, going UNREACHABLE."))
+	STRACE_WARNING("Unable to communicate with provider, going UNREACHABLE.");
 	*retcode     = TSP_STATUS_ERROR_PROVIDER_UNREACHABLE;
 	/* 
 	 * As soon as TSP provider is unreachable flag RPC server as dead i.e. NULL 
@@ -192,8 +191,8 @@
   otsp->information.max_client_number     = ans_sample->max_client_number;
   otsp->information.current_client_number = ans_sample->current_client_number;
   
-  STRACE_DEBUG(("Number of symbols found in answer = %d",symbols_number));
-  STRACE_INFO(("Provider base frequency = %f Hz", ans_sample->base_frequency));
+  STRACE_DEBUG("Number of symbols found in answer = %d",symbols_number);
+  STRACE_INFO("Provider base frequency = %f Hz", ans_sample->base_frequency);
   
   /* allocate memory to store those symbols */
   otsp->information.symbols.TSP_sample_symbol_info_list_t_len = symbols_number;
@@ -310,9 +309,9 @@
 
 void 
 TSP_print_object_tsp(TSP_otsp_t* o) {	
-  STRACE_INFO(("----------------------------------------------"));
-  STRACE_INFO(("SERVER_INFO->INFO='%s'\n", o->server_info.info));
-  STRACE_INFO(("----------------------------------------------"));
+  STRACE_INFO("----------------------------------------------");
+  STRACE_INFO("SERVER_INFO->INFO='%s'", o->server_info.info);
+  STRACE_INFO("----------------------------------------------");
 }
 
 /*-------------------------------------------------------------------*/
@@ -344,7 +343,7 @@
       if(p && (p == (*argv)[i] )) {
 	
 	  /* TSP Arg */
-	  STRACE_INFO(("Tsp ARG : '%s'", (*argv)[i]));
+	  STRACE_INFO("Tsp ARG : '%s'", (*argv)[i]);
 	  
 	  /* Look for start flag */
 	  if(!strcmp(TSP_ARG_STREAM_INIT_START, (*argv)[i]))
@@ -362,7 +361,7 @@
 		}
 	      else
 		{
-		  STRACE_WARNING(("Unexpected "TSP_ARG_STREAM_INIT_START));
+		  STRACE_WARNING("Unexpected "TSP_ARG_STREAM_INIT_START);
 		  retcode = TSP_STATUS_ERROR_UNKNOWN;
 		}
 	    }
@@ -374,14 +373,14 @@
 		}
 	      else
 		{
-		  STRACE_WARNING(("Unexpected "TSP_ARG_STREAM_INIT_STOP));
+		  STRACE_WARNING("Unexpected "TSP_ARG_STREAM_INIT_STOP);
 		  retcode = TSP_STATUS_ERROR_UNKNOWN;
 		}
 	    }
 	  else
 	    {
 	      /* Unkown option */
-	      STRACE_WARNING(("Unknown TSP option : '%s'",(*argv)[i] ));
+	      STRACE_WARNING("Unknown TSP option : '%s'",(*argv)[i]);
 	      retcode = TSP_STATUS_ERROR_UNKNOWN;
 	    }
 	}
@@ -405,7 +404,7 @@
   
   if( found_stream_start && !found_stream_stop )
     {
-      STRACE_WARNING(("A " TSP_ARG_STREAM_INIT_STOP " flag was expected"));
+      STRACE_WARNING("A " TSP_ARG_STREAM_INIT_STOP " flag was expected");
       retcode = TSP_STATUS_ERROR_UNKNOWN;
     }
 
@@ -424,7 +423,7 @@
     X_tsp_init_ok = TRUE;
   } else {
     X_tsp_init_ok = FALSE;
-    STRACE_WARNING((TSP_ARG_CONSUMER_USAGE));
+    STRACE_WARNING(TSP_ARG_CONSUMER_USAGE);
   }
 
   return retcode;  
@@ -442,7 +441,7 @@
    /* By the way. do ->NOT<- free X_tsp_argv and X_argv,
       the main code may be using them... */
 
-  STRACE_INFO(("TSP Consumer End..."));
+  STRACE_INFO("TSP Consumer End...");
 } /* TSP_consumer_end */
 
 TSP_provider_t
@@ -525,7 +524,7 @@
   if( servernumber >= 0 )
     {
       sprintf(url_lkup, TSP_URL_FORMAT, protocol, hostname, servername, servernumber);
-      STRACE_INFO(("Trying to connect to <%s>", url_lkup ));
+      STRACE_INFO("Trying to connect to <%s>", url_lkup);
 
       /* Is server name/number alive on given host on that protocol ?*/ 
       if(TSP_remote_open_server(  protocol,
@@ -540,7 +539,7 @@
 	  return (TSP_provider_t*)TSP_new_object_tsp(server, url_lkup);
 	}
       
-      STRACE_INFO(("No TSP provider on URL <%s>", url_lkup));
+      STRACE_INFO("No TSP provider on URL <%s>", url_lkup);
       return NULL;
     }
   else {
@@ -553,11 +552,11 @@
       if(provider)
 	return provider;
     }
-    STRACE_INFO(("No TSP provider based on URL <%s>", url));
+    STRACE_INFO("No TSP provider based on URL <%s>", url);
     return NULL;    
   }
   
-  STRACE_ERROR(("Cannot parse such URL %s", url));
+  STRACE_ERROR("Cannot parse such URL %s", url);
   return NULL;
 } /* end of TSP_consumer_connect_url */
 
@@ -596,7 +595,7 @@
 	  TSP_server_t server;
 	  TSP_server_info_string_t server_info;
 
-	  STRACE_DEBUG(("Trying to open server No %d", i));
+	  STRACE_DEBUG("Trying to open server No %d", i);
 
 	  /* Is server number 'i' alive ?*/ 
 	  if(TSP_remote_open_server(  TSP_DEFAULT_PROTOCOL,
@@ -610,7 +609,7 @@
 	      (*providers)[*nb_providers] = TSP_new_object_tsp(server, server_info);
 	      if( 0 == (*providers)[*nb_providers])
 		{
-		  STRACE_ERROR(("TSP_new_object_tsp failed for No=%d", i));
+		  STRACE_ERROR("TSP_new_object_tsp failed for No=%d", i);
 		  (*nb_providers) = 0;
 		  return;
 
@@ -620,17 +619,17 @@
 	    }
 	  else
 	    {
-	      STRACE_DEBUG(("unable to open server No %d for target '%s'", i, host_name));
+	      STRACE_DEBUG("unable to open server No %d for target '%s'", i, host_name);
 	    }
 				
 	}
     }
   else
     {
-      STRACE_ERROR(("Unable to get server max number"));
+      STRACE_ERROR("Unable to get server max number");
     }
 
-  STRACE_INFO(("%d server opened", *nb_providers));
+  STRACE_INFO("%d server opened", *nb_providers);
 }
 
 
@@ -657,7 +656,7 @@
     }
   else
     {
-      STRACE_ERROR(("Unable to get server max number"));
+      STRACE_ERROR("Unable to get server max number");
     }
   
   free(providers);
@@ -683,7 +682,7 @@
   TSP_answer_open_t* ans_open = 0;
   int32_t retcode = TSP_STATUS_OK;
 
-  STRACE_REQUEST(("OPEN"));
+  STRACE_REQUEST("OPEN");
        
   assert(X_tsp_init_ok);
   
@@ -698,7 +697,7 @@
       /* Check if a command line exists and trace a warning */
       if( 0 != X_tsp_argv.TSP_argv_t_len )
 	{
-	  STRACE_WARNING(("Overriding command line stream initialisation by custom stream initialisation")); 
+	  STRACE_WARNING("Overriding command line stream initialisation by custom stream initialisation"); 
 	}
       req_open.argv.TSP_argv_t_val = custom_argv;
       req_open.argv.TSP_argv_t_len = custom_argc;
@@ -714,16 +713,16 @@
 	  otsp->channel_id = ans_open->channel_id;
 	  break;
 	case TSP_STATUS_ERROR_SEE_STRING :
-	  STRACE_WARNING(("Provider error : %s", ans_open->status_str));
+	  STRACE_WARNING("Provider error : %s", ans_open->status_str);
 	  break;
 	case TSP_STATUS_ERROR_UNKNOWN :
-	  STRACE_WARNING(("Provider unknown error"));
+	  STRACE_WARNING("Provider unknown error");
 	  break;
 	case TSP_STATUS_ERROR_VERSION :
-	  STRACE_WARNING(("Provider version error"));
+	  STRACE_WARNING("Provider version error");
 	  break;
 	default:
-	  STRACE_ERROR(("The provider sent an unreferenced error. It looks like a bug."));
+	  STRACE_ERROR("The provider sent an unreferenced error. It looks like a bug.");
 	  break;
 	}
     }
@@ -732,7 +731,7 @@
     }		
   }
   else {
-    STRACE_ERROR(("This provider need to be tsp_consumer_connect_url first"));    
+    STRACE_ERROR("This provider need to be tsp_consumer_connect_url first");
   }
   
   return retcode;	
@@ -752,14 +751,14 @@
   TSP_request_close_t req_close;
   int32_t retcode = TSP_STATUS_OK;
 
-  STRACE_REQUEST(("CLOSE"));	
+  STRACE_REQUEST("CLOSE");
 
   TSP_CHECK_SESSION(otsp, TSP_STATUS_ERROR_INVALID_CHANNEL_ID);
 	
   req_close.version_id = TSP_PROTOCOL_VERSION;
   req_close.channel_id = otsp->channel_id;
 	
-  STRACE_DEBUG(("TSP_request_close(ing) channel_id=%u", otsp->channel_id));
+  STRACE_DEBUG("TSP_request_close(ing) channel_id=%u", otsp->channel_id);
 	
   if (NULL==TSP_request_close(&req_close, otsp->server)) {
 	  TSP_consumer_private_goUnreachable(&retcode,otsp);
@@ -780,7 +779,7 @@
   int32_t retcode = TSP_STATUS_ERROR_UNKNOWN;
   int i;
 	
-  STRACE_REQUEST(("INFORMATION"));	
+  STRACE_REQUEST("INFORMATION");	
   TSP_CHECK_SESSION(otsp, TSP_STATUS_ERROR_INVALID_CHANNEL_ID);
 
   /* Delete allocation of any previous call */
@@ -800,13 +799,13 @@
 	case TSP_STATUS_OK :
 	  break;
 	case TSP_STATUS_ERROR_UNKNOWN :
-	  STRACE_WARNING(("Provider unknown error"));
+	  STRACE_WARNING("Provider unknown error");
 	  break;
 	case TSP_STATUS_ERROR_VERSION :
-	  STRACE_WARNING(("Provider version error"));
+	  STRACE_WARNING("Provider version error");
 	  break;
 	default:
-	  STRACE_ERROR(("The provider sent an unreferenced error. It looks like a bug."));
+	  STRACE_ERROR("The provider sent an unreferenced error. It looks like a bug.");
 	  break;
 	}
     } 
@@ -818,7 +817,7 @@
   if( TSP_STATUS_OK == retcode ) {
     retcode = TSP_consumer_store_informations(otsp,ans_sample);
     if (TSP_STATUS_OK != retcode) {
-      STRACE_ERROR(("Unable to store answer information in session"));
+      STRACE_ERROR("Unable to store answer information in session");
     }
   }
 
@@ -840,7 +839,7 @@
   TSP_answer_sample_t* ans_sample = 0;
   int32_t retcode = TSP_STATUS_ERROR_UNKNOWN;
 		
-  STRACE_REQUEST(("FILTERED INFORMATION"));	
+  STRACE_REQUEST("FILTERED INFORMATION");
   TSP_CHECK_SESSION(otsp, TSP_STATUS_ERROR_INVALID_CHANNEL_ID);
 
   /* Delete allocation of any previous call */
@@ -860,19 +859,19 @@
 	case TSP_STATUS_OK :
 	  break;
 	case TSP_STATUS_ERROR_SYMBOL_FILTER :
-	  STRACE_WARNING(("Symbol filter error"));
+	  STRACE_WARNING("Symbol filter error");
 	  break;
         case TSP_STATUS_ERROR_SYMBOLS :	  
-	  STRACE_WARNING(("Symbols error"));
+	  STRACE_WARNING("Symbols error");
 	  break;
 	case TSP_STATUS_ERROR_UNKNOWN :
-	  STRACE_WARNING(("Provider unknown error"));
+	  STRACE_WARNING("Provider unknown error");
 	  break;
 	case TSP_STATUS_ERROR_VERSION :
-	  STRACE_WARNING(("Provider version error"));
+	  STRACE_WARNING("Provider version error");
 	  break;
 	default:
-	  STRACE_ERROR(("The provider sent an unreferenced error. It looks like a bug."));
+	  STRACE_ERROR("The provider sent an unreferenced error. It looks like a bug.");
 	  break;
 	}
     } 
@@ -882,7 +881,7 @@
 
   if( TSP_STATUS_OK == retcode ) {
     if (TSP_STATUS_OK != TSP_consumer_store_informations(otsp,ans_sample)) {
-      STRACE_ERROR(("Unable to store answer information in session"));
+      STRACE_ERROR("Unable to store answer information in session");
     }
   }
 			
@@ -897,7 +896,7 @@
   TSP_answer_extended_information_t* ans_extinfo;
   int32_t i;
 
-  STRACE_REQUEST(("EXTENDED INFORMATION"));	
+  STRACE_REQUEST("EXTENDED INFORMATION");
   TSP_CHECK_SESSION(otsp, FALSE);  
   TSP_consumer_delete_extended_informations(otsp);
 
@@ -924,19 +923,19 @@
     case TSP_STATUS_OK :
       break;
     case TSP_STATUS_ERROR_SYMBOL_FILTER :
-      STRACE_WARNING(("Symbol filter error"));
+      STRACE_WARNING("Symbol filter error");
       break;
     case TSP_STATUS_ERROR_PGI_UNKNOWN :	  
-      STRACE_WARNING(("Some provided PGI were unknown"));
+      STRACE_WARNING("Some provided PGI were unknown");
       break;
     case TSP_STATUS_ERROR_UNKNOWN :
-      STRACE_WARNING(("Provider unknown error"));
+      STRACE_WARNING("Provider unknown error");
       break;
     case TSP_STATUS_ERROR_VERSION :
-      STRACE_WARNING(("Provider version error"));
+      STRACE_WARNING("Provider version error");
       break;
     default:
-      STRACE_ERROR(("The provider sent an unreferenced error=%d. It looks like a bug.",ans_extinfo->status));
+      STRACE_ERROR("The provider sent an unreferenced error=%d. It looks like a bug.",ans_extinfo->status);
       break;
     }
     TSP_consumer_store_extended_informations(otsp,ans_extinfo);
@@ -999,7 +998,7 @@
   TSP_request_sample_t req_sample;
   int i;
   
-  STRACE_REQUEST(("SAMPLE"));		
+  STRACE_REQUEST("SAMPLE");
   TSP_CHECK_SESSION(otsp, TSP_STATUS_ERROR_INVALID_CHANNEL_ID);
 	
   req_sample.version_id = TSP_PROTOCOL_VERSION;
@@ -1035,19 +1034,19 @@
     case TSP_STATUS_OK :
       break;
     case TSP_STATUS_ERROR_UNKNOWN :
-      STRACE_WARNING(("Provider unknown error"));
+      STRACE_WARNING("Provider unknown error");
       break;
     case TSP_STATUS_ERROR_VERSION :
-      STRACE_WARNING(("Provider version error"));
+      STRACE_WARNING("Provider version error");
       break;
     case TSP_STATUS_ERROR_SYMBOLS :
-      STRACE_WARNING(("Provider symbols error"));
+      STRACE_WARNING("Provider symbols error");
       break;
     case TSP_STATUS_ERROR_INVALID_REQUEST :
-      STRACE_WARNING(("Provider says request is invalid"));
+      STRACE_WARNING("Provider says request is invalid");
       break;
     default:
-      STRACE_ERROR(("The provider sent an unreferenced error. It looks like a bug."));
+      STRACE_ERROR("The provider sent an unreferenced error. It looks like a bug.");
       break;
     }
   
@@ -1056,7 +1055,7 @@
   /* Create group table and store requested symbols */
   /*-------------------------------------------------*/
   if (TSP_STATUS_OK==retcode) {
-    STRACE_INFO(("Total group number = %d", ans_sample->provider_group_number));
+    STRACE_INFO("Total group number = %d", ans_sample->provider_group_number);
     /* Create group table but delete any previous allocation*/
     TSP_group_delete_group_table(otsp->groups);
     otsp->groups = TSP_group_create_group_table(&(ans_sample->symbols), ans_sample->provider_group_number);
@@ -1067,7 +1066,7 @@
     }
     else {
 	    retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;	    
-	    STRACE_ERROR(("Function TSP_group_create_group_table failed"));	   
+	    STRACE_ERROR("Function TSP_group_create_group_table failed");
     }
   }
   for(i=0; i < ans_sample->symbols.TSP_sample_symbol_info_list_t_len; i++) {
@@ -1088,7 +1087,7 @@
     return &(otsp->requested_sym);
   }
   else {
-    STRACE_ERROR(("TSP_consumer_request_sample must be called first"));
+    STRACE_ERROR("TSP_consumer_request_sample must be called first");
     return NULL;
   }
 } /* TSP_consumer_get_requested_sample */
@@ -1101,9 +1100,9 @@
   int is_fifo_full;  
 
 #if defined(_WIN32)
-  STRACE_INFO(("Receiver thread started. Id=%u", (uint32_t)pthread_self().p)); 
+  STRACE_INFO("Receiver thread started. Id=%u", (uint32_t)pthread_self().p); 
 #else
-  STRACE_INFO(("Receiver thread started. Id=%u", (uint32_t)pthread_self())); 
+  STRACE_INFO("Receiver thread started. Id=%u", (uint32_t)pthread_self()); 
 #endif
 
   while(TRUE)
@@ -1118,7 +1117,7 @@
 	}
       else
         {
-	  STRACE_INFO(("function TSP_data_receiver_receive returned FALSE. End of Thread"));
+	  STRACE_INFO("function TSP_data_receiver_receive returned FALSE. End of Thread");
 	  break;
         }
  
@@ -1135,7 +1134,7 @@
   TSP_answer_sample_init_t* ans_sample = 0;
   TSP_request_sample_init_t req_sample;
 
-  STRACE_REQUEST(("SAMPLE INIT"));	
+  STRACE_REQUEST("SAMPLE INIT");
   TSP_CHECK_SESSION(otsp, TSP_STATUS_ERROR_INVALID_CHANNEL_ID);
   
   req_sample.version_id = TSP_PROTOCOL_VERSION;
@@ -1145,7 +1144,7 @@
   
   if (NULL!=ans_sample) {
     retcode = ans_sample->status;
-    STRACE_DEBUG(("data_address = '%s'", ans_sample->data_address));
+    STRACE_DEBUG("data_address = '%s'", ans_sample->data_address);
       
     /* Create the data receiver */
     otsp->receiver = TSP_data_receiver_create(ans_sample->data_address, callback, user_data);
@@ -1178,7 +1177,7 @@
 	}
       else
 	{
-	  STRACE_ERROR(("Unable to create data receiver"));
+	  STRACE_ERROR("Unable to create data receiver");
 	  
 	}
     }
@@ -1198,7 +1197,7 @@
   TSP_answer_sample_destroy_t* ans_sample = 0;
   TSP_request_sample_destroy_t req_sample;
 	
-  STRACE_REQUEST(("SAMPLE DESTROY"));
+  STRACE_REQUEST("SAMPLE DESTROY");
 
   TSP_CHECK_SESSION(otsp, FALSE);
   
@@ -1218,13 +1217,13 @@
 	case TSP_STATUS_OK :
 	  break;
 	case TSP_STATUS_ERROR_UNKNOWN :
-	  STRACE_WARNING(("Provider unknown error"));
+	  STRACE_WARNING("Provider unknown error");
 	  break;
 	case TSP_STATUS_ERROR_VERSION :
-	  STRACE_WARNING(("Provider version error"));
+	  STRACE_WARNING("Provider version error");
 	  break;
 	default:
-	  STRACE_ERROR(("The provider sent an unreferenced error. It looks like a bug."));
+	  STRACE_ERROR("The provider sent an unreferenced error. It looks like a bug.");
 	  break;
 	}
     }
@@ -1270,35 +1269,35 @@
 	  
 	  /* GIGAFIXME : We need some kind of get_last_error to read
 	     these values thrue the consumer API */
-	  STRACE_INFO(("Received status message %X",  sample->provider_global_index));
+	  STRACE_INFO("Received status message %X",  sample->provider_global_index);
 	  switch(sample->provider_global_index)
 	    {
 	    case TSP_DUMMY_PROVIDER_GLOBAL_INDEX_EOF :
-	      STRACE_INFO (("status message EOF"));
+	      STRACE_INFO("status message EOF");
 	      /* FIXME : get last error � gerer ? */
 	      break;
 	    case TSP_DUMMY_PROVIDER_GLOBAL_INDEX_RECONF :
-	      STRACE_INFO (("status message RECONF"));
+	      STRACE_INFO("status message RECONF");
 	      /* FIXME : get last error � gerer ? */
 	      break;
 	    case TSP_DUMMY_PROVIDER_GLOBAL_INDEX_RECEIVER_ERROR :
-	      STRACE_WARNING (("status message RECEIVER ERROR"));
+	      STRACE_WARNING("status message RECEIVER ERROR");
 	      TSP_consumer_private_goUnreachable(&retcode,otsp);
 	      /* FIXME : get last error � gerer ? */
 	      break;
 	    case TSP_DUMMY_PROVIDER_GLOBAL_INDEX_GLU_DATA_LOST :
-	      STRACE_WARNING (("status message GLU DATA LOST. Some data were lost by the GLU on the provider side. "
-			       "is the provider too slow ?"));
+	      STRACE_WARNING("status message GLU DATA LOST. Some data were lost by the GLU on the provider side. "
+			     "is the provider too slow ?");
 	      /* FIXME : get last error � gerer ? */
 	      break;
 	    case TSP_DUMMY_PROVIDER_GLOBAL_INDEX_CONSUMER_DATA_LOST :
-	      STRACE_WARNING (("status message CONSUMER DATA LOST. Some data were lost for this consumer"
-			       " on the provider side. Is the consumer too slow, or"
-			       " the network overloaded ?"));
+	      STRACE_WARNING("status message CONSUMER DATA LOST. Some data were lost for this consumer"
+			     " on the provider side. Is the consumer too slow, or"
+			     " the network overloaded ?");
 	      /* FIXME : get last error � gerer ? */
 	      break;
 	    default:
-	      STRACE_ERROR (("Unknown status message"));
+	      STRACE_ERROR("Unknown status message");
 	      /* FIXME : get last error � gerer ? */
 	    }
 	}
@@ -1320,9 +1319,10 @@
   TSP_async_sample_t async_write;
   int32_t ret = TSP_STATUS_ERROR_UNKNOWN;
   TSP_otsp_t* otsp = (TSP_otsp_t*)provider;
-   STRACE_REQUEST(("ASYNC WRITE")); 
+
+  STRACE_REQUEST("ASYNC WRITE");
+
   /* As there are a two level structure for hidding all RPC stuff, we need to copy the struct fields */
-  
   async_write.provider_global_index = async_sample_write->provider_global_index;
   async_write.data.data_val         = async_sample_write->value_ptr;
   async_write.data.data_len         = async_sample_write->value_size;
@@ -1337,7 +1337,7 @@
 	    TSP_consumer_private_goUnreachable(&ret, otsp);	    
     }
   } else {
-    STRACE_ERROR(("This provider is not in a valid state (missing 'TSP_consumer_connect_url'?"));
+    STRACE_ERROR("This provider is not in a valid state (missing 'TSP_consumer_connect_url'?");
   }
      
   return ret;
@@ -1354,7 +1354,9 @@
   
   int32_t ret = TSP_STATUS_ERROR_UNKNOWN;
   TSP_otsp_t* otsp = (TSP_otsp_t*)provider;
-  STRACE_REQUEST(("ASYNC READ")); 
+
+  STRACE_REQUEST("ASYNC READ");
+
   /* update internal RPC structure */
   async_read_param.provider_global_index  = async_sample_read->provider_global_index;
   async_read_param.data.data_val = async_sample_read->value_ptr;
@@ -1362,18 +1364,18 @@
 
   
   if(NULL != otsp) {   
-    STRACE_DEBUG(("TSP consumer async read for pgi <%d>\n",async_sample_read->provider_global_index));
+    STRACE_DEBUG("TSP consumer async read for pgi <%d>",async_sample_read->provider_global_index);
 
     async_read_result = TSP_request_async_sample_read(&async_read_param,otsp->server);
-    STRACE_DEBUG(("async_read_result is <0x%X>\n", (unsigned int)async_read_result));
+    STRACE_DEBUG("async_read_result is <0x%X>", (unsigned int)async_read_result);
 
     /* Provider has probably died */
     if (async_read_result == NULL) {
 	    TSP_consumer_private_goUnreachable(&ret,otsp);
     } else {
-      STRACE_DEBUG(("async_read_result->pgi=%d\n", async_read_result->provider_global_index));
-      STRACE_DEBUG(("async_read_result->value_size=%d\n", async_sample_read->value_size));
-      STRACE_DEBUG(("async_read_result->data.data_val = 0x%X\n", (unsigned int)async_read_result->data.data_val));
+      STRACE_DEBUG("async_read_result->pgi=%d", async_read_result->provider_global_index);
+      STRACE_DEBUG("async_read_result->value_size=%d", async_sample_read->value_size);
+      STRACE_DEBUG("async_read_result->data.data_val = 0x%X", (unsigned int)async_read_result->data.data_val);
       if (-1 == async_read_result->provider_global_index) {
 	ret = TSP_STATUS_ERROR_PGI_UNKNOWN;
       } else {
@@ -1391,7 +1393,7 @@
     }
   }
   else{
-    STRACE_ERROR(("This provider is not in a valid state (missing 'TSP_consumer_connect_url'?"));
+    STRACE_ERROR("This provider is not in a valid state (missing 'TSP_consumer_connect_url'?");
   }
      
   return ret;
@@ -1460,7 +1462,7 @@
     */
   default:
     /* nothing to do 0 */
-    STRACE_WARNING(("No possible conversion for type <%d>", sample.type));
+    STRACE_WARNING("No possible conversion for type <%d>", sample.type);
     break;
   }
   return retval;
Index: src/core/driver/tsp_data_receiver.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/driver/tsp_data_receiver.c,v
retrieving revision 1.29
diff -u -r1.29 tsp_data_receiver.c
--- src/core/driver/tsp_data_receiver.c	28 Aug 2007 09:44:29 -0000	1.29
+++ src/core/driver/tsp_data_receiver.c	3 Feb 2008 19:38:45 -0000
@@ -107,7 +107,7 @@
 	break;
     
     default:	 
-      STRACE_ERROR(("Group id % in not a reserved group", group_index));
+      STRACE_ERROR("Group id % in not a reserved group", group_index);
       ret = FALSE;
     }
   
@@ -137,7 +137,7 @@
   if( 0 == receiver->stream_receiver)
     {
       /* FIXME : bof...*/
-      STRACE_ERROR(("TSP_stream_receiver_create failed")); 
+      STRACE_ERROR("TSP_stream_receiver_create failed"); 
       free(receiver->buf);receiver->buf = 0;
       free(receiver);
       receiver = 0;
@@ -220,7 +220,7 @@
 									   in_buf);
 		      if(!ret)
 			{
-			  STRACE_ERROR(("decoder function failed"));
+			  STRACE_ERROR("decoder function failed");
 			  break;
 			}
 
@@ -299,7 +299,7 @@
 			case TSP_TYPE_UNKNOWN:
 			  
 			default:
-			  STRACE_WARNING(("Impossible TSP TYPE in decode??"));
+			  STRACE_WARNING("Impossible TSP TYPE in decode??");
 			  sample->uvalue.raw_value= ((uint8_t*)groups[group_index].decode_buffer)[i];
                                break;
 			       
@@ -331,7 +331,7 @@
 		{
 		  if(!receiver_stopped)
 		    {
-		      STRACE_WARNING(("Unable to receive samples"));
+		      STRACE_WARNING("Unable to receive samples");
 		      /* Add in fifo a message to report the incident via the read_sample API*/
 		      TSP_data_receiver_process_receiver_error(sample_fifo);
 		    }
@@ -344,7 +344,7 @@
 	      ret = TSP_data_receiver_process_reserved_group_id(group_index, sample_fifo);
 	      if(!ret)
 		{
-		  STRACE_ERROR(("The received group id is corrupted. This should not happen..."));
+		  STRACE_ERROR("The received group id is corrupted. This should not happen...");
 		  assert(0);
 		  TSP_data_receiver_process_receiver_error(sample_fifo);
 		}
@@ -355,7 +355,7 @@
 	{
 	  if(!receiver_stopped)
 	    {		  
-	      STRACE_WARNING(("Unable to receive group size and time stamp, provider died?"));
+	      STRACE_WARNING("Unable to receive group size and time stamp, provider died?");
 	      /* Add in fifo a message to report the incident via the read sample API*/
 	      TSP_data_receiver_process_receiver_error(sample_fifo);
 	    }
Index: src/core/driver/tsp_group.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/driver/tsp_group.c,v
retrieving revision 1.12
diff -u -r1.12 tsp_group.c
--- src/core/driver/tsp_group.c	28 Aug 2007 09:44:30 -0000	1.12
+++ src/core/driver/tsp_group.c	3 Feb 2008 19:38:45 -0000
@@ -132,10 +132,10 @@
 				       table->groups[group_id].items[rank].sizeof_encoded_item :
 				       decode_buffer_maxsize);
 	      
-	      STRACE_DEBUG(("Added to group table Id=%d, Gr=%d, Rank=%d", 
+	      STRACE_DEBUG("Added to group table Id=%d, Gr=%d, Rank=%d", 
 			    table->groups[group_id].items[rank].provider_global_index,
 			    group_id,
-			    rank));
+			    rank);
 	      rank++; 
 	      i++;
 	    }  
Index: src/core/driver/tsp_stream_receiver.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/driver/tsp_stream_receiver.c,v
retrieving revision 1.14
diff -u -r1.14 tsp_stream_receiver.c
--- src/core/driver/tsp_stream_receiver.c	30 Nov 2007 15:42:00 -0000	1.14
+++ src/core/driver/tsp_stream_receiver.c	3 Feb 2008 19:38:45 -0000
@@ -86,7 +86,7 @@
   str_port = strtok_r(NULL, ":", &last);
   port = (unsigned short)atoi(str_port);
   
-  STRACE_DEBUG(("Connection Data : Host='%s' port=%u", host, (unsigned int)port));
+  STRACE_DEBUG("Connection Data : Host='%s' port=%u", host, (unsigned int)port);
 
   /* Init socket */
   sock->socketId = socket(AF_INET, SOCK_STREAM, 0);
@@ -98,7 +98,7 @@
       status = setsockopt(sock->socketId, SOL_SOCKET, SO_RCVBUF, (void * )&OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("Probleme with set socket size"));
+	  STRACE_ERROR("Probleme with set socket size");
 
 	  close(sock->socketId);
 	  free(sock);
@@ -112,7 +112,7 @@
 			  (void *) &OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-          STRACE_ERROR(("pb set local address reuse"));
+          STRACE_ERROR("pb set local address reuse");
 	  close(sock->socketId);
 	  free(sock);
 	  return 0;
@@ -125,7 +125,7 @@
 			  (void *) &OptInt, sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb set periodic state control"));
+	  STRACE_ERROR("pb set periodic state control");
 
 	  close(sock->socketId);
 	  free(sock);
@@ -138,7 +138,7 @@
 			  sizeof(OptInt));
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb set TCP no delay"));
+	  STRACE_ERROR("pb set TCP no delay");
 
 	  close(sock->socketId);
 	  free(sock);
@@ -150,7 +150,7 @@
       Host_p = gethostbyname(host);
       if (Host_p == (struct hostent *) NULL)
 	{
-	  STRACE_ERROR(("pb get host by name"));
+	  STRACE_ERROR("pb get host by name");
 
 	  close(sock->socketId);
 	  free(sock);
@@ -181,7 +181,7 @@
     
       if (status == -1)
 	{
-	  STRACE_ERROR(("pb connecting to socket"));
+	  STRACE_ERROR("pb connecting to socket");
 	  close(sock->socketId);
 	  free(sock);
 	  return 0;
@@ -267,13 +267,13 @@
 	      else 
 		  {
 		  
-		    STRACE_INFO(("read failed"));
+		    STRACE_INFO("read failed");
 		    return FALSE;
 		  }
 	  }
       else if (nread == 0)
 	  {
-		  STRACE_INFO(("Received socket EOF"));
+		  STRACE_INFO("Received socket EOF");
 		  return FALSE;
 	  }
 	  
Index: src/core/include/tsp_const_def.h
===================================================================
RCS file: /sources/tsp/tsp/src/core/include/tsp_const_def.h,v
retrieving revision 1.45
diff -u -r1.45 tsp_const_def.h
--- src/core/include/tsp_const_def.h	2 Nov 2007 15:30:13 -0000	1.45
+++ src/core/include/tsp_const_def.h	3 Feb 2008 19:38:45 -0000
@@ -276,7 +276,7 @@
 	{ \
 		if ( 0 == p ) \
 		{ \
-			STRACE_ERROR(("TSP_CHECK_ALLOC : ERROR : Memory allocation failed"))  \
+			STRACE_ERROR("TSP_CHECK_ALLOC: Memory allocation failed");	\
 			return ret; \
 		} \
 	}
@@ -285,7 +285,7 @@
 	{ \
 		if ( NULL == p ) \
 		{ \
-			STRACE_ERROR(("TSP_CHECK_POINTER : NULL POINTER : " # msg ))  \
+			STRACE_ERROR("TSP_CHECK_POINTER: NULL POINTER : " # msg );	\
 			return ret; \
 		} \
 	}
@@ -294,7 +294,7 @@
 	{ \
 		if ( 0 != status ) \
 		{ \
-			STRACE_ERROR(("TSP_CHECK_THREAD : ERROR : Thread API Error status =%d",status))  \
+			STRACE_ERROR("TSP_CHECK_THREAD: Thread API Error status =%d",status); \
 			return ret; \
 		} \
 	}	
@@ -303,7 +303,7 @@
 	{ \
 		if ( 0 != pthread_mutex_lock(mutex) )\
 		{ \
-			STRACE_ERROR(("TSP_LOCK_MUTEX : ERROR : Mutex Lock Error"))  \
+			STRACE_ERROR("TSP_LOCK_MUTEX: Mutex Lock Error"); \
 			return ret; \
 		} \
 	}	
@@ -312,7 +312,7 @@
 	{ \
 		if ( 0 != pthread_mutex_unlock(mutex) ) \
 		{ \
-			STRACE_ERROR(("TSP_UNLOCK_MUTEX : ERROR : Mutex Unlock Error"))  \
+			STRACE_ERROR("TSP_UNLOCK_MUTEX: Mutex Unlock Error"); \
 			return ret; \
 		} \
 	}	
Index: src/core/include/tsp_prjcfg.h.in
===================================================================
RCS file: /sources/tsp/tsp/src/core/include/tsp_prjcfg.h.in,v
retrieving revision 1.9
diff -u -r1.9 tsp_prjcfg.h.in
--- src/core/include/tsp_prjcfg.h.in	18 Oct 2006 09:58:48 -0000	1.9
+++ src/core/include/tsp_prjcfg.h.in	3 Feb 2008 19:38:45 -0000
@@ -49,7 +49,7 @@
  */
 #define TSP_SOURCE_VERSION "@PACKAGE_VERSION@"
 
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 
 /*
  * The following macro is used under windows system to declare 
Index: src/core/include/tsp_simple_trace.h
===================================================================
RCS file: src/core/include/tsp_simple_trace.h
diff -N src/core/include/tsp_simple_trace.h
--- src/core/include/tsp_simple_trace.h	21 Oct 2006 08:48:00 -0000	1.22
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-/*
-
-$Header: /sources/tsp/tsp/src/core/include/tsp_simple_trace.h,v 1.22 2006/10/21 08:48:00 erk Exp $
-
------------------------------------------------------------------------
-
-TSP Library - core components for a generic Transport Sampling Protocol.
-
-Copyright (c) 2002 Yves DUFRENNE, Stephane GALLES, Eric NOULARD and Robert PAGNOT 
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
------------------------------------------------------------------------
-
-Project   : TSP
-Maintainer : tsp@astrium-space.com
-Component : Consumer / Provider
-
------------------------------------------------------------------------
-
-Purpose   : Some trace macro
-
------------------------------------------------------------------------
- */
-
-#ifndef __TSP_SIMPLE_TRACE_H
-#define __TSP_SIMPLE_TRACE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIMPLE_TRACE_FUNC(level,src,func,text) \
-{ \
-    static int _strace_debug_level = -1; \
-    if (_strace_debug_level<0) { \
-        if (getenv ("STRACE_DEBUG") != (char *)0) {\
-            _strace_debug_level = atoi(getenv("STRACE_DEBUG")); \
-        } else {\
-            _strace_debug_level = 0; }\
-    }\
-    if ((0==level) || (_strace_debug_level & level) ) {		       \
-           printf("%7s||%s##%s##%d: ", src, __FILE__, func, __LINE__); \
-           printf text; printf("\n"); fflush(stdout);\
-    }\
-} 
-#if defined(__GNUC__) || defined(_MSC_VER)
-#  define SIMPLE_TRACE(level,src,text) SIMPLE_TRACE_FUNC(level,src,__FUNCTION__,text)
-#else 
-#  define SIMPLE_TRACE(level,src,text) SIMPLE_TRACE_FUNC(level,src,"where?",text)
-#endif
-				  
-#ifdef  USE_STRACE
-# define STRACE_TEST(text) SIMPLE_TRACE(32, "TEST", text)
-# define STRACE_DEBUG_MORE(text) SIMPLE_TRACE(16, "Debug More", text)
-# define STRACE_DEBUG(text) SIMPLE_TRACE(8, "Debug", text)
-# define STRACE_REQUEST(text) SIMPLE_TRACE(4, "TSP Request", text)
-# define STRACE_INFO(text) SIMPLE_TRACE(2, "Info", text)
-#else
-# define STRACE_TEST(text)
-# define STRACE_DEBUG_MORE(text)
-# define STRACE_DEBUG(text)
-# define STRACE_REQUEST(text)
-# define STRACE_INFO(text)
-#endif
-
-#define STRACE_WARNING(text) SIMPLE_TRACE(1, "WarninG", text)
-#define STRACE_ERROR(text) SIMPLE_TRACE(0,"ERROR", text)
-
-#endif /*_SIMPLE_TRACE_H*/
Index: src/core/misc_utils/tsp_ringbuf.h
===================================================================
RCS file: /sources/tsp/tsp/src/core/misc_utils/tsp_ringbuf.h,v
retrieving revision 1.9
diff -u -r1.9 tsp_ringbuf.h
--- src/core/misc_utils/tsp_ringbuf.h	30 Jul 2007 16:24:25 -0000	1.9
+++ src/core/misc_utils/tsp_ringbuf.h	3 Feb 2008 19:38:45 -0000
@@ -245,7 +245,7 @@
   {									\
     int mul_offset =  RINGBUF_MULTSUP((sizeof(ItemType) + nbSpareBytes),sizeof(ItemType)) / sizeof(ItemType); \
     name = (TypeName*)malloc(sizeof(TypeName) + (sizeof(ItemType) * mul_offset  * sz)); \
-    STRACE_DEBUG(("RINGBUF_PTR_INIT request %d Kbytes (sizeof(" #TypeName ")=%d,sizeof(" #ItemType ")=%d,mul_offset=%d,sz=%d)",(sizeof(TypeName) + (sizeof(ItemType) *mul_offset  * sz))/1024,sizeof(TypeName),sizeof(ItemType),mul_offset,sz)); \
+    STRACE_DEBUG("RINGBUF_PTR_INIT request %d Kbytes (sizeof(" #TypeName ")=%d,sizeof(" #ItemType ")=%d,mul_offset=%d,sz=%d)",(sizeof(TypeName) + (sizeof(ItemType) *mul_offset  * sz))/1024,sizeof(TypeName),sizeof(ItemType),mul_offset,sz); \
     if(NULL!=name) {							\
       (name)->size   = sz;						\
       (name)->put   = 0;						\
Index: src/core/rpc/tsp_client.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_client.c,v
retrieving revision 1.21
diff -u -r1.21 tsp_client.c
--- src/core/rpc/tsp_client.c	12 May 2007 22:09:32 -0000	1.21
+++ src/core/rpc/tsp_client.c	3 Feb 2008 19:38:45 -0000
@@ -44,13 +44,13 @@
 int tsp_wrap_rpc_clnt_set_timeout(CLIENT *client, int timeout);
 
 #define LOCAL_RPCCHECK_NORETURN  	if( server == (TSP_server_t)0)  \
-                                        { STRACE_ERROR(("RPCCHECK failed")) ;} 
+                                        { STRACE_ERROR("RPCCHECK failed") ;} 
 
 #define LOCAL_RPCCHECK_FALSE  	if( server == (TSP_server_t)0)  \
-				{ STRACE_ERROR(("RPCCHECK failed")) ; return FALSE ;} 
+				{ STRACE_ERROR("RPCCHECK failed") ; return FALSE ;} 
 				
 #define LOCAL_RPCCHECK_0  	if( server == (TSP_server_t)0) \
-				{ STRACE_ERROR(("RPCCHECK failed")) ; return 0 ;} 
+				{ STRACE_ERROR("RPCCHECK failed") ; return 0 ;} 
 
 TSP_provider_info_t * tsp_provider_information(TSP_server_t server)
 {
@@ -76,10 +76,10 @@
   cl = clnt_create(target_name, progid, TSP_RPC_VERSION_INITIAL, "tcp");
 
   if (cl == (CLIENT *)0) {
-    STRACE_DEBUG(("ERROR : GLOBAL clnt_create failed for host <%s> / progid <%d/0x%08X>", target_name, progid,progid));
+    STRACE_DEBUG("ERROR : GLOBAL clnt_create failed for host <%s> / progid <%d/0x%08X>", target_name, progid,progid);
   }
   else {
-    STRACE_INFO(("CONNECTED to server %s", target_name));
+    STRACE_INFO("CONNECTED to server %s", target_name);
     /* Set time out */
     tsp_wrap_rpc_clnt_set_timeout(cl, TSP_RPC_CONNECT_TIMEOUT);    
   }
@@ -107,7 +107,7 @@
 
   if(strcmp(protocol, TSP_RPC_PROTOCOL) != 0)
     {
-      STRACE_ERROR(("Protocol %s not handled, use %s", protocol, TSP_RPC_PROTOCOL));
+      STRACE_ERROR("Protocol %s not handled, use %s", protocol, TSP_RPC_PROTOCOL);
     }
   else if((server_id < prodid_max_number) && (server_id >=0) )
     {
@@ -129,42 +129,42 @@
 				 strlen(server_name)) == 0)
 			{
 			  strcpy(server_info, server_info_t->info);
-			  STRACE_INFO(("Server opened : '%s'", server_info));
+			  STRACE_INFO("Server opened : '%s'", server_info);
 			  ret = TRUE;
 			}
 		      else
 			{
-			  STRACE_INFO(("Not the requested server : '%s'", server_info_t->info));
+			  STRACE_INFO("Not the requested server : '%s'", server_info_t->info);
 			  TSP_remote_close_server(*server);
 			  ret = FALSE;
 			}
 		    }
 		  else
 		    {
-		      STRACE_ERROR(("Returned info string too long"));
+		      STRACE_ERROR("Returned info string too long");
 		    }
 		}
 	      else
 		{
-		  STRACE_ERROR(("%s", clnt_sperror(*server, "sp_server_info_1\n") ));
+		  STRACE_ERROR("%s", clnt_sperror(*server, "sp_server_info_1"));
 		}
 	      
 	    }
 	  else
 	    {
-	      STRACE_DEBUG(("tsp_remote_open_progid failed"));
+	      STRACE_DEBUG("tsp_remote_open_progid failed");
 	    }
 			
 	}
       else
 	{
-	  STRACE_ERROR(("No ProgId for Server Id=%d", server_id));
+	  STRACE_ERROR("No ProgId for Server Id=%d", server_id);
 	}
 		
     }
   else
     {
-      STRACE_ERROR(("server_id %d too high", server_id));
+      STRACE_ERROR("server_id %d too high", server_id);
     }
 	
   return ret;
Index: src/core/rpc/tsp_rpc.h.linux
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc.h.linux,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc.h.linux
--- src/core/rpc/tsp_rpc.h.linux	22 Apr 2007 21:15:35 -0000	1.1
+++ src/core/rpc/tsp_rpc.h.linux	3 Feb 2008 19:38:46 -0000
@@ -276,7 +276,7 @@
 	char *info;
 };
 typedef struct TSP_provider_info_t TSP_provider_info_t;
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 struct tsp_request_filtered_information_1_argument {
 	TSP_request_information_t arg1;
Index: src/core/rpc/tsp_rpc.h.rtems
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc.h.rtems,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc.h.rtems
--- src/core/rpc/tsp_rpc.h.rtems	2 Nov 2007 15:30:12 -0000	1.1
+++ src/core/rpc/tsp_rpc.h.rtems	3 Feb 2008 19:38:46 -0000
@@ -276,7 +276,7 @@
 	char *info;
 };
 typedef struct TSP_provider_info_t TSP_provider_info_t;
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 struct tsp_request_filtered_information_1_argument {
 	TSP_request_information_t arg1;
Index: src/core/rpc/tsp_rpc.h.win32
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc.h.win32,v
retrieving revision 1.2
diff -u -r1.2 tsp_rpc.h.win32
--- src/core/rpc/tsp_rpc.h.win32	26 Apr 2007 17:51:30 -0000	1.2
+++ src/core/rpc/tsp_rpc.h.win32	3 Feb 2008 19:38:46 -0000
@@ -276,7 +276,7 @@
 	char *info;
 };
 typedef struct TSP_provider_info_t TSP_provider_info_t;
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 struct tsp_request_filtered_information_1_argument {
 	TSP_request_information_t req_info;
Index: src/core/rpc/tsp_rpc.x
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc.x,v
retrieving revision 1.42
diff -u -r1.42 tsp_rpc.x
--- src/core/rpc/tsp_rpc.x	25 Oct 2006 14:40:30 -0000	1.42
+++ src/core/rpc/tsp_rpc.x	3 Feb 2008 19:38:46 -0000
@@ -755,4 +755,4 @@
 %}
 #endif
 
-%#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult)  {  STRACE_ERROR(("%s", clnt_sperror(cl, "")));  }
+%#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult)  {  STRACE_ERROR("%s", clnt_sperror(cl, ""));  }
Index: src/core/rpc/tsp_rpc_clnt.c.linux
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_clnt.c.linux,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_clnt.c.linux
--- src/core/rpc/tsp_rpc_clnt.c.linux	22 Apr 2007 21:15:35 -0000	1.1
+++ src/core/rpc/tsp_rpc_clnt.c.linux	3 Feb 2008 19:38:46 -0000
@@ -16,7 +16,7 @@
  tv.tv_usec = 0;
  return clnt_control(client, CLSET_TIMEOUT, (char *)&tv);
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 /* Default timeout can be changed using clnt_control() */
 static struct timeval TIMEOUT = { 25, 0 };
Index: src/core/rpc/tsp_rpc_clnt.c.win32
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_clnt.c.win32,v
retrieving revision 1.2
diff -u -r1.2 tsp_rpc_clnt.c.win32
--- src/core/rpc/tsp_rpc_clnt.c.win32	26 Apr 2007 17:51:30 -0000	1.2
+++ src/core/rpc/tsp_rpc_clnt.c.win32	3 Feb 2008 19:38:46 -0000
@@ -16,7 +16,7 @@
  tv.tv_usec = 0;
  return clnt_control(client, CLSET_TIMEOUT, (char *)&tv);
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 /* Default timeout can be changed using clnt_control() */
 static struct timeval TIMEOUT = { 25, 0 };
Index: src/core/rpc/tsp_rpc_clnt_rtems.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_clnt_rtems.c,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_clnt_rtems.c
--- src/core/rpc/tsp_rpc_clnt_rtems.c	2 Nov 2007 15:30:11 -0000	1.1
+++ src/core/rpc/tsp_rpc_clnt_rtems.c	3 Feb 2008 19:38:46 -0000
@@ -16,7 +16,7 @@
  tv.tv_usec = 0;
  return clnt_control(client, CLSET_TIMEOUT, (char *)&tv);
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 /* Default timeout can be changed using clnt_control() */
 static struct timeval TIMEOUT = { 25, 0 };
Index: src/core/rpc/tsp_rpc_svc.c.linux
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_svc.c.linux,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_svc.c.linux
--- src/core/rpc/tsp_rpc_svc.c.linux	22 Apr 2007 21:15:35 -0000	1.1
+++ src/core/rpc/tsp_rpc_svc.c.linux	3 Feb 2008 19:38:48 -0000
@@ -18,7 +18,7 @@
 #ifndef SIG_PF
 #define SIG_PF void(*)(int)
 #endif
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 static TSP_provider_info_t *
 _tsp_provider_information_1 (void  *argp, struct svc_req *rqstp)
Index: src/core/rpc/tsp_rpc_svc.c.win32
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_svc.c.win32,v
retrieving revision 1.2
diff -u -r1.2 tsp_rpc_svc.c.win32
--- src/core/rpc/tsp_rpc_svc.c.win32	26 Apr 2007 17:51:30 -0000	1.2
+++ src/core/rpc/tsp_rpc_svc.c.win32	3 Feb 2008 19:38:48 -0000
@@ -22,7 +22,7 @@
 #ifndef SIG_PF
 #define SIG_PF void(*)(int)
 #endif
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 static TSP_provider_info_t *
 _tsp_provider_information_1 (void  *argp, struct svc_req *rqstp)
Index: src/core/rpc/tsp_rpc_svc_rtems.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_svc_rtems.c,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_svc_rtems.c
--- src/core/rpc/tsp_rpc_svc_rtems.c	2 Nov 2007 15:30:12 -0000	1.1
+++ src/core/rpc/tsp_rpc_svc_rtems.c	3 Feb 2008 19:38:48 -0000
@@ -18,7 +18,7 @@
 #ifndef SIG_PF
 #define SIG_PF void(*)(int)
 #endif
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
 
 static TSP_provider_info_t *
 _tsp_provider_information_1 (void  *argp, struct svc_req *rqstp)
Index: src/core/rpc/tsp_rpc_xdr.c.linux
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_xdr.c.linux,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_xdr.c.linux
--- src/core/rpc/tsp_rpc_xdr.c.linux	22 Apr 2007 21:15:35 -0000	1.1
+++ src/core/rpc/tsp_rpc_xdr.c.linux	3 Feb 2008 19:38:48 -0000
@@ -857,4 +857,4 @@
 		 return FALSE;
 	return TRUE;
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
Index: src/core/rpc/tsp_rpc_xdr.c.win32
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_xdr.c.win32,v
retrieving revision 1.2
diff -u -r1.2 tsp_rpc_xdr.c.win32
--- src/core/rpc/tsp_rpc_xdr.c.win32	26 Apr 2007 17:51:30 -0000	1.2
+++ src/core/rpc/tsp_rpc_xdr.c.win32	3 Feb 2008 19:38:48 -0000
@@ -852,4 +852,4 @@
 		 return FALSE;
 	return TRUE;
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
Index: src/core/rpc/tsp_rpc_xdr_rtems.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_rpc_xdr_rtems.c,v
retrieving revision 1.1
diff -u -r1.1 tsp_rpc_xdr_rtems.c
--- src/core/rpc/tsp_rpc_xdr_rtems.c	2 Nov 2007 15:30:11 -0000	1.1
+++ src/core/rpc/tsp_rpc_xdr_rtems.c	3 Feb 2008 19:38:48 -0000
@@ -857,4 +857,4 @@
 		 return FALSE;
 	return TRUE;
 }
-#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR(("%s", clnt_sperror(cl, ""))); }
+#define TSP_STRACE_RPC_ERROR(cl, pResult) if(!pResult) { STRACE_ERROR("%s", clnt_sperror(cl, "")); }
Index: src/core/rpc/tsp_server.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/rpc/tsp_server.c,v
retrieving revision 1.35
diff -u -r1.35 tsp_server.c
--- src/core/rpc/tsp_server.c	30 Nov 2007 15:42:02 -0000	1.35
+++ src/core/rpc/tsp_server.c	3 Feb 2008 19:38:48 -0000
@@ -179,7 +179,7 @@
   
 
   /* endianity managment*/
-/*   STRACE_DEBUG(("Len=%d,  pgi = %d value = %f et ret = %d", async_sample_write.data.data_len, async_sample_write.provider_global_index,(double*)(async_sample_write.data.data_val),ret)); */
+/*   STRACE_DEBUG("Len=%d,  pgi = %d value = %f et ret = %d", async_sample_write.data.data_len, async_sample_write.provider_global_index,(double*)(async_sample_write.data.data_val),ret); */
 
 /*   switch (async_sample_write.data.data_len) { */
 /*   case 2:  */
@@ -196,11 +196,11 @@
 /*   } */
 	
 
-  STRACE_DEBUG(("TSP_SERVER Before async_write : pgi %d value %s return %d ",async_sample_write.provider_global_index,async_sample_write.data.data_val,ret ));
+  STRACE_DEBUG("TSP_SERVER Before async_write : pgi %d value %s return %d ",async_sample_write.provider_global_index,async_sample_write.data.data_val,ret);
   
   ret = TSP_provider_request_async_sample_write(&async_sample_write);	
   
-  STRACE_DEBUG(("TSP_SERVER After async_write : pgi %d value %s return %d ",async_sample_write.provider_global_index,async_sample_write.data.data_val,ret ));
+  STRACE_DEBUG("TSP_SERVER After async_write : pgi %d value %s return %d ",async_sample_write.provider_global_index,async_sample_write.data.data_val,ret);
 
   return &ret;
   
@@ -211,7 +211,7 @@
   static TSP_async_sample_t ret;
   
   /* endianity managment*/
-/*   STRACE_DEBUG(("Len=%d,  pgi = %d value = %f et ret = %d", async_sample_read.data.data_len, async_sample_read.provider_global_index,(double*)(async_sample_read.data.data_val),ret)); */
+/*   STRACE_DEBUG("Len=%d,  pgi = %d value = %f et ret = %d", async_sample_read.data.data_len, async_sample_read.provider_global_index,(double*)(async_sample_read.data.data_val),ret); */
 
 /*   switch (async_sample_read.data.data_len) { */
 /*   case 2:  */
@@ -268,27 +268,27 @@
   config->xprt = svctcp_create(RPC_ANYSOCK, 0, 0);
   if (config->xprt == NULL) 
     {
-      STRACE_ERROR(("Cannot create TCP service"));
+      STRACE_ERROR("Cannot create TCP service");
       return;
     }
 
   if (!svc_register(config->xprt, rpc_progid, TSP_RPC_VERSION_INITIAL, tsp_rpc_1, IPPROTO_TCP))
     {
-      STRACE_ERROR(("RPC server unable to register ProgId=%X",  rpc_progid));
+      STRACE_ERROR("RPC server unable to register ProgId=%X",  rpc_progid);
       return;
     }
 
-  STRACE_DEBUG(("RPC server is being be started with ProgId=%X", rpc_progid));
+  STRACE_DEBUG("RPC server is being be started with ProgId=%X", rpc_progid);
   
-  STRACE_DEBUG(("launching svc_run..."));
+  STRACE_DEBUG("launching svc_run...");
   svc_run();
-  STRACE_INFO(("svc_run returned"));
+  STRACE_INFO("svc_run returned");
 
 }
 
 static void TSP_rpc_stop(TSP_rpc_request_config_t *config)
 {
-  /* STRACE_DEBUG(("calling svc_exit...")); */
+  /* STRACE_DEBUG("calling svc_exit..."); */
   /* svc_destroy(config->xprt); */
 
   /* Clean-up Port map so that next provider could use this ProgId */
@@ -338,7 +338,7 @@
   
   config->server_number = TSP_rpc_init(config);
   if(config->server_number < 0) {
-      STRACE_ERROR(("unable to register any RPC progid :\n\tcheck RPC daemons, or use tsp_rpc_cleanup to clean-up all TSP RPC port mapping"));
+      STRACE_ERROR("unable to register any RPC progid :\n\tcheck RPC daemons, or use tsp_rpc_cleanup to clean-up all TSP RPC port mapping");
       cthis->status = TSP_RQH_STATUS_IDLE;
       
       return FALSE;
@@ -348,7 +348,7 @@
 #if NUMERIC_HOST
     myhost = gethostbyname(hostname);
     if (myhost == NULL) {
-      STRACE_ERROR(("Cannot gethostbyname '(hostname --> @IP)' for host <%s> check your /etc/hosts file.\n",hostname));
+      STRACE_ERROR("Cannot gethostbyname '(hostname --> @IP)' for host <%s> check your /etc/hosts file.",hostname);
       /* be tolerant we keep going with hostname but... consumer may not handle this properly */    
     } else {
      /* 
Index: src/core/xmlrpc/tsp_xmlrpc_client.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/xmlrpc/tsp_xmlrpc_client.c,v
retrieving revision 1.4
diff -u -r1.4 tsp_xmlrpc_client.c
--- src/core/xmlrpc/tsp_xmlrpc_client.c	18 Jul 2006 23:59:19 -0000	1.4
+++ src/core/xmlrpc/tsp_xmlrpc_client.c	3 Feb 2008 19:38:48 -0000
@@ -56,7 +56,7 @@
   TSP_provider_info_t *prov_info;
   xmlrpc_value *result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   result = xmlrpc_client_call(&server->xmlrpc_envi, server->url, "tsp.tsp_provider_information", "()");
   die_if_fault_occurred(&server->xmlrpc_envi);
@@ -64,7 +64,7 @@
   prov_info = xmlrpc_value_to_TSP_provider_info(&server->xmlrpc_envi, result);
   xmlrpc_DECREF(result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 
   return prov_info;
 }	
@@ -83,7 +83,7 @@
   *server = (TSP_server_t)malloc(sizeof(**server));
   server_info[0] = '\0';
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   /* XMLRPC client library startup */
   xmlrpc_client_init(XMLRPC_CLIENT_NO_FLAGS, NAME, VERSION);
@@ -104,21 +104,21 @@
 							 server_info_t->info,
 							 strlen(server_name)) == 0) {
 						  strcpy(server_info, server_info_t->info);
-						  STRACE_INFO(("Server opened : '%s'", server_info));
+						  STRACE_INFO("Server opened : '%s'", server_info);
 						  ret = TRUE;
 				  } else {																					 
-						  STRACE_INFO(("Not the requested server : '%s'", server_info_t->info));
+						  STRACE_INFO("Not the requested server : '%s'", server_info_t->info);
 						  TSP_remote_close_server(*server);
 						  ret = FALSE;
 				  }
 		  } else {
-				  STRACE_ERROR(("Returned info string too long"));
+				  STRACE_ERROR("Returned info string too long");
 		  }
   } else {
-		  STRACE_ERROR(("Could not connect to specified server"));
+		  STRACE_ERROR("Could not connect to specified server");
   }
   
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 
 	
   return ret;
@@ -127,7 +127,7 @@
 
 void TSP_remote_close_server(TSP_server_t server)
 {
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   
   /* Clean up our error-handling environment. */
@@ -136,7 +136,7 @@
   /* Shutdown our XML-RPC client library. */
   xmlrpc_client_cleanup();
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 }
 
 
@@ -151,9 +151,9 @@
   TSP_answer_open_t *ans_open;
   xmlrpc_value *result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
-  STRACE_IO((server->url));
+  STRACE_IO(server->url);
 
 
   result = xmlrpc_client_call(&server->xmlrpc_envi, server->url, "tsp.tsp_request_open", 
@@ -168,7 +168,7 @@
 
   xmlrpc_DECREF(result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
   return   ans_open;
 }	
 
@@ -178,7 +178,7 @@
   int res;
   xmlrpc_value *result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   result = xmlrpc_client_call(&server->xmlrpc_envi, 
 							  server->url, 
@@ -195,7 +195,7 @@
   /* Dispose of our result value. */
   xmlrpc_DECREF(result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 	
   return res;
 }	
@@ -206,7 +206,7 @@
   TSP_answer_sample_t *ans_sample;
   xmlrpc_value *result;
 
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   result = xmlrpc_client_call(&server->xmlrpc_envi, 
 							  server->url, 
@@ -220,7 +220,7 @@
 
   xmlrpc_DECREF(result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
   return ans_sample;
   
 }	
@@ -233,7 +233,7 @@
   TSP_answer_sample_t *ans_sample;
   xmlrpc_value *xmlrpc_params, *result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   xmlrpc_params = TSP_request_sample_to_xmlrpc_value(&server->xmlrpc_envi, req_sample);
 
@@ -247,7 +247,7 @@
   ans_sample = xmlrpc_value_to_TSP_answer_sample(&server->xmlrpc_envi, result);
   xmlrpc_DECREF(result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 	
   return ans_sample;
 }
@@ -260,7 +260,7 @@
   TSP_answer_sample_init_t* ans_sample_init;
   xmlrpc_value *xr_result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 
   xr_result = xmlrpc_client_call(&server->xmlrpc_envi, 
 							  server->url, 
@@ -274,7 +274,7 @@
   ans_sample_init = xmlrpc_value_to_TSP_answer_sample_init(&server->xmlrpc_envi, xr_result);
   xmlrpc_DECREF(xr_result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 	
   return ans_sample_init;
 }
@@ -287,7 +287,7 @@
   TSP_answer_sample_destroy_t* ans_sample_destroy;
   xmlrpc_value *xr_result;
 	
-  STRACE_IO(("-->IN"));
+  STRACE_IO("-->IN");
 	
   xr_result = xmlrpc_client_call(&server->xmlrpc_envi, 
 								 server->url, 
@@ -303,26 +303,26 @@
  	
   xmlrpc_DECREF(xr_result);
 
-  STRACE_IO(("-->OUT"));
+  STRACE_IO("-->OUT");
 	
   return ans_sample_destroy;
 }
 	
 TSP_answer_sample_t * TSP_request_filtered_information(const TSP_request_information_t* req_info, int filter_kind, char* filter_string, TSP_server_t server)
 {
-    STRACE_ERROR(("TSP_request_filtered_information unimplemented in XMLRPC"));
+    STRACE_ERROR("TSP_request_filtered_information unimplemented in XMLRPC");
 	return NULL;
 }
 
 int* TSP_request_async_sample_write(const TSP_async_sample_t* async_sample_write, TSP_server_t server)
 {
-    STRACE_ERROR(("TSP_request_async_sample_write unimplemented in XMLRPC"));
+    STRACE_ERROR("TSP_request_async_sample_write unimplemented in XMLRPC");
 	return NULL;
 }
 TSP_async_sample_t* TSP_request_async_sample_read(const TSP_async_sample_t* async_sample_read, 
 						  TSP_server_t server)
 {
-    STRACE_ERROR(("TSP_request_async_sample_read unimplemented in XMLRPC"));
+    STRACE_ERROR("TSP_request_async_sample_read unimplemented in XMLRPC");
 	return NULL;
 }
 
Index: src/core/xmlrpc/tsp_xmlrpc_server.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/xmlrpc/tsp_xmlrpc_server.c,v
retrieving revision 1.25
diff -u -r1.25 tsp_xmlrpc_server.c
--- src/core/xmlrpc/tsp_xmlrpc_server.c	9 Nov 2007 23:20:41 -0000	1.25
+++ src/core/xmlrpc/tsp_xmlrpc_server.c	3 Feb 2008 19:38:48 -0000
@@ -84,7 +84,7 @@
   TSP_provider_info_t server_info;
 
   server_info.info = strdup(GLU_get_server_name());
-  STRACE_DEBUG(("server_info.info: %s\n",server_info.info));
+  STRACE_DEBUG("server_info.info: %s",server_info.info);
   return xmlrpc_build_value(env, "{s:s}", "info", server_info.info);
 }
 
@@ -296,7 +296,7 @@
   xmlrpc_registry * registry;
   xmlrpc_env env;
 
-  STRACE_DEBUG(("Launched Abyss server"));
+  STRACE_DEBUG("Launched Abyss server");
 
   atexit(clean_exit);
 
@@ -357,9 +357,9 @@
   //TODO: make it configurable
   serverparm.log_file_name = "/dev/stderr";
 
-  STRACE_INFO(("Starting abyss server..."));
+  STRACE_INFO("Starting abyss server...");
   xmlrpc_server_abyss(&env, &serverparm, XMLRPC_APSIZE(log_file_name));
-  STRACE_ERROR(("Abyss server returned"));
+  STRACE_ERROR("Abyss server returned");
   return;
 }
 
Index: src/core/xmlrpc/tsp_xmlrpc_util.c
===================================================================
RCS file: /sources/tsp/tsp/src/core/xmlrpc/tsp_xmlrpc_util.c,v
retrieving revision 1.6
diff -u -r1.6 tsp_xmlrpc_util.c
--- src/core/xmlrpc/tsp_xmlrpc_util.c	20 Feb 2007 21:09:15 -0000	1.6
+++ src/core/xmlrpc/tsp_xmlrpc_util.c	3 Feb 2008 19:38:48 -0000
@@ -1,5 +1,5 @@
 #include "tsp_xmlrpc_util.h"
-#include "tsp_simple_trace.h"
+#include "tsp_common_trace.h"
 
 
 
@@ -221,7 +221,7 @@
   
   die_if_fault_occurred(env);
 
-  STRACE_DEBUG(("Nombre de symboles: %d\n\n", req_sample->symbols.TSP_sample_symbol_info_list_t_len));
+  STRACE_DEBUG("Number of symbols: %d", req_sample->symbols.TSP_sample_symbol_info_list_t_len);
 
 
   req_sample->symbols.TSP_sample_symbol_info_list_t_val = malloc(sizeof(TSP_sample_symbol_info_t)*req_sample->symbols.TSP_sample_symbol_info_list_t_len);
Index: src/core/xmlrpc/tsp_xmlrpc_util.h
===================================================================
RCS file: /sources/tsp/tsp/src/core/xmlrpc/tsp_xmlrpc_util.h,v
retrieving revision 1.3
diff -u -r1.3 tsp_xmlrpc_util.h
--- src/core/xmlrpc/tsp_xmlrpc_util.h	9 Nov 2007 23:20:42 -0000	1.3
+++ src/core/xmlrpc/tsp_xmlrpc_util.h	3 Feb 2008 19:38:48 -0000
@@ -8,8 +8,8 @@
 #define die_if_fault_occurred(x) \
 { \
     if ((x)->fault_occurred) { \
-        STRACE_ERROR(("XML-RPC Fault: %s (%d)\n", \
-					  (x)->fault_string, (x)->fault_code)); \
+        STRACE_ERROR("XML-RPC Fault: %s (%d)", \
+					  (x)->fault_string, (x)->fault_code); \
         exit(1); \
     } \
 }
Index: src/providers/bb_provider/bb_tsp_provider.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/bb_provider/bb_tsp_provider.c,v
retrieving revision 1.34
diff -u -r1.34 bb_tsp_provider.c
--- src/providers/bb_provider/bb_tsp_provider.c	23 Mar 2007 21:12:53 -0000	1.34
+++ src/providers/bb_provider/bb_tsp_provider.c	3 Feb 2008 19:38:49 -0000
@@ -402,7 +402,7 @@
 		} else  { /* skip unhandled BB type */ 
 			char *n;
 			n = bb_get_varname(&bb_data_desc(shadow_bb)[i]);
-			STRACE_INFO(("Skipping unhandled symbol type <%d> name <%s>",bb_data_desc(shadow_bb)[i].type, n));
+			STRACE_INFO("Skipping unhandled symbol type <%d> name <%s>",bb_data_desc(shadow_bb)[i].type, n);
 			free(n);
 		}
 	} /* loop over bb items */
@@ -446,7 +446,7 @@
   void *sym_value;
   char *n;
 
-  STRACE_INFO(("Starting symbol Valid nb_symbol=%u",symbol_list->TSP_sample_symbol_info_list_t_len));
+  STRACE_INFO("Starting symbol Valid nb_symbol=%u",symbol_list->TSP_sample_symbol_info_list_t_len);
   /* For each requested symbols, check by name, and find the provider global index */
   for (i = 0 ; i < symbol_list->TSP_sample_symbol_info_list_t_len ; i++) {
 
@@ -458,17 +458,17 @@
           n,
           VARNAME_MAX_SIZE,
           array_index, &array_index_len)) {
-      STRACE_INFO  (("%s: cannot parse symname <%s>",
+      STRACE_INFO("%s: cannot parse symname <%s>",
             "BB_GLU_get_pgi",
-            symbol_list->TSP_sample_symbol_info_list_t_val[i].name));
+            symbol_list->TSP_sample_symbol_info_list_t_val[i].name);
       ret = FALSE;
       free(n);
       continue;
     } 	 
     else {
-      STRACE_DEBUG  (("%s: array name <%s> parsed to symname <%s>",
+      STRACE_DEBUG("%s: array name <%s> parsed to symname <%s>",
             "BB_GLU_get_pgi",
-            symbol_list->TSP_sample_symbol_info_list_t_val[i].name, n));
+            symbol_list->TSP_sample_symbol_info_list_t_val[i].name, n);
       /* search if the symbol is published in the blackboard */
       bb_set_varname(&sym_data_desc, n);
       sym_data_desc.type      = E_BB_DISCOVER;
@@ -477,8 +477,8 @@
       sym_value = bb_alias_subscribe(shadow_bb,&sym_data_desc,array_index,array_index_len);    	
 
       if (NULL==sym_value) {
-        STRACE_INFO  (("symbol <%s> not found in BB <%s>",
-              n, shadow_bb->name));
+        STRACE_INFO("symbol <%s> not found in BB <%s>",
+              n, shadow_bb->name);
         pg_indexes[i] = -1;	     
         ret = FALSE;
         free(n);
@@ -488,8 +488,8 @@
         /* find the index of the symbol in the BB */
         bbidx = bb_find(shadow_bb, n);
 
-        STRACE_DEBUG(("Validate symbol: orig_name=<%s>, short=<%s>",
-              symbol_list->TSP_sample_symbol_info_list_t_val[i].name, n));
+        STRACE_DEBUG("Validate symbol: orig_name=<%s>, short=<%s>",
+              symbol_list->TSP_sample_symbol_info_list_t_val[i].name, n);
 
         /* 
          * Array index is in reverse order of aliasstack.
@@ -509,7 +509,7 @@
         if (-1==bbidx) {
           pg_indexes[i] = -1;
           ret=FALSE;
-          STRACE_INFO(("Symbol=%s, not found",symbol_list->TSP_sample_symbol_info_list_t_val[i].name));
+          STRACE_INFO("Symbol=%s, not found",symbol_list->TSP_sample_symbol_info_list_t_val[i].name);
           free(n);
           continue;
         } else {
@@ -523,9 +523,9 @@
             /* validate */
             if ((aliasstack[j].dimension > 1) && (aliasstack[j].dimension < array_index[array_index_ptr])) {
               char *n = bb_get_varname(&aliasstack[j]);
-              STRACE_INFO(("Symbol=%s, found but index=%d out of range for element <%s>",
+              STRACE_INFO("Symbol=%s, found but index=%d out of range for element <%s>",
                     symbol_list->TSP_sample_symbol_info_list_t_val[i].name,
-                    array_index[array_index_ptr], n));
+                    array_index[array_index_ptr], n);
               ret = FALSE;
               free(n);
             }
@@ -578,7 +578,7 @@
             }
 
             pg_indexes[i] = bbindex_to_pgi[bbidx] + pgi_offset;
-            STRACE_INFO(("Symbol=%s, found index=%d",symbol_list->TSP_sample_symbol_info_list_t_val[i].name,pg_indexes[i]));
+            STRACE_INFO("Symbol=%s, found index=%d",symbol_list->TSP_sample_symbol_info_list_t_val[i].name,pg_indexes[i]);
           }
         }
       }
@@ -591,7 +591,7 @@
         &(pg_indexes[i]));
   }
 
-  STRACE_INFO(("End of symbol Valid")); 
+  STRACE_INFO("End of symbol Valid");
 
   return ret;
 } /* BB_GLU_get_pgi */
@@ -680,7 +680,7 @@
 	char   strvalue[256];
 	void*  genuineBBdata;
 	
-	STRACE_INFO(("BB_PROVIDER want to AsyncWrite : pgi <%d> with value : 0x%X (value_size=%d)",provider_global_index, (uint32_t)value_ptr,value_size));
+	STRACE_INFO("BB_PROVIDER want to AsyncWrite : pgi <%d> with value : 0x%X (value_size=%d)",provider_global_index, (uint32_t)value_ptr,value_size);
 	
 	/* FIXME : Should use the pgi to cast properly the data versus the real type */
 	value = *(double*)value_ptr;
@@ -693,7 +693,7 @@
 			char *n;
 	    data_desc = bbdatadesc_by_pgi[provider_global_index];
 			n = bb_get_varname(data_desc);
-	    STRACE_INFO(("About to write on symbol <%s> value <%f> (strvalue=%s)...",n,value,strvalue));	    
+	    STRACE_INFO("About to write on symbol <%s> value <%f> (strvalue=%s)...",n,value,strvalue);
 			free(n);
 	    /* 
 	     * Note that we should write to genuine BB not the shadow ... 
@@ -705,13 +705,13 @@
 	                   (value_by_pgi[provider_global_index] - bb_data(shadow_bb));
 	    retcode = bb_value_direct_write(genuineBBdata,*data_desc,strvalue,0);
 	  } else {
-	    STRACE_INFO(("BB_GLU : pgi = %d is not allowed to be written",provider_global_index));
+	    STRACE_INFO("BB_GLU : pgi = %d is not allowed to be written",provider_global_index);
 	  }
 	} else {
-	  STRACE_INFO(("BB_GLU : pgi = %d is not valid provider_global_index",provider_global_index));	
+	  STRACE_INFO("BB_GLU : pgi = %d is not valid provider_global_index",provider_global_index);
 	}
 	
-	STRACE_DEBUG(("BB_PROVIDER After AsyncWrite : value %f return :%d",*((double*)value_by_pgi[provider_global_index]), retcode));
+	STRACE_DEBUG("BB_PROVIDER After AsyncWrite : value %f return :%d",*((double*)value_by_pgi[provider_global_index]), retcode);
 
 	return retcode;
 } /* end of BB_GLU_async_sample_write */
@@ -723,15 +723,15 @@
 	int retcode = BB_NOK; 
 	void*  genuineBBdata;
 	
-	STRACE_DEBUG(("BB_PROVIDER want to AsyncRead : pgi <%d> (value_size allowed=%d)",provider_global_index,*value_size));
+	STRACE_DEBUG("BB_PROVIDER want to AsyncRead : pgi <%d> (value_size allowed=%d)",provider_global_index,*value_size);
 	
 	/* try to read */
 	if (provider_global_index>=0 && provider_global_index<nbTspSymbols) {
 			char *n;
 	    data_desc = bbdatadesc_by_pgi[provider_global_index];
 			n = bb_get_varname(data_desc);
-	    STRACE_INFO(("About to read from symbol <%s> value...",n));
-			free(n);
+	    STRACE_INFO("About to read from symbol <%s> value...",n);
+	    free(n);
 	    /* 
 	     * Note that we should read from genuine BB not the shadow ... 
 	     * since the shadow may be overwritten immediatly on next update cycle
@@ -743,13 +743,13 @@
 	    
 	    *((double*)value_ptr) = bb_double_of(genuineBBdata,
 						 bbdatadesc_by_pgi[provider_global_index]->type);
-	    STRACE_INFO(("AsyncRead value is <%f>.",*((double*)value_ptr)));
+	    STRACE_INFO("AsyncRead value is <%f>.",*((double*)value_ptr));
 	    retcode = BB_OK;	
 	} else {
-	  STRACE_INFO(("BB_GLU : pgi = %d is not valid provider_global_index",provider_global_index));	
+	  STRACE_INFO("BB_GLU : pgi = %d is not valid provider_global_index",provider_global_index);
 	}
 	
-	STRACE_DEBUG(("BB_PROVIDER After AsyncRead : value %f return :%d",*((double*)value_ptr), retcode));
+	STRACE_DEBUG("BB_PROVIDER After AsyncRead : value %f return :%d",*((double*)value_ptr), retcode);
 
 	return retcode;
 } /* end of BB_GLU_async_sample_read */
Index: src/providers/generic_reader/glu_genreader.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/generic_reader/glu_genreader.c,v
retrieving revision 1.10
diff -u -r1.10 glu_genreader.c
--- src/providers/generic_reader/glu_genreader.c	29 Mar 2007 20:42:53 -0000	1.10
+++ src/providers/generic_reader/glu_genreader.c	3 Feb 2008 19:38:49 -0000
@@ -99,7 +99,7 @@
       /*end of line no good*/
       if(END_SAMPLE_SET!=rep && item.provider_global_index>=genreader->ssi_list->TSP_sample_symbol_info_list_t_len)
       {
-	STRACE_ERROR(("ERROR: file format is not good (not enough or too much symbol or end of line no good\n"));
+	STRACE_ERROR("file format is not good (not enough or too much symbol or end of line no good");
 	break;
       }
 
Index: src/providers/generic_reader/macsim_fmt.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/generic_reader/macsim_fmt.c,v
retrieving revision 1.12
diff -u -r1.12 macsim_fmt.c
--- src/providers/generic_reader/macsim_fmt.c	25 Mar 2007 14:17:06 -0000	1.12
+++ src/providers/generic_reader/macsim_fmt.c	3 Feb 2008 19:38:49 -0000
@@ -588,7 +588,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion double for <%s>\n",data_var));
+    STRACE_ERROR("Error conversion double for <%s>",data_var);
     return TSP_STATUS_ERROR_UNKNOWN;
   }
 
@@ -607,7 +607,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion float\n"));
+    STRACE_ERROR("Error conversion float");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
 
@@ -625,7 +625,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion int8\n"));
+    STRACE_ERROR("Error conversion int8");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
 
@@ -644,7 +644,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion int16\n"));
+    STRACE_ERROR("Error conversion int16");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
 
@@ -663,7 +663,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion int32\n"));
+    STRACE_ERROR("Error conversion int32");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
@@ -681,7 +681,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion int64\n"));
+    STRACE_ERROR("Error conversion int64");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
@@ -699,7 +699,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion uint8\n"));
+    STRACE_ERROR("Error conversion uint8");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
@@ -717,7 +717,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion uint16\n"));
+    STRACE_ERROR("Error conversion uint16");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
@@ -735,7 +735,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion uint32\n"));
+    STRACE_ERROR("Error conversion uint32");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
@@ -753,7 +753,7 @@
 
   if(data_var==rep || '\0'!=*rep)
   {
-    STRACE_ERROR(("Error conversion uint64\n"));
+    STRACE_ERROR("Error conversion uint64");
     return TSP_STATUS_ERROR_UNKNOWN;
   }
   return TSP_STATUS_OK;
Index: src/providers/res_reader/glue_res.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/res_reader/glue_res.c,v
retrieving revision 1.14
diff -u -r1.14 glue_res.c
--- src/providers/res_reader/glue_res.c	23 Apr 2006 22:28:43 -0000	1.14
+++ src/providers/res_reader/glue_res.c	3 Feb 2008 19:38:49 -0000
@@ -90,7 +90,7 @@
     {
       if(d_read_r(obj->h_res, obj->res_values) == EOF)
 	{
-	  STRACE_DEBUG (("EOF for time=%d, val[0]=%g", obj->time_stamp, *((double*)item.raw_value)));
+	  STRACE_DEBUG("EOF for time=%d, val[0]=%g", obj->time_stamp, *((double*)item.raw_value));
 	  if(!_wait_eof)
 	    {
 	      state = GLU_GET_EOF;
@@ -122,7 +122,7 @@
 	      TSP_datapool_push_next_item(res_GLU->datapool,&item);
 
 	      if(i==0)
-		STRACE_INFO (("New record : time=%d, val[0]=%g", obj->time_stamp, *((double*)item.raw_value)));
+		STRACE_INFO("New record : time=%d, val[0]=%g", obj->time_stamp, *((double*)item.raw_value));
 	    }
       
 	}
@@ -161,7 +161,7 @@
       /* FIXME : quand la fonction renvera un code d'erreur, le verifier ! */
       obj->time_stamp = -1;
 
-      STRACE_INFO(("stream_init = '%s'", res_file));
+      STRACE_INFO("stream_init = '%s'", res_file);
       obj->h_res = d_ropen_r(res_file, &(obj->use_dbl));
 	 
       if( obj->h_res )
@@ -169,9 +169,9 @@
 	  obj->nbvar = d_rval_r(obj->h_res, 'v');
 	  nbrec = d_rval_r(obj->h_res, 'r');
 
-	  STRACE_INFO(("Total number of records = %d", nbrec));
-	  STRACE_INFO(("Total number of variables = %d", obj->nbvar));
-	  STRACE_INFO(("Data type = %s", obj->use_dbl ? "DOUBLE" : "FLOAT" ));
+	  STRACE_INFO("Total number of records = %d", nbrec);
+	  STRACE_INFO("Total number of variables = %d", obj->nbvar);
+	  STRACE_INFO("Data type = %s", obj->use_dbl ? "DOUBLE" : "FLOAT");
 
 	  obj->ssiList = TSP_SSIList_new(obj->nbvar+1);
 	  assert(obj->ssiList);
@@ -211,7 +211,7 @@
 	}
       else
 	{
-	  STRACE_ERROR(("Function d_rval_r failed for file : '%s'", res_file));
+	  STRACE_ERROR("Function d_rval_r failed for file : '%s'", res_file);
 	}
 
        if(fallback_argc > GLU_RES_WAIT_EOF)
@@ -221,7 +221,7 @@
     }
   else
     {
-      STRACE_ERROR((GLU_STREAM_INIT_USAGE));
+      STRACE_ERROR(GLU_STREAM_INIT_USAGE);
       ret = FALSE;
     }
 
Index: src/providers/stub/glue_stub.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/stub/glue_stub.c,v
retrieving revision 1.29
diff -u -r1.29 glue_stub.c
--- src/providers/stub/glue_stub.c	25 Oct 2006 15:00:31 -0000	1.29
+++ src/providers/stub/glue_stub.c	3 Feb 2008 19:38:49 -0000
@@ -165,7 +165,7 @@
 		*((uint8_t*)item.raw_value) = 10; /* (uint8_t)calc_func(index, my_time);*/
 		break;
 	      default:
-		STRACE_ERROR(("Unhandled TSP datatype =%d",X_sample_symbol_info_list_val[index].type));
+		STRACE_ERROR("Unhandled TSP datatype =%d",X_sample_symbol_info_list_val[index].type);
 	 
 	      }
 	      }
@@ -195,12 +195,12 @@
       my_time++;    
       
       /* print out some pseudo time for debug purpose */
-      if (!(my_time%1000))  STRACE_INFO(("TOP %d : %s=%g \t%s=%g \t%s=%g \t%s=%g", my_time,
+      if (!(my_time%1000))  STRACE_INFO("TOP %d : %s=%g \t%s=%g \t%s=%g \t%s=%g", my_time,
 					 X_sample_symbol_info_list_val[0].name, memo_val[0],
 					 X_sample_symbol_info_list_val[1].name, memo_val[1],
 					 X_sample_symbol_info_list_val[2].name, memo_val[2],
 					 X_sample_symbol_info_list_val[3].name, memo_val[3]
-					));
+					);
     }
     
   return cthis;
@@ -482,7 +482,7 @@
 
   /* Store all global indexes into list including NOT FOUND ones */
   for ( i=0 ; i < pgis_len;++i) {    
-    STRACE_DEBUG(("Getting extended info for PGI <%d>",pgis[i]));
+    STRACE_DEBUG("Getting extended info for PGI <%d>",pgis[i]);
     if(-1!=pgis[i]) {
 
       SSEI_list->TSP_sample_symbol_extended_info_list_t_val[i].provider_global_index=pgis[i]; 
Index: src/providers/stub/server_main.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/stub/server_main.c,v
retrieving revision 1.16
diff -u -r1.16 server_main.c
--- src/providers/stub/server_main.c	30 Nov 2007 15:42:02 -0000	1.16
+++ src/providers/stub/server_main.c	3 Feb 2008 19:38:50 -0000
@@ -105,7 +105,7 @@
   /* intercept SIGINT signal */
   if ( SIG_ERR == signal(SIGINT, intrpt))
   {
-    STRACE_ERROR(("Error initialisation signal intercept function"));
+    STRACE_ERROR("Error initialisation signal intercept function");
     exit(1);
   }
 #else
Index: src/providers/stub/stub_server_rtems.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/stub/stub_server_rtems.c,v
retrieving revision 1.2
diff -u -r1.2 stub_server_rtems.c
--- src/providers/stub/stub_server_rtems.c	30 Nov 2007 15:42:02 -0000	1.2
+++ src/providers/stub/stub_server_rtems.c	3 Feb 2008 19:38:50 -0000
@@ -107,7 +107,7 @@
   /* intercept SIGINT signal */
   if ( SIG_ERR == signal(SIGINT, intrpt))
   {
-    STRACE_ERROR(("Error initialisation signal intercept function"));
+    STRACE_ERROR("Error initialisation signal intercept function");
     exit(1);
   }
 #else
Index: src/providers/vxstub/glue_stub.c
===================================================================
RCS file: /sources/tsp/tsp/src/providers/vxstub/glue_stub.c,v
retrieving revision 1.6
diff -u -r1.6 glue_stub.c
--- src/providers/vxstub/glue_stub.c	26 Feb 2006 13:36:06 -0000	1.6
+++ src/providers/vxstub/glue_stub.c	3 Feb 2008 19:38:50 -0000
@@ -119,12 +119,12 @@
       TSP_datapool_push_commit(my_time, GLU_GET_NEW_ITEM);
       
 
-      if (!(my_time%1000))  STRACE_INFO(("TOP %d : %s=%g \t%s=%g \t%s=%g \t%s=%g", my_time,
+      if (!(my_time%1000))  STRACE_INFO("TOP %d : %s=%g \t%s=%g \t%s=%g \t%s=%g", my_time,
 					 X_sample_symbol_info_list_val[0].name, memo_val[0],
 					 X_sample_symbol_info_list_val[1].name, memo_val[1],
 					 X_sample_symbol_info_list_val[2].name, memo_val[2],
 					 X_sample_symbol_info_list_val[3].name, memo_val[3]
-					));
+					);
       my_time++;    
     }
     
Index: src/util/libbb/bb_core.c
===================================================================
RCS file: /sources/tsp/tsp/src/util/libbb/bb_core.c,v
retrieving revision 1.47
diff -u -r1.47 bb_core.c
--- src/util/libbb/bb_core.c	6 Nov 2007 08:47:02 -0000	1.47
+++ src/util/libbb/bb_core.c	3 Feb 2008 19:38:50 -0000
@@ -54,7 +54,7 @@
 #include <tsp_abs_types.h>
 #include <tsp_abs_types.h>
 #include <tsp_sys_headers.h>
-#include <tsp_simple_trace.h>
+#include <tsp_common_trace.h>
 
 #endif /* __KERNEL__ */
 
@@ -1579,18 +1579,18 @@
     
   case BB_LOG_ABORT:
   case BB_LOG_SEVERE:
-    STRACE_ERROR(("%s : %s",who,message));
+    STRACE_ERROR("%s : %s",who,message);
     break;
   case BB_LOG_WARNING:
-    STRACE_WARNING(("%s : %s",who,message));
+    STRACE_WARNING("%s : %s",who,message);
     break;
   case BB_LOG_INFO:
   case BB_LOG_CONFIG:
-    STRACE_INFO(("%s : %s",who,message));
+    STRACE_INFO("%s : %s",who,message);
     break;
   case BB_LOG_FINE:
   case BB_LOG_FINER:
-    STRACE_DEBUG(("%s : %s",who,message));
+    STRACE_DEBUG("%s : %s",who,message);
 
   }
   return 0;
Index: src/util/libbb/bb_utils.c
===================================================================
RCS file: /sources/tsp/tsp/src/util/libbb/bb_utils.c,v
retrieving revision 1.16
diff -u -r1.16 bb_utils.c
--- src/util/libbb/bb_utils.c	15 Nov 2007 20:10:19 -0000	1.16
+++ src/util/libbb/bb_utils.c	3 Feb 2008 19:38:50 -0000
@@ -46,7 +46,7 @@
 #include <tsp_sys_headers.h>
 #include <bb_utils.h>
 #include <bb_sha1.h>
-#include "tsp_simple_trace.h"
+#include "tsp_common_trace.h"
 
 char* 
 bb_utils_build_shm_name(const char* shm_name) {
Index: src/util/libbb/bbtools/CMakeLists.txt
===================================================================
RCS file: /sources/tsp/tsp/src/util/libbb/bbtools/CMakeLists.txt,v
retrieving revision 1.4
diff -u -r1.4 CMakeLists.txt
--- src/util/libbb/bbtools/CMakeLists.txt	4 May 2007 15:04:01 -0000	1.4
+++ src/util/libbb/bbtools/CMakeLists.txt	3 Feb 2008 19:38:50 -0000
@@ -22,9 +22,9 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libbb)
 
 ADD_EXECUTABLE(bb_simu ${SIMU_SRC})
-TARGET_LINK_LIBRARIES(bb_simu bb m)
+TARGET_LINK_LIBRARIES(bb_simu bb tsp_common m)
 TSP_PROGRAM_INSTALL(bb_simu)
 
 ADD_EXECUTABLE(bb_tools ${TOOLS_SRC})
-TARGET_LINK_LIBRARIES(bb_tools bb)
+TARGET_LINK_LIBRARIES(bb_tools bb tsp_common)
 TSP_PROGRAM_INSTALL(bb_tools)
Index: src/util/libtspcfg/tspcfg_file.c
===================================================================
RCS file: /sources/tsp/tsp/src/util/libtspcfg/tspcfg_file.c,v
retrieving revision 1.4
diff -u -r1.4 tspcfg_file.c
--- src/util/libtspcfg/tspcfg_file.c	18 Oct 2006 23:44:38 -0000	1.4
+++ src/util/libtspcfg/tspcfg_file.c	3 Feb 2008 19:38:50 -0000
@@ -148,7 +148,7 @@
     if (NULL==tspCfgSampleList->implicit_type)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",implicit_type));
+      STRACE_ERROR("Cannot strdup <%s>",implicit_type);
     }
  } 
  else
@@ -162,7 +162,7 @@
     if (NULL==tspCfgSampleList->implicit_access)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",implicit_access));
+      STRACE_ERROR("Cannot strdup <%s>",implicit_access);
     }
  } 
  else
@@ -176,7 +176,7 @@
     if (NULL==tspCfgSampleList->implicit_provider)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",implicit_provider));
+      STRACE_ERROR("Cannot strdup <%s>",implicit_provider);
     }
  } 
  else
@@ -190,7 +190,7 @@
     if (NULL==tspCfgSampleList->renamed)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",renamed));
+      STRACE_ERROR("Cannot strdup <%s>",renamed);
     }
  } 
  else
@@ -299,7 +299,7 @@
     if (NULL==provider->name)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",name));
+      STRACE_ERROR("Cannot strdup <%s>",name);
     }
 
   } 
@@ -322,7 +322,7 @@
     if (NULL==provider->url)
     {
       retcode = TSP_STATUS_ERROR_MEMORY_ALLOCATION;
-      STRACE_ERROR(("Cannot strdup <%s>",url));
+      STRACE_ERROR("Cannot strdup <%s>",url);
     }
   } 
   else
