-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
get_available_speed(workstation);
}
+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,
{
XBT_DEBUG("See '%s'",mnt.name);
if(!strcmp(mount,mnt.name)){
- st = mnt.id;
+ st = mnt.storage;
break;
}
}
return st;
}
+static xbt_dict_t ws_get_storage_list(void *workstation)
+{
+ s_mount_t mnt;
+ unsigned int i;
+ xbt_dict_t storage_list = xbt_dict_new_homogeneous(NULL);
+ char *storage_name = NULL;
+
+ workstation_CLM03_t ws = (workstation_CLM03_t) surf_workstation_resource_priv(workstation);
+ xbt_dynar_t storages = ws->storage;
+
+ xbt_dynar_foreach(storages,i,mnt)
+ {
+ storage_name = ((storage_t)mnt.storage)->generic_resource.name;
+ xbt_dict_set(storage_list,mnt.name,storage_name,NULL);
+ }
+ return storage_list;
+}
+
static surf_action_t ws_action_open(void *workstation, const char* mount,
const char* path)
{
return model->extension.storage.close(st, fd);
}
-static surf_action_t ws_action_read(void *workstation, size_t size,
- surf_file_t fd)
+static surf_action_t ws_action_read(void *workstation, surf_file_t fd, sg_storage_size_t size)
{
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);
+ return model->extension.storage.read(st, fd, size);
}
-static surf_action_t ws_action_write(void *workstation, size_t size,
- surf_file_t fd)
+static surf_action_t ws_action_write(void *workstation, surf_file_t fd, sg_storage_size_t size)
{
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);
+ return model->extension.storage.write(st, fd, size);
}
static int ws_file_unlink(void *workstation, surf_file_t fd)
return model->extension.storage.ls(st, path);
}
-static size_t ws_file_get_size(void *workstation, surf_file_t fd)
+static sg_storage_size_t ws_file_get_size(void *workstation, surf_file_t fd)
{
return fd->size;
}
+static xbt_dynar_t ws_file_get_info(void *workstation, surf_file_t fd)
+{
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+ sg_storage_size_t *psize = xbt_new(sg_storage_size_t, 1);
+ *psize = fd->size;
+ xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL);
+ xbt_dynar_push_as(info, sg_storage_size_t *, psize);
+ xbt_dynar_push_as(info, void *, fd->mount);
+ xbt_dynar_push_as(info, void *, st->generic_resource.name);
+ xbt_dynar_push_as(info, void *, st->type_id);
+ xbt_dynar_push_as(info, void *, st->content_type);
+
+ return info;
+}
+
+static sg_storage_size_t ws_storage_get_free_size(void *workstation,const char* name)
+{
+ storage_t st = find_storage_on_mount_list(workstation, name);
+ return st->size - st->used_size;
+}
+
+static sg_storage_size_t ws_storage_get_used_size(void *workstation,const char* name)
+{
+ storage_t st = find_storage_on_mount_list(workstation, name);
+ return st->used_size;
+}
+
static void surf_workstation_model_init_internal(void)
{
surf_workstation_model = surf_model_init();
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.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.unlink = ws_file_unlink;
surf_workstation_model->extension.workstation.ls = ws_action_ls;
surf_workstation_model->extension.workstation.get_size = ws_file_get_size;
+ surf_workstation_model->extension.workstation.get_info = ws_file_get_info;
+ surf_workstation_model->extension.workstation.get_free_size = ws_storage_get_free_size;
+ surf_workstation_model->extension.workstation.get_used_size = ws_storage_get_used_size;
+ surf_workstation_model->extension.workstation.get_storage_list = ws_get_storage_list;
}
void surf_workstation_model_init_current_default(void)
{
surf_workstation_model_init_internal();
- xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", xbt_strdup("yes"));
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
