X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9f1e4b399f0d6093f78cb7fda7beaeabded297f..b0b37b3b19ca4660c9dd3c01ffd46c6c6df8e898:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 5db137d417..f50cf05b3d 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,160 +7,121 @@
 #include "xbt/ex.h"
 #include "xbt/dict.h"
 #include "portable.h"
-#include "workstation_private.h"
-#include "cpu_private.h"
-#include "network_common.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 *net_elm;
+  xbt_dynar_t storage;
+} s_workstation_CLM03_t, *workstation_CLM03_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                 "Logging specific to the SURF workstation module");
 
 surf_model_t surf_workstation_model = NULL;
 
-static void workstation_free(void *workstation)
-{
-  free(((workstation_CLM03_t) workstation)->name);
-  free(workstation);
-}
-
-static workstation_CLM03_t workstation_new(const char *name,
-                                           void *cpu, void *card)
+static void workstation_new(sg_platf_host_cbarg_t host)
 {
   workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
-  workstation->model = surf_workstation_model;
-  workstation->name = xbt_strdup(name);
-  workstation->cpu = cpu;
-  workstation->network_card = card;
-
-  xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
-               workstation, workstation_free);
-
-  return workstation;
-}
-
-void create_workstations(void)
-{
-  xbt_dict_cursor_t cursor = NULL;
-  char *name = NULL;
-  void *cpu = NULL;
-  void *nw_card = NULL;
-
-  xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) {
-    nw_card = surf_model_resource_by_name(surf_network_model, name);
-    xbt_assert1(nw_card, "No corresponding card found for %s", name);
-
-    workstation_new(name, cpu, nw_card);
-  }
-}
-
-static const char *get_resource_name(void *resource_id)
-{
-  return ((workstation_CLM03_t) resource_id)->name;
+  workstation->generic_resource.model = surf_workstation_model;
+  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 resource_used(void *resource_id)
+static int ws_resource_used(void *resource_id)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
+  return -1;
 }
 
-static void parallel_action_cancel(surf_action_t action)
+static void ws_parallel_action_cancel(surf_action_t action)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
 }
 
-static int parallel_action_free(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 void parallel_action_use(surf_action_t action)
-{
-  THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
-}
-
-static int action_free(surf_action_t action)
+static int ws_action_unref(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    return surf_network_model->action_free(action);
+    return surf_network_model->action_unref(action);
   else if (action->model_type == surf_cpu_model)
-    return surf_cpu_model->action_free(action);
+    return surf_cpu_model->action_unref(action);
   else if (action->model_type == surf_workstation_model)
-    return parallel_action_free(action);
+    return ws_parallel_action_free(action);
   else
     DIE_IMPOSSIBLE;
   return 0;
 }
 
-static void action_use(surf_action_t action)
-{
-  if (action->model_type == surf_network_model)
-    surf_network_model->action_use(action);
-  else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->action_use(action);
-  else if (action->model_type == surf_workstation_model)
-    parallel_action_use(action);
-  else
-    DIE_IMPOSSIBLE;
-  return;
-}
-
-static void action_cancel(surf_action_t action)
+static void ws_action_cancel(surf_action_t action)
 {
   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);
   else if (action->model_type == surf_workstation_model)
-    parallel_action_cancel(action);
+    ws_parallel_action_cancel(action);
   else
     DIE_IMPOSSIBLE;
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void ws_action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->action_change_state(action, state);
+    surf_network_model->action_state_set(action, state);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->action_change_state(action, state);
+    surf_cpu_model->action_state_set(action, state);
   else if (action->model_type == surf_workstation_model)
-    surf_action_change_state(action, state);
+    surf_action_state_set(action, state);
   else
     DIE_IMPOSSIBLE;
   return;
 }
 
-static double share_resources(double now)
+static double ws_share_resources(double now)
 {
   return -1.0;
 }
 
-static void update_actions_state(double now, double delta)
+static void ws_update_actions_state(double now, double delta)
 {
   return;
 }
 
-static void update_resource_state(void *id,
-                                  tmgr_trace_event_t event_type,
-                                  double value, double date)
+static void ws_update_resource_state(void *id,
+                                     tmgr_trace_event_t event_type,
+                                     double value, double date)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
 }
 
-static surf_action_t execute(void *workstation, double size)
+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 action_sleep(void *workstation, double duration)
+static surf_action_t ws_action_sleep(void *workstation, double duration)
 {
-  return surf_cpu_model->extension.
-    cpu.sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+  return surf_cpu_model->extension.cpu.
+      sleep(workstation, duration);
 }
 
-static void action_suspend(surf_action_t action)
+static void ws_action_suspend(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
     surf_network_model->suspend(action);
@@ -171,7 +131,7 @@ static void action_suspend(surf_action_t action)
     DIE_IMPOSSIBLE;
 }
 
-static void action_resume(surf_action_t action)
+static void ws_action_resume(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
     surf_network_model->resume(action);
@@ -181,16 +141,18 @@ static void action_resume(surf_action_t action)
     DIE_IMPOSSIBLE;
 }
 
-static int action_is_suspended(surf_action_t action)
+static int ws_action_is_suspended(surf_action_t action)
 {
   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);
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
-static void 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);
@@ -200,7 +162,7 @@ static void action_set_max_duration(surf_action_t action, double duration)
     DIE_IMPOSSIBLE;
 }
 
-static void action_set_priority(surf_action_t action, double priority)
+static void ws_action_set_priority(surf_action_t action, double priority)
 {
   if (action->model_type == surf_network_model)
     surf_network_model->set_priority(action, priority);
@@ -210,182 +172,407 @@ static void action_set_priority(surf_action_t action, double priority)
     DIE_IMPOSSIBLE;
 }
 
-static surf_action_t communicate(void *workstation_src,
-                                 void *workstation_dst, double size,
-                                 double rate)
+#ifdef HAVE_TRACING
+static void ws_action_set_category(surf_action_t action, const char *category)
 {
-  return surf_network_model->extension.
-    network.communicate(((workstation_CLM03_t) workstation_src)->network_card,
-                        ((workstation_CLM03_t) workstation_dst)->network_card,
-                        size, rate);
+  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);
+  else
+    return 0;
 }
+#endif
 
-static e_surf_cpu_state_t get_state(void *workstation)
+static double ws_action_get_remains(surf_action_t action)
 {
-  return surf_cpu_model->extension.
-    cpu.get_state(((workstation_CLM03_t) workstation)->cpu);
+  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);
+  DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
-static double get_speed(void *workstation, double load)
+static surf_action_t ws_communicate(void *workstation_src,
+                                    void *workstation_dst, double size,
+                                    double rate)
 {
-  return surf_cpu_model->extension.
-    cpu.get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+  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 double get_available_speed(void *workstation)
+static e_surf_resource_state_t ws_get_state(void *workstation)
 {
-  return surf_cpu_model->extension.
-    cpu.get_available_speed(((workstation_CLM03_t)
-                             workstation)->cpu);
+  return surf_cpu_model->extension.cpu.
+      get_state(workstation);
 }
 
-static xbt_dict_t get_properties(void *workstation)
+static double ws_get_speed(void *workstation, double load)
 {
-  return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)->
-                                        cpu);
+  return surf_cpu_model->extension.cpu.
+      get_speed(workstation, load);
 }
 
-static surf_action_t execute_parallel_task(int workstation_nb,
-                                           void **workstation_list,
-                                           double *computation_amount,
-                                           double *communication_amount,
-                                           double amount, double rate)
+static int ws_get_core(void *workstation)
 {
-  THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
+  return surf_cpu_model->extension.cpu.
+      get_core(workstation);
 }
 
 
-/* returns an array of network_link_CM02_t */
-static const void **get_route(void *src, void *dst)
+
+static double ws_get_available_speed(void *workstation)
 {
-  workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
-  workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
-  return surf_network_model->extension.network.get_route(workstation_src->
-                                                         network_card,
-                                                         workstation_dst->
-                                                         network_card);
+  return surf_cpu_model->extension.cpu.
+      get_available_speed(workstation);
 }
 
-static int get_route_size(void *src, void *dst)
+static double ws_get_current_power_peak(void *workstation)
 {
-  workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
-  workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
-  return surf_network_model->extension.
-    network.get_route_size(workstation_src->network_card,
-                           workstation_dst->network_card);
+  return surf_cpu_model->extension.cpu.
+      get_current_power_peak(workstation);
 }
 
-static const char *get_link_name(const void *link)
+static double ws_get_power_peak_at(void *workstation, int pstate_index)
 {
-  return surf_network_model->extension.network.get_link_name(link);
+  return surf_cpu_model->extension.cpu.
+      get_power_peak_at(workstation, pstate_index);
 }
 
-static double get_link_bandwidth(const void *link)
+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 *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(src->net_elm,
+                  dst->net_elm);
+}
+
+static double ws_get_link_bandwidth(const void *link)
 {
   return surf_network_model->extension.network.get_link_bandwidth(link);
 }
 
-static double get_link_latency(const void *link)
+static double ws_get_link_latency(const void *link)
 {
   return surf_network_model->extension.network.get_link_latency(link);
 }
 
-static int link_shared(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 finalize(void)
+static void ws_finalize(void)
 {
   surf_model_exit(surf_workstation_model);
   surf_workstation_model = NULL;
 }
 
+static xbt_dict_t ws_get_properties(const void *ws)
+{
+  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 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)
+{
+  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, 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, fd, size);
+}
+
+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, fd, size);
+}
+
+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 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_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
-
-  surf_workstation_model->get_resource_name = get_resource_name;
-  surf_workstation_model->action_get_state = surf_action_get_state;
-  surf_workstation_model->action_get_start_time = surf_action_get_start_time;
-  surf_workstation_model->action_get_finish_time =
-    surf_action_get_finish_time;
-  surf_workstation_model->action_free = action_free;
-  surf_workstation_model->action_use = action_use;
-  surf_workstation_model->action_cancel = action_cancel;
-  surf_workstation_model->action_change_state = action_change_state;
-  surf_workstation_model->action_set_data = surf_action_set_data;
+
   surf_workstation_model->name = "Workstation";
+  surf_workstation_model->action_unref = ws_action_unref;
+  surf_workstation_model->action_cancel = ws_action_cancel;
+  surf_workstation_model->action_state_set = ws_action_state_set;
 
-  surf_workstation_model->model_private->resource_used = resource_used;
-  surf_workstation_model->model_private->share_resources = share_resources;
+  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->update_actions_state =
-    update_actions_state;
+      ws_update_actions_state;
   surf_workstation_model->model_private->update_resource_state =
-    update_resource_state;
-  surf_workstation_model->model_private->finalize = finalize;
-
-  surf_workstation_model->suspend = action_suspend;
-  surf_workstation_model->resume = action_resume;
-  surf_workstation_model->is_suspended = action_is_suspended;
-  surf_workstation_model->set_max_duration = action_set_max_duration;
-  surf_workstation_model->set_priority = action_set_priority;
-
-  surf_workstation_model->extension.workstation.execute = execute;
-  surf_workstation_model->extension.workstation.sleep = action_sleep;
-  surf_workstation_model->extension.workstation.get_state = get_state;
-  surf_workstation_model->extension.workstation.get_speed = get_speed;
+      ws_update_resource_state;
+  surf_workstation_model->model_private->finalize = ws_finalize;
+
+  surf_workstation_model->suspend = ws_action_suspend;
+  surf_workstation_model->resume = ws_action_resume;
+  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;
+#endif
+
+  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 =
-    get_available_speed;
-
-  /*manage the properties of the workstation */
-  surf_workstation_model->get_properties = get_properties;
-
-  surf_workstation_model->extension.workstation.communicate = 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 =
-    execute_parallel_task;
-  surf_workstation_model->extension.workstation.get_route = get_route;
-  surf_workstation_model->extension.workstation.get_route_size =
-    get_route_size;
-  surf_workstation_model->extension.workstation.get_link_name = get_link_name;
+      ws_execute_parallel_task;
   surf_workstation_model->extension.workstation.get_link_bandwidth =
-    get_link_bandwidth;
+      ws_get_link_bandwidth;
   surf_workstation_model->extension.workstation.get_link_latency =
-    get_link_latency;
-  surf_workstation_model->extension.workstation.link_shared = link_shared;
-}
-
-/********************************************************************/
-/* 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)
+      ws_get_link_latency;
+  surf_workstation_model->extension.workstation.link_shared =
+      ws_link_shared;
+  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_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();
-  surf_cpu_model_init_Cas01(filename);
-  surf_network_model_init_CM02(filename);
-  update_model_description(surf_workstation_model_description,
-                           "CLM03", surf_workstation_model);
+  xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "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);
 }