Still fixing bugs - Adrien

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

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index d5cb5d6..94933eb 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -22,13 +22,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm_workstation, surf,
 
 surf_model_t surf_vm_workstation_model = NULL;
 
-static void vm_ws_create (const char *name, void *phys_workstation)
+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);
-  vm_ws->physical_workstation = phys_workstation;
+ // 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_workstation = 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);
 }
@@ -38,14 +39,14 @@ static void vm_ws_create (const char *name, void *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(smx_host_t host)
+static void vm_ws_destroy(void *ind_phys_workstation)
 { 
-       workstation_VM2013_t vm_ws = surf_workstation_resource_priv(host);
+       /* ind_phys_workstation equals to smx_host_t */
+       workstation_VM2013_t vm_ws = surf_workstation_resource_priv(ind_phys_workstation);
        xbt_assert(vm_ws);
        xbt_assert(vm_ws->generic_resource.model == surf_vm_workstation_model);
 
        const char *name = vm_ws->generic_resource.name;
-       /* not defined yet, but we should have  */
        /* this will call surf_resource_free() */
        xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
 
@@ -53,12 +54,12 @@ static void vm_ws_destroy(smx_host_t host)
        xbt_free(vm_ws);
 }
 
-static int vm_ws_get_state(void *vm_ws){
-       return ((workstation_VM2013_t)vm_ws)->current_state;
+static int vm_ws_get_state(void *ind_vm_ws){
+       return ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state;
 }
 
-static void vm_ws_set_state(void *vm_ws, int state){
-        ((workstation_VM2013_t)vm_ws)->current_state=state;
+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;
 }
 static void surf_vm_workstation_model_init_internal(void)
 {