Start to add second CPU model for the VM layer

[simgrid.git] / src / surf / vm_workstation.c

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index 8c1326c8b309f03ea63dca15b0f02f91d76fa311..ffa4ad06bc92a3f25949280cd52d1c10c9ca0fc3 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -7,42 +7,76 @@
 #include "xbt/ex.h"
 #include "xbt/dict.h"
 #include "portable.h"
-#include "surf_private.h"
 #include "surf/surf_resource.h"
 #include "simgrid/sg_config.h"
 
+#include "workstation_private.h"
+
 typedef struct workstation_VM2013 {
-  s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
-  surf_resource_t ind_physical_workstation;  // Pointer to the host OS
+  s_workstation_CLM03_t ws;    /* a VM is a ''v''host */
+
+  workstation_CLM03_t sub_ws;  // Pointer to the ''host'' OS
   e_msg_vm_state_t current_state;           // See include/msg/datatypes.h
 } s_workstation_VM2013_t, *workstation_VM2013_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm_workstation, surf,
                                 "Logging specific to the SURF VM workstation module");
 
+
+
+
 surf_model_t surf_vm_workstation_model = NULL;
 
 static void vm_ws_create(const char *name, void *ind_phys_workstation)
 {
   workstation_VM2013_t vm_ws = xbt_new0(s_workstation_VM2013_t, 1);
-// TODO Complete the surf vm workstation model
-  vm_ws->generic_resource.model = surf_vm_workstation_model;
-  vm_ws->generic_resource.name = xbt_strdup(name);
- // ind means ''indirect'' that this is a reference on the whole dict_elm structure (i.e not on the surf_resource_private infos)
-  vm_ws->ind_physical_workstation = ind_phys_workstation;
+
+  // //// WORKSTATION  RELATED STUFF ////
+  __init_ws(&(vm_ws->ws), name);
+  // Override the model with the current VM one.
+  vm_ws->ws.generic_resource.model = surf_vm_workstation_model;
+
+  // //// CPU  RELATED STUFF ////
+  vm_ws->ws->generic_resource.model.extension.cpu=cpu_model_cas01(0);
+
+ // //// NET RELATED STUFF ////
+  // Bind virtual net_elm to the host
+  // TODO rebind each time you migrate a VM
+  // TODO check how network requests are scheduled between distinct processes competing for the same card.
+  vm_ws->ws.net_elm=xbt_lib_get_or_null(host_lib,vm_ws->physical_ws->generic_resource.name,ROUTING_HOST_LEVEL);
+  xbt_lib_set(host_lib, name, ROUTING_HOST_LEVEL, vm_ws->ws.net_elm);
+
+  // //// STORAGE RELATED STUFF ////
+
+  // ind means ''indirect'' that this is a reference on the whole dict_elm structure (i.e not on the surf_resource_private infos)
+  vm_ws->physical_ws = surf_workstation_resource_priv(ind_phys_workstation);
   vm_ws->current_state=msg_vm_state_created,
   xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, vm_ws);
+
 }
 
+/*
+ * Update the physical host of the given VM
+ */
+static void vm_ws_migrate(void *ind_vm_workstation, void *ind_dest_phys_workstation)
+{ 
+   /* ind_phys_workstation equals to smx_host_t */
+   workstation_VM2013_t vm_ws = surf_workstation_resource_priv(ind_vm_workstation);
+   xbt_assert(vm_ws);
+
+   /* do something */
+
+   vm_ws->physical_workstation = surf_workstation_resource_priv(ind_dest_phys_workstation);
+}
 
 /*
  * A physical host does not disapper in the current SimGrid code, but a VM may
  * disapper during a simulation.
  */
-static void vm_ws_destroy(void *ind_phys_workstation)
+static void vm_ws_destroy(void *ind_vm_workstation)
 { 
        /* ind_phys_workstation equals to smx_host_t */
-       workstation_VM2013_t vm_ws = surf_workstation_resource_priv(ind_phys_workstation);
+       workstation_VM2013_t vm_ws = surf_workstation_resource_priv(ind_vm_workstation);
        xbt_assert(vm_ws);
        xbt_assert(vm_ws->generic_resource.model == surf_vm_workstation_model);
 
@@ -61,6 +95,17 @@ static int vm_ws_get_state(void *ind_vm_ws){
 static void vm_ws_set_state(void *ind_vm_ws, int state){
         ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state=state;
 }
+
+/*
+ * A surf level object will be useless in the upper layer. Returing the name
+ * will be simple and suffcient.
+ **/
+static const char *vm_ws_get_phys_host(void *ind_vm_ws)
+{
+       workstation_VM2013_t vm_ws = surf_workstation_resource_priv(ind_vm_ws);
+       return vm_ws->physical_workstation->name;
+}
+
 static void surf_vm_workstation_model_init_internal(void)
 {
   surf_vm_workstation_model = surf_model_init();
@@ -70,6 +115,8 @@ static void surf_vm_workstation_model_init_internal(void)
   surf_vm_workstation_model->extension.vm_workstation.create = vm_ws_create;
   surf_vm_workstation_model->extension.vm_workstation.set_state = vm_ws_set_state;
   surf_vm_workstation_model->extension.vm_workstation.get_state = vm_ws_get_state;
+  surf_vm_workstation_model->extension.vm_workstation.migrate = vm_ws_migrate;
+  surf_vm_workstation_model->extension.vm_workstation.get_phys_host = vm_ws_get_phys_host;
   surf_vm_workstation_model->extension.vm_workstation.destroy = vm_ws_destroy;
 
 }