s/TRY/TRYOLD/ I'd like to introduce a TRY macro in the exception mecanism, but this...

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 0bfebdb..2949934 100644 (file)
--- 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,8 +32,8 @@ static workstation_t workstation_new(const char *name,
 
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_t)workstation)->name);
-  xbt_free(workstation);
+  free(((workstation_CLM03_t)workstation)->name);
+  free(workstation);
 }
 
 static void create_workstations(void)
@@ -46,7 +46,7 @@ static void create_workstations(void)
   xbt_dict_foreach(cpu_set, cursor, name, cpu) {
     nw_card = NULL;
     xbt_dict_get(network_card_set, name, (void *) &nw_card);
-    xbt_assert0(nw_card, "No corresponding card found");
+    xbt_assert1(nw_card, "No corresponding card found for %s",name);
     xbt_dict_set(workstation_set, name,
                 workstation_new(name, cpu, nw_card), workstation_free);
   }
@@ -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)
@@ -73,8 +73,24 @@ static int resource_used(void *resource_id)
   return 0;
 }
 
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
 {
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    return surf_network_resource->common_public->action_free(action);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    return surf_cpu_resource->common_public->action_free(action);
+  else DIE_IMPOSSIBLE;
+  return 0;
+}
+
+
+static void action_use(surf_action_t action)
+{
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    surf_network_resource->common_public->action_use(action);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->action_use(action);
+  else DIE_IMPOSSIBLE;
   return;
 }
 
@@ -91,7 +107,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 +136,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)
@@ -152,19 +172,28 @@ static int action_is_suspended(surf_action_t action)
   DIE_IMPOSSIBLE;
 }
 
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+  if(action->resource_type==(surf_resource_t)surf_network_resource)
+    surf_network_resource->common_public->set_max_duration(action,duration);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->set_max_duration(action,duration);
+  else  DIE_IMPOSSIBLE;
+}
+
 static surf_action_t communicate(void *workstation_src,
                                 void *workstation_dst, double size,
                                 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)
@@ -177,11 +206,11 @@ static void finalize(void)
                failed_action_set);
   xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
 
-  xbt_free(surf_workstation_resource->common_public);
-  xbt_free(surf_workstation_resource->common_private);
-  xbt_free(surf_workstation_resource->extension_public);
+  free(surf_workstation_resource->common_public);
+  free(surf_workstation_resource->common_private);
+  free(surf_workstation_resource->extension_public);
 
-  xbt_free(surf_workstation_resource);
+  free(surf_workstation_resource);
   surf_workstation_resource = NULL;
 }
 
@@ -214,6 +243,7 @@ static void surf_workstation_resource_init_internal(void)
   surf_workstation_resource->common_public->action_get_state =
       surf_action_get_state;
   surf_workstation_resource->common_public->action_free = action_free;
+  surf_workstation_resource->common_public->action_use = action_use;
   surf_workstation_resource->common_public->action_cancel = action_cancel;
   surf_workstation_resource->common_public->action_recycle =
       action_recycle;
@@ -234,6 +264,7 @@ static void surf_workstation_resource_init_internal(void)
   surf_workstation_resource->common_public->suspend = action_suspend;
   surf_workstation_resource->common_public->resume = action_resume;
   surf_workstation_resource->common_public->is_suspended = action_is_suspended;
+  surf_workstation_resource->common_public->set_max_duration = action_set_max_duration;
 
   surf_workstation_resource->extension_public->execute = execute;
   surf_workstation_resource->extension_public->sleep = action_sleep;