#include "xbt/ex.h"
#include "xbt/dict.h"
#include "portable.h"
-#include "surf_private.h"
#include "storage_private.h"
#include "surf/surf_resource.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;
+#include "simgrid/sg_config.h"
+#include "workstation_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
"Logging specific to the SURF workstation module");
surf_model_t surf_workstation_model = NULL;
+
+void __init_ws(workstation_CLM03_t ws, const char *id){
+ ws->generic_resource.model = surf_workstation_model;
+ ws->generic_resource.name = xbt_strdup(id);
+ ws->storage = xbt_lib_get_or_null(storage_lib,id,ROUTING_STORAGE_HOST_LEVEL);
+ ws->net_elm = xbt_lib_get_or_null(host_lib,id,ROUTING_HOST_LEVEL);
+ XBT_DEBUG("Create ws %s with %ld mounted disks",id,xbt_dynar_length(ws->storage));
+ xbt_lib_set(host_lib, id, SURF_WKS_LEVEL, ws);
+ ws->generic_resource.model.extension.cpu=cpu_model_cas01(0);
+}
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(host->id);
- workstation->cpu = xbt_lib_get_or_null(host_lib, host->id, SURF_CPU_LEVEL);
- 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);
+ __init_ws(workstation, host->id, level);
}
static int ws_resource_used(void *resource_id)
if (action->model_type == surf_network_model)
return surf_network_model->action_unref(action);
else if (action->model_type == surf_cpu_model)
- return surf_cpu_model->action_unref(action);
+ return action->model_type->action_unref(action);
+ // previously was: Adrien/Arnaud 6 feb
+ // surf_cpu_model->action_unref(action);
else if (action->model_type == surf_workstation_model)
return ws_parallel_action_free(action);
else
if (action->model_type == surf_network_model)
surf_network_model->action_cancel(action);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->action_cancel(action);
+ action->model_type->action_cancel(action);
else if (action->model_type == surf_workstation_model)
ws_parallel_action_cancel(action);
else
if (action->model_type == surf_network_model)
surf_network_model->action_state_set(action, state);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->action_state_set(action, state);
+ action->model_type->action_state_set(action, state);
else if (action->model_type == surf_workstation_model)
surf_action_state_set(action, state);
else
static double ws_share_resources(double now)
{
+// invoke share_resources on CPU and network (layer 0)
return -1.0;
}
static surf_action_t ws_execute(void *workstation, double size)
{
- void *cpu = ((workstation_CLM03_t) workstation)->cpu;
- return ((surf_resource_t) cpu)->model->extension.cpu.execute(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);
+ surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation));
+ return cpu->model->extension.cpu.sleep(workstation, duration);
}
static void ws_action_suspend(surf_action_t action)
if (action->model_type == surf_network_model)
surf_network_model->suspend(action);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->suspend(action);
+ action->model_type->suspend(action);
else
DIE_IMPOSSIBLE;
}
if (action->model_type == surf_network_model)
surf_network_model->resume(action);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->resume(action);
+ action->model_type->resume(action);
else
DIE_IMPOSSIBLE;
}
if (action->model_type == surf_network_model)
return surf_network_model->is_suspended(action);
if (action->model_type == surf_cpu_model)
- return surf_cpu_model->is_suspended(action);
+ return action->model_type->is_suspended(action);
DIE_IMPOSSIBLE;
return -1;
}
if (action->model_type == surf_network_model)
surf_network_model->set_max_duration(action, duration);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->set_max_duration(action, duration);
+ action->model_type->set_max_duration(action, duration);
else
DIE_IMPOSSIBLE;
}
if (action->model_type == surf_network_model)
surf_network_model->set_priority(action, priority);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->set_priority(action, priority);
+ action->model_type->set_priority(action, priority);
else
DIE_IMPOSSIBLE;
}
if (action->model_type == surf_network_model)
surf_network_model->set_category(action, category);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->set_category(action, category);
+ action->model_type->set_category(action, category);
else
DIE_IMPOSSIBLE;
}
if (action->model_type == surf_network_model)
return surf_network_model->get_remains(action);
if (action->model_type == surf_cpu_model)
- return surf_cpu_model->get_remains(action);
+ return action->model_type->get_remains(action);
DIE_IMPOSSIBLE;
return -1.0;
}
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(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);
+ surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation));
+ return cpu->model->extension.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);
+ surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation));
+ return cpu->model->extension.cpu.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);
+ surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation));
+ return cpu->model->extension.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;
}
static xbt_dynar_t ws_get_route(void *workstation_src, void *workstation_dst)
{
XBT_DEBUG("ws_get_route");
- 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.get_route(src->net_elm,
dst->net_elm);
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;
- xbt_dynar_t storage_list = ((workstation_CLM03_t) workstation)->storage;
+ 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,((workstation_CLM03_t) workstation)->generic_resource.name);
+ 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);
break;
}
}
- if(!st) xbt_die("Can't find mount '%s' for '%s'",storage,((workstation_CLM03_t) workstation)->generic_resource.name);
+ 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* storage, const char* path, const char* mode)
+static surf_action_t ws_action_open(void *workstation, const char* mount, const char* path, const char* mode)
{
- storage_t st = find_storage_on_mount_list(workstation, storage);
+ 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, path, mode);
+ return model->extension.storage.open(st, mount, path, mode);
}
-static surf_action_t ws_action_close(void *workstation, const char* storage, m_file_t fp)
+static surf_action_t ws_action_close(void *workstation, surf_file_t fp)
{
- storage_t st = find_storage_on_mount_list(workstation, storage);
+ storage_t st = find_storage_on_mount_list(workstation, fp->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, fp);
}
-static surf_action_t ws_action_read(void *workstation, const char* storage, void* ptr, size_t size, size_t nmemb, m_file_t stream)
+static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream)
{
- storage_t st = find_storage_on_mount_list(workstation, storage);
+ storage_t st = find_storage_on_mount_list(workstation, stream->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, size, nmemb, stream);
+ return model->extension.storage.read(st, ptr, (double)size, nmemb, stream);
}
-static surf_action_t ws_action_write(void *workstation, const char* storage, const void* ptr, size_t size, size_t nmemb, m_file_t stream)
+static surf_action_t ws_action_write(void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream)
{
- storage_t st = find_storage_on_mount_list(workstation, storage);
+ storage_t st = find_storage_on_mount_list(workstation, stream->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, stream);
}
-static surf_action_t ws_action_stat(void *workstation, const char* storage, int fd, void* buf)
+static surf_action_t ws_action_stat(void *workstation, surf_file_t stream)
{
- storage_t st = find_storage_on_mount_list(workstation, storage);
+ storage_t st = find_storage_on_mount_list(workstation, stream->storage);
XBT_DEBUG("STAT on disk '%s'",st->generic_resource.name);
surf_model_t model = st->generic_resource.model;
- return model->extension.storage.stat(st, fd, buf);
+ return model->extension.storage.stat(st, stream);
+}
+
+static surf_action_t ws_action_unlink(void *workstation, surf_file_t stream)
+{
+ storage_t st = find_storage_on_mount_list(workstation, stream->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, stream);
+}
+
+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 void surf_workstation_model_init_internal(void)
{
surf_workstation_model = surf_model_init();
+ // TODO surf_workstation_model->extension.cpu=cpu_model_cas01(0);
surf_workstation_model->name = "Workstation";
surf_workstation_model->action_unref = ws_action_unref;
surf_workstation_model->action_cancel = ws_action_cancel;
surf_workstation_model->extension.workstation.read = ws_action_read;
surf_workstation_model->extension.workstation.write = ws_action_write;
surf_workstation_model->extension.workstation.stat = ws_action_stat;
+ surf_workstation_model->extension.workstation.unlink = ws_action_unlink;
+ surf_workstation_model->extension.workstation.ls = ws_action_ls;
}
void surf_workstation_model_init_current_default(void)
{
+
surf_workstation_model_init_internal();
- xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
- surf_cpu_model_init_Cas01();
+
+ xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", 1);
surf_network_model_init_LegrandVelho();
xbt_dynar_push(model_list, &surf_workstation_model);
