Change "if(...) xbt_die(...)" to "xbt_assert(...)".

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

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 0c59e70..af8a699 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2019. The SimGrid Team.
+/* Copyright (c) 2009-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,6 +11,7 @@
 #include "xbt/misc.h"
 #include <algorithm>
 #include <map>
+#include <stdexcept>
 
 #include "dax_dtd.h"
 #include "dax_dtd.c"
@@ -20,8 +21,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 /* Ensure that transfer tasks have unique names even though a file is used several times */
 void uniq_transfer_task_name(SD_task_t task)
 {
-  SD_task_t child = *(task->successors->begin());
-  SD_task_t parent = *(task->predecessors->begin());
+  const_SD_task_t child  = *(task->successors->begin());
+  const_SD_task_t parent = *(task->predecessors->begin());
 
   std::string new_name =
       std::string(SD_task_get_name(parent)) + "_" + SD_task_get_name(task) + "_" + SD_task_get_name(child);
@@ -29,22 +30,24 @@ void uniq_transfer_task_name(SD_task_t task)
   SD_task_set_name(task, new_name.c_str());
 }
 
-static bool children_are_marked(SD_task_t task){
+static bool children_are_marked(const_SD_task_t task)
+{
   return std::none_of(task->successors->begin(), task->successors->end(),
                       [](const SD_task_t& elm) { return not elm->marked; }) &&
          std::none_of(task->outputs->begin(), task->outputs->end(),
                       [](const SD_task_t& elm) { return not elm->marked; });
 }
 
-static bool parents_are_marked(SD_task_t task){
+static bool parents_are_marked(const_SD_task_t task)
+{
   return std::none_of(task->predecessors->begin(), task->predecessors->end(),
                       [](const SD_task_t& elm) { return not elm->marked; }) &&
          std::none_of(task->inputs->begin(), task->inputs->end(), [](const SD_task_t& elm) { return not elm->marked; });
 }
 
-bool acyclic_graph_detail(xbt_dynar_t dag){
+bool acyclic_graph_detail(const_xbt_dynar_t dag)
+{
   unsigned int count;
-  bool all_marked = true;
   SD_task_t task = nullptr;
   std::vector<SD_task_t> current;
   xbt_dynar_foreach (dag, count, task)
@@ -72,7 +75,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
     current = next;
   }
 
-  all_marked = true;
+  bool all_marked = true;
   //test if all tasks are marked
   xbt_dynar_foreach(dag,count,task){
     if (task->kind != SD_TASK_COMM_E2E && not task->marked) {
@@ -126,8 +129,8 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
 static YY_BUFFER_STATE input_buffer;
 
 static xbt_dynar_t result;
-static std::map<std::string, SD_task_t> jobs;
-static std::map<std::string, SD_task_t> files;
+static std::map<std::string, SD_task_t, std::less<>> jobs;
+static std::map<std::string, SD_task_t, std::less<>> files;
 static SD_task_t current_job;
 
 /** @brief loads a DAX file describing a DAG
@@ -151,9 +154,7 @@ xbt_dynar_t SD_daxload(const char *filename)
   xbt_dynar_push(result, &root_task);
   SD_task_t end_task = SD_task_create_comp_seq("end", nullptr, 0);
 
-  int res = dax_lex();
-  if (res != 0)
-    xbt_die("Parse error in %s: %s", filename, dax__parse_err_msg());
+  xbt_assert(dax_lex() == 0, "Parse error in %s: %s", filename, dax__parse_err_msg());
   dax__delete_buffer(input_buffer);
   fclose(in_file);
   dax_lex_destroy();