From ebc26573ecc26d178eb9efa4f365b5d702a8d163 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 19 Jan 2016 15:53:56 +0100 Subject: [PATCH] Thx green guy! power is speed. --- examples/simdag/properties/test_prop.tesh | 4 +- examples/simdag/sd_avail.c | 12 +++--- examples/simdag/test_simdag_avail.tesh | 28 ++++++------ examples/simdag/test_simdag_seq_access.tesh | 48 ++++++++++----------- include/simgrid/simdag.h | 4 +- src/simdag/sd_workstation.cpp | 22 +++++----- teshsuite/simdag/platforms/flatifier.cpp | 2 +- 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh index 7c969a52d1..22c76d2fba 100755 --- a/examples/simdag/properties/test_prop.tesh +++ b/examples/simdag/properties/test_prop.tesh @@ -15,8 +15,8 @@ $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml > [0.000000] [test/INFO] Property: Hdd old value: 120 > [0.000000] [test/INFO] Property: Hdd new value: 250 > [0.000000] [sd_workstation/INFO] Displaying workstation host2 -> [0.000000] [sd_workstation/INFO] - power: 1000000000 -> [0.000000] [sd_workstation/INFO] - available power: 1.00 +> [0.000000] [sd_workstation/INFO] - speed: 1000000000 +> [0.000000] [sd_workstation/INFO] - available speed: 1.00 > [0.000000] [sd_workstation/INFO] - access mode: Exclusive > [0.000000] [sd_workstation/INFO] no task running > [0.000000] [sd_workstation/INFO] - properties: diff --git a/examples/simdag/sd_avail.c b/examples/simdag/sd_avail.c index d9af2ee4d3..94c5809adb 100644 --- a/examples/simdag/sd_avail.c +++ b/examples/simdag/sd_avail.c @@ -89,12 +89,12 @@ int main(int argc, char **argv) XBT_INFO("link1: bw=%.0f, lat=%f", SD_route_get_bandwidth(workstations[0], workstations[1]), SD_route_get_latency(workstations[0], workstations[1])); - XBT_INFO("Jupiter: power=%.0f", - SD_workstation_get_power(workstations[0])* - SD_workstation_get_available_power(workstations[0])); - XBT_INFO("Tremblay: power=%.0f", - SD_workstation_get_power(workstations[1])* - SD_workstation_get_available_power(workstations[1])); + XBT_INFO("Jupiter: speed=%.0f", + SD_workstation_get_speed(workstations[0])* + SD_workstation_get_available_speed(workstations[0])); + XBT_INFO("Tremblay: speed=%.0f", + SD_workstation_get_speed(workstations[1])* + SD_workstation_get_available_speed(workstations[1])); xbt_dynar_foreach(changed_tasks, ctr, task) { XBT_INFO("Task '%s' start time: %f, finish time: %f", SD_task_get_name(task), diff --git a/examples/simdag/test_simdag_avail.tesh b/examples/simdag/test_simdag_avail.tesh index 87134ead5b..c4591ba023 100644 --- a/examples/simdag/test_simdag_avail.tesh +++ b/examples/simdag/test_simdag_avail.tesh @@ -5,30 +5,30 @@ p Test of the management of availability traces with simdag $ $SG_TEST_EXENV ${bindir:=.}/sd_avail two_hosts.xml > [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks. > [1.000000] [sd_avail/INFO] link1: bw=125000000, lat=0.000100 -> [1.000000] [sd_avail/INFO] Jupiter: power=12500000 -> [1.000000] [sd_avail/INFO] Tremblay: power=12500000 +> [1.000000] [sd_avail/INFO] Jupiter: speed=12500000 +> [1.000000] [sd_avail/INFO] Tremblay: speed=12500000 > [1.000000] [sd_avail/INFO] Task 't1' start time: 0.000000, finish time: 1.000000 > [2.000200] [sd_avail/INFO] link1: bw=62500000, lat=0.000100 -> [2.000200] [sd_avail/INFO] Jupiter: power=12500000 -> [2.000200] [sd_avail/INFO] Tremblay: power=25000000 +> [2.000200] [sd_avail/INFO] Jupiter: speed=12500000 +> [2.000200] [sd_avail/INFO] Tremblay: speed=25000000 > [2.000200] [sd_avail/INFO] Task 'c1' start time: 1.000000, finish time: 2.000200 > [3.000200] [sd_avail/INFO] link1: bw=62500000, lat=0.000100 -> [3.000200] [sd_avail/INFO] Jupiter: power=12500000 -> [3.000200] [sd_avail/INFO] Tremblay: power=25000000 +> [3.000200] [sd_avail/INFO] Jupiter: speed=12500000 +> [3.000200] [sd_avail/INFO] Tremblay: speed=25000000 > [3.000200] [sd_avail/INFO] Task 't2' start time: 2.000200, finish time: 3.000200 > [4.000600] [sd_avail/INFO] link1: bw=31250000, lat=0.000100 -> [4.000600] [sd_avail/INFO] Jupiter: power=25000000 -> [4.000600] [sd_avail/INFO] Tremblay: power=25000000 +> [4.000600] [sd_avail/INFO] Jupiter: speed=25000000 +> [4.000600] [sd_avail/INFO] Tremblay: speed=25000000 > [4.000600] [sd_avail/INFO] Task 'c2' start time: 3.000200, finish time: 4.000600 > [5.000600] [sd_avail/INFO] link1: bw=31250000, lat=0.000100 -> [5.000600] [sd_avail/INFO] Jupiter: power=25000000 -> [5.000600] [sd_avail/INFO] Tremblay: power=25000000 +> [5.000600] [sd_avail/INFO] Jupiter: speed=25000000 +> [5.000600] [sd_avail/INFO] Tremblay: speed=25000000 > [5.000600] [sd_avail/INFO] Task 't3' start time: 4.000600, finish time: 5.000600 > [6.000700] [sd_avail/INFO] link1: bw=31250000, lat=0.000100 -> [6.000700] [sd_avail/INFO] Jupiter: power=25000000 -> [6.000700] [sd_avail/INFO] Tremblay: power=25000000 +> [6.000700] [sd_avail/INFO] Jupiter: speed=25000000 +> [6.000700] [sd_avail/INFO] Tremblay: speed=25000000 > [6.000700] [sd_avail/INFO] Task 'c3' start time: 5.000600, finish time: 6.000700 > [7.000700] [sd_avail/INFO] link1: bw=31250000, lat=0.000100 -> [7.000700] [sd_avail/INFO] Jupiter: power=25000000 -> [7.000700] [sd_avail/INFO] Tremblay: power=25000000 +> [7.000700] [sd_avail/INFO] Jupiter: speed=25000000 +> [7.000700] [sd_avail/INFO] Tremblay: speed=25000000 > [7.000700] [sd_avail/INFO] Task 't4' start time: 6.000700, finish time: 7.000700 \ No newline at end of file diff --git a/examples/simdag/test_simdag_seq_access.tesh b/examples/simdag/test_simdag_seq_access.tesh index 6b6eb66e08..d7de4803c6 100644 --- a/examples/simdag/test_simdag_seq_access.tesh +++ b/examples/simdag/test_simdag_seq_access.tesh @@ -5,63 +5,63 @@ p Simple test of simdag $ $SG_TEST_EXENV ./sd_seq_access ${srcdir:=.}/2clusters.xml > [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_workstation/INFO] Displaying workstation C2-05 -> [0.000000] [sd_workstation/INFO] - power: 5000000000 -> [0.000000] [sd_workstation/INFO] - available power: 1.00 +> [0.000000] [sd_workstation/INFO] - speed: 5000000000 +> [0.000000] [sd_workstation/INFO] - available speed: 1.00 > [0.000000] [sd_workstation/INFO] - access mode: Space shared > [0.000000] [sd_seq_access/INFO] Change access mode of C2-05 to sequential > [0.000000] [sd_workstation/INFO] Displaying workstation C2-06 -> [0.000000] [sd_workstation/INFO] - power: 5000000000 -> [0.000000] [sd_workstation/INFO] - available power: 1.00 +> [0.000000] [sd_workstation/INFO] - speed: 5000000000 +> [0.000000] [sd_workstation/INFO] - available speed: 1.00 > [0.000000] [sd_workstation/INFO] - access mode: Space shared > [0.000000] [sd_seq_access/INFO] Change access mode of C2-06 to sequential > [0.000000] [sd_seq_access/INFO] Change access mode of C2-06 to shared > [0.000000] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [0.000000] [sd_workstation/INFO] Displaying workstation C2-05 -> [0.000000] [sd_workstation/INFO] - power: 5000000000 -> [0.000000] [sd_workstation/INFO] - available power: 1.00 +> [0.000000] [sd_workstation/INFO] - speed: 5000000000 +> [0.000000] [sd_workstation/INFO] - available speed: 1.00 > [0.000000] [sd_workstation/INFO] - access mode: Exclusive > [0.000000] [sd_workstation/INFO] current running task: Task A > [0.000000] [sd_workstation/INFO] Displaying workstation C2-06 -> [0.000000] [sd_workstation/INFO] - power: 5000000000 -> [0.000000] [sd_workstation/INFO] - available power: 1.00 +> [0.000000] [sd_workstation/INFO] - speed: 5000000000 +> [0.000000] [sd_workstation/INFO] - available speed: 1.00 > [0.000000] [sd_workstation/INFO] - access mode: Space shared > [4.000000] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [4.000000] [sd_workstation/INFO] Displaying workstation C2-05 -> [4.000000] [sd_workstation/INFO] - power: 5000000000 -> [4.000000] [sd_workstation/INFO] - available power: 1.00 +> [4.000000] [sd_workstation/INFO] - speed: 5000000000 +> [4.000000] [sd_workstation/INFO] - available speed: 1.00 > [4.000000] [sd_workstation/INFO] - access mode: Exclusive > [4.000000] [sd_workstation/INFO] current running task: Task B > [4.000000] [sd_workstation/INFO] Displaying workstation C2-06 -> [4.000000] [sd_workstation/INFO] - power: 5000000000 -> [4.000000] [sd_workstation/INFO] - available power: 1.00 +> [4.000000] [sd_workstation/INFO] - speed: 5000000000 +> [4.000000] [sd_workstation/INFO] - available speed: 1.00 > [4.000000] [sd_workstation/INFO] - access mode: Space shared > [5.600300] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [5.600300] [sd_workstation/INFO] Displaying workstation C2-05 -> [5.600300] [sd_workstation/INFO] - power: 5000000000 -> [5.600300] [sd_workstation/INFO] - available power: 1.00 +> [5.600300] [sd_workstation/INFO] - speed: 5000000000 +> [5.600300] [sd_workstation/INFO] - available speed: 1.00 > [5.600300] [sd_workstation/INFO] - access mode: Exclusive > [5.600300] [sd_workstation/INFO] no task running > [5.600300] [sd_workstation/INFO] Displaying workstation C2-06 -> [5.600300] [sd_workstation/INFO] - power: 5000000000 -> [5.600300] [sd_workstation/INFO] - available power: 1.00 +> [5.600300] [sd_workstation/INFO] - speed: 5000000000 +> [5.600300] [sd_workstation/INFO] - available speed: 1.00 > [5.600300] [sd_workstation/INFO] - access mode: Space shared > [9.600300] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [9.600300] [sd_workstation/INFO] Displaying workstation C2-05 -> [9.600300] [sd_workstation/INFO] - power: 5000000000 -> [9.600300] [sd_workstation/INFO] - available power: 1.00 +> [9.600300] [sd_workstation/INFO] - speed: 5000000000 +> [9.600300] [sd_workstation/INFO] - available speed: 1.00 > [9.600300] [sd_workstation/INFO] - access mode: Exclusive > [9.600300] [sd_workstation/INFO] no task running > [9.600300] [sd_workstation/INFO] Displaying workstation C2-06 -> [9.600300] [sd_workstation/INFO] - power: 5000000000 -> [9.600300] [sd_workstation/INFO] - available power: 1.00 +> [9.600300] [sd_workstation/INFO] - speed: 5000000000 +> [9.600300] [sd_workstation/INFO] - available speed: 1.00 > [9.600300] [sd_workstation/INFO] - access mode: Space shared > [22.000000] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [22.000000] [sd_workstation/INFO] Displaying workstation C2-05 -> [22.000000] [sd_workstation/INFO] - power: 5000000000 -> [22.000000] [sd_workstation/INFO] - available power: 1.00 +> [22.000000] [sd_workstation/INFO] - speed: 5000000000 +> [22.000000] [sd_workstation/INFO] - available speed: 1.00 > [22.000000] [sd_workstation/INFO] - access mode: Exclusive > [22.000000] [sd_workstation/INFO] no task running > [22.000000] [sd_workstation/INFO] Displaying workstation C2-06 -> [22.000000] [sd_workstation/INFO] - power: 5000000000 -> [22.000000] [sd_workstation/INFO] - available power: 1.00 +> [22.000000] [sd_workstation/INFO] - speed: 5000000000 +> [22.000000] [sd_workstation/INFO] - available speed: 1.00 > [22.000000] [sd_workstation/INFO] - access mode: Space shared diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index fe649edebf..0b4e263ef7 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -151,8 +151,8 @@ XBT_PUBLIC(const SD_link_t *) SD_route_get_list(SD_workstation_t src, SD_workstation_t dst); XBT_PUBLIC(int) SD_route_get_size(SD_workstation_t src, SD_workstation_t dst); -XBT_PUBLIC(double) SD_workstation_get_power(SD_workstation_t workstation); -XBT_PUBLIC(double) SD_workstation_get_available_power(SD_workstation_t +XBT_PUBLIC(double) SD_workstation_get_speed(SD_workstation_t workstation); +XBT_PUBLIC(double) SD_workstation_get_available_speed(SD_workstation_t workstation); XBT_PUBLIC(int) SD_workstation_get_cores(SD_workstation_t workstation); XBT_PUBLIC(e_SD_workstation_access_mode_t) diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp index 67522e2b82..38517ff2ae 100644 --- a/src/simdag/sd_workstation.cpp +++ b/src/simdag/sd_workstation.cpp @@ -175,8 +175,8 @@ void SD_workstation_dump(SD_workstation_t ws) SD_task_t task = NULL; XBT_INFO("Displaying workstation %s", SD_workstation_get_name(ws)); - XBT_INFO(" - power: %.0f", SD_workstation_get_power(ws)); - XBT_INFO(" - available power: %.2f", SD_workstation_get_available_power(ws)); + XBT_INFO(" - speed: %.0f", SD_workstation_get_speed(ws)); + XBT_INFO(" - available speed: %.2f", SD_workstation_get_available_speed(ws)); switch (sg_host_sd(ws)->access_mode){ case SD_WORKSTATION_SHARED_ACCESS: XBT_INFO(" - access mode: Space shared"); @@ -248,13 +248,13 @@ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst) } /** - * \brief Returns the total power of a workstation + * \brief Returns the total speed of a workstation * * \param workstation a workstation - * \return the total power of this workstation - * \see SD_workstation_get_available_power() + * \return the total speed of this workstation + * \see SD_workstation_get_available_speed() */ -double SD_workstation_get_power(SD_workstation_t workstation) +double SD_workstation_get_speed(SD_workstation_t workstation) { return workstation->speed(); } @@ -269,13 +269,13 @@ int SD_workstation_get_cores(SD_workstation_t workstation) { } /** - * \brief Returns the proportion of available power in a workstation + * \brief Returns the proportion of available speed in a workstation * * \param workstation a workstation - * \return the proportion of power currently available in this workstation (normally a number between 0 and 1) - * \see SD_workstation_get_power() + * \return the proportion of speed currently available in this workstation (normally a number between 0 and 1) + * \see SD_workstation_get_speed() */ -double SD_workstation_get_available_power(SD_workstation_t workstation) +double SD_workstation_get_available_speed(SD_workstation_t workstation) { return surf_host_get_available_speed(workstation); } @@ -292,7 +292,7 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation, { xbt_assert(flops_amount >= 0, "flops_amount must be greater than or equal to zero"); - return flops_amount / SD_workstation_get_power(workstation); + return flops_amount / SD_workstation_get_speed(workstation); } /** diff --git a/teshsuite/simdag/platforms/flatifier.cpp b/teshsuite/simdag/platforms/flatifier.cpp index 9e5bb84728..408876fa67 100644 --- a/teshsuite/simdag/platforms/flatifier.cpp +++ b/teshsuite/simdag/platforms/flatifier.cpp @@ -146,7 +146,7 @@ int main(int argc, char **argv) for (i = 0; i < totalHosts; i++) { printf(" 1) { printf(" core=\"%d\"", SD_workstation_get_cores(hosts[i])); -- 2.20.1