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;
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));
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);
+ 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(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,
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* mount, const char* path, const char* mode)
+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, mode);
+ return model->extension.storage.open(st, mount, path);
}
-static surf_action_t ws_action_close(void *workstation, surf_file_t fp)
+static surf_action_t ws_action_close(void *workstation, surf_file_t fd)
{
- storage_t st = find_storage_on_mount_list(workstation, fp->storage);
+ 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, fp);
+ 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 stream)
return model->extension.storage.ls(st, path);
}
+static size_t ws_file_get_size(void *workstation, surf_file_t stream)
+{
+ return stream->size;
+}
+
static void surf_workstation_model_init_internal(void)
{
surf_workstation_model = surf_model_init();
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;
+ 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(_sg_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_host_add_cb(workstation_new);
-// sg_platf_postparse_add_cb(create_workstations);
}
void surf_workstation_model_init_compound()
surf_workstation_model_init_internal();
xbt_dynar_push(model_list, &surf_workstation_model);
sg_platf_host_add_cb(workstation_new);
-// sg_platf_postparse_add_cb(create_workstations);
}