Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
various little cleanups
[simgrid.git] / src / surf / surf_interface.cpp
index e4f4d0d..8cef095 100644 (file)
-#include "surf.hpp"
-#include "workstation.hpp"
-#include "network.hpp"
-#include "instr/instr_private.h"
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
+/* Copyright (c) 2004-2015. 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. */
+
+#include "src/portable.h"
+#include "surf_private.h"
+#include "surf_interface.hpp"
+#include "network_interface.hpp"
+#include "cpu_interface.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "src/simix/smx_host_private.h"
+#include "surf_routing.hpp"
+#include "simgrid/sg_config.h"
+#include "mc/mc.h"
+#include "virtual_machine.hpp"
+#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+
+XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
 
 /*********
- * TOOLS *
+ * Utils *
  *********/
-extern double NOW;
 
-char *surf_routing_edge_name(sg_routing_edge_t edge){
-  return edge->p_name;
+/* model_list_invoke contains only surf_host and surf_vm.
+ * The callback functions of cpu_model and network_model will be called from those of these host models. */
+xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */
+xbt_dynar_t model_list_invoke = NULL;  /* to invoke callbacks */
+
+simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
+xbt_dynar_t surf_path = NULL;
+xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), NULL);
+xbt_dict_t watched_hosts_lib;
+
+namespace simgrid {
+namespace surf {
+
+simgrid::xbt::signal<void(void)> surfExitCallbacks;
+
+}
 }
 
-#ifdef CONTEXT_THREADS
+#include <simgrid/plugins/energy.h> // FIXME: this plugin should not be linked to the core
+
+s_surf_model_description_t surf_plugin_description[] = {
+    {"Energy", "Cpu energy consumption.", sg_energy_plugin_init},
+     {NULL, NULL,  NULL}      /* this array must be NULL terminated */
+};
+
+/* Don't forget to update the option description in smx_config when you change this */
+s_surf_model_description_t surf_network_model_description[] = {
+  {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ",
+   surf_network_model_init_LegrandVelho},
+  {"Constant",
+   "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.",
+   surf_network_model_init_Constant},
+  {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)",
+   surf_network_model_init_SMPI},
+  {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
+   surf_network_model_init_IB},
+  {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).",
+   surf_network_model_init_CM02},
+#ifdef HAVE_NS3
+  {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3},
+#endif
+  {"Reno",  "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+   surf_network_model_init_Reno},
+  {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+   surf_network_model_init_Reno2},
+  {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+   surf_network_model_init_Vegas},
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
+s_surf_model_description_t surf_cpu_model_description[] = {
+  {"Cas01", "Simplistic CPU model (time=size/power).", surf_cpu_model_init_Cas01},
+  {NULL, NULL,  NULL}      /* this array must be NULL terminated */
+};
+
+s_surf_model_description_t surf_host_model_description[] = {
+  {"default",   "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", surf_host_model_init_current_default},
+  {"compound",  "Host model that is automatically chosen if you change the network and CPU models", surf_host_model_init_compound},
+  {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", surf_host_model_init_ptask_L07},
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
+s_surf_model_description_t surf_vm_model_description[] = {
+  {"default", "Default vm model.", surf_vm_model_init_HL13},
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
+s_surf_model_description_t surf_optimization_mode_description[] = {
+  {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", NULL},
+  {"TI",   "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", NULL},
+  {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", NULL},
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
+s_surf_model_description_t surf_storage_model_description[] = {
+  {"default", "Simplistic storage model.", surf_storage_model_init_default},
+  {NULL, NULL,  NULL}      /* this array must be NULL terminated */
+};
+
+#ifdef HAVE_THREAD_CONTEXTS
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 
-static double *surf_mins = NULL; /* return value of share_resources for each model */
-static int surf_min_index;       /* current index in surf_mins */
-static double surf_min;               /* duration determined by surf_solve */
+double NOW = 0;
 
-void surf_presolve(void)
+double surf_get_clock(void)
 {
-  double next_event_date = -1.0;
-  tmgr_trace_event_t event = NULL;
-  double value = -1.0;
-  surf_resource_t resource = NULL;
-  surf_model_t model = NULL;
-  unsigned int iter;
+  return NOW;
+}
 
-  XBT_DEBUG
-      ("First Run! Let's \"purge\" events and put models in the right state");
-  while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-    if (next_event_date > NOW)
-      break;
-    while ((event =
-            tmgr_history_get_next_event_leq(history, next_event_date,
-                                            &value,
-                                            (void **) &resource))) {
-      if (value >= 0){
-        resource->updateState(event, value, NOW);
-      }
-    }
+#ifdef _XBT_WIN32
+# define FILE_DELIM "\\"
+#else
+# define FILE_DELIM "/"         /* FIXME: move to better location */
+#endif
+
+FILE *surf_fopen(const char *name, const char *mode)
+{
+  unsigned int cpt;
+  char *path_elm = NULL;
+  char *buff;
+  FILE *file = NULL;
+
+  xbt_assert(name);
+
+  if (__surf_is_absolute_file_path(name))       /* don't mess with absolute file names */
+    return fopen(name, mode);
+
+  /* search relative files in the path */
+  xbt_dynar_foreach(surf_path, cpt, path_elm) {
+    buff = bprintf("%s" FILE_DELIM "%s", path_elm, name);
+    file = fopen(buff, mode);
+    free(buff);
+
+    if (file)
+      return file;
   }
-  xbt_dynar_foreach(model_list, iter, model)
-      model->updateActionsState(NOW, 0.0);
+  return NULL;
 }
 
-static void surf_share_resources(surf_model_t model)
+#ifdef _XBT_WIN32
+#include <windows.h>
+#define MAX_DRIVE 26
+static const char *disk_drives_letter_table[MAX_DRIVE] = {
+  "A:\\","B:\\","C:\\","D:\\","E:\\","F:\\","G:\\","H:\\","I:\\","J:\\","K:\\","L:\\","M:\\",
+  "N:\\","O:\\","P:\\","Q:\\","R:\\","S:\\","T:\\","U:\\","V:\\","W:\\","X:\\","Y:\\","Z:\\"
+};
+#endif
+
+/*
+ * Returns the initial path. On Windows the initial path is
+ * the current directory for the current process in the other
+ * case the function returns "./" that represents the current
+ * directory on Unix/Linux platforms.
+ */
+
+const char *__surf_get_initial_path(void)
 {
-  double next_action_end = -1.0;
-  int i = __sync_fetch_and_add(&surf_min_index, 1);
-  if (strcmp(model->m_name.c_str(), "network NS3")) {
-    XBT_DEBUG("Running for Resource [%s]", model->m_name.c_str());
-    next_action_end = model->shareResources(NOW);
-    XBT_DEBUG("Resource [%s] : next action end = %f",
-        model->m_name.c_str(), next_action_end);
+
+#ifdef _XBT_WIN32
+  unsigned i;
+  char current_directory[MAX_PATH + 1] = { 0 };
+  unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory);
+  char root[4] = { 0 };
+
+  if (!len)
+    return NULL;
+
+  strncpy(root, current_directory, 3);
+
+  for (i = 0; i < MAX_DRIVE; i++) {
+    if (toupper(root[0]) == disk_drives_letter_table[i][0])
+      return disk_drives_letter_table[i];
   }
-  surf_mins[i] = next_action_end;
+
+  return NULL;
+#else
+  return "./";
+#endif
 }
 
-static void surf_update_actions_state(surf_model_t model)
+/* The __surf_is_absolute_file_path() returns 1 if
+ * file_path is a absolute file path, in the other
+ * case the function returns 0.
+ */
+int __surf_is_absolute_file_path(const char *file_path)
 {
-  model->updateActionsState(NOW, surf_min);
+#ifdef _XBT_WIN32
+  WIN32_FIND_DATA wfd = { 0 };
+  HANDLE hFile = FindFirstFile(file_path, &wfd);
+
+  if (INVALID_HANDLE_VALUE == hFile)
+    return 0;
+
+  FindClose(hFile);
+  return 1;
+#else
+  return (file_path[0] == '/');
+#endif
 }
 
-double surf_solve(double max_date)
+/** Displays the long description of all registered models, and quit */
+void model_help(const char *category, s_surf_model_description_t * table)
 {
-  surf_min = -1.0; /* duration */
-  double next_event_date = -1.0;
-  double model_next_action_end = -1.0;
-  double value = -1.0;
-  surf_resource_t resource = NULL;
-  surf_model_t model = NULL;
-  tmgr_trace_event_t event = NULL;
-  unsigned int iter;
-
-  if (max_date != -1.0 && max_date != NOW) {
-    surf_min = max_date - NOW;
-  }
+  printf("Long description of the %s models accepted by this simulator:\n", category);
+  for (int i = 0; table[i].name; i++)
+    printf("  %s: %s\n", table[i].name, table[i].description);
+}
 
-  XBT_DEBUG("Looking for next action end for all models except NS3");
+int find_model_description(s_surf_model_description_t * table,
+                           const char *name)
+{
+  int i;
+  char *name_list = NULL;
 
-  if (surf_mins == NULL) {
-    surf_mins = xbt_new(double, xbt_dynar_length(model_list));
+  for (i = 0; table[i].name; i++)
+    if (!strcmp(name, table[i].name)) {
+      return i;
+    }
+  if (!table[0].name)
+    xbt_die("No model is valid! This is a bug.");
+  name_list = xbt_strdup(table[0].name);
+  for (i = 1; table[i].name; i++) {
+    name_list = (char *) xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 3);
+    strcat(name_list, ", ");
+    strcat(name_list, table[i].name);
   }
-  surf_min_index = 0;
+  xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list);
+  return -1;
+}
 
-  /* sequential version */
-  xbt_dynar_foreach(model_list, iter, model) {
-    surf_share_resources(static_cast<ModelPtr>(model));
-  }
+static XBT_INLINE void surf_storage_free(void *r)
+{
+  delete static_cast<simgrid::surf::Storage*>(r);
+}
 
-  unsigned i;
-  for (i = 0; i < xbt_dynar_length(model_list); i++) {
-    if ((surf_min < 0.0 || surf_mins[i] < surf_min)
-        && surf_mins[i] >= 0.0) {
-      surf_min = surf_mins[i];
+void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) {
+    if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
+      fprintf(stderr,
+          "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
+          "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
+              SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
+        lib_version_major,lib_version_minor,lib_version_patch);
+      abort();
     }
-  }
+    if (lib_version_patch != SIMGRID_VERSION_PATCH) {
+        fprintf(stderr,
+            "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
+            "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
+                SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
+          lib_version_major,lib_version_minor,lib_version_patch);
+    }
+}
 
-  XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min);
+void sg_version(int *ver_major,int *ver_minor,int *ver_patch) {
+  *ver_major = SIMGRID_VERSION_MAJOR;
+  *ver_minor = SIMGRID_VERSION_MINOR;
+  *ver_patch = SIMGRID_VERSION_PATCH;
+}
 
-  XBT_DEBUG("Looking for next trace event");
+void surf_init(int *argc, char **argv)
+{
+  XBT_DEBUG("Create all Libs");
+  host_list = xbt_dict_new_homogeneous([](void*p) {
+    simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
+    simgrid::s4u::Host::onDestruction(*host);
+    delete host;
+  });
+  USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
 
-  do {
-    XBT_DEBUG("Next TRACE event : %f", next_event_date);
+  as_router_lib = xbt_lib_new();
+  storage_lib = xbt_lib_new();
+  storage_type_lib = xbt_lib_new();
+  file_lib = xbt_lib_new();
+  watched_hosts_lib = xbt_dict_new_homogeneous(NULL);
 
-    next_event_date = tmgr_history_next_date(history);
 
-    if(!strcmp(surf_network_model->m_name.c_str(), "network NS3")){//FIXME: add surf_network_model->m_name &&
-      if(next_event_date!=-1.0 && surf_min!=-1.0) {
-        surf_min = MIN(next_event_date - NOW, surf_min);
-      } else{
-        surf_min = MAX(next_event_date - NOW, surf_min);
-      }
+  XBT_DEBUG("Add routing levels");
+  ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, NULL);
 
-      XBT_DEBUG("Run for network at most %f", surf_min);
-      // run until min or next flow
-      model_next_action_end = surf_network_model->shareResources(surf_min);
+  XBT_DEBUG("Add SURF levels");
+  simgrid::surf::HostImpl::classInit();
+  SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
 
-      XBT_DEBUG("Min for network : %f", model_next_action_end);
-      if(model_next_action_end>=0.0)
-        surf_min = model_next_action_end;
-    }
+  xbt_init(argc, argv);
+  if (!all_existing_models)
+    all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL);
+  if (!model_list_invoke)
+    model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL);
+  if (!future_evt_set)
+    future_evt_set = new simgrid::trace_mgr::future_evt_set();
 
-    if (next_event_date < 0.0) {
-      XBT_DEBUG("no next TRACE event. Stop searching for it");
-      break;
-    }
+  TRACE_add_start_function(TRACE_surf_alloc);
+  TRACE_add_end_function(TRACE_surf_release);
 
-    if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break;
-
-    XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", surf_min, NOW, next_event_date);
-    while ((event =
-            tmgr_history_get_next_event_leq(history, next_event_date,
-                                            &value,
-                                            (void **) &resource))) {
-      if (resource->isUsed()) {
-        surf_min = next_event_date - NOW;
-        XBT_DEBUG
-            ("This event will modify model state. Next event set to %f",
-             surf_min);
-      }
-      /* update state of model_obj according to new value. Does not touch lmm.
-         It will be modified if needed when updating actions */
-      XBT_DEBUG("Calling update_resource_state for resource %s with min %lf",
-             resource->p_model->m_name.c_str(), surf_min);
-      resource->updateState(event, value, next_event_date);
-    }
-  } while (1);
+  sg_config_init(argc, argv);
 
-  /* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0.
-   * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
-   * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
-  if (surf_min == -1.0) {
-  XBT_DEBUG("No next event at all. Bail out now.");
-    return -1.0;
-  }
+  if (MC_is_active())
+    MC_memory_init();
+}
+
+void surf_exit(void)
+{
+  unsigned int iter;
+  simgrid::surf::Model *model = NULL;
+
+  TRACE_end();                  /* Just in case it was not called by the upper
+                                 * layer (or there is no upper layer) */
+
+  sg_config_finalize();
+
+  xbt_dynar_free(&host_that_restart);
+  xbt_dynar_free(&surf_path);
+
+  xbt_dict_free(&host_list);
+  xbt_lib_free(&as_router_lib);
+  xbt_lib_free(&storage_lib);
+  sg_link_exit();
+  xbt_lib_free(&storage_type_lib);
+  xbt_lib_free(&file_lib);
+  xbt_dict_free(&watched_hosts_lib);
 
-  XBT_DEBUG("Duration set to %f", surf_min);
+  xbt_dynar_foreach(all_existing_models, iter, model)
+    delete model;
+  xbt_dynar_free(&all_existing_models);
+  xbt_dynar_free(&model_list_invoke);
+  routing_exit();
 
-  NOW = NOW + surf_min;
+  simgrid::surf::surfExitCallbacks();
 
-  /* sequential version */
-  xbt_dynar_foreach(model_list, iter, model) {
-    surf_update_actions_state(model);
+  if (future_evt_set) {
+    delete future_evt_set;
+    future_evt_set = nullptr;
   }
 
-#ifdef HAVE_TRACING
-  TRACE_paje_dump_buffer (0);
+#ifdef HAVE_THREAD_CONTEXTS
+  xbt_parmap_destroy(surf_parmap);
 #endif
 
-  return surf_min;
-}
-
-XBT_INLINE double surf_get_clock(void)
-{
-  return NOW;
-}
+  tmgr_finalize();
+  sg_platf_exit();
 
-void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
-                              xbt_dynar_t * route, double *latency){
-  routing_platf->getRouteAndLatency(src, dst, route, latency);
+  NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
 }
 
 /*********
- * MODEL *
+ * Model *
  *********/
 
-const char *surf_model_name(surf_model_t model){
-  return model->m_name.c_str();
-}
+namespace simgrid {
+namespace surf {
 
-xbt_swag_t surf_model_done_action_set(surf_model_t model){
-  return model->p_doneActionSet;
+Model::Model()
+  : p_maxminSystem(NULL)
+{
+  p_readyActionSet = new ActionList();
+  p_runningActionSet = new ActionList();
+  p_failedActionSet = new ActionList();
+  p_doneActionSet = new ActionList();
+
+  p_modifiedSet = NULL;
+  p_actionHeap = NULL;
+  p_updateMechanism = UM_UNDEFINED;
+  m_selectiveUpdate = 0;
 }
 
-xbt_swag_t surf_model_failed_action_set(surf_model_t model){
-  return model->p_failedActionSet;
+Model::~Model(){
+  delete p_readyActionSet;
+  delete p_runningActionSet;
+  delete p_failedActionSet;
+  delete p_doneActionSet;
 }
 
-xbt_swag_t surf_model_ready_action_set(surf_model_t model){
-  return model->p_readyActionSet;
+double Model::next_occuring_event(double now)
+{
+  //FIXME: set the good function once and for all
+  if (p_updateMechanism == UM_LAZY)
+    return next_occuring_event_lazy(now);
+  else if (p_updateMechanism == UM_FULL)
+    return next_occuring_event_full(now);
+  else
+    xbt_die("Invalid cpu update mechanism!");
 }
 
-xbt_swag_t surf_model_running_action_set(surf_model_t model){
-  return model->p_runningActionSet;
+double Model::next_occuring_event_lazy(double now)
+{
+  Action *action = NULL;
+  double min = -1;
+  double share;
+
+  XBT_DEBUG
+      ("Before share resources, the size of modified actions set is %zd",
+       p_modifiedSet->size());
+
+  lmm_solve(p_maxminSystem);
+
+  XBT_DEBUG
+      ("After share resources, The size of modified actions set is %zd",
+       p_modifiedSet->size());
+
+  while(!p_modifiedSet->empty()) {
+    action = &(p_modifiedSet->front());
+    p_modifiedSet->pop_front();
+    int max_dur_flag = 0;
+
+    if (action->getStateSet() != p_runningActionSet)
+      continue;
+
+    /* bogus priority, skip it */
+    if (action->getPriority() <= 0 || action->getHat()==LATENCY)
+      continue;
+
+    action->updateRemainingLazy(now);
+
+    min = -1;
+    share = lmm_variable_getvalue(action->getVariable());
+
+    if (share > 0) {
+      double time_to_completion;
+      if (action->getRemains() > 0) {
+        time_to_completion = action->getRemainsNoUpdate() / share;
+      } else {
+        time_to_completion = 0.0;
+      }
+      min = now + time_to_completion; // when the task will complete if nothing changes
+    }
+
+    if ((action->getMaxDuration() != NO_MAX_DURATION)
+        && (min == -1
+            || action->getStartTime() +
+            action->getMaxDuration() < min)) {
+      min = action->getStartTime() +
+          action->getMaxDuration();  // when the task will complete anyway because of the deadline if any
+      max_dur_flag = 1;
+    }
+
+
+    XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->getVariable()->id_int);
+
+    XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
+        action->getStartTime(), min, share,
+        action->getMaxDuration());
+
+    if (min != -1) {
+      action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL);
+      XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min,
+                now);
+    } else DIE_IMPOSSIBLE;
+  }
+
+  //hereafter must have already the min value for this resource model
+  if (xbt_heap_size(p_actionHeap) > 0)
+    min = xbt_heap_maxkey(p_actionHeap) - now;
+  else
+    min = -1;
+
+  XBT_DEBUG("The minimum with the HEAP %f", min);
+
+  return min;
 }
 
-surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_model_t model,
-                                                   int workstation_nb,
-                                            void **workstation_list,
-                                            double *computation_amount,
-                                            double *communication_amount,
-                                            double rate){
-  return model->executeParallelTask(workstation_nb, workstation_list, computation_amount, communication_amount, rate);
+double Model::next_occuring_event_full(double /*now*/) {
+  THROW_UNIMPLEMENTED;
 }
 
-surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_workstation_CLM03_t src, surf_workstation_CLM03_t dst, double size, double rate){
-  model->communicate(src, dst, size, rate);
+double Model::shareResourcesMaxMin(ActionList *running_actions,
+                          lmm_system_t sys,
+                          void (*solve) (lmm_system_t))
+{
+  Action *action = NULL;
+  double min = -1;
+  double value = -1;
+
+  solve(sys);
+
+  ActionList::iterator it(running_actions->begin()), itend(running_actions->end());
+  for(; it != itend ; ++it) {
+    action = &*it;
+    value = lmm_variable_getvalue(action->getVariable());
+    if ((value > 0) || (action->getMaxDuration() >= 0))
+      break;
+  }
+
+  if (!action)
+    return -1.0;
+
+  if (value > 0) {
+    if (action->getRemains() > 0)
+      min = action->getRemainsNoUpdate() / value;
+    else
+      min = 0.0;
+    if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min))
+      min = action->getMaxDuration();
+  } else
+    min = action->getMaxDuration();
+
+
+  for (++it; it != itend; ++it) {
+  action = &*it;
+    value = lmm_variable_getvalue(action->getVariable());
+    if (value > 0) {
+      if (action->getRemains() > 0)
+        value = action->getRemainsNoUpdate() / value;
+      else
+        value = 0.0;
+      if (value < min) {
+        min = value;
+        XBT_DEBUG("Updating min (value) with %p: %f", action, min);
+      }
+    }
+    if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) {
+      min = action->getMaxDuration();
+      XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
+    }
+  }
+  XBT_DEBUG("min value : %f", min);
+
+  return min;
 }
 
-xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model,
-                                                    surf_workstation_t src, surf_workstation_t dst){
-  return model->getRoute((WorkstationCLM03Ptr)surf_workstation_resource_priv(src),(WorkstationCLM03Ptr)surf_workstation_resource_priv(dst));
+void Model::updateActionsState(double now, double delta)
+{
+  if (p_updateMechanism == UM_FULL)
+  updateActionsStateFull(now, delta);
+  else if (p_updateMechanism == UM_LAZY)
+  updateActionsStateLazy(now, delta);
+  else
+  xbt_die("Invalid cpu update mechanism!");
 }
 
-surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
-  model->communicate(src, dst, size, rate);
+void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)
+{
+ THROW_UNIMPLEMENTED;
 }
 
-const char *surf_resource_name(surf_resource_t resource){
-  return resource->m_name;
+void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
+{
+  THROW_UNIMPLEMENTED;
 }
 
-xbt_dict_t surf_resource_get_properties(surf_resource_t resource){
-  return resource->m_properties;
 }
+}
+
+/************
+ * Resource *
+ ************/
+
+namespace simgrid {
+namespace surf {
+
+Resource::Resource(Model *model, const char *name)
+  : Resource(model, name, 1/*ON*/)
+{}
+
+Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
+  : Resource(model, name, constraint, 1/*ON*/)
+{}
+  
+Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn)
+  : p_name(xbt_strdup(name))
+  , p_model(model)
+  , m_isOn(initiallyOn)
+  , p_constraint(constraint)
+{}
+
+Resource::Resource(Model *model, const char *name, int initiallyOn)
+  : p_name(xbt_strdup(name))
+  , p_model(model)
+  , m_isOn(initiallyOn)
+{}
+
 
-e_surf_resource_state_t surf_resource_get_state(surf_resource_t resource){
-  return resource->getState();
+Resource::~Resource() {
+  xbt_free((void*)p_name);
 }
 
-surf_action_t surf_workstation_sleep(surf_workstation_t resource, double duration){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->sleep(duration);
+bool Resource::isOn() {
+  return m_isOn;
+}
+bool Resource::isOff() {
+  return ! m_isOn;
 }
 
-double surf_workstation_get_speed(surf_workstation_t resource, double load){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->getSpeed(load);
+void Resource::turnOn()
+{
+  if (!m_isOn) {
+    m_isOn = true;
+  }
 }
 
-double surf_workstation_get_available_speed(surf_workstation_t resource){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->getAvailableSpeed();
+void Resource::turnOff()
+{
+  if (m_isOn) {
+    m_isOn = false;
+  }
 }
 
-int surf_workstation_get_core(surf_workstation_t resource){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->getCore();
+Model *Resource::getModel() {
+  return p_model;
 }
 
-surf_action_t surf_workstation_execute(surf_workstation_t resource, double size){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->execute(size);
+const char *Resource::getName() {
+  return p_name;
 }
 
-surf_action_t surf_workstation_communicate(surf_workstation_t workstation_src, surf_workstation_t workstation_dst, double size, double rate){
-  return surf_workstation_model->communicate((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation_src),(surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation_dst), size, rate);
+lmm_constraint_t Resource::getConstraint() {
+  return p_constraint;
 }
 
-surf_action_t surf_workstation_open(surf_workstation_t workstation, const char* mount, const char* path){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation))->open(mount, path);
+}
 }
 
-surf_action_t surf_workstation_close(surf_workstation_t workstation, surf_file_t fd){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation))->close(fd);
+/**********
+ * Action *
+ **********/
+
+const char *surf_action_state_names[6] = {
+  "SURF_ACTION_READY",
+  "SURF_ACTION_RUNNING",
+  "SURF_ACTION_FAILED",
+  "SURF_ACTION_DONE",
+  "SURF_ACTION_TO_FREE",
+  "SURF_ACTION_NOT_IN_THE_SYSTEM"
+};
+
+/* added to manage the communication action's heap */
+void surf_action_lmm_update_index_heap(void *action, int i) {
+  static_cast<simgrid::surf::Action*>(action)->updateIndexHeap(i);
 }
 
-int surf_workstation_unlink(surf_workstation_t workstation, surf_file_t fd){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation))->unlink(fd);
+namespace simgrid {
+namespace surf {
+
+void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
+                        lmm_variable_t var)
+{
+  m_remains = cost;
+  m_start = surf_get_clock();
+  m_cost = cost;
+  p_model = model;
+  p_variable = var;
+  if (failed)
+    p_stateSet = getModel()->getFailedActionSet();
+  else
+    p_stateSet = getModel()->getRunningActionSet();
+
+  p_stateSet->push_back(*this);
 }
 
-surf_action_t surf_workstation_ls(surf_workstation_t workstation, const char* mount, const char *path){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation))->ls(mount, path);
+Action::Action(simgrid::surf::Model *model, double cost, bool failed)
+{
+  initialize(model, cost, failed);
 }
 
-size_t surf_workstation_get_size(surf_workstation_t workstation, surf_file_t fd){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(workstation))->getSize(fd);
+Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
+{
+  initialize(model, cost, failed, var);
 }
 
-surf_action_t surf_workstation_read(surf_workstation_t resource, void *ptr, size_t size, surf_file_t fd){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->read(ptr, size, fd);
+Action::~Action() {
+  xbt_free(p_category);
 }
 
-surf_action_t surf_workstation_write(surf_workstation_t resource, const void *ptr, size_t size, surf_file_t fd){
-  return ((surf_workstation_CLM03_t)surf_workstation_resource_priv(resource))->write(ptr, size, fd);
+void Action::finish() {
+    m_finish = surf_get_clock();
 }
 
-int surf_network_link_is_shared(surf_network_link_t link){
-  return link->isShared();
+e_surf_action_state_t Action::getState()
+{
+  if (p_stateSet ==  getModel()->getReadyActionSet())
+    return SURF_ACTION_READY;
+  if (p_stateSet ==  getModel()->getRunningActionSet())
+    return SURF_ACTION_RUNNING;
+  if (p_stateSet ==  getModel()->getFailedActionSet())
+    return SURF_ACTION_FAILED;
+  if (p_stateSet ==  getModel()->getDoneActionSet())
+    return SURF_ACTION_DONE;
+  return SURF_ACTION_NOT_IN_THE_SYSTEM;
+}
+
+void Action::setState(e_surf_action_state_t state)
+{
+  //surf_action_state_t action_state = &(action->model_type->states);
+  XBT_IN("(%p,%s)", this, surf_action_state_names[state]);
+  p_stateSet->erase(p_stateSet->iterator_to(*this));
+  if (state == SURF_ACTION_READY)
+    p_stateSet = getModel()->getReadyActionSet();
+  else if (state == SURF_ACTION_RUNNING)
+    p_stateSet = getModel()->getRunningActionSet();
+  else if (state == SURF_ACTION_FAILED)
+    p_stateSet = getModel()->getFailedActionSet();
+  else if (state == SURF_ACTION_DONE)
+    p_stateSet = getModel()->getDoneActionSet();
+  else
+    p_stateSet = NULL;
+
+  if (p_stateSet)
+    p_stateSet->push_back(*this);
+  XBT_OUT();
+}
+
+double Action::getBound()
+{
+  return (p_variable) ? lmm_variable_getbound(p_variable) : 0;
 }
 
-double surf_network_link_get_bandwidth(surf_network_link_t link){
-  return link->getBandwidth();
+void Action::setBound(double bound)
+{
+  XBT_IN("(%p,%g)", this, bound);
+  if (p_variable)
+    lmm_update_variable_bound(getModel()->getMaxminSystem(), p_variable, bound);
+
+  if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock())
+    heapRemove(getModel()->getActionHeap());
+  XBT_OUT();
 }
 
-double surf_network_link_get_latency(surf_network_link_t link){
-  return link->getLatency();
+double Action::getStartTime()
+{
+  return m_start;
 }
 
-const char *surf_cpu_name(surf_cpu_t resource){
-  return resource->m_name;
+double Action::getFinishTime()
+{
+  /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
+  return m_remains == 0 ? m_finish : -1;
 }
 
-surf_action_t surf_cpu_execute(surf_cpu_t cpu, double size){
-  return cpu->execute(size);
+void Action::setData(void* data)
+{
+  p_data = data;
 }
 
-surf_action_t surf_cpu_sleep(surf_cpu_t cpu, double duration){
-  return cpu->sleep(duration);
+void Action::setCategory(const char *category)
+{
+  XBT_IN("(%p,%s)", this, category);
+  p_category = xbt_strdup(category);
+  XBT_OUT();
 }
 
-double surf_action_get_start_time(surf_action_t action){
-  return action->m_start;
+void Action::ref(){
+  m_refcount++;
 }
 
-double surf_action_get_finish_time(surf_action_t action){
-  return action->m_finish;
+void Action::setMaxDuration(double duration)
+{
+  XBT_IN("(%p,%g)", this, duration);
+  m_maxDuration = duration;
+  if (getModel()->getUpdateMechanism() == UM_LAZY)      // remove action from the heap
+    heapRemove(getModel()->getActionHeap());
+  XBT_OUT();
 }
 
-double surf_action_get_remains(surf_action_t action){
-  return action->m_remains;
+void Action::gapRemove() {}
+
+void Action::setPriority(double priority)
+{
+  XBT_IN("(%p,%g)", this, priority);
+  m_priority = priority;
+  lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
+
+  if (getModel()->getUpdateMechanism() == UM_LAZY)
+    heapRemove(getModel()->getActionHeap());
+  XBT_OUT();
 }
 
-void surf_action_unref(surf_action_t action){
-  action->unref();
+void Action::cancel(){
+  setState(SURF_ACTION_FAILED);
+  if (getModel()->getUpdateMechanism() == UM_LAZY) {
+    if (action_lmm_hook.is_linked())
+      getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
+    heapRemove(getModel()->getActionHeap());
+  }
 }
 
-void surf_action_suspend(surf_action_t action){
-  action->suspend();
+int Action::unref(){
+  m_refcount--;
+  if (!m_refcount) {
+    if (action_hook.is_linked())
+      p_stateSet->erase(p_stateSet->iterator_to(*this));
+    if (getVariable())
+      lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
+    if (getModel()->getUpdateMechanism() == UM_LAZY) {
+      /* remove from heap */
+      heapRemove(getModel()->getActionHeap());
+      if (action_lmm_hook.is_linked())
+        getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
+    }
+    delete this;
+    return 1;
+  }
+  return 0;
 }
 
-void surf_action_resume(surf_action_t action){
-  action->suspend();
+void Action::suspend()
+{
+  XBT_IN("(%p)", this);
+  if (m_suspended != 2) {
+    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
+    m_suspended = 1;
+    if (getModel()->getUpdateMechanism() == UM_LAZY)
+      heapRemove(getModel()->getActionHeap());
+  }
+  XBT_OUT();
 }
 
-void surf_action_cancel(surf_action_t action){
-  action->cancel();
+void Action::resume()
+{
+  XBT_IN("(%p)", this);
+  if (m_suspended != 2) {
+    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), m_priority);
+    m_suspended = 0;
+    if (getModel()->getUpdateMechanism() == UM_LAZY)
+      heapRemove(getModel()->getActionHeap());
+  }
+  XBT_OUT();
 }
 
-void surf_action_set_priority(surf_action_t action, double priority){
-  action->setPriority(priority);
+bool Action::isSuspended()
+{
+  return m_suspended == 1;
+}
+/* insert action on heap using a given key and a hat (heap_action_type)
+ * a hat can be of three types for communications:
+ *
+ * NORMAL = this is a normal heap entry stating the date to finish transmitting
+ * LATENCY = this is a heap entry to warn us when the latency is payed
+ * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
+ */
+void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat)
+{
+  m_hat = hat;
+  xbt_heap_push(heap, this, key);
 }
 
-void surf_action_set_category(surf_action_t action, const char *category){
-  action->setCategory(category);
+void Action::heapRemove(xbt_heap_t heap)
+{
+  m_hat = NOTSET;
+  if (m_indexHeap >= 0) {
+    xbt_heap_remove(heap, m_indexHeap);
+  }
 }
 
-void *surf_action_get_data(surf_action_t action){
-  return action->p_data;
+void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat)
+{
+  m_hat = hat;
+  if (m_indexHeap >= 0) {
+    xbt_heap_update(heap, m_indexHeap, key);
+  }else{
+    xbt_heap_push(heap, this, key);
+  }
 }
 
-void surf_action_set_data(surf_action_t action, void *data){
-  action->p_data = data;
+void Action::updateIndexHeap(int i) {
+  m_indexHeap = i;
 }
 
-e_surf_action_state_t surf_action_get_state(surf_action_t action){
-  return action->getState();
+double Action::getRemains()
+{
+  XBT_IN("(%p)", this);
+  /* update remains before return it */
+  if (getModel()->getUpdateMechanism() == UM_LAZY)      /* update remains before return it */
+    updateRemainingLazy(surf_get_clock());
+  XBT_OUT();
+  return m_remains;
 }
 
-int surf_action_get_cost(surf_action_t action){
-  return action->m_cost;
+double Action::getRemainsNoUpdate()
+{
+  return m_remains;
 }
 
-surf_file_t surf_storage_action_get_file(surf_storage_action_lmm_t action){
-  return action->p_file;
+//FIXME split code in the right places
+void Action::updateRemainingLazy(double now)
+{
+  double delta = 0.0;
+
+  if(getModel() == surf_network_model)
+  {
+    if (m_suspended != 0)
+      return;
+  }
+  else
+  {
+    xbt_assert(p_stateSet == getModel()->getRunningActionSet(),
+        "You're updating an action that is not running.");
+
+      /* bogus priority, skip it */
+    xbt_assert(m_priority > 0,
+        "You're updating an action that seems suspended.");
+  }
+
+  delta = now - m_lastUpdate;
+
+  if (m_remains > 0) {
+    XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate);
+    double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision);
+
+    if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) {
+      simgrid::surf::Resource *cpu = static_cast<simgrid::surf::Resource*>(
+        lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0)));
+      TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate);
+    }
+    XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains);
+  }
+
+  if(getModel() == surf_network_model)
+  {
+    if (m_maxDuration != NO_MAX_DURATION)
+      double_update(&m_maxDuration, delta, sg_surf_precision);
+
+    //FIXME: duplicated code
+    if ((m_remains <= 0) &&
+        (lmm_get_variable_weight(getVariable()) > 0)) {
+      finish();
+      setState(SURF_ACTION_DONE);
+      heapRemove(getModel()->getActionHeap());
+    } else if (((m_maxDuration != NO_MAX_DURATION)
+        && (m_maxDuration <= 0))) {
+      finish();
+      setState(SURF_ACTION_DONE);
+      heapRemove(getModel()->getActionHeap());
+    }
+  }
+
+  m_lastUpdate = now;
+  m_lastValue = lmm_variable_getvalue(getVariable());
 }
 
-xbt_dict_t surf_storage_action_get_ls_dict(surf_storage_action_lmm_t action){
-  return action->p_lsDict;
+}
 }