X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/283e9bdd63e87b5e568ed8ccc88297680138c1be..c5898c7bb61800b2ffac463d79738309dcc6170b:/src/simdag/sd_daxloader.c

diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c
index 8719c534d7..5117925cc2 100644
--- a/src/simdag/sd_daxloader.c
+++ b/src/simdag/sd_daxloader.c
@@ -165,14 +165,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
     if(task->kind == SD_TASK_COMM_E2E) continue;
     //test if all tasks are marked
     if(task->marked == 0){
-      WARN1("the task %s is not marked",task->name);
+      XBT_WARN("the task %s is not marked",task->name);
       all_marked = false;
       break;
     }
   }
   task = NULL;
   if(!all_marked){
-    VERB0("there is at least one cycle in your task graph");
+    XBT_VERB("there is at least one cycle in your task graph");
 
     current = xbt_dynar_new(sizeof(SD_task_t),NULL);
     xbt_dynar_foreach(dag,count,task){
@@ -235,7 +235,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
       if(task->kind == SD_TASK_COMM_E2E) continue;
       //test if all tasks are marked
       if(task->marked == 0){
-        WARN1("the task %s is in a cycle",task->name);
+        XBT_WARN("the task %s is in a cycle",task->name);
         all_marked = false;
       }
     }
@@ -258,7 +258,7 @@ static void dump_res()
   unsigned int cursor;
   SD_task_t task;
   xbt_dynar_foreach(result, cursor, task) {
-    INFO1("Task %d", cursor);
+    XBT_INFO("Task %d", cursor);
     SD_task_dump(task);
   }
 }
@@ -280,7 +280,7 @@ xbt_dynar_t SD_daxload(const char *filename)
   SD_task_t file;
   char *name;
   FILE *in_file = fopen(filename, "r");
-  xbt_assert1(in_file, "Unable to open \"%s\"\n", filename);
+  xbt_assert(in_file, "Unable to open \"%s\"\n", filename);
   input_buffer = dax__create_buffer(in_file, 10);
   dax__switch_to_buffer(input_buffer);
   dax_lineno = 1;
@@ -295,7 +295,9 @@ xbt_dynar_t SD_daxload(const char *filename)
   xbt_dynar_push(result, &root_task);
   end_task = SD_task_create_comp_seq("end", NULL, 0);
 
-  xbt_assert2(!dax_lex(), "Parse error in %s: %s", filename,
+  int res;
+  res = dax_lex();
+  xbt_assert(!res, "Parse error in %s: %s", filename,
               dax__parse_err_msg());
   dax__delete_buffer(input_buffer);
   fclose(in_file);
@@ -318,8 +320,8 @@ xbt_dynar_t SD_daxload(const char *filename)
         SD_task_dependency_add(NULL, NULL, root_task, newfile);
         SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
 #ifdef HAVE_TRACING
-        if (depbefore->src){
-          const char *category = depbefore->src->category;
+        if (depafter->src){
+          const char *category = depafter->src->category;
           if (category){
             TRACE_category (category);
             TRACE_sd_set_task_category (newfile, category);
@@ -349,7 +351,7 @@ xbt_dynar_t SD_daxload(const char *filename)
       xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) {
         xbt_dynar_foreach(file->tasks_after, cpt2, depafter) {
           if (depbefore->src == depafter->dst) {
-            WARN2
+            XBT_WARN
                 ("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.",
                  file->name, depbefore->src->name);
           }
@@ -390,9 +392,10 @@ xbt_dynar_t SD_daxload(const char *filename)
 
 void STag_dax__adag(void)
 {
-  double version = dax_parse_double(A_dax__adag_version);
+  double version;
+  version = dax_parse_double(A_dax__adag_version);
 
-  xbt_assert1((version == 2.1),
+  xbt_assert(version == 2.1,
               "Expected version 2.1 in <adag> tag, got %f. Fix the parser or your file",
               version);
 }
@@ -402,7 +405,7 @@ void STag_dax__job(void)
   double runtime = dax_parse_double(A_dax__job_runtime);
   char *name = bprintf("%s@%s", A_dax__job_id, A_dax__job_name);
   runtime *= 4200000000.;       /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */
-//  INFO3("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
+//  XBT_INFO("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
   current_job = SD_task_create_comp_seq(name, NULL, runtime);
 #ifdef HAVE_TRACING
   char *category = A_dax__job_name;
@@ -422,14 +425,14 @@ void STag_dax__uses(void)
   double size = dax_parse_double(A_dax__uses_size);
   int is_input = (A_dax__uses_link == A_dax__uses_link_input);
 
-//  INFO2("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
+//  XBT_INFO("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
   file = xbt_dict_get_or_null(files, A_dax__uses_file);
   if (file == NULL) {
     file = SD_task_create_comm_e2e(A_dax__uses_file, NULL, size);
     xbt_dict_set(files, A_dax__uses_file, file, &dax_task_free);
   } else {
     if (SD_task_get_amount(file) != size) {
-      WARN3("Ignoring file %s size redefinition from %.0f to %.0f",
+      XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",
             A_dax__uses_file, SD_task_get_amount(file), size);
     }
   }
@@ -438,7 +441,7 @@ void STag_dax__uses(void)
   } else {
     SD_task_dependency_add(NULL, NULL, current_job, file);
     if (xbt_dynar_length(file->tasks_before) > 1) {
-      WARN1("File %s created at more than one location...", file->name);
+      XBT_WARN("File %s created at more than one location...", file->name);
     }
   }
 }
@@ -467,27 +470,27 @@ void STag_dax__parent(void)
                      current_child->name, A_dax__parent_ref,
                      A_dax__parent_ref));
   SD_task_dependency_add(NULL, NULL, parent, current_child);
-  DEBUG2("Control-flow dependency from %s to %s", current_child->name,
+  XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name,
          parent->name);
 }
 
 void ETag_dax__adag(void)
 {
-//  INFO0("See </adag>");
+//  XBT_INFO("See </adag>");
 }
 
 void ETag_dax__job(void)
 {
   current_job = NULL;
-//  INFO0("See </job>");
+//  XBT_INFO("See </job>");
 }
 
 void ETag_dax__parent(void)
 {
-//  INFO0("See </parent>");
+//  XBT_INFO("See </parent>");
 }
 
 void ETag_dax__uses(void)
 {
-//  INFO0("See </uses>");
+//  XBT_INFO("See </uses>");
 }