A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Misc. cosmetic changes.
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.cpp
diff --git
a/src/simdag/sd_daxloader.cpp
b/src/simdag/sd_daxloader.cpp
index
3331c7b
..
af8a699
100644
(file)
--- a/
src/simdag/sd_daxloader.cpp
+++ b/
src/simdag/sd_daxloader.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team.
+/* Copyright (c) 2009-20
21
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-21,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)
{
/* 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);
std::string new_name =
std::string(SD_task_get_name(parent)) + "_" + SD_task_get_name(task) + "_" + SD_task_get_name(child);
@@
-48,7
+48,6
@@
static bool parents_are_marked(const_SD_task_t task)
bool acyclic_graph_detail(const_xbt_dynar_t dag)
{
unsigned int count;
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)
SD_task_t task = nullptr;
std::vector<SD_task_t> current;
xbt_dynar_foreach (dag, count, task)
@@
-76,7
+75,7
@@
bool acyclic_graph_detail(const_xbt_dynar_t dag)
current = next;
}
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) {
//test if all tasks are marked
xbt_dynar_foreach(dag,count,task){
if (task->kind != SD_TASK_COMM_E2E && not task->marked) {
@@
-130,8
+129,8
@@
bool acyclic_graph_detail(const_xbt_dynar_t dag)
static YY_BUFFER_STATE input_buffer;
static xbt_dynar_t result;
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
static SD_task_t current_job;
/** @brief loads a DAX file describing a DAG
@@
-155,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);
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();
dax__delete_buffer(input_buffer);
fclose(in_file);
dax_lex_destroy();