X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baa3acafbe0f80df768f37ab78ef8f015ee86439..4db64504cb1972613311ca094cf183e7375bc34c:/src/instr/interface.c

diff --git a/src/instr/interface.c b/src/instr/interface.c
index 4dc5d80b20..61103f8a9e 100644
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -30,7 +30,7 @@ int trace_mask;
  *
  * \param name of the file that will contain the traces
  * \param mask to take into account during trace
- * \return 1 if everything is ok, 0 otherwise
+ * \return 0 if everything is ok
  */
 int TRACE_start_with_mask(const char *filename, int mask) {
   if (IS_TRACING) { /* what? trace is already active... ignore.. */
@@ -47,7 +47,7 @@ int TRACE_start_with_mask(const char *filename, int mask) {
 
   FILE *file = fopen(filename, "w");
   if (!file) {
-    THROW1 (tracing_error, TRACE_ERROR_FILE_OPEN,
+    THROW1 (tracing_error, TRACE_ERROR_START,
     		"Tracefile %s could not be opened for writing.", filename);
   } else {
     TRACE_paje_start (file);
@@ -100,26 +100,25 @@ int TRACE_start_with_mask(const char *filename, int mask) {
   __TRACE_surf_init();
   __TRACE_msg_process_init ();
 
-  return 1;
+  return 0;
 }
 
 int TRACE_end() {
-  if (!IS_TRACING) return 0;
-  __TRACE_surf_finalize();
+  if (!IS_TRACING) return 1;
   FILE *file = TRACE_paje_end();
   fclose (file);
-  return 1;
+  return 0;
 }
 
-void TRACE_category (const char *category)
+int TRACE_category (const char *category)
 {
-  if (!IS_TRACING) return;
+  if (!IS_TRACING) return 1;
   static int first_time = 1;
   if (first_time){
 	  TRACE_define_type ("user_type", "0", 1);
 	  first_time = 0;
   }
-  TRACE_create_category (category, "user_type", "0");
+  return TRACE_create_category (category, "user_type", "0");
 }
 
 void TRACE_define_type (const char *type,
@@ -147,7 +146,7 @@ void TRACE_define_type (const char *type,
   xbt_dict_set (defined_types, type, xbt_strdup("1"), xbt_free);
 }
 
-void TRACE_create_category (const char *category,
+int TRACE_create_category (const char *category,
 		const char *type, const char *parent_category)
 {
   if (!IS_TRACING) return;
@@ -155,14 +154,17 @@ void TRACE_create_category (const char *category,
   //check if type is defined
   if (!xbt_dict_get_or_null (defined_types, type)) {
 	 THROW1 (tracing_error, TRACE_ERROR_TYPE_NOT_DEFINED, "Type %s is not defined", type);
+	 return 1;
   }
   //check if parent_category exists
   if (strcmp(parent_category, "0") && !xbt_dict_get_or_null (created_categories, parent_category)){
      THROW1 (tracing_error, TRACE_ERROR_CATEGORY_NOT_DEFINED, "Category (used as parent) %s is not created", parent_category);
+     return 1;
   }
   //check if category is created
   if (xbt_dict_get_or_null (created_categories, category)){
-	 THROW1 (tracing_error, TRACE_ERROR_CATEGORY_ALREADY_DEFINED, "Category %s is already created", type);
+	 INFO1 ("Category %s is already created", category);
+     return 1;
   }
 
   pajeCreateContainer(MSG_get_clock(), category, type, parent_category, category);
@@ -175,6 +177,7 @@ void TRACE_create_category (const char *category,
   if (IS_TRACING_PLATFORM) pajeDefineVariableType (state, "HOST", state);
 
   xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+  return 0;
 }
 
 void TRACE_set_mask (int mask)