X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9070feda0eec90cf10d562ece376fcd6a777ff7c..54b36b81cc3bd164e2a77326cd59011652d612c0:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 0bfebdbe3b..636ed1e2c1 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -17,10 +17,10 @@ surf_workstation_resource_t surf_workstation_resource = NULL;
 
 xbt_dict_t workstation_set = NULL;
 
-static workstation_t workstation_new(const char *name,
+static workstation_CLM03_t workstation_new(const char *name,
 				     void *cpu, void *card)
 {
-  workstation_t workstation = xbt_new0(s_workstation_t, 1);
+  workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
   workstation->resource = (surf_resource_t) surf_workstation_resource;
   workstation->name = xbt_strdup(name);
@@ -32,7 +32,7 @@ static workstation_t workstation_new(const char *name,
 
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_t)workstation)->name);
+  xbt_free(((workstation_CLM03_t)workstation)->name);
   xbt_free(workstation);
 }
 
@@ -63,7 +63,7 @@ static void *name_service(const char *name)
 
 static const char *get_resource_name(void *resource_id)
 {
-  return ((workstation_t) resource_id)->name;
+  return ((workstation_CLM03_t) resource_id)->name;
 }
 
 static int resource_used(void *resource_id)
@@ -75,6 +75,11 @@ static int resource_used(void *resource_id)
 
 static void action_free(surf_action_t action)
 {
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    surf_network_resource->common_public->action_free(action);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->action_free(action);
+  else DIE_IMPOSSIBLE;
   return;
 }
 
@@ -91,7 +96,11 @@ static void action_recycle(surf_action_t action)
 static void action_change_state(surf_action_t action,
 				e_surf_action_state_t state)
 {
-  surf_action_change_state(action, state);
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    surf_network_resource->common_public->action_change_state(action,state);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->action_change_state(action,state);
+  else DIE_IMPOSSIBLE;
   return;
 }
 
@@ -116,13 +125,13 @@ static void update_resource_state(void *id,
 static surf_action_t execute(void *workstation, double size)
 {
   return surf_cpu_resource->extension_public->
-      execute(((workstation_t) workstation)->cpu, size);
+      execute(((workstation_CLM03_t) workstation)->cpu, size);
 }
 
 static surf_action_t action_sleep(void *workstation, double duration)
 {
   return surf_cpu_resource->extension_public->
-      sleep(((workstation_t) workstation)->cpu, duration);
+      sleep(((workstation_CLM03_t) workstation)->cpu, duration);
 }
 
 static void action_suspend(surf_action_t action)
@@ -157,14 +166,14 @@ static surf_action_t communicate(void *workstation_src,
 				 double rate)
 {
   return surf_network_resource->extension_public->
-      communicate(((workstation_t) workstation_src)->network_card,
-		  ((workstation_t) workstation_dst)->network_card, size, rate);
+      communicate(((workstation_CLM03_t) workstation_src)->network_card,
+		  ((workstation_CLM03_t) workstation_dst)->network_card, size, rate);
 }
 
 static e_surf_cpu_state_t get_state(void *workstation)
 {
   return surf_cpu_resource->extension_public->
-      get_state(((workstation_t) workstation)->cpu);
+      get_state(((workstation_CLM03_t) workstation)->cpu);
 }
 
 static void finalize(void)