also change the namespace of kernel/resource/{Action,Model}

[simgrid.git] / src / simdag / sd_daxloader.cpp

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 110716b..185966b 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team.
+/* Copyright (c) 2009-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,20 +6,16 @@
 
 #include "simdag_private.hpp"
 #include "simgrid/simdag.h"
-#include "xbt/file.h" /* xbt_basename() */
+#include "xbt/file.hpp"
 #include "xbt/log.h"
 #include "xbt/misc.h"
-#include "xbt/str.h"
 #include <map>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 
 extern "C" {
-  #undef CLEANUP
-  #include "dax_dtd.h"
-  #define register /* g++ don't like register, so don't say it */
-  #include "dax_dtd.c"
-  #undef register
+#include "dax_dtd.h"
+#include "dax_dtd.c"
 }
 
 /* Ensure that transfer tasks have unique names even though a file is used several times */
@@ -192,15 +188,15 @@ xbt_dynar_t SD_daxload(const char *filename)
     if (file->predecessors->empty()) {
       for (SD_task_t const& it : *file->successors) {
         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
-        SD_task_dependency_add(nullptr, nullptr, root_task, newfile);
-        SD_task_dependency_add(nullptr, nullptr, newfile, it);
+        SD_task_dependency_add(root_task, newfile);
+        SD_task_dependency_add(newfile, it);
         xbt_dynar_push(result, &newfile);
       }
     } else if (file->successors->empty()) {
       for (SD_task_t const& it : *file->predecessors) {
         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
-        SD_task_dependency_add(nullptr, nullptr, it, newfile);
-        SD_task_dependency_add(nullptr, nullptr, newfile, end_task);
+        SD_task_dependency_add(it, newfile);
+        SD_task_dependency_add(newfile, end_task);
         xbt_dynar_push(result, &newfile);
       }
     } else {
@@ -211,8 +207,8 @@ xbt_dynar_t SD_daxload(const char *filename)
                       "This loop dependency will prevent the execution of the task.", file->name, it->name);
           }
           newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
-          SD_task_dependency_add(nullptr, nullptr, it, newfile);
-          SD_task_dependency_add(nullptr, nullptr, newfile, it2);
+          SD_task_dependency_add(it, newfile);
+          SD_task_dependency_add(newfile, it2);
           xbt_dynar_push(result, &newfile);
         }
       }
@@ -235,9 +231,9 @@ xbt_dynar_t SD_daxload(const char *filename)
        */
       if ((file != root_task) && (file != end_task)) {
         if (file->inputs->empty())
-          SD_task_dependency_add(nullptr, nullptr, root_task, file);
+          SD_task_dependency_add(root_task, file);
         if (file->outputs->empty())
-          SD_task_dependency_add(nullptr, nullptr, file, end_task);
+          SD_task_dependency_add(file, end_task);
       }
     } else {
       THROW_IMPOSSIBLE;
@@ -245,9 +241,8 @@ xbt_dynar_t SD_daxload(const char *filename)
   }
 
   if (not acyclic_graph_detail(result)) {
-    char* base = xbt_basename(filename);
-    XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base);
-    free(base);
+    std::string base = simgrid::xbt::Path(filename).getBasename();
+    XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base.c_str());
     xbt_dynar_foreach(result, cpt, file)
       SD_task_destroy(file);
     xbt_dynar_free_container(&result);
@@ -307,9 +302,9 @@ void STag_dax__uses()
     }
   }
   if (is_input) {
-    SD_task_dependency_add(nullptr, nullptr, file, current_job);
+    SD_task_dependency_add(file, current_job);
   } else {
-    SD_task_dependency_add(nullptr, nullptr, current_job, file);
+    SD_task_dependency_add(current_job, file);
     if ((file->predecessors->size() + file->inputs->size()) > 1) {
       XBT_WARN("File %s created at more than one location...", file->name);
     }
@@ -338,7 +333,7 @@ void STag_dax__parent()
   auto job = jobs.find(A_dax__parent_ref);
   if (job != jobs.end()) {
     SD_task_t parent = job->second;
-    SD_task_dependency_add(nullptr, nullptr, parent, current_child);
+    SD_task_dependency_add(parent, current_child);
     XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name);
   } else {
     throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) +