X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83b6eb642c9777ecc8f947d1a645cbec1874173b..d155fd69fa99c97b3a9c86bb7f2e472c2e7332df:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 938e2236b7..f961c7f12b 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -7,6 +7,7 @@ #include "private.h" #include "simdag/simdag.h" #include "xbt/dict.h" +#include "xbt/lib.h" #include "xbt/sysdep.h" #include "surf/surf.h" #include "surf/surf_resource.h" @@ -22,19 +23,18 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data) { - SD_workstation_t workstation; + SD_workstation_priv_t workstation; const char *name; - workstation = xbt_new(s_SD_workstation_t, 1); - workstation->surf_workstation = surf_workstation; + workstation = xbt_new(s_SD_workstation_priv_t, 1); workstation->data = data; /* user data */ workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS; /* default mode is shared */ workstation->task_fifo = NULL; workstation->current_task = NULL; - name = SD_workstation_get_name(workstation); + name = surf_resource_name(surf_workstation); xbt_lib_set(host_lib,name,SD_HOST_LEVEL,workstation); - return workstation; + return xbt_lib_get_elm_or_null(host_lib,name); } /** @@ -47,7 +47,7 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, */ SD_workstation_t SD_workstation_get_by_name(const char *name) { - return xbt_lib_get_or_null(host_lib, name, SD_HOST_LEVEL); + return xbt_lib_get_elm_or_null(host_lib, name); } /** @@ -70,12 +70,12 @@ const SD_workstation_t *SD_workstation_get_list(void) if (sd_global->workstation_list == NULL) { /* this is the first time the function is called */ sd_global->workstation_list = - xbt_new(SD_workstation_t, host_lib->count); + xbt_new(SD_workstation_t, xbt_lib_length(host_lib)); i = 0; 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]; + sd_global->workstation_list[i++] = xbt_dict_cursor_get_elm(cursor); } } return sd_global->workstation_list; @@ -89,7 +89,7 @@ const SD_workstation_t *SD_workstation_get_list(void) */ int SD_workstation_get_number(void) { - return host_lib->count; + return xbt_lib_length(host_lib); } /** @@ -101,7 +101,7 @@ int SD_workstation_get_number(void) */ void *SD_workstation_get_data(SD_workstation_t workstation) { - return workstation->data; + return SD_workstation_priv(workstation)->data; } /** @@ -116,7 +116,7 @@ void *SD_workstation_get_data(SD_workstation_t workstation) */ void SD_workstation_set_data(SD_workstation_t workstation, void *data) { - workstation->data = data; + SD_workstation_priv(workstation)->data = data; } /** @@ -127,7 +127,7 @@ void SD_workstation_set_data(SD_workstation_t workstation, void *data) */ const char *SD_workstation_get_name(SD_workstation_t workstation) { - return surf_resource_name(workstation->surf_workstation); + return sg_host_name(workstation); } /** @@ -153,11 +153,47 @@ const char *SD_workstation_get_property_value(SD_workstation_t ws, xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation) { return surf_workstation_model->extension. - workstation.get_properties(workstation->surf_workstation); - + workstation.get_properties(surf_workstation_resource_priv(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 (SD_workstation_priv(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: break; + } + 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 * @@ -183,8 +219,8 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_number()); } - surf_src = src->surf_workstation; - surf_dst = dst->surf_workstation; + surf_src = src; + surf_dst = dst; surf_route = surf_workstation_model->extension.workstation.get_route(surf_src, surf_dst); @@ -208,8 +244,7 @@ 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) { return xbt_dynar_length(surf_workstation_model->extension. - workstation.get_route(src->surf_workstation, - dst->surf_workstation)); + workstation.get_route(src, dst)); } /** @@ -222,7 +257,7 @@ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst) double SD_workstation_get_power(SD_workstation_t workstation) { return surf_workstation_model->extension.workstation. - get_speed(workstation->surf_workstation, 1.0); + get_speed(workstation, 1.0); } /** @@ -235,7 +270,7 @@ double SD_workstation_get_power(SD_workstation_t workstation) double SD_workstation_get_available_power(SD_workstation_t workstation) { return surf_workstation_model->extension. - workstation.get_available_speed(workstation->surf_workstation); + workstation.get_available_speed(workstation); } /** @@ -254,7 +289,7 @@ double SD_workstation_get_computation_time(SD_workstation_t 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 @@ -283,7 +318,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 @@ -375,7 +410,7 @@ 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) { - return workstation->access_mode; + return SD_workstation_priv(workstation)->access_mode; } /** @@ -397,30 +432,34 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, e_SD_workstation_access_mode_t access_mode) { - if (access_mode == workstation->access_mode) { + xbt_assert(access_mode != SD_WORKSTATION_SEQUENTIAL_ACCESS || + access_mode != SD_WORKSTATION_SHARED_ACCESS, + "Trying to set an invalid access mode"); + + if (access_mode == SD_workstation_priv(workstation)->access_mode) { return; // nothing is changed } - workstation->access_mode = access_mode; + SD_workstation_priv(workstation)->access_mode = access_mode; if (access_mode == SD_WORKSTATION_SHARED_ACCESS) { - xbt_fifo_free(workstation->task_fifo); - workstation->task_fifo = NULL; + xbt_fifo_free(SD_workstation_priv(workstation)->task_fifo); + SD_workstation_priv(workstation)->task_fifo = NULL; } else { - workstation->task_fifo = xbt_fifo_new(); + SD_workstation_priv(workstation)->task_fifo = xbt_fifo_new(); } } -/* Returns whether a task can start now on a workstation. - *//* - int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) { - SD_CHECK_INIT_DONE(); - xbt_assert(workstation != NULL && task != NULL, "Invalid parameter"); +/* Returns whether a task can start now on a workstation*/ +/* + int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) { + SD_CHECK_INIT_DONE(); + 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); - } - */ + return !__SD_workstation_is_busy(workstation) && + (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task); + } +*/ /* Returns whether a workstation is busy. A workstation is busy is it is * in sequential mode and a task is running on it or the fifo is not empty. @@ -430,17 +469,17 @@ int __SD_workstation_is_busy(SD_workstation_t workstation) XBT_DEBUG ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d", SD_workstation_get_name(workstation), - (workstation->access_mode == + (SD_workstation_priv(workstation)->access_mode == SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO", - (workstation->current_task ? - SD_task_get_name(workstation->current_task) + (SD_workstation_priv(workstation)->current_task ? + SD_task_get_name(SD_workstation_priv(workstation)->current_task) : "none"), - (workstation->task_fifo ? xbt_fifo_size(workstation->task_fifo) : + (SD_workstation_priv(workstation)->task_fifo ? xbt_fifo_size(SD_workstation_priv(workstation)->task_fifo) : 0)); - return workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS && - (workstation->current_task != NULL - || xbt_fifo_size(workstation->task_fifo) > 0); + return SD_workstation_priv(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS && + (SD_workstation_priv(workstation)->current_task != NULL + || xbt_fifo_size(SD_workstation_priv(workstation)->task_fifo) > 0); } /* Destroys a workstation. @@ -448,11 +487,11 @@ int __SD_workstation_is_busy(SD_workstation_t workstation) void __SD_workstation_destroy(void *workstation) { - SD_workstation_t w; + SD_workstation_priv_t w; /* workstation->surf_workstation is freed by surf_exit and workstation->data is freed by the user */ - w = (SD_workstation_t) workstation; + w = (SD_workstation_priv_t) workstation; if (w->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) { xbt_fifo_free(w->task_fifo); @@ -466,9 +505,35 @@ void __SD_workstation_destroy(void *workstation) * \param workstation a workstation */ SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation) { - xbt_assert(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, + xbt_assert(SD_workstation_priv(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS" " to use this function"); - return (workstation->current_task); + return (SD_workstation_priv(workstation)->current_task); +} + +/** + * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to the AS + * or router + * + * \param AS, router name + * \return the xbt_dict_t properties of the AS + */ +xbt_dict_t SD_as_router_get_properties(const char *asr) +{ + return get_as_router_properties(asr); +} +/** + * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to the AS + * or router + * + * \param AS, router name + * \param The name of a properties + * \return value of the properties + */ +const char* SD_as_router_get_property_value(const char *asr, const char *name) +{ + xbt_dict_t dict = get_as_router_properties(asr); + if(!dict) return NULL; + return xbt_dict_get_or_null(dict,name); }