From d73052d71017c704ebee93f5590a9827488d2afe Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 3 Aug 2017 22:48:59 +0200 Subject: [PATCH] dict-- --- examples/simdag/daxload/sd_daxload.tesh | 12 ++++++------ src/simdag/sd_daxloader.cpp | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh index 34171340f4..d3f16d9907 100644 --- a/examples/simdag/daxload/sd_daxload.tesh +++ b/examples/simdag/daxload/sd_daxload.tesh @@ -109,16 +109,16 @@ $ cat ${srcdir:=.}/daxload/smalldax.trace > [0.016600] node-1.acme.org compute 42000000000.000000 # 1@task1 > [0.016600] node-10.acme.org compute 42000000000.000000 # 2@task2 > [42.033200] node-11.acme.org compute 42000000000.000000 # 3@task1 -> [0.000000] node-0.acme.org send node-10.acme.org 1000000.000000 # root_i2_2@task2 -> [0.016600] node-10.acme.org recv node-0.acme.org 1000000.000000 # root_i2_2@task2 -> [42.016600] node-1.acme.org send node-11.acme.org 1000000.000000 # 1@task1_o1_3@task1 -> [42.033200] node-11.acme.org recv node-1.acme.org 1000000.000000 # 1@task1_o1_3@task1 -> [42.016600] node-10.acme.org send node-11.acme.org 1000000.000000 # 2@task2_o2_3@task1 -> [42.033200] node-11.acme.org recv node-10.acme.org 1000000.000000 # 2@task2_o2_3@task1 > [84.033200] node-11.acme.org send node-0.acme.org 4167312.000000 # 3@task1_o3_end > [84.067138] node-0.acme.org recv node-11.acme.org 4167312.000000 # 3@task1_o3_end > [0.000000] node-0.acme.org send node-1.acme.org 1000000.000000 # root_i1_1@task1 > [0.016600] node-1.acme.org recv node-0.acme.org 1000000.000000 # root_i1_1@task1 +> [42.016600] node-1.acme.org send node-11.acme.org 1000000.000000 # 1@task1_o1_3@task1 +> [42.033200] node-11.acme.org recv node-1.acme.org 1000000.000000 # 1@task1_o1_3@task1 +> [0.000000] node-0.acme.org send node-10.acme.org 1000000.000000 # root_i2_2@task2 +> [0.016600] node-10.acme.org recv node-0.acme.org 1000000.000000 # root_i2_2@task2 +> [42.016600] node-10.acme.org send node-11.acme.org 1000000.000000 # 2@task2_o2_3@task1 +> [42.033200] node-11.acme.org recv node-10.acme.org 1000000.000000 # 2@task2_o2_3@task1 > [84.067138] node-0.acme.org compute 0.000000 # end $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index f18920c2ad..718faabc63 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -142,7 +142,7 @@ static YY_BUFFER_STATE input_buffer; static xbt_dynar_t result; static std::unordered_map jobs; -static xbt_dict_t files; +static std::unordered_map files; static SD_task_t current_job; static SD_task_t root_task; static SD_task_t end_task; @@ -158,9 +158,7 @@ static void dax_task_free(void *task) */ xbt_dynar_t SD_daxload(const char *filename) { - xbt_dict_cursor_t cursor; SD_task_t file; - char* name; FILE* in_file = fopen(filename, "r"); xbt_assert(in_file, "Unable to open \"%s\"\n", filename); input_buffer = dax__create_buffer(in_file, 10); @@ -168,7 +166,6 @@ xbt_dynar_t SD_daxload(const char *filename) dax_lineno = 1; result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free); - files = xbt_dict_new_homogeneous(&dax_task_free); 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); @@ -189,7 +186,8 @@ xbt_dynar_t SD_daxload(const char *filename) * Files not consumed in the system are said to be consumed by end task (bottom of DAG). */ - xbt_dict_foreach(files, cursor, name, file) { + for (auto elm : files) { + file = elm.second; SD_task_t newfile; if (file->predecessors->empty()) { for (SD_task_t it : *file->successors) { @@ -225,7 +223,8 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_push(result, &end_task); /* Free previous copy of the files */ - xbt_dict_free(&files); + for (auto elm : files) + SD_task_destroy(elm.second); unsigned int cpt; xbt_dynar_foreach(result, cpt, file) { if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { @@ -295,12 +294,14 @@ void STag_dax__uses() bool is_input = (A_dax__uses_link == A_dax__uses_link_input); XBT_DEBUG("See ",A_dax__uses_file,(is_input?"in":"out")); - SD_task_t file = static_cast(xbt_dict_get_or_null(files, A_dax__uses_file)); - if (file == nullptr) { + auto it = files.find(A_dax__uses_file); + SD_task_t file; + if (it == files.end()) { file = SD_task_create_comm_e2e(A_dax__uses_file, nullptr, size); sd_global->initial_tasks->erase(file); - xbt_dict_set(files, A_dax__uses_file, file, nullptr); + files[A_dax__uses_file] = file; } else { + file = it->second; if (file->amount < size || file->amount > size) { XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); } -- 2.20.1