X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..6ad830890449074a4ad511e0415e4345acac2600:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 05b32dd937..79a7099293 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2011. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,6 +9,9 @@ #include "xbt/dict.h" #include "xbt/sysdep.h" #include "surf/surf.h" +#include "surf/surf_resource.h" + + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd, "Logging specific to SimDag (workstation)"); @@ -21,8 +24,6 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, SD_workstation_t workstation; const char *name; - SD_CHECK_INIT_DONE(); - xbt_assert0(surf_workstation != NULL, "surf_workstation is NULL !"); workstation = xbt_new(s_SD_workstation_t, 1); workstation->surf_workstation = surf_workstation; @@ -32,9 +33,7 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, workstation->current_task = NULL; name = SD_workstation_get_name(workstation); - xbt_dict_set(sd_global->workstations, name, workstation, __SD_workstation_destroy); /* add the workstation to the dictionary */ - sd_global->workstation_count++; - + xbt_lib_set(host_lib,name,SD_HOST_LEVEL,workstation); return workstation; } @@ -48,11 +47,7 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, */ SD_workstation_t SD_workstation_get_by_name(const char *name) { - SD_CHECK_INIT_DONE(); - - xbt_assert0(name != NULL, "Invalid parameter"); - - return xbt_dict_get_or_null(sd_global->workstations, name); + return xbt_lib_get_or_null(host_lib, name, SD_HOST_LEVEL); } /** @@ -66,21 +61,21 @@ SD_workstation_t SD_workstation_get_by_name(const char *name) const SD_workstation_t *SD_workstation_get_list(void) { - xbt_dict_cursor_t cursor; + xbt_lib_cursor_t cursor; char *key; - void *data; + void **data; int i; - SD_CHECK_INIT_DONE(); - xbt_assert0(SD_workstation_get_number() > 0, "There is no workstation!"); + xbt_assert(SD_workstation_get_number() > 0, "There is no workstation!"); if (sd_global->workstation_list == NULL) { /* this is the first time the function is called */ sd_global->workstation_list = - xbt_new(SD_workstation_t, sd_global->workstation_count); + xbt_new(SD_workstation_t, xbt_lib_length(host_lib)); i = 0; - xbt_dict_foreach(sd_global->workstations, cursor, key, data) { - sd_global->workstation_list[i++] = (SD_workstation_t) data; + xbt_lib_foreach(host_lib, cursor, key, data) { + if(data[SD_HOST_LEVEL]) + sd_global->workstation_list[i++] = (SD_workstation_t) data[SD_HOST_LEVEL]; } } return sd_global->workstation_list; @@ -94,8 +89,7 @@ const SD_workstation_t *SD_workstation_get_list(void) */ int SD_workstation_get_number(void) { - SD_CHECK_INIT_DONE(); - return sd_global->workstation_count; + return xbt_lib_length(host_lib); } /** @@ -107,8 +101,6 @@ int SD_workstation_get_number(void) */ void *SD_workstation_get_data(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); return workstation->data; } @@ -124,8 +116,6 @@ void *SD_workstation_get_data(SD_workstation_t workstation) */ void SD_workstation_set_data(SD_workstation_t workstation, void *data) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); workstation->data = data; } @@ -137,8 +127,6 @@ void SD_workstation_set_data(SD_workstation_t workstation, void *data) */ const char *SD_workstation_get_name(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); return surf_resource_name(workstation->surf_workstation); } @@ -164,14 +152,48 @@ const char *SD_workstation_get_property_value(SD_workstation_t ws, */ xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0((workstation != NULL), "Invalid parameters"); - return surf_workstation_model->extension. workstation.get_properties(workstation->surf_workstation); } +/** @brief Displays debugging informations about a workstation */ +void SD_workstation_dump(SD_workstation_t ws) +{ + xbt_dict_t props; + xbt_dict_cursor_t cursor=NULL; + char *key,*data; + 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)); + switch (ws->access_mode){ + case SD_WORKSTATION_SHARED_ACCESS: + XBT_INFO(" - access mode: Space shared"); + break; + case SD_WORKSTATION_SEQUENTIAL_ACCESS: + XBT_INFO(" - access mode: Exclusive"); + task = SD_workstation_get_current_task(ws); + if(task) + XBT_INFO(" current running task: %s", + SD_task_get_name(task)); + else + XBT_INFO(" no task running"); + break; + default: + XBT_INFO(" - (unknown access mode)"); + } + props = SD_workstation_get_properties(ws); + + if (!xbt_dict_is_empty(props)){ + XBT_INFO(" - properties:"); + + xbt_dict_foreach(props,cursor,key,data) { + XBT_INFO(" %s->%s",key,data); + } + } +} /** * \brief Returns the route between two workstations @@ -193,8 +215,6 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, void *surf_link; unsigned int cpt; - SD_CHECK_INIT_DONE(); - if (sd_global->recyclable_route == NULL) { /* first run */ sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_number()); @@ -209,7 +229,7 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, xbt_dynar_foreach(surf_route, cpt, surf_link) { link_name = surf_resource_name(surf_link); sd_global->recyclable_route[cpt] = - xbt_dict_get(sd_global->links, link_name); + xbt_lib_get_or_null(link_lib, link_name, SD_LINK_LEVEL); } return sd_global->recyclable_route; } @@ -224,7 +244,6 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, */ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst) { - SD_CHECK_INIT_DONE(); return xbt_dynar_length(surf_workstation_model->extension. workstation.get_route(src->surf_workstation, dst->surf_workstation)); @@ -239,8 +258,6 @@ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst) */ double SD_workstation_get_power(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); return surf_workstation_model->extension.workstation. get_speed(workstation->surf_workstation, 1.0); } @@ -254,8 +271,6 @@ double SD_workstation_get_power(SD_workstation_t workstation) */ double SD_workstation_get_available_power(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); return surf_workstation_model->extension. workstation.get_available_speed(workstation->surf_workstation); } @@ -270,15 +285,13 @@ double SD_workstation_get_available_power(SD_workstation_t workstation) double SD_workstation_get_computation_time(SD_workstation_t workstation, double computation_amount) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); - xbt_assert0(computation_amount >= 0, + xbt_assert(computation_amount >= 0, "computation_amount must be greater than or equal to zero"); return computation_amount / SD_workstation_get_power(workstation); } /** - * \brief Returns the latency of the route between two workstations, i.e. the sum of all link latencies + * \brief Returns the latency of the route between two workstations, i.e. the sum of all link latencies * between the workstations. * * \param src the first workstation @@ -295,8 +308,6 @@ double SD_route_get_current_latency(SD_workstation_t src, double latency; int i; - SD_CHECK_INIT_DONE(); - xbt_assert0(src != NULL && dst != NULL, "Invalid parameter"); links = SD_route_get_list(src, dst); nb_links = SD_route_get_size(src, dst); latency = 0.0; @@ -309,7 +320,7 @@ double SD_route_get_current_latency(SD_workstation_t src, } /** - * \brief Returns the bandwidth of the route between two workstations, i.e. the minimum link bandwidth of all + * \brief Returns the bandwidth of the route between two workstations, i.e. the minimum link bandwidth of all * between the workstations. * * \param src the first workstation @@ -327,9 +338,6 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, double min_bandwidth; int i; - SD_CHECK_INIT_DONE(); - xbt_assert0(src != NULL && dst != NULL, "Invalid parameter"); - links = SD_route_get_list(src, dst); nb_links = SD_route_get_size(src, dst); bandwidth = min_bandwidth = -1.0; @@ -369,9 +377,7 @@ double SD_route_get_communication_time(SD_workstation_t src, double latency; int i; - SD_CHECK_INIT_DONE(); - xbt_assert0(src != NULL && dst != NULL, "Invalid parameter"); - xbt_assert0(communication_amount >= 0, + xbt_assert(communication_amount >= 0, "communication_amount must be greater than or equal to zero"); @@ -406,8 +412,6 @@ double SD_route_get_communication_time(SD_workstation_t src, e_SD_workstation_access_mode_t SD_workstation_get_access_mode(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); return workstation->access_mode; } @@ -430,9 +434,6 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, e_SD_workstation_access_mode_t access_mode) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); - if (access_mode == workstation->access_mode) { return; // nothing is changed } @@ -451,7 +452,7 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, *//* int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) { SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL && task != NULL, "Invalid parameter"); + xbt_assert(workstation != NULL && task != NULL, "Invalid parameter"); return !__SD_workstation_is_busy(workstation) && (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task); @@ -463,9 +464,6 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, */ int __SD_workstation_is_busy(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); - XBT_DEBUG ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d", SD_workstation_get_name(workstation), @@ -489,8 +487,6 @@ void __SD_workstation_destroy(void *workstation) SD_workstation_t w; - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); /* workstation->surf_workstation is freed by surf_exit and workstation->data is freed by the user */ w = (SD_workstation_t) workstation; @@ -507,9 +503,7 @@ void __SD_workstation_destroy(void *workstation) * \param workstation a workstation */ SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert0(workstation != NULL, "Invalid parameter"); - xbt_assert0(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, + xbt_assert(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS" " to use this function");