X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/014983949544db9a324cece29a0ccc46b1e3e1f3..c87e01d1a48d08773380367ef6c547a38a019061:/deployment.cpp diff --git a/deployment.cpp b/deployment.cpp index 1b26a8a..8f52806 100644 --- a/deployment.cpp +++ b/deployment.cpp @@ -1,20 +1,28 @@ -#include "deployment.h" - +#include +#include +#include #include +#include #include +#include #include #include #include + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl); + #include "hostdata.h" +#include "misc.h" #include "options.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl); +#include "deployment.h" void MY_launch_application() { deployment_generator* gen; gen = opt::topologies.new_instance(opt::auto_depl::topology); gen->generate(); + gen->distribute_load(); gen->deploy(); delete gen; } @@ -22,7 +30,6 @@ void MY_launch_application() deployment_generator::deployment_generator() : hosts(opt::auto_depl::nhosts) { - set_load(0, opt::auto_depl::load); } void deployment_generator::set_load(int host, double load) @@ -41,56 +48,47 @@ void deployment_generator::set_link(int host1, int host2) set_neighbor(host2, host1); } +void deployment_generator::distribute_load() +{ + using std::placeholders::_1; + + if (!opt::auto_depl::random_distribution) { + set_load(0, opt::auto_depl::load); + return; + } + srand48(opt::auto_depl::random_seed); + std::vector loads(hosts.size()); + std::generate(loads.begin(), loads.end(), drand48); + double factor = opt::auto_depl::load / + std::accumulate(loads.begin(), loads.end(), 0.0); + std::transform(loads.begin(), loads.end(), loads.begin(), + std::bind(std::multiplies(), _1, factor)); + for (unsigned i = 0 ; i < hosts.size() ; ++i) + set_load(i, loads[i]); +} + void deployment_generator::deploy() { - const char* func = "simulation_main"; xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), NULL); for (unsigned i = 0 ; i < hosts.size() ; ++i) { const char* hostname = hostdata::at(i).get_name(); std::ostringstream oss; oss << std::setprecision(12) << hosts[i].load; std::string strload = oss.str(); - DEBUG2("%s/load -> \"%s\"", hostname, strload.c_str()); + XBT_DEBUG("%s/load -> \"%s\"", hostname, strload.c_str()); xbt_dynar_push_as(args, const char*, strload.c_str()); for (unsigned j = 0 ; j < hosts[i].neighbors.size() ; ++j) { int neighbor = hosts[i].neighbors[j]; const char* neighbor_name = hostdata::at(neighbor).get_name(); - DEBUG2("%s/neighbor -> \"%s\"", hostname, neighbor_name); + XBT_DEBUG("%s/neighbor -> \"%s\"", hostname, neighbor_name); xbt_dynar_push_as(args, const char*, neighbor_name); } - MSG_set_function(hostname, func, args); + MSG_set_function(hostname, "compute", args); xbt_dynar_reset(args); } xbt_dynar_free(&args); } -void deployment_line::generate() -{ - for (unsigned i = 0 ; i < size() - 1 ; ++i) - set_link(i, i + 1); -} - -void deployment_ring::generate() -{ - set_neighbor(0, size() - 1); - for (unsigned i = 0 ; i < size() - 1 ; ++i) - set_link(i, i + 1); - set_neighbor(size() - 1, 0); -} - -void deployment_star::generate() -{ - for (unsigned i = 1 ; i < size() ; ++i) - set_link(0, i); -} - -void deployment_clique::generate() -{ - for (unsigned i = 0 ; i < size() ; ++i) - for (unsigned j = 0 ; j < i ; ++j) - set_link(i, j); -} - void deployment_btree::generate() { for (unsigned i = 0 ; i < size() / 2 ; ++i) { @@ -104,9 +102,12 @@ void deployment_btree::generate() } } -// void deployment_torus::generate() -// { -// } +void deployment_clique::generate() +{ + for (unsigned i = 0 ; i < size() ; ++i) + for (unsigned j = 0 ; j < i ; ++j) + set_link(i, j); +} void deployment_hcube::generate() { @@ -125,3 +126,87 @@ void deployment_hcube::generate() set_link(i, j); } } + +void deployment_line::generate() +{ + for (unsigned i = 0 ; i < size() - 1 ; ++i) + set_link(i, i + 1); +} + +void deployment_ring::generate() +{ + set_neighbor(0, size() - 1); + for (unsigned i = 0 ; i < size() - 1 ; ++i) + set_link(i, i + 1); + set_neighbor(size() - 1, 0); +} + +void deployment_star::generate() +{ + for (unsigned i = 1 ; i < size() ; ++i) + set_link(0, i); +} + +void deployment_torus::generate() +{ + unsigned a = 0; + unsigned b = size(); + while (a + 1 < b) { + unsigned c = (a + b) / 2; + if (c * c < size()) + a = c; + else + b = c; + } + unsigned width = b; + // here width == ceil(sqrt(size)) + + unsigned first_on_last_line = (size() - 1) - (size() - 1) % width; + XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u", + size(), width, size() / width + !!(size() % width), + first_on_last_line); + for (unsigned i = 0; i < size(); i++) { + unsigned next_line; + unsigned prev_line; + unsigned next_column; + unsigned prev_column; + + next_line = i + width; + if (next_line >= size()) + next_line %= width; // rewind + + if (i >= width) { + prev_line = i - width; + } else { + prev_line = first_on_last_line + i; // rewind + if (prev_line >= size()) + prev_line -= width; // need to go at last but one line + } + + if (i != size() - 1) { + next_column = i + 1; + if (next_column % width == 0) + next_column -= width; // rewind + } else { + next_column = first_on_last_line; // special case for last cell + } + + if (i % width != 0) { + prev_column = i - 1; + } else if (i < first_on_last_line) { + prev_column = i + width - 1; // rewind + } else { + prev_column = size() - 1; // special case for 1st cell of last line + } + if (next_line != i) { + set_neighbor(i, next_line); + if (prev_line != next_line) + set_neighbor(i, prev_line); + } + if (next_column != i) { + set_neighbor(i, next_column); + if (prev_column != next_column) + set_neighbor(i, prev_column); + } + } +}