X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69a8b72d8b6ded47e92595e5d0d05aed5623dc36..f3a6ed3541c05cff15e5634721f1029f8b28e7e2:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 46808556d0..232b83ce6b 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -21,8 +21,6 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, SD_workstation_t workstation; const char *name; - SD_CHECK_INIT_DONE(); - xbt_assert(surf_workstation != NULL, "surf_workstation is NULL !"); workstation = xbt_new(s_SD_workstation_t, 1); workstation->surf_workstation = surf_workstation; @@ -46,10 +44,6 @@ 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_assert(name != NULL, "Invalid parameter"); - return xbt_lib_get_or_null(host_lib, name, SD_HOST_LEVEL); } @@ -69,7 +63,6 @@ const SD_workstation_t *SD_workstation_get_list(void) void **data; int i; - SD_CHECK_INIT_DONE(); 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 */ @@ -93,7 +86,6 @@ const SD_workstation_t *SD_workstation_get_list(void) */ int SD_workstation_get_number(void) { - SD_CHECK_INIT_DONE(); return host_lib->count; } @@ -106,8 +98,6 @@ int SD_workstation_get_number(void) */ void *SD_workstation_get_data(SD_workstation_t workstation) { - SD_CHECK_INIT_DONE(); - xbt_assert(workstation != NULL, "Invalid parameter"); return workstation->data; } @@ -123,8 +113,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_assert(workstation != NULL, "Invalid parameter"); workstation->data = data; } @@ -136,8 +124,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_assert(workstation != NULL, "Invalid parameter"); return surf_resource_name(workstation->surf_workstation); } @@ -163,9 +149,6 @@ 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_assert((workstation != NULL), "Invalid parameters"); - return surf_workstation_model->extension. workstation.get_properties(workstation->surf_workstation); @@ -192,8 +175,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()); @@ -223,7 +204,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)); @@ -238,8 +218,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_assert(workstation != NULL, "Invalid parameter"); return surf_workstation_model->extension.workstation. get_speed(workstation->surf_workstation, 1.0); } @@ -253,8 +231,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_assert(workstation != NULL, "Invalid parameter"); return surf_workstation_model->extension. workstation.get_available_speed(workstation->surf_workstation); } @@ -269,8 +245,6 @@ 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_assert(workstation != NULL, "Invalid parameter"); xbt_assert(computation_amount >= 0, "computation_amount must be greater than or equal to zero"); return computation_amount / SD_workstation_get_power(workstation); @@ -294,8 +268,6 @@ double SD_route_get_current_latency(SD_workstation_t src, double latency; int i; - SD_CHECK_INIT_DONE(); - xbt_assert(src != NULL && dst != NULL, "Invalid parameter"); links = SD_route_get_list(src, dst); nb_links = SD_route_get_size(src, dst); latency = 0.0; @@ -326,9 +298,6 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, double min_bandwidth; int i; - SD_CHECK_INIT_DONE(); - xbt_assert(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; @@ -368,8 +337,6 @@ double SD_route_get_communication_time(SD_workstation_t src, double latency; int i; - SD_CHECK_INIT_DONE(); - xbt_assert(src != NULL && dst != NULL, "Invalid parameter"); xbt_assert(communication_amount >= 0, "communication_amount must be greater than or equal to zero"); @@ -405,8 +372,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_assert(workstation != NULL, "Invalid parameter"); return workstation->access_mode; } @@ -429,9 +394,6 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, e_SD_workstation_access_mode_t access_mode) { - SD_CHECK_INIT_DONE(); - xbt_assert(workstation != NULL, "Invalid parameter"); - if (access_mode == workstation->access_mode) { return; // nothing is changed } @@ -462,9 +424,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_assert(workstation != NULL, "Invalid parameter"); - XBT_DEBUG ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d", SD_workstation_get_name(workstation), @@ -488,8 +447,6 @@ void __SD_workstation_destroy(void *workstation) SD_workstation_t w; - SD_CHECK_INIT_DONE(); - xbt_assert(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; @@ -506,8 +463,6 @@ 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_assert(workstation != NULL, "Invalid parameter"); xbt_assert(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS" " to use this function");