X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5d07fead4e49e89ad1ae13797eee1213f5811fd..077972fd6355b0900d78e4ff0779cf58a5e10e71:/src/simdag/sd_workstation.cpp diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp index d37ceadd37..b617568d6e 100644 --- a/src/simdag/sd_workstation.cpp +++ b/src/simdag/sd_workstation.cpp @@ -16,23 +16,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd, "Logging specific to SimDag (workstation)"); -/* Creates a workstation and registers it in SD. - */ -SD_workstation_t __SD_workstation_create(const char *name) -{ - - SD_workstation_priv_t workstation; - - workstation = xbt_new(s_SD_workstation_priv_t, 1); - workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS; /* default mode is shared */ - workstation->task_fifo = NULL; - workstation->current_task = NULL; - - sg_host_t sg_host = sg_host_by_name(name); - sg_host_sd_set(sg_host,workstation); - return sg_host; -} - /* Creates a storage and registers it in SD. */ SD_storage_t __SD_storage_create(void *surf_storage, void *data) @@ -171,26 +154,10 @@ 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(" - speed: %.0f", SD_workstation_get_speed(ws)); XBT_INFO(" - available speed: %.2f", SD_workstation_get_available_speed(ws)); - switch (sg_host_sd(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)){ @@ -393,58 +360,6 @@ double SD_route_get_communication_time(SD_workstation_t src, return latency + (bytes_amount / min_bandwidth); } -/** - * \brief Returns the access mode of this workstation. - * - * \param workstation a workstation - * \return the access mode for the tasks running on this workstation: - * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS - * - * \see SD_workstation_set_access_mode(), e_SD_workstation_access_mode_t - */ -e_SD_workstation_access_mode_t -SD_workstation_get_access_mode(SD_workstation_t workstation) -{ - return sg_host_sd(workstation)->access_mode; -} - -/** - * \brief Sets the access mode for the tasks that will be executed on a workstation - * - * By default, a workstation model is shared, i.e. several tasks - * can be executed at the same time on a workstation. The CPU power of - * the workstation is shared between the running tasks on the workstation. - * In sequential mode, only one task can use the workstation, and the other - * tasks wait in a FIFO. - * - * \param workstation a workstation - * \param access_mode the access mode you want to set to this workstation: - * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS - * - * \see SD_workstation_get_access_mode(), e_SD_workstation_access_mode_t - */ -void SD_workstation_set_access_mode(SD_workstation_t workstation, - e_SD_workstation_access_mode_t - 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 == sg_host_sd(workstation)->access_mode) { - return; // nothing is changed - } - - sg_host_sd(workstation)->access_mode = access_mode; - - if (access_mode == SD_WORKSTATION_SHARED_ACCESS) { - xbt_fifo_free(sg_host_sd(workstation)->task_fifo); - sg_host_sd(workstation)->task_fifo = NULL; - } else { - sg_host_sd(workstation)->task_fifo = xbt_fifo_new(); - } -} - /** * \brief Return the list of mounted storages on a workstation. * @@ -475,68 +390,3 @@ const char *SD_storage_get_host(msg_storage_t storage) { SD_storage_priv_t priv = SD_storage_priv(storage); return priv->host; } - -/* 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); - } -*/ - -/* 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. - */ -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), - (sg_host_sd(workstation)->access_mode == - SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO", - (sg_host_sd(workstation)->current_task ? - SD_task_get_name(sg_host_sd(workstation)->current_task) - : "none"), - (sg_host_sd(workstation)->task_fifo ? xbt_fifo_size(sg_host_sd(workstation)->task_fifo) : - 0)); - - return sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS && - (sg_host_sd(workstation)->current_task != NULL - || xbt_fifo_size(sg_host_sd(workstation)->task_fifo) > 0); -} - -/* Destroys a workstation. - */ -void __SD_workstation_destroy(void *workstation) -{ - - if (workstation==NULL) - return; - SD_workstation_priv_t w; - - /* workstation->surf_workstation is freed by surf_exit and workstation->data is freed by the user */ - - w = (SD_workstation_priv_t) workstation; - - if (w->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) { - xbt_fifo_free(w->task_fifo); - } - xbt_free(w); -} - -/** - * \brief Returns the kind of the task currently running on a workstation - * Only call this with sequential access mode set - * \param workstation a workstation */ -SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation) -{ - xbt_assert(sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, - "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS" - " to use this function"); - - return (sg_host_sd(workstation)->current_task); -} -