X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/066bc21e2478c4a57290c8847351b72de8e0419c..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simdag/sd_dotloader.cpp

diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index b2008872e7..536d34b2f7 100644
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -1,21 +1,22 @@
-/* Copyright (c) 2009-2017. The SimGrid Team.
+/* Copyright (c) 2009-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simdag_private.hpp"
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/simdag.h"
 #include "src/internal_config.h"
-#include "xbt/file.h"
+#include "xbt/file.hpp"
 #include <cstring>
 #include <unordered_map>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
-
 #if HAVE_GRAPHVIZ
 #include <graphviz/cgraph.h>
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
+
 xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule);
 
 static void dot_task_p_free(void *task) {
@@ -103,9 +104,10 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
         if ((performer != -1 && order != -1) && performer < static_cast<int>(sg_host_count())) {
           /* required parameters are given and less performers than hosts are required */
           XBT_DEBUG ("Task '%s' is scheduled on workstation '%d' in position '%d'", task->name, performer, order);
-          try {
-            computer = computers.at(char_performer);
-          } catch (std::out_of_range& unfound) {
+          auto comp = computers.find(char_performer);
+          if (comp != computers.end()) {
+            computer = comp->second;
+          } else {
             computer = new std::vector<SD_task_t>;
             computers.insert({char_performer, computer});
           }
@@ -176,15 +178,15 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
             task = SD_task_create_comm_e2e(name.c_str(), nullptr, size);
           else
             task = SD_task_create_comm_par_mxn_1d_block(name.c_str(), nullptr, size);
-          SD_task_dependency_add(nullptr, nullptr, src, task);
-          SD_task_dependency_add(nullptr, nullptr, task, dst);
+          SD_task_dependency_add(src, task);
+          SD_task_dependency_add(task, dst);
           jobs.insert({name, task});
           xbt_dynar_push(result, &task);
         } else {
           XBT_WARN("Task '%s' is defined more than once", name.c_str());
         }
       } else {
-        SD_task_dependency_add(nullptr, nullptr, src, dst);
+        SD_task_dependency_add(src, dst);
       }
     }
   }
@@ -197,12 +199,12 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
   xbt_dynar_foreach (result, i, task){
     if (task->predecessors->empty() && task->inputs->empty() && task != root) {
       XBT_DEBUG("Task '%s' has no source. Add dependency from 'root'", task->name);
-      SD_task_dependency_add(nullptr, nullptr, root, task);
+      SD_task_dependency_add(root, task);
     }
 
     if (task->successors->empty() && task->outputs->empty() && task != end) {
       XBT_DEBUG("Task '%s' has no destination. Add dependency to 'end'", task->name);
-      SD_task_dependency_add(nullptr, nullptr, task, end);
+      SD_task_dependency_add(task, end);
     }
   }
 
@@ -211,24 +213,25 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
 
   if(schedule){
     if (schedule_success) {
-      const sg_host_t *workstations = sg_host_list ();
-      for (auto elm : computers) {
+      std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts();
+
+      for (auto const& elm : computers) {
         SD_task_t previous_task = nullptr;
-        for (auto task : *elm.second) {
+        for (auto const& cur_task : *elm.second) {
           /* add dependency between the previous and the task to avoid parallel execution */
-          if(task){
-            if (previous_task && not SD_task_dependency_exists(previous_task, task))
-              SD_task_dependency_add(nullptr, nullptr, previous_task, task);
+          if (cur_task) {
+            if (previous_task && not SD_task_dependency_exists(previous_task, cur_task))
+              SD_task_dependency_add(previous_task, cur_task);
 
-            SD_task_schedulel(task, 1, workstations[atoi(elm.first.c_str())]);
-            previous_task = task;
+            SD_task_schedulel(cur_task, 1, hosts[std::stod(elm.first)]);
+            previous_task = cur_task;
           }
         }
         delete elm.second;
       }
     } else {
       XBT_WARN("The scheduling is ignored");
-      for (auto elm : computers)
+      for (auto const& elm : computers)
         delete elm.second;
       xbt_dynar_free(&result);
       result = nullptr;
@@ -236,9 +239,8 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
   }
 
   if (result && not acyclic_graph_detail(result)) {
-    char* base = xbt_basename(filename);
-    XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base);
-    free(base);
+    std::string base = simgrid::xbt::Path(filename).get_base_name();
+    XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str());
     xbt_dynar_free(&result);
     result = nullptr;
   }