From 6bb627c14aee270f3ea93332ffec2a9e655d96d2 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 8 Mar 2018 11:19:02 +0100 Subject: [PATCH] SD_task_dependency_add(): remove unused parameters 'name' and 'data'. --- ChangeLog | 3 +++ doc/doxygen/FAQ.doc | 4 ++-- .../simdag/availability/sd_availability.c | 14 +++++------ examples/simdag/scheduling/sd_scheduling.c | 4 ++-- examples/simdag/test/sd_test.cpp | 16 ++++++------- examples/simdag/throttling/sd_throttling.c | 10 ++++---- examples/simdag/typed_tasks/sd_typed_tasks.c | 10 ++++---- include/simgrid/simdag.h | 4 ++-- src/simdag/sd_daxloader.cpp | 24 +++++++++---------- src/simdag/sd_dotloader.cpp | 14 +++++------ src/simdag/sd_task.cpp | 6 ++--- teshsuite/simdag/basic0/basic0.c | 6 ++--- teshsuite/simdag/basic1/basic1.c | 6 ++--- teshsuite/simdag/basic3/basic3.c | 6 ++--- teshsuite/simdag/basic4/basic4.c | 6 ++--- teshsuite/simdag/basic5/basic5.c | 6 ++--- .../comm-p2p-latency-2/comm-p2p-latency-2.c | 6 ++--- .../comm-p2p-latency-3/comm-p2p-latency-3.c | 6 ++--- .../comm-p2p-latency-bound.c | 4 ++-- teshsuite/simdag/incomplete/incomplete.c | 8 +++---- 20 files changed, 82 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 405ce3531e..827ae25d50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ SimGrid (3.19) NOT RELEASED YET (target: March 20 2018, 16:15:27 UTC) XBT - Remove XBT_LOG_CONNECT, it should be useless nowadays. + SimDag + - SD_task_dependency_add(): remove unused parameters 'name' and 'data'. + SMPI - The privatization of global variables via mmap() is now significantly more flexible and allows the use of daemons with SMPI and to add new processes diff --git a/doc/doxygen/FAQ.doc b/doc/doxygen/FAQ.doc index cce950bad5..15a35ec156 100644 --- a/doc/doxygen/FAQ.doc +++ b/doc/doxygen/FAQ.doc @@ -266,8 +266,8 @@ create 3 SD_tasks: t1, t2 and c and add dependencies in the following way: \code -SD_task_dependency_add(NULL, NULL, t1, c); -SD_task_dependency_add(NULL, NULL, c, t2); +SD_task_dependency_add(t1, c); +SD_task_dependency_add(c, t2); \endcode This way task t2 cannot start before the termination of communication c diff --git a/examples/simdag/availability/sd_availability.c b/examples/simdag/availability/sd_availability.c index a0b20a03f9..601a6ed3c8 100644 --- a/examples/simdag/availability/sd_availability.c +++ b/examples/simdag/availability/sd_availability.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016. The SimGrid Team. +/* Copyright (c) 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -52,12 +52,12 @@ int main(int argc, char **argv) SD_task_t t4 = SD_task_create_comp_seq("t4", NULL, 25000000); /* Add dependencies: t1->c1->t2->c2->t3 */ - SD_task_dependency_add(NULL, NULL, t1, c1); - SD_task_dependency_add(NULL, NULL, c1, t2); - SD_task_dependency_add(NULL, NULL, t2, c2); - SD_task_dependency_add(NULL, NULL, c2, t3); - SD_task_dependency_add(NULL, NULL, t3, c3); - SD_task_dependency_add(NULL, NULL, c3, t4); + SD_task_dependency_add(t1, c1); + SD_task_dependency_add(c1, t2); + SD_task_dependency_add(t2, c2); + SD_task_dependency_add(c2, t3); + SD_task_dependency_add(t3, c3); + SD_task_dependency_add(c3, t4); /* Schedule tasks t1 and w3 on first host, t2 on second host */ /* Transfers are auto-scheduled */ diff --git a/examples/simdag/scheduling/sd_scheduling.c b/examples/simdag/scheduling/sd_scheduling.c index bb53f2b888..92c3e925a5 100644 --- a/examples/simdag/scheduling/sd_scheduling.c +++ b/examples/simdag/scheduling/sd_scheduling.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. +/* Copyright (c) 2009-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -216,7 +216,7 @@ int main(int argc, char **argv) if (last_scheduled_task && (SD_task_get_state(last_scheduled_task) != SD_DONE) && (SD_task_get_state(last_scheduled_task) != SD_FAILED) && !SD_task_dependency_exists(sg_host_get_last_scheduled_task(selected_host), selected_task)) - SD_task_dependency_add("resource", NULL, last_scheduled_task, selected_task); + SD_task_dependency_add(last_scheduled_task, selected_task); sg_host_set_last_scheduled_task(selected_host, selected_task); sg_host_set_available_at(selected_host, min_finish_time); diff --git a/examples/simdag/test/sd_test.cpp b/examples/simdag/test/sd_test.cpp index affd7b6c08..63ccade699 100644 --- a/examples/simdag/test/sd_test.cpp +++ b/examples/simdag/test/sd_test.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. +/* Copyright (c) 2006-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -63,14 +63,14 @@ int main(int argc, char **argv) if (fabs(comp_amount1 - (*(static_cast(SD_task_get_data(taskA))))) > 1e-12) XBT_ERROR("User data was corrupted by a simple set/get"); - SD_task_dependency_add(NULL, NULL, taskB, taskA); - SD_task_dependency_add(NULL, NULL, taskC, taskA); - SD_task_dependency_add(NULL, NULL, taskD, taskB); - SD_task_dependency_add(NULL, NULL, taskD, taskC); - SD_task_dependency_add(NULL, NULL, taskB, taskC); + SD_task_dependency_add(taskB, taskA); + SD_task_dependency_add(taskC, taskA); + SD_task_dependency_add(taskD, taskB); + SD_task_dependency_add(taskD, taskC); + SD_task_dependency_add(taskB, taskC); try { - SD_task_dependency_add(NULL, NULL, taskA, taskA); /* shouldn't work and must raise an exception */ + SD_task_dependency_add(taskA, taskA); /* shouldn't work and must raise an exception */ xbt_die("Hey, I can add a dependency between Task A and Task A!"); } catch (xbt_ex& ex) { if (ex.category != arg_error) @@ -78,7 +78,7 @@ int main(int argc, char **argv) } try { - SD_task_dependency_add(NULL, NULL, taskB, taskA); /* shouldn't work and must raise an exception */ + SD_task_dependency_add(taskB, taskA); /* shouldn't work and must raise an exception */ xbt_die("Oh oh, I can add an already existing dependency!"); } catch (xbt_ex& ex) { if (ex.category != arg_error) diff --git a/examples/simdag/throttling/sd_throttling.c b/examples/simdag/throttling/sd_throttling.c index dd9e0a45b6..ec120e19da 100644 --- a/examples/simdag/throttling/sd_throttling.c +++ b/examples/simdag/throttling/sd_throttling.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -29,10 +29,10 @@ int main(int argc, char **argv) SD_task_t taskD = SD_task_create_comm_e2e("Task D", NULL, 1e7); SD_task_t taskE = SD_task_create_comp_seq("Task E", NULL, 5e9); - SD_task_dependency_add(NULL, NULL, taskA, taskB); - SD_task_dependency_add(NULL, NULL, taskB, taskC); - SD_task_dependency_add(NULL, NULL, taskC, taskD); - SD_task_dependency_add(NULL, NULL, taskD, taskE); + SD_task_dependency_add(taskA, taskB); + SD_task_dependency_add(taskB, taskC); + SD_task_dependency_add(taskC, taskD); + SD_task_dependency_add(taskD, taskE); /* Add watchpoints on completion of compute tasks */ SD_task_watch(taskA, SD_DONE); diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.c b/examples/simdag/typed_tasks/sd_typed_tasks.c index f86c64a1af..293656a514 100644 --- a/examples/simdag/typed_tasks/sd_typed_tasks.c +++ b/examples/simdag/typed_tasks/sd_typed_tasks.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2010, 2012-2016. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -34,11 +34,11 @@ int main(int argc, char **argv) SD_task_t par_comp2 = SD_task_create_comp_par_amdahl("Par. Comp. 2", NULL, 3e8, 0.5); SD_task_t par_comp3 = SD_task_create("Par. Comp. 3", NULL, 1e9); - SD_task_dependency_add(NULL, NULL, seq_comp1, e2e_comm); - SD_task_dependency_add(NULL, NULL, e2e_comm, seq_comp2); + SD_task_dependency_add(seq_comp1, e2e_comm); + SD_task_dependency_add(e2e_comm, seq_comp2); - SD_task_dependency_add(NULL, NULL, par_comp1, redist); - SD_task_dependency_add(NULL, NULL, redist, par_comp2); + SD_task_dependency_add(par_comp1, redist); + SD_task_dependency_add(redist, par_comp2); SD_task_schedulel(seq_comp1, 1, hosts[8]); SD_task_schedulel(seq_comp2, 1, hosts[9]); diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 8f64ea326a..4c044a517f 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2010, 2012-2017. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -128,7 +128,7 @@ XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); * @see SD_task_api * @{ */ -XBT_PUBLIC(void) SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst); +XBT_PUBLIC(void) SD_task_dependency_add(SD_task_t src, SD_task_t dst); XBT_PUBLIC(void) SD_task_dependency_remove(SD_task_t src, SD_task_t dst); XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); /** @} */ diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index eb18b68f99..185966bcf3 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. +/* Copyright (c) 2009-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -188,15 +188,15 @@ xbt_dynar_t SD_daxload(const char *filename) if (file->predecessors->empty()) { for (SD_task_t const& it : *file->successors) { 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); + SD_task_dependency_add(root_task, newfile); + SD_task_dependency_add(newfile, it); xbt_dynar_push(result, &newfile); } } else if (file->successors->empty()) { for (SD_task_t const& it : *file->predecessors) { 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); + SD_task_dependency_add(it, newfile); + SD_task_dependency_add(newfile, end_task); xbt_dynar_push(result, &newfile); } } else { @@ -207,8 +207,8 @@ xbt_dynar_t SD_daxload(const char *filename) "This loop dependency will prevent the execution of the task.", file->name, it->name); } 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); + SD_task_dependency_add(it, newfile); + SD_task_dependency_add(newfile, it2); xbt_dynar_push(result, &newfile); } } @@ -231,9 +231,9 @@ xbt_dynar_t SD_daxload(const char *filename) */ if ((file != root_task) && (file != end_task)) { if (file->inputs->empty()) - SD_task_dependency_add(nullptr, nullptr, root_task, file); + SD_task_dependency_add(root_task, file); if (file->outputs->empty()) - SD_task_dependency_add(nullptr, nullptr, file, end_task); + SD_task_dependency_add(file, end_task); } } else { THROW_IMPOSSIBLE; @@ -302,9 +302,9 @@ void STag_dax__uses() } } if (is_input) { - SD_task_dependency_add(nullptr, nullptr, file, current_job); + SD_task_dependency_add(file, current_job); } else { - SD_task_dependency_add(nullptr, nullptr, current_job, file); + SD_task_dependency_add(current_job, file); if ((file->predecessors->size() + file->inputs->size()) > 1) { XBT_WARN("File %s created at more than one location...", file->name); } @@ -333,7 +333,7 @@ void STag_dax__parent() auto job = jobs.find(A_dax__parent_ref); if (job != jobs.end()) { SD_task_t parent = job->second; - SD_task_dependency_add(nullptr, nullptr, parent, current_child); + SD_task_dependency_add(parent, current_child); XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); } else { throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) + diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index b4f8b3b733..ee34cab0de 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. +/* Copyright (c) 2009-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -177,15 +177,15 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched task = SD_task_create_comm_e2e(name.c_str(), nullptr, size); else task = SD_task_create_comm_par_mxn_1d_block(name.c_str(), nullptr, size); - SD_task_dependency_add(nullptr, nullptr, src, task); - SD_task_dependency_add(nullptr, nullptr, task, dst); + SD_task_dependency_add(src, task); + SD_task_dependency_add(task, dst); jobs.insert({name, task}); xbt_dynar_push(result, &task); } else { XBT_WARN("Task '%s' is defined more than once", name.c_str()); } } else { - SD_task_dependency_add(nullptr, nullptr, src, dst); + SD_task_dependency_add(src, dst); } } } @@ -198,12 +198,12 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched xbt_dynar_foreach (result, i, task){ if (task->predecessors->empty() && task->inputs->empty() && task != root) { XBT_DEBUG("Task '%s' has no source. Add dependency from 'root'", task->name); - SD_task_dependency_add(nullptr, nullptr, root, task); + SD_task_dependency_add(root, task); } if (task->successors->empty() && task->outputs->empty() && task != end) { XBT_DEBUG("Task '%s' has no destination. Add dependency to 'end'", task->name); - SD_task_dependency_add(nullptr, nullptr, task, end); + SD_task_dependency_add(task, end); } } @@ -219,7 +219,7 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched /* add dependency between the previous and the task to avoid parallel execution */ if(task){ if (previous_task && not SD_task_dependency_exists(previous_task, task)) - SD_task_dependency_add(nullptr, nullptr, previous_task, task); + SD_task_dependency_add(previous_task, task); SD_task_schedulel(task, 1, workstations[atoi(elm.first.c_str())]); previous_task = task; diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 42b7142230..081a6996dd 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. +/* Copyright (c) 2006-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -527,13 +527,11 @@ void SD_task_dotty(SD_task_t task, void *out) * \a dst will depend on \a src, ie \a dst will not start before \a src is finished. * Their \ref e_SD_task_state_t "state" must be #SD_NOT_SCHEDULED, #SD_SCHEDULED or #SD_RUNNABLE. * - * \param name the name of the new dependency (can be \c nullptr) - * \param data the user data you want to associate with this dependency (can be \c nullptr) * \param src the task which must be executed first * \param dst the task you want to make depend on \a src * \see SD_task_dependency_remove() */ -void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst) +void SD_task_dependency_add(SD_task_t src, SD_task_t dst) { if (src == dst) THROWF(arg_error, 0, "Cannot add a dependency between task '%s' and itself", SD_task_get_name(src)); diff --git a/teshsuite/simdag/basic0/basic0.c b/teshsuite/simdag/basic0/basic0.c index 0115af360d..7bc98cc2c2 100644 --- a/teshsuite/simdag/basic0/basic0.c +++ b/teshsuite/simdag/basic0/basic0.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -37,8 +37,8 @@ int main(int argc, char **argv) SD_task_t taskA = SD_task_create("Task Comm 1", NULL, 1.0); SD_task_t taskB = SD_task_create("Task Comm 2", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskInit, taskB); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskInit, taskB); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0); diff --git a/teshsuite/simdag/basic1/basic1.c b/teshsuite/simdag/basic1/basic1.c index 5f0cdfa749..416da67eed 100644 --- a/teshsuite/simdag/basic1/basic1.c +++ b/teshsuite/simdag/basic1/basic1.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -36,8 +36,8 @@ int main(int argc, char **argv) SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0); SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskInit, taskB); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskInit, taskB); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, SD_SCHED_NO_COST, SD_SCHED_NO_COST, -1.0); diff --git a/teshsuite/simdag/basic3/basic3.c b/teshsuite/simdag/basic3/basic3.c index 01467e7000..03c7308ad4 100644 --- a/teshsuite/simdag/basic3/basic3.c +++ b/teshsuite/simdag/basic3/basic3.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -30,8 +30,8 @@ int main(int argc, char **argv) SD_task_t taskA = SD_task_create("Task A", NULL, 1.0); SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskA, taskFin); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskA, taskFin); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0); diff --git a/teshsuite/simdag/basic4/basic4.c b/teshsuite/simdag/basic4/basic4.c index 3d3ea052c3..3ad87e0be2 100644 --- a/teshsuite/simdag/basic4/basic4.c +++ b/teshsuite/simdag/basic4/basic4.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -33,8 +33,8 @@ int main(int argc, char **argv) SD_task_t taskA = SD_task_create("Task A", NULL, 1.0); SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskA, taskFin); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskA, taskFin); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0); diff --git a/teshsuite/simdag/basic5/basic5.c b/teshsuite/simdag/basic5/basic5.c index 1382e36d7a..58565effcc 100644 --- a/teshsuite/simdag/basic5/basic5.c +++ b/teshsuite/simdag/basic5/basic5.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -36,8 +36,8 @@ int main(int argc, char **argv) SD_task_t taskA = SD_task_create("Task A", NULL, 1.0); SD_task_t taskB = SD_task_create("Task B", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskInit, taskB); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskInit, taskB); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0); diff --git a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c index b8fa568234..1f4b0e1ac6 100644 --- a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c +++ b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c @@ -1,6 +1,6 @@ /* Latency tests */ -/* Copyright (c) 2007, 2009-2011, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007, 2009-2011, 2013-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -34,8 +34,8 @@ int main(int argc, char **argv) SD_task_schedule(task2, 2, hosts, no_cost, communication_amount2, -1.0); xbt_free(hosts); - SD_task_dependency_add(NULL, NULL, root, task1); - SD_task_dependency_add(NULL, NULL, root, task2); + SD_task_dependency_add(root, task1); + SD_task_dependency_add(root, task2); SD_simulate(-1.0); diff --git a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c index c95a637fd6..4adeee9964 100644 --- a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c +++ b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c @@ -1,6 +1,6 @@ /* Latency tests */ -/* Copyright (c) 2007, 2009-2011, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007, 2009-2011, 2013-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -36,8 +36,8 @@ int main(int argc, char **argv) SD_task_schedule(task2, 2, hosts, no_cost, communication_amount2, -1.0); xbt_free(hosts); - SD_task_dependency_add(NULL, NULL, root, task1); - SD_task_dependency_add(NULL, NULL, root, task2); + SD_task_dependency_add(root, task1); + SD_task_dependency_add(root, task2); SD_simulate(-1.0); diff --git a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c index 407b0f3a0a..2b5d0bcca3 100644 --- a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c +++ b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c @@ -1,6 +1,6 @@ /* Latency tests */ -/* Copyright (c) 2007, 2009-2011, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007, 2009-2011, 2013-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ int main(int argc, char **argv) for (int i = 0; i < TASK_NUM; i++) { task[i] = SD_task_create("Comm", NULL, 1.0); SD_task_schedule(task[i], 2, hosts, no_cost, communication_amount, -1.0); - SD_task_dependency_add(NULL, NULL, root, task[i]); + SD_task_dependency_add(root, task[i]); } xbt_free(hosts); diff --git a/teshsuite/simdag/incomplete/incomplete.c b/teshsuite/simdag/incomplete/incomplete.c index 538a3838aa..ea1411ba2e 100644 --- a/teshsuite/simdag/incomplete/incomplete.c +++ b/teshsuite/simdag/incomplete/incomplete.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012, 2014-2015. The SimGrid Team. +/* Copyright (c) 2007-2012, 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -38,9 +38,9 @@ int main(int argc, char **argv) SD_task_t taskC = SD_task_create("Task C", NULL, 1.0); SD_task_t taskD = SD_task_create("Task D", NULL, 1.0); - SD_task_dependency_add(NULL, NULL, taskInit, taskA); - SD_task_dependency_add(NULL, NULL, taskInit, taskB); - SD_task_dependency_add(NULL, NULL, taskC, taskD); + SD_task_dependency_add(taskInit, taskA); + SD_task_dependency_add(taskInit, taskB); + SD_task_dependency_add(taskC, taskD); sg_host_t *hosts = sg_host_list(); SD_task_schedule(taskInit, 1, hosts, &no_cost, &no_cost, -1.0); -- 2.20.1