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
+ #undef CLEANUP
+ #include "dax_dtd.h"
+ #define register /* g++ don't like register, so don't say it */
+ #include "dax_dtd.c"
+ #undef register
+}
+
+/* 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());
+
+ char *new_name = bprintf("%s_%s_%s", SD_task_get_name(parent), SD_task_get_name(task), SD_task_get_name(child));
+
+ SD_task_set_name(task, new_name);
+
+ free(new_name);
}
static bool children_are_marked(SD_task_t task){
current.push_back(task);
}
}
- while(!current.empty()){
+ while (not current.empty()) {
std::vector<SD_task_t> next;
for (auto t: current){
//Mark task
//test if all tasks are marked
xbt_dynar_foreach(dag,count,task){
if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){
- XBT_WARN("the task %s is not marked",task->name.c_str());
+ XBT_WARN("the task %s is not marked",task->name);
all_marked = false;
break;
}
}
- if(!all_marked){
+ if (not all_marked) {
XBT_VERB("there is at least one cycle in your task graph");
xbt_dynar_foreach(dag,count,task){
if(task->kind != SD_TASK_COMM_E2E && task->predecessors->empty() && task->inputs->empty()){
- task->marked = 1;
- current.push_back(task);
+ task->marked = 1;
+ current.push_back(task);
}
}
//test if something has to be done for the next iteration
- while(!current.empty()){
+ while (not current.empty()) {
std::vector<SD_task_t> next;
//test if the current iteration is done
for (auto t: current){
all_marked = true;
xbt_dynar_foreach(dag,count,task){
if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){
- XBT_WARN("the task %s is in a cycle",task->name.c_str());
+ XBT_WARN("the task %s is in a cycle",task->name);
all_marked = false;
}
}
static YY_BUFFER_STATE input_buffer;
static xbt_dynar_t result;
-static xbt_dict_t files;
static xbt_dict_t jobs;
+static xbt_dict_t files;
static SD_task_t current_job;
+static SD_task_t root_task;
+static SD_task_t end_task;
static void dax_task_free(void *task)
{
}
/** @brief loads a DAX file describing a DAG
- *
+ *
* See https://confluence.pegasus.isi.edu/display/pegasus/WorkflowGenerator for more details.
*/
xbt_dynar_t SD_daxload(const char *filename)
result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free);
files = xbt_dict_new_homogeneous(&dax_task_free);
jobs = xbt_dict_new_homogeneous(nullptr);
- SD_task_t root_task = SD_task_create_comp_seq("root", nullptr, 0);
+ root_task = SD_task_create_comp_seq("root", nullptr, 0);
/* by design the root task is always SCHEDULABLE */
SD_task_set_state(root_task, SD_SCHEDULABLE);
xbt_dynar_push(result, &root_task);
- SD_task_t end_task = SD_task_create_comp_seq("end", nullptr, 0);
+ end_task = SD_task_create_comp_seq("end", nullptr, 0);
int res = dax_lex();
if (res != 0)
SD_task_t newfile;
if (file->predecessors->empty()) {
for (SD_task_t it : *file->successors) {
- newfile = SD_task_create_comm_e2e(file->name.c_str(), nullptr, file->amount);
+ 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);
xbt_dynar_push(result, &newfile);
}
} else if (file->successors->empty()) {
for (SD_task_t it : *file->predecessors){
- newfile = SD_task_create_comm_e2e(file->name.c_str(), nullptr, file->amount);
+ 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);
xbt_dynar_push(result, &newfile);
for (SD_task_t it2 : *file->successors) {
if (it == it2) {
XBT_WARN ("File %s is produced and consumed by task %s."
- "This loop dependency will prevent the execution of the task.",
- file->name.c_str(), it->name.c_str());
+ "This loop dependency will prevent the execution of the task.", file->name, it->name);
}
- newfile = SD_task_create_comm_e2e(file->name.c_str(), nullptr, file->amount);
+ 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);
xbt_dynar_push(result, &newfile);
unsigned int cpt;
xbt_dynar_foreach(result, cpt, file) {
if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) {
- /* Ensure that transfer tasks have unique names even though a file is used several times */
- file->name = std::string((*file->predecessors->begin())->name+ "_" + file->name + "_" +
- (*file->successors->begin())->name);
+ uniq_transfer_task_name(file);
} else if (SD_task_get_kind(file) == SD_TASK_COMP_SEQ){
/* If some tasks do not take files as input, connect them to the root
* if they don't produce files, connect them to the end node.
*/
- if ((file != root_task) && file->inputs->empty())
- SD_task_dependency_add(nullptr, nullptr, root_task, file);
- if ((file != end_task) && file->outputs->empty())
- SD_task_dependency_add(nullptr, nullptr, file, end_task);
+ if ((file != root_task) && (file != end_task)) {
+ if (file->inputs->empty())
+ SD_task_dependency_add(nullptr, nullptr, root_task, file);
+ if (file->outputs->empty())
+ SD_task_dependency_add(nullptr, nullptr, file, end_task);
+ }
} else {
- THROW_IMPOSSIBLE;
+ THROW_IMPOSSIBLE;
}
}
- if (!acyclic_graph_detail(result)) {
+ 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);
void STag_dax__adag()
{
- double version = xbt_str_parse_double(A_dax__adag_version, "Parse error: %s is not a double");
+ XBT_ATTRIB_UNUSED double version;
+ version = xbt_str_parse_double(A_dax__adag_version, "Parse error: %s is not a double");
xbt_assert(version == 2.1, "Expected version 2.1 in <adag> tag, got %f. Fix the parser or your file", version);
}
void STag_dax__job()
{
double runtime = xbt_str_parse_double(A_dax__job_runtime, "Parse error: %s is not a double");
- std::string name = std::string(A_dax__job_id) +"@"+ std::string(A_dax__job_name);
+ 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? */
XBT_DEBUG("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
- current_job = SD_task_create_comp_seq(name.c_str(), nullptr, runtime);
+ current_job = SD_task_create_comp_seq(name, nullptr, runtime);
xbt_dict_set(jobs, A_dax__job_id, current_job, nullptr);
+ free(name);
xbt_dynar_push(result, ¤t_job);
}
} else {
SD_task_dependency_add(nullptr, nullptr, current_job, file);
if ((file->predecessors->size() + file->inputs->size()) > 1) {
- XBT_WARN("File %s created at more than one location...", file->name.c_str());
+ XBT_WARN("File %s created at more than one location...", file->name);
}
}
}
{
SD_task_t parent = static_cast<SD_task_t>(xbt_dict_get_or_null(jobs, A_dax__parent_ref));
xbt_assert(parent != nullptr, "Parse error on line %d: Asked to add a dependency from %s to %s, but %s does not exist",
- dax_lineno, current_child->name.c_str(), A_dax__parent_ref, A_dax__parent_ref);
+ dax_lineno, current_child->name, A_dax__parent_ref, A_dax__parent_ref);
SD_task_dependency_add(nullptr, nullptr, parent, current_child);
- XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name.c_str(), parent->name.c_str());
+ XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name);
}
void ETag_dax__adag()
