X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45b714b8561efbd12ebfd1f59e836e0ab006e824..91bb8b44ef09735fc79f40a3d9eeb69456a46909:/src/instr/instr_TI_trace.c?ds=sidebyside

diff --git a/src/instr/instr_TI_trace.c b/src/instr/instr_TI_trace.c
index 6fd798f25e..9e0e73b9d7 100644
--- a/src/instr/instr_TI_trace.c
+++ b/src/instr/instr_TI_trace.c
@@ -8,7 +8,8 @@
 #include "xbt/xbt_os_time.h"
 #include "simgrid/sg_config.h"
 
-
+#include <errno.h>
+#include <string.h>
 #include <sys/stat.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_TI_trace, instr_trace, "tracing event system");
@@ -19,7 +20,6 @@ double prefix=0.0;
 xbt_dict_t tracing_files = NULL;
 
 extern s_instr_trace_writer_t active_writer;
-extern xbt_dynar_t buffer;
 
 void TRACE_TI_init(void)
 {
@@ -45,60 +45,60 @@ void TRACE_TI_start(void)
   /* output comment file */
   dump_comment_file(TRACE_get_comment_file());
 
-  buffer = xbt_dynar_new(sizeof(paje_event_t), NULL);
 }
 
 void TRACE_TI_end(void)
 {
-  if(tracing_files)xbt_dict_free(&tracing_files);
+  xbt_dict_free(&tracing_files);
   fclose(tracing_file);
   char *filename = TRACE_get_filename();
-  xbt_dynar_free(&buffer);
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-void print_TICreateContainer(paje_event_t event){
+void print_TICreateContainer(paje_event_t event)
+{
+  //if we are in the mode with only one file
+  static FILE *temp = NULL;
 
-  char* folder_name = bprintf("%s_files",TRACE_get_filename());
-  if(tracing_files==NULL){
+  if (tracing_files == NULL) {
     tracing_files = xbt_dict_new_homogeneous(NULL);
-    struct stat st;
-    if (stat(folder_name, &st) == -1) {
-        mkdir(folder_name, 0700);
-    }
     //generate unique run id with time
-    prefix=xbt_os_time();
+    prefix = xbt_os_time();
   }
 
-  //Open a file for each new container
-  char *filename = NULL;
-
-
-  //if we are in the mode with only one file
-  static FILE* temp = NULL;
-
-  if (!xbt_cfg_get_boolean(_sg_cfg_set, "tracing/smpi/format/ti_one_file") || temp ==NULL){
-    filename = bprintf("%s/%f_%s.txt", folder_name, prefix, ((createContainer_t) event->data)->container->name);
-    temp=fopen(filename, "w");
-    if(temp==NULL){
-    xbt_die("Tracefile %s could not be opened for writing.",
-           filename);
-    }
+  if (!xbt_cfg_get_boolean(_sg_cfg_set, "tracing/smpi/format/ti_one_file")
+      || temp == NULL) {
+    char *folder_name = bprintf("%s_files", TRACE_get_filename());
+    char *filename = bprintf("%s/%f_%s.txt", folder_name, prefix,
+                             ((createContainer_t) event->data)->container->name);
+#ifdef WIN32
+    mkdir(folder_name);
+#else
+    mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO);
+#endif
+    temp = fopen(filename, "w");
+    if (temp == NULL)
+      xbt_die("Tracefile %s could not be opened for writing: %s",
+              filename, strerror(errno));
     fprintf(tracing_file, "%s\n", filename);
 
+    xbt_free(folder_name);
+    xbt_free(filename);
   }
 
-
-
-  xbt_dict_set(tracing_files, ((createContainer_t) event->data)->container->name, (void*)temp, NULL);
-
-  //Append its path to the main file
-  free(folder_name);
-  free(filename);
+  xbt_dict_set(tracing_files,
+               ((createContainer_t) event->data)->container->name,
+               (void *) temp, NULL);
 }
 
-
-void print_TIDestroyContainer(paje_event_t event){
+void print_TIDestroyContainer(paje_event_t event)
+{
+  if (!xbt_cfg_get_boolean(_sg_cfg_set, "tracing/smpi/format/ti_one_file")||
+      xbt_dict_length(tracing_files) == 1) {
+    FILE* f = xbt_dict_get_or_null(tracing_files,
+        ((destroyContainer_t) event->data)->container->name);
+    fclose(f);
+  }
   xbt_dict_remove(tracing_files, ((destroyContainer_t) event->data)->container->name);
 }