From 84aa5be3d9ab49de6fa4a8405350e6f0611e6a2f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 15 Feb 2016 22:58:50 +0100 Subject: [PATCH] I'm psychotic --- src/simdag/sd_workstation.cpp | 22 +++++++--------------- teshsuite/simdag/platforms/basic_tracing.c | 4 +--- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp index 5e8ed9779a..1c54dcd7c9 100644 --- a/src/simdag/sd_workstation.cpp +++ b/src/simdag/sd_workstation.cpp @@ -25,14 +25,11 @@ */ SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst) { - xbt_dynar_t surf_route; - SD_link_t* list; void *surf_link; unsigned int cpt; - surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, - src, dst); + xbt_dynar_t surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst); - list = xbt_new(SD_link_t, xbt_dynar_length(surf_route)); + SD_link_t *list = xbt_new(SD_link_t, xbt_dynar_length(surf_route)); xbt_dynar_foreach(surf_route, cpt, surf_link) { list[cpt] = (SD_link_t)surf_link; } @@ -49,8 +46,7 @@ SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst) */ int SD_route_get_size(sg_host_t src, sg_host_t dst) { - return xbt_dynar_length(surf_host_model_get_route( - (surf_host_model_t)surf_host_model, src, dst)); + return xbt_dynar_length(surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst)); } /** @@ -66,8 +62,7 @@ double SD_route_get_latency(sg_host_t src, sg_host_t dst) xbt_dynar_t route = NULL; double latency = 0; - routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, - &route, &latency); + routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, &latency); return latency; } @@ -78,8 +73,7 @@ double SD_route_get_latency(sg_host_t src, sg_host_t dst) * * \param src the first workstation * \param dst the second workstation - * \return the bandwidth of the route between the two workstations - * (in bytes/second) + * \return the bandwidth of the route between the two workstations (in bytes/second) * \see SD_route_get_latency() */ double SD_route_get_bandwidth(sg_host_t src, sg_host_t dst) @@ -87,15 +81,13 @@ double SD_route_get_bandwidth(sg_host_t src, sg_host_t dst) xbt_dynar_t route = NULL; unsigned int cpt; double latency = 0; - double bandwidth; double min_bandwidth = -1.0; SD_link_t link; - routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, - &route, &latency); + routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, &latency); xbt_dynar_foreach(route, cpt, link){ - bandwidth = sg_link_bandwidth(link); + double bandwidth = sg_link_bandwidth(link); if (bandwidth < min_bandwidth || min_bandwidth == -1.0) min_bandwidth = bandwidth; } diff --git a/teshsuite/simdag/platforms/basic_tracing.c b/teshsuite/simdag/platforms/basic_tracing.c index 606b219cca..590d0f6d96 100644 --- a/teshsuite/simdag/platforms/basic_tracing.c +++ b/teshsuite/simdag/platforms/basic_tracing.c @@ -8,11 +8,9 @@ #include #include "simgrid/msg.h" -int host(int argc, char *argv[]); - XBT_LOG_NEW_DEFAULT_CATEGORY(basic_tracing,"Messages specific for this example"); -int host(int argc, char *argv[]) +static int host(int argc, char *argv[]) { XBT_INFO("Sleep for 1s"); MSG_process_sleep(1); -- 2.20.1