#include "simgrid/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
+#include "xbt/str.h"
#include "xbt/file.h" /* xbt_basename() */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
#undef register
}
-bool children_are_marked(SD_task_t task);
-bool parents_are_marked(SD_task_t task);
-
-/* Parsing helpers */
-
-static double dax_parse_double(const char *string)
-{
- double value;
-
- int ret = sscanf(string, "%lg", &value);
- xbt_assert (ret == 1, "Parse error on line %d: %s is not a double", dax_lineno, string);
- return value;
-}
-
/* 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, parent;
+ SD_task_t child;
+ SD_task_t parent;
xbt_dynar_t children = SD_task_get_children(task);
xbt_dynar_t parents = SD_task_get_parents(task);
free(new_name);
}
-bool children_are_marked(SD_task_t task){
- SD_dependency_t depafter = NULL;
+static bool children_are_marked(SD_task_t task){
+ SD_dependency_t depafter = nullptr;
unsigned int count;
xbt_dynar_foreach(task->tasks_after,count,depafter){
- if(depafter->dst->marked == 0) {
+ if(depafter->dst->marked == 0)
return false;
- }
}
return true;
}
-bool parents_are_marked(SD_task_t task){
- SD_dependency_t depbefore = NULL;
+static bool parents_are_marked(SD_task_t task){
+ SD_dependency_t depbefore = nullptr;
unsigned int count;
xbt_dynar_foreach(task->tasks_before,count,depbefore){
- if(depbefore->src->marked == 0) {
+ if(depbefore->src->marked == 0)
return false;
- }
}
return true;
}
bool acyclic_graph_detail(xbt_dynar_t dag){
unsigned int count, count_current=0;
bool all_marked = true;
- SD_task_t task = NULL, parent_task = NULL, child_task = NULL;
- SD_dependency_t depbefore = NULL, depafter = NULL;
- xbt_dynar_t next = NULL, current = xbt_dynar_new(sizeof(SD_task_t),NULL);
+ SD_task_t task = nullptr, parent_task = nullptr, child_task = nullptr;
+ SD_dependency_t depbefore = nullptr, depafter = nullptr;
+ xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr);
xbt_dynar_foreach(dag,count,task){
if(task->kind == SD_TASK_COMM_E2E) continue;
}
//test if something has to be done for the next iteration
while(!xbt_dynar_is_empty(current)){
- next = xbt_dynar_new(sizeof(SD_task_t),NULL);
+ next = xbt_dynar_new(sizeof(SD_task_t),nullptr);
//test if the current iteration is done
xbt_dynar_foreach(current,count_current,task){
- if (task == NULL) continue;
+ if (task == nullptr)
+ continue;
//push task in next
task->marked = 1;
xbt_dynar_foreach(task->tasks_before,count,depbefore){
if(parent_task->kind == SD_TASK_COMM_E2E){
unsigned int j=0;
parent_task->marked = 1;
- SD_task_t parent_task_2 = NULL;
+ SD_task_t parent_task_2 = nullptr;
xbt_dynar_foreach(parent_task->tasks_before,j,depbefore){
parent_task_2 = depbefore->src;
if(children_are_marked(parent_task_2))
if(children_are_marked(parent_task))
xbt_dynar_push(next, &parent_task);
}
- parent_task = NULL;
+ parent_task = nullptr;
}
}
xbt_dynar_free(¤t);
current = next;
- next = NULL;
+ next = nullptr;
}
xbt_dynar_free(¤t);
all_marked = true;
xbt_dynar_foreach(dag,count,task){
- if(task->kind == SD_TASK_COMM_E2E) continue;
+ if(task->kind == SD_TASK_COMM_E2E)
+ continue;
//test if all tasks are marked
if(task->marked == 0){
XBT_WARN("the task %s is not marked",task->name);
if(!all_marked){
XBT_VERB("there is at least one cycle in your task graph");
- current = xbt_dynar_new(sizeof(SD_task_t),NULL);
+ current = xbt_dynar_new(sizeof(SD_task_t),nullptr);
xbt_dynar_foreach(dag,count,task){
- if(task->kind == SD_TASK_COMM_E2E) continue;
+ if(task->kind == SD_TASK_COMM_E2E)
+ continue;
if(xbt_dynar_is_empty(task->tasks_before)){
xbt_dynar_push(current, &task);
}
}
xbt_dynar_foreach(dag,count,task){
- if(task->kind == SD_TASK_COMM_E2E) continue;
+ if(task->kind == SD_TASK_COMM_E2E)
+ continue;
if(xbt_dynar_is_empty(task->tasks_before)){
task->marked = 1;
xbt_dynar_push(current, &task);
}
//test if something has to be done for the next iteration
while(!xbt_dynar_is_empty(current)){
- next = xbt_dynar_new(sizeof(SD_task_t),NULL);
+ next = xbt_dynar_new(sizeof(SD_task_t),nullptr);
//test if the current iteration is done
xbt_dynar_foreach(current,count_current,task){
- if (task == NULL) continue;
+ if (task == nullptr)
+ continue;
//push task in next
task->marked = 1;
xbt_dynar_foreach(task->tasks_after,count,depafter){
if(child_task->kind == SD_TASK_COMM_E2E){
unsigned int j=0;
child_task->marked = 1;
- SD_task_t child_task_2 = NULL;
+ SD_task_t child_task_2 = nullptr;
xbt_dynar_foreach(child_task->tasks_after,j,depafter){
child_task_2 = depbefore->dst;
if(parents_are_marked(child_task_2))
if(parents_are_marked(child_task))
xbt_dynar_push(next, &child_task);
}
- child_task = NULL;
+ child_task = nullptr;
}
}
xbt_dynar_free(¤t);
current = next;
- next = NULL;
+ next = nullptr;
}
xbt_dynar_free(¤t);
all_marked = true;
xbt_dynar_foreach(dag,count,task){
- if(task->kind == SD_TASK_COMM_E2E) continue;
+ if(task->kind == SD_TASK_COMM_E2E)
+ continue;
//test if all tasks are marked
if(task->marked == 0){
XBT_WARN("the task %s is in a cycle",task->name);
static void dax_task_free(void *task)
{
- SD_task_destroy((SD_task_t)task);
+ SD_task_destroy(static_cast<SD_task_t>(task));
}
/** @brief loads a DAX file describing a DAG
result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free);
files = xbt_dict_new_homogeneous(&dax_task_free);
- jobs = xbt_dict_new_homogeneous(NULL);
- root_task = SD_task_create_comp_seq("root", NULL, 0);
+ jobs = xbt_dict_new_homogeneous(nullptr);
+ 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);
- end_task = SD_task_create_comp_seq("end", NULL, 0);
+ end_task = SD_task_create_comp_seq("end", nullptr, 0);
int res = dax_lex();
if (res != 0)
*/
xbt_dict_foreach(files, cursor, name, file) {
- unsigned int cpt1, cpt2;
+ unsigned int cpt1;
+ unsigned int cpt2;
SD_task_t newfile;
- SD_dependency_t depbefore, depafter;
+ SD_dependency_t depbefore;
+ SD_dependency_t depafter;
if (xbt_dynar_is_empty(file->tasks_before)) {
xbt_dynar_foreach(file->tasks_after, cpt2, depafter) {
- newfile = SD_task_create_comm_e2e(file->name, NULL, file->amount);
- SD_task_dependency_add(NULL, NULL, root_task, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
+ 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, depafter->dst);
xbt_dynar_push(result, &newfile);
}
} else if (xbt_dynar_is_empty(file->tasks_after)) {
xbt_dynar_foreach(file->tasks_before, cpt2, depbefore) {
- newfile = SD_task_create_comm_e2e(file->name, NULL, file->amount);
- SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, end_task);
+ newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
+ SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile);
+ SD_task_dependency_add(nullptr, nullptr, newfile, end_task);
xbt_dynar_push(result, &newfile);
}
} else {
("File %s is produced and consumed by task %s."
"This loop dependency will prevent the execution of the task.", file->name, depbefore->src->name);
}
- newfile = SD_task_create_comm_e2e(file->name, NULL, file->amount);
- SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
+ newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
+ SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile);
+ SD_task_dependency_add(nullptr, nullptr, newfile, depafter->dst);
xbt_dynar_push(result, &newfile);
}
}
xbt_dynar_foreach(result, cpt, file) {
if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) {
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) && xbt_dynar_is_empty(file->tasks_before)) {
- SD_task_dependency_add(NULL, NULL, root_task, file);
- }
- if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) {
- SD_task_dependency_add(NULL, NULL, file, end_task);
+ } 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) && xbt_dynar_is_empty(file->tasks_before)) {
+ SD_task_dependency_add(nullptr, nullptr, root_task, file);
+ }
+ if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) {
+ SD_task_dependency_add(nullptr, nullptr, file, end_task);
+ }
+ } else {
+ THROW_IMPOSSIBLE;
}
}
}
if (!acyclic_graph_detail(result)){
- XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", xbt_basename(filename));
+ char* base = xbt_basename(filename);
+ XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base);
+ free(base);
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
- return NULL;
+ return nullptr;
} else {
return result;
}
}
-void STag_dax__adag(void)
+void STag_dax__adag()
{
XBT_ATTRIB_UNUSED double version;
- version = dax_parse_double(A_dax__adag_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(void)
+void STag_dax__job()
{
- double runtime = dax_parse_double(A_dax__job_runtime);
+ double runtime = xbt_str_parse_double(A_dax__job_runtime, "Parse error: %s is not a double");
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_INFO("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
- current_job = SD_task_create_comp_seq(name, NULL, runtime);
- xbt_dict_set(jobs, A_dax__job_id, current_job, NULL);
+ 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, nullptr, runtime);
+ xbt_dict_set(jobs, A_dax__job_id, current_job, nullptr);
free(name);
xbt_dynar_push(result, ¤t_job);
}
void STag_dax__uses(void)
{
- double size = dax_parse_double(A_dax__uses_size);
+ double size = xbt_str_parse_double(A_dax__uses_size, "Parse error: %s is not a double");
int is_input = (A_dax__uses_link == A_dax__uses_link_input);
-// XBT_INFO("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
- SD_task_t file = (SD_task_t)xbt_dict_get_or_null(files, A_dax__uses_file);
- if (file == NULL) {
- file = SD_task_create_comm_e2e(A_dax__uses_file, NULL, size);
- xbt_dynar_pop(sd_global->initial_task_set,NULL);
- xbt_dict_set(files, A_dax__uses_file, file, NULL);
+ XBT_DEBUG("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
+ SD_task_t file = static_cast<SD_task_t>(xbt_dict_get_or_null(files, A_dax__uses_file));
+ if (file == nullptr) {
+ file = SD_task_create_comm_e2e(A_dax__uses_file, nullptr, size);
+ xbt_dynar_pop(sd_global->initial_task_set,nullptr);
+ xbt_dict_set(files, A_dax__uses_file, file, nullptr);
} else {
if (SD_task_get_amount(file) != size) {
XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size);
}
}
if (is_input) {
- SD_task_dependency_add(NULL, NULL, file, current_job);
+ SD_task_dependency_add(nullptr, nullptr, file, current_job);
} else {
- SD_task_dependency_add(NULL, NULL, current_job, file);
+ SD_task_dependency_add(nullptr, nullptr, current_job, file);
if (xbt_dynar_length(file->tasks_before) > 1) {
XBT_WARN("File %s created at more than one location...", file->name);
}
}
static SD_task_t current_child;
-void STag_dax__child(void)
+void STag_dax__child()
{
- current_child = (SD_task_t)xbt_dict_get_or_null(jobs, A_dax__child_ref);
- xbt_assert(current_child != NULL,"Parse error on line %d: Asked to add dependencies to the non-existent %s task",
+ current_child = static_cast<SD_task_t>(xbt_dict_get_or_null(jobs, A_dax__child_ref));
+ xbt_assert(current_child != nullptr,"Parse error on line %d: Asked to add dependencies to the non-existent %s task",
dax_lineno, A_dax__child_ref);
}
-void ETag_dax__child(void)
+void ETag_dax__child()
{
- current_child = NULL;
+ current_child = nullptr;
}
-void STag_dax__parent(void)
+void STag_dax__parent()
{
- SD_task_t parent = (SD_task_t)xbt_dict_get_or_null(jobs, A_dax__parent_ref);
- xbt_assert(parent != NULL, "Parse error on line %d: Asked to add a dependency from %s to %s, but %s does not exist",
+ 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, A_dax__parent_ref, A_dax__parent_ref);
- SD_task_dependency_add(NULL, NULL, parent, current_child);
+ SD_task_dependency_add(nullptr, nullptr, parent, current_child);
XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name);
}
-void ETag_dax__adag(void)
+void ETag_dax__adag()
{
-// XBT_INFO("See </adag>");
+ XBT_DEBUG("See </adag>");
}
void ETag_dax__job(void)
{
- current_job = NULL;
-// XBT_INFO("See </job>");
+ current_job = nullptr;
+ XBT_DEBUG("See </job>");
}
void ETag_dax__parent(void)
{
-// XBT_INFO("See </parent>");
+ XBT_DEBUG("See </parent>");
}
void ETag_dax__uses(void)
{
-// XBT_INFO("See </uses>");
+ XBT_DEBUG("See </uses>");
}
