#include "xbt/dict.h"
#include "portable.h"
#include "surf_private.h"
+#include "storage_private.h"
#include "surf/surf_resource.h"
-
-
+#include "simgrid/sg_config.h"
typedef struct workstation_CLM03 {
s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
- void *cpu;
+ void *net_elm;
+ xbt_dynar_t storage;
} s_workstation_CLM03_t, *workstation_CLM03_t;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
surf_model_t surf_workstation_model = NULL;
-static workstation_CLM03_t workstation_new(const char *name, void *cpu)
+static void workstation_new(sg_platf_host_cbarg_t host)
{
workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
workstation->generic_resource.model = surf_workstation_model;
- workstation->generic_resource.name = xbt_strdup(name);
- workstation->cpu = cpu;
-
- xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
-
- return workstation;
-}
-
-void create_workstations(void)
-{
- xbt_lib_cursor_t cursor = NULL;
- char *name = NULL;
- void **cpu = NULL;
-
- xbt_lib_foreach(host_lib, cursor, name, cpu) {
- if(cpu[SURF_CPU_LEVEL])
- workstation_new(name, cpu[SURF_CPU_LEVEL]);
- }
+ workstation->generic_resource.name = xbt_strdup(host->id);
+ workstation->storage = xbt_lib_get_or_null(storage_lib,host->id,ROUTING_STORAGE_HOST_LEVEL);
+ workstation->net_elm = xbt_lib_get_or_null(host_lib,host->id,ROUTING_HOST_LEVEL);
+ XBT_DEBUG("Create workstation %s with %ld mounted disks",host->id,xbt_dynar_length(workstation->storage));
+ xbt_lib_set(host_lib, host->id, SURF_WKS_LEVEL, workstation);
}
static int ws_resource_used(void *resource_id)
static surf_action_t ws_execute(void *workstation, double size)
{
- return surf_cpu_model->extension.cpu.
- execute(((workstation_CLM03_t) workstation)->cpu, size);
+ surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation));
+ return cpu->model->extension.cpu.execute(workstation, size);
}
static surf_action_t ws_action_sleep(void *workstation, double duration)
{
return surf_cpu_model->extension.cpu.
- sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+ sleep(workstation, duration);
}
static void ws_action_suspend(surf_action_t action)
void *workstation_dst, double size,
double rate)
{
- workstation_CLM03_t src = (workstation_CLM03_t) workstation_src;
- workstation_CLM03_t dst = (workstation_CLM03_t) workstation_dst;
+ workstation_CLM03_t src = surf_workstation_resource_priv(workstation_src);
+ workstation_CLM03_t dst = surf_workstation_resource_priv(workstation_dst);
return surf_network_model->extension.network.
- communicate(surf_resource_name(src->cpu),
- surf_resource_name(dst->cpu), size, rate);
+ communicate(src->net_elm,
+ dst->net_elm, size, rate);
}
static e_surf_resource_state_t ws_get_state(void *workstation)
{
return surf_cpu_model->extension.cpu.
- get_state(((workstation_CLM03_t) workstation)->cpu);
+ get_state(workstation);
}
static double ws_get_speed(void *workstation, double load)
{
return surf_cpu_model->extension.cpu.
- get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+ get_speed(workstation, load);
}
static double ws_get_available_speed(void *workstation)
{
return surf_cpu_model->extension.cpu.
- get_available_speed(((workstation_CLM03_t)
- workstation)->cpu);
+ get_available_speed(workstation);
}
static surf_action_t ws_execute_parallel_task(int workstation_nb,
void **workstation_list,
double *computation_amount,
double *communication_amount,
- double amount, double rate)
-{
+ double rate)
+{
+#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
+ if ((workstation_nb == 1)
+ && (cost_or_zero(communication_amount, 0) == 0.0))
+ return ws_execute(workstation_list[0], computation_amount[0]);
+ else if ((workstation_nb == 1)
+ && (cost_or_zero(computation_amount, 0) == 0.0))
+ return ws_communicate(workstation_list[0], workstation_list[0],communication_amount[0], rate);
+ else if ((workstation_nb == 2)
+ && (cost_or_zero(computation_amount, 0) == 0.0)
+ && (cost_or_zero(computation_amount, 1) == 0.0)) {
+ int i,nb = 0;
+ double value = 0.0;
+
+ for (i = 0; i < workstation_nb * workstation_nb; i++) {
+ if (cost_or_zero(communication_amount, i) > 0.0) {
+ nb++;
+ value = cost_or_zero(communication_amount, i);
+ }
+ }
+ if (nb == 1)
+ return ws_communicate(workstation_list[0], workstation_list[1],value, rate);
+ }
+#undef cost_or_zero
+
THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
return NULL;
}
/* returns an array of network_link_CM02_t */
-static xbt_dynar_t ws_get_route(void *src, void *dst)
+static xbt_dynar_t ws_get_route(void *workstation_src, void *workstation_dst)
{
+ XBT_DEBUG("ws_get_route");
+ workstation_CLM03_t src = surf_workstation_resource_priv(workstation_src);
+ workstation_CLM03_t dst = surf_workstation_resource_priv(workstation_dst);
return surf_network_model->extension.
- network.get_route(surf_resource_name(src), surf_resource_name(dst));
+ network.get_route(src->net_elm,
+ dst->net_elm);
}
static double ws_get_link_bandwidth(const void *link)
static int ws_link_shared(const void *link)
{
- return surf_network_model->extension.network.get_link_latency(link);
+ return surf_network_model->extension.network.link_shared(link);
}
static void ws_finalize(void)
static xbt_dict_t ws_get_properties(const void *ws)
{
- return surf_resource_properties(((workstation_CLM03_t) ws)->cpu);
+ return surf_resource_properties(surf_cpu_resource_priv(ws));
+}
+
+static storage_t find_storage_on_mount_list(void *workstation,const char* storage)
+{
+ storage_t st = NULL;
+ s_mount_t mnt;
+ unsigned int cursor;
+ workstation_CLM03_t ws = (workstation_CLM03_t) surf_workstation_resource_priv(workstation);
+ xbt_dynar_t storage_list = ws->storage;
+
+ XBT_DEBUG("Search for storage name '%s' on '%s'",storage,ws->generic_resource.name);
+ xbt_dynar_foreach(storage_list,cursor,mnt)
+ {
+ XBT_DEBUG("See '%s'",mnt.name);
+ if(!strcmp(storage,mnt.name)){
+ st = mnt.id;
+ break;
+ }
+ }
+ if(!st) xbt_die("Can't find mount '%s' for '%s'",storage,ws->generic_resource.name);
+ return st;
+}
+
+static surf_action_t ws_action_open(void *workstation, const char* mount,
+ const char* path)
+{
+ storage_t st = find_storage_on_mount_list(workstation, mount);
+ XBT_DEBUG("OPEN on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.open(st, mount, path);
+}
+
+static surf_action_t ws_action_close(void *workstation, surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ XBT_DEBUG("CLOSE on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.close(st, fd);
+}
+
+static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size,
+ size_t nmemb, surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ XBT_DEBUG("READ on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.read(st, ptr, (double)size, nmemb, fd);
+}
+
+static surf_action_t ws_action_write(void *workstation, const void* ptr,
+ size_t size, size_t nmemb, surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ XBT_DEBUG("WRITE on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.write(st, ptr, size, nmemb, fd);
+}
+
+static surf_action_t ws_action_unlink(void *workstation, surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ XBT_DEBUG("UNLINK on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.unlink(st, fd);
+}
+
+static surf_action_t ws_action_ls(void *workstation, const char* mount,
+ const char *path)
+{
+ XBT_DEBUG("LS on mount '%s' and file '%s'",mount, path);
+ storage_t st = find_storage_on_mount_list(workstation, mount);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.ls(st, path);
+}
+
+static size_t ws_file_get_size(void *workstation, surf_file_t fd)
+{
+ return fd->size;
}
static void surf_workstation_model_init_internal(void)
surf_workstation_model->extension.workstation.get_properties =
ws_get_properties;
+ surf_workstation_model->extension.workstation.open = ws_action_open;
+ surf_workstation_model->extension.workstation.close = ws_action_close;
+ surf_workstation_model->extension.workstation.read = ws_action_read;
+ surf_workstation_model->extension.workstation.write = ws_action_write;
+ surf_workstation_model->extension.workstation.unlink = ws_action_unlink;
+ surf_workstation_model->extension.workstation.ls = ws_action_ls;
+ surf_workstation_model->extension.workstation.get_size = ws_file_get_size;
}
void surf_workstation_model_init_current_default(void)
{
surf_workstation_model_init_internal();
- //xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", xbt_strdup("yes"));
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
xbt_dynar_push(model_list, &surf_workstation_model);
- sg_platf_postparse_add_cb(create_workstations);
-}
-
-/********************************************************************/
-/* The model used in MSG and presented at CCGrid03 */
-/********************************************************************/
-/* @InProceedings{Casanova.CLM_03, */
-/* author = {Henri Casanova and Arnaud Legrand and Loris Marchal}, */
-/* title = {Scheduling Distributed Applications: the SimGrid Simulation Framework}, */
-/* booktitle = {Proceedings of the third IEEE International Symposium on Cluster Computing and the Grid (CCGrid'03)}, */
-/* publisher = {"IEEE Computer Society Press"}, */
-/* month = {may}, */
-/* year = {2003} */
-/* } */
-void surf_workstation_model_init_CLM03(void)
-{
- surf_workstation_model_init_internal();
- surf_cpu_model_init_Cas01();
- surf_network_model_init_CM02();
-
- xbt_dynar_push(model_list, &surf_workstation_model);
- sg_platf_postparse_add_cb(create_workstations);
+ sg_platf_host_add_cb(workstation_new);
}
void surf_workstation_model_init_compound()
xbt_assert(surf_network_model, "No network model defined yet!");
surf_workstation_model_init_internal();
xbt_dynar_push(model_list, &surf_workstation_model);
- sg_platf_postparse_add_cb(create_workstations);
+ sg_platf_host_add_cb(workstation_new);
}
