#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_dict_set(surf_model_resource_set(surf_workstation_model), name,
- workstation, surf_resource_free);
-
- return workstation;
-}
-
-void create_workstations(void)
-{
- xbt_dict_cursor_t cursor = NULL;
- char *name = NULL;
- void *cpu = NULL;
-
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) {
- workstation_new(name, cpu);
- }
+ 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)
{
THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
+ return -1;
}
static void ws_parallel_action_cancel(surf_action_t action)
static int ws_parallel_action_free(surf_action_t action)
{
THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
+ return -1;
}
static int ws_action_unref(surf_action_t action)
}
static void ws_update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value, double date)
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
}
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)
if (action->model_type == surf_cpu_model)
return surf_cpu_model->is_suspended(action);
DIE_IMPOSSIBLE;
+ return -1;
}
-static void ws_action_set_max_duration(surf_action_t action, double duration)
+static void ws_action_set_max_duration(surf_action_t action,
+ double duration)
{
if (action->model_type == surf_network_model)
surf_network_model->set_max_duration(action, duration);
DIE_IMPOSSIBLE;
}
+#ifdef HAVE_TRACING
+static void ws_action_set_category(surf_action_t action, const char *category)
+{
+ 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);
+ else
+ DIE_IMPOSSIBLE;
+}
+#endif
+
#ifdef HAVE_LATENCY_BOUND_TRACKING
static int ws_get_latency_limited(surf_action_t action)
{
if (action->model_type == surf_network_model)
return surf_network_model->get_latency_limited(action);
- INFO0("You tried to ask if a non network action is limited by latency, aborting...");
- DIE_IMPOSSIBLE;
+ else
+ return 0;
}
#endif
if (action->model_type == surf_cpu_model)
return surf_cpu_model->get_remains(action);
DIE_IMPOSSIBLE;
+ return -1.0;
}
static surf_action_t ws_communicate(void *workstation_src,
- void *workstation_dst, double size,
- double rate)
+ 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 int ws_get_core(void *workstation)
+{
+ return surf_cpu_model->extension.cpu.
+ get_core(workstation);
}
+
+
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)
+static double ws_get_current_power_peak(void *workstation)
{
+ return surf_cpu_model->extension.cpu.
+ get_current_power_peak(workstation);
+}
+
+static double ws_get_power_peak_at(void *workstation, int pstate_index)
+{
+ return surf_cpu_model->extension.cpu.
+ get_power_peak_at(workstation, pstate_index);
+}
+
+static int ws_get_nb_pstates(void *workstation)
+{
+ return surf_cpu_model->extension.cpu.
+ get_nb_pstates(workstation);
+}
+
+static void ws_set_power_peak_at(void *workstation, int pstate_index)
+{
+ surf_cpu_model->extension.cpu.
+ set_power_peak_at(workstation, pstate_index);
+}
+
+static double ws_get_consumed_energy(void *workstation)
+{
+ return surf_cpu_model->extension.cpu.
+ get_consumed_energy(workstation);
+}
+
+
+static surf_action_t ws_execute_parallel_task(int workstation_nb,
+ void **workstation_list,
+ double *computation_amount,
+ double *communication_amount,
+ 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)
{
- return surf_network_model->extension.network.get_route(surf_resource_name(src),
- surf_resource_name(src));
+ 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(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* mount)
+{
+ 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'",mount,ws->generic_resource.name);
+ xbt_dynar_foreach(storage_list,cursor,mnt)
+ {
+ XBT_DEBUG("See '%s'",mnt.name);
+ if(!strcmp(mount,mnt.name)){
+ st = mnt.storage;
+ break;
+ }
+ }
+ if(!st) xbt_die("Can't find mount '%s' for '%s'",mount,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->mount);
+ 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, size_t size,
+ surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+ XBT_DEBUG("READ on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.read(st, size, fd);
+}
+
+static surf_action_t ws_action_write(void *workstation, size_t size,
+ surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+ XBT_DEBUG("WRITE on disk '%s'",st->generic_resource.name);
+ surf_model_t model = st->generic_resource.model;
+ return model->extension.storage.write(st, size, fd);
+}
+
+static int ws_file_unlink(void *workstation, surf_file_t fd)
+{
+ if (!fd){
+ XBT_WARN("No such file descriptor. Impossible to unlink");
+ return 0;
+ } else {
+// XBT_INFO("%s %zu", fd->storage, fd->size);
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+ xbt_dict_t content_dict = (st)->content;
+ /* Check if the file is on this storage */
+ if (!xbt_dict_get_or_null(content_dict, fd->name)){
+ XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name,
+ st->generic_resource.name);
+ return 0;
+ } else {
+ XBT_DEBUG("UNLINK on disk '%s'",st->generic_resource.name);
+ st->used_size -= fd->size;
+
+ // Remove the file from storage
+ xbt_dict_remove(content_dict,fd->name);
+
+ free(fd->name);
+ free(fd->mount);
+ xbt_free(fd);
+ return 1;
+ }
+ }
+}
+
+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->action_state_set = ws_action_state_set;
surf_workstation_model->model_private->resource_used = ws_resource_used;
- surf_workstation_model->model_private->share_resources = ws_share_resources;
+ surf_workstation_model->model_private->share_resources =
+ ws_share_resources;
surf_workstation_model->model_private->update_actions_state =
- ws_update_actions_state;
+ ws_update_actions_state;
surf_workstation_model->model_private->update_resource_state =
- ws_update_resource_state;
+ ws_update_resource_state;
surf_workstation_model->model_private->finalize = ws_finalize;
surf_workstation_model->suspend = ws_action_suspend;
surf_workstation_model->is_suspended = ws_action_is_suspended;
surf_workstation_model->set_max_duration = ws_action_set_max_duration;
surf_workstation_model->set_priority = ws_action_set_priority;
+#ifdef HAVE_TRACING
+ surf_workstation_model->set_category = ws_action_set_category;
+#endif
surf_workstation_model->get_remains = ws_action_get_remains;
#ifdef HAVE_LATENCY_BOUND_TRACKING
surf_workstation_model->get_latency_limited = ws_get_latency_limited;
surf_workstation_model->extension.workstation.execute = ws_execute;
surf_workstation_model->extension.workstation.sleep = ws_action_sleep;
surf_workstation_model->extension.workstation.get_state = ws_get_state;
+ surf_workstation_model->extension.workstation.get_core = ws_get_core;
surf_workstation_model->extension.workstation.get_speed = ws_get_speed;
surf_workstation_model->extension.workstation.get_available_speed =
- ws_get_available_speed;
-
- surf_workstation_model->extension.workstation.communicate = ws_communicate;
+ ws_get_available_speed;
+ surf_workstation_model->extension.workstation.get_current_power_peak = ws_get_current_power_peak;
+ surf_workstation_model->extension.workstation.get_power_peak_at = ws_get_power_peak_at;
+ surf_workstation_model->extension.workstation.get_nb_pstates = ws_get_nb_pstates;
+ surf_workstation_model->extension.workstation.set_power_peak_at = ws_set_power_peak_at;
+ surf_workstation_model->extension.workstation.get_consumed_energy = ws_get_consumed_energy;
+
+ surf_workstation_model->extension.workstation.communicate =
+ ws_communicate;
surf_workstation_model->extension.workstation.get_route = ws_get_route;
surf_workstation_model->extension.workstation.execute_parallel_task =
- ws_execute_parallel_task;
+ ws_execute_parallel_task;
surf_workstation_model->extension.workstation.get_link_bandwidth =
- ws_get_link_bandwidth;
+ ws_get_link_bandwidth;
surf_workstation_model->extension.workstation.get_link_latency =
- ws_get_link_latency;
- surf_workstation_model->extension.workstation.link_shared = ws_link_shared;
+ ws_get_link_latency;
+ surf_workstation_model->extension.workstation.link_shared =
+ ws_link_shared;
surf_workstation_model->extension.workstation.get_properties =
- ws_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_file_unlink;
+ surf_workstation_model->extension.workstation.ls = ws_action_ls;
+ surf_workstation_model->extension.workstation.get_size = ws_file_get_size;
}
-/********************************************************************/
-/* 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(const char *filename)
+void surf_workstation_model_init_current_default(void)
{
surf_workstation_model_init_internal();
- surf_cpu_model_init_Cas01_im(filename);
- surf_network_model_init_LegrandVelho(filename);
- update_model_description(surf_workstation_model_description,
- "CLM03", surf_workstation_model);
+ 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);
}
-void surf_workstation_model_init_compound(const char *filename)
+void surf_workstation_model_init_compound()
{
- xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
- xbt_assert0(surf_network_model, "No network model defined yet!");
+ xbt_assert(surf_cpu_model, "No CPU model defined yet!");
+ xbt_assert(surf_network_model, "No network model defined yet!");
surf_workstation_model_init_internal();
-
- update_model_description(surf_workstation_model_description,
- "compound", surf_workstation_model);
-
xbt_dynar_push(model_list, &surf_workstation_model);
+ sg_platf_host_add_cb(workstation_new);
}
