-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/lib.h"
#include "xbt/sysdep.h"
#include "surf/surf.h"
-#include "surf/surf_resource.h"
#include "simgrid/msg.h" //FIXME: why?
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd,
const char *name;
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 = surf_resource_name(surf_workstation);
- xbt_lib_set(host_lib,name,SD_HOST_LEVEL,workstation);
- return xbt_lib_get_elm_or_null(host_lib,name);
+ sg_host_t sg_host = sg_host_by_name(name);
+ sg_host_sd_set(sg_host,workstation);
+ sg_host_user_set(sg_host,data);
+ return sg_host;
}
/* Creates a storage and registers it in SD.
*/
SD_workstation_t SD_workstation_get_by_name(const char *name)
{
- return xbt_lib_get_elm_or_null(host_lib, name);
+ return sg_host_by_name(name);
}
/**
* \remark The workstation order in the returned array is generally different from the workstation creation/declaration order in the XML platform (we use a hash table internally).
* \see SD_workstation_get_number()
*/
-const SD_workstation_t *SD_workstation_get_list(void)
-{
-
- xbt_lib_cursor_t cursor;
- char *key;
- void **data;
- int i;
-
+const SD_workstation_t *SD_workstation_get_list(void) {
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, xbt_lib_length(host_lib));
+ if (sd_global->workstation_list == NULL) /* this is the first time the function is called */
+ sd_global->workstation_list = xbt_dynar_to_array(sg_hosts_as_dynar());
- i = 0;
- xbt_lib_foreach(host_lib, cursor, key, data) {
- if(data[SD_HOST_LEVEL])
- sd_global->workstation_list[i++] = xbt_dict_cursor_get_elm(cursor);
- }
- }
return sd_global->workstation_list;
}
*/
int SD_workstation_get_number(void)
{
- return xbt_lib_length(host_lib);
+ return sg_host_count();
}
/**
*/
void *SD_workstation_get_data(SD_workstation_t workstation)
{
- return SD_workstation_priv(workstation)->data;
+ return sg_host_user(workstation);
}
/**
*/
void SD_workstation_set_data(SD_workstation_t workstation, void *data)
{
- SD_workstation_priv(workstation)->data = data;
+ sg_host_user_set(workstation, data);
}
/**
*/
const char *SD_workstation_get_name(SD_workstation_t workstation)
{
- return sg_host_name(workstation);
+ return sg_host_get_name(workstation);
}
/**
*/
xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
{
- return surf_resource_get_properties(surf_host_resource_priv(workstation));
+ return surf_host_get_properties(surf_host_resource_priv(workstation));
}
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){
+ switch (sg_host_sd(ws)->access_mode){
case SD_WORKSTATION_SHARED_ACCESS:
XBT_INFO(" - access mode: Space shared");
break;
void *surf_src;
void *surf_dst;
xbt_dynar_t surf_route;
- const char *link_name;
void *surf_link;
unsigned int cpt;
surf_src, surf_dst);
xbt_dynar_foreach(surf_route, cpt, surf_link) {
- link_name = surf_resource_name(surf_link);
- sd_global->recyclable_route[cpt] =
- xbt_lib_get_or_null(link_lib, link_name, SD_LINK_LEVEL);
+ sd_global->recyclable_route[cpt] = surf_link;
}
return sd_global->recyclable_route;
}
e_SD_workstation_access_mode_t
SD_workstation_get_access_mode(SD_workstation_t workstation)
{
- return SD_workstation_priv(workstation)->access_mode;
+ return sg_host_sd(workstation)->access_mode;
}
/**
access_mode != SD_WORKSTATION_SHARED_ACCESS,
"Trying to set an invalid access mode");
- if (access_mode == SD_workstation_priv(workstation)->access_mode) {
+ if (access_mode == sg_host_sd(workstation)->access_mode) {
return; // nothing is changed
}
- SD_workstation_priv(workstation)->access_mode = access_mode;
+ sg_host_sd(workstation)->access_mode = access_mode;
if (access_mode == SD_WORKSTATION_SHARED_ACCESS) {
- xbt_fifo_free(SD_workstation_priv(workstation)->task_fifo);
- SD_workstation_priv(workstation)->task_fifo = NULL;
+ xbt_fifo_free(sg_host_sd(workstation)->task_fifo);
+ sg_host_sd(workstation)->task_fifo = NULL;
} else {
- SD_workstation_priv(workstation)->task_fifo = xbt_fifo_new();
+ sg_host_sd(workstation)->task_fifo = xbt_fifo_new();
}
}
XBT_DEBUG
("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d",
SD_workstation_get_name(workstation),
- (SD_workstation_priv(workstation)->access_mode ==
+ (sg_host_sd(workstation)->access_mode ==
SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO",
- (SD_workstation_priv(workstation)->current_task ?
- SD_task_get_name(SD_workstation_priv(workstation)->current_task)
+ (sg_host_sd(workstation)->current_task ?
+ SD_task_get_name(sg_host_sd(workstation)->current_task)
: "none"),
- (SD_workstation_priv(workstation)->task_fifo ? xbt_fifo_size(SD_workstation_priv(workstation)->task_fifo) :
+ (sg_host_sd(workstation)->task_fifo ? xbt_fifo_size(sg_host_sd(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);
+ 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 */
* \param workstation a workstation */
SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation)
{
- xbt_assert(SD_workstation_priv(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS,
+ 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 (SD_workstation_priv(workstation)->current_task);
+ return (sg_host_sd(workstation)->current_task);
}
/**
