X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/5851cba291d6ac7b89baf771e4a3821cc1aaa81c..9ec598fc7b8d73ed8e9822aed084ad1e1b2918b6:/deployment.cpp diff --git a/deployment.cpp b/deployment.cpp index d582dc6..5826014 100644 --- a/deployment.cpp +++ b/deployment.cpp @@ -1,14 +1,15 @@ -#include "deployment.h" - #include #include #include #include #include + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl); + #include "hostdata.h" #include "options.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl); +#include "deployment.h" void MY_launch_application() { @@ -43,7 +44,6 @@ void deployment_generator::set_link(int host1, int host2) 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(); @@ -58,7 +58,7 @@ void deployment_generator::deploy() DEBUG2("%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, "loba", args); xbt_dynar_reset(args); } xbt_dynar_free(&args); @@ -134,6 +134,7 @@ void deployment_torus::generate() b = c; } unsigned width = b; + // here width == ceil(sqrt(size)) unsigned first_on_last_line = (size() - 1) - (size() - 1) % width; DEBUG4("torus size = %u ; width = %u ; height = %u ; foll = %u",