X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/865f97c868ce92518b1cf4f23e23bd1b16b7917c..d7417d92e963c0d6ed8443454a56c85a3728d214:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index a229326039..54f40fa410 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -17,24 +17,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
 
 surf_model_t surf_workstation_model = NULL;
 
-static void workstation_free(void *workstation)
-{
-  free(((workstation_CLM03_t) workstation)->name);
-  free(workstation);
-}
-
 static workstation_CLM03_t workstation_new(const char *name,
                                            void *cpu, void *card)
 {
   workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
-  workstation->model = surf_workstation_model;
-  workstation->name = xbt_strdup(name);
+  workstation->generic_resource.model = surf_workstation_model;
+  workstation->generic_resource.name = xbt_strdup(name);
   workstation->cpu = cpu;
   workstation->network_card = card;
 
   xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
-               workstation, workstation_free);
+               workstation, surf_resource_free);
 
   return workstation;
 }
@@ -54,11 +48,6 @@ void create_workstations(void)
   }
 }
 
-static const char *get_resource_name(void *resource_id)
-{
-  return ((workstation_CLM03_t) resource_id)->name;
-}
-
 static int resource_used(void *resource_id)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
@@ -79,12 +68,12 @@ static void parallel_action_use(surf_action_t action)
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    return surf_network_model->common_public.action_free(action);
+    return surf_network_model->action_unref(action);
   else if (action->model_type == surf_cpu_model)
-    return surf_cpu_model->common_public.action_free(action);
+    return surf_cpu_model->action_unref(action);
   else if (action->model_type == surf_workstation_model)
     return parallel_action_free(action);
   else
@@ -92,12 +81,12 @@ static int action_free(surf_action_t action)
   return 0;
 }
 
-static void action_use(surf_action_t action)
+static void action_ref(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.action_use(action);
+    surf_network_model->action_ref(action);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.action_use(action);
+    surf_cpu_model->action_ref(action);
   else if (action->model_type == surf_workstation_model)
     parallel_action_use(action);
   else
@@ -108,9 +97,9 @@ static void action_use(surf_action_t action)
 static void action_cancel(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.action_cancel(action);
+    surf_network_model->action_cancel(action);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.action_cancel(action);
+    surf_cpu_model->action_cancel(action);
   else if (action->model_type == surf_workstation_model)
     parallel_action_cancel(action);
   else
@@ -118,15 +107,15 @@ static void action_cancel(surf_action_t action)
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void ws_action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.action_change_state(action, state);
+    surf_network_model->action_state_set(action, state);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.action_change_state(action, state);
+    surf_cpu_model->action_state_set(action, state);
   else if (action->model_type == surf_workstation_model)
-    surf_action_change_state(action, state);
+    surf_action_state_set(action, state);
   else
     DIE_IMPOSSIBLE;
   return;
@@ -164,9 +153,9 @@ static surf_action_t action_sleep(void *workstation, double duration)
 static void action_suspend(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.suspend(action);
+    surf_network_model->suspend(action);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.suspend(action);
+    surf_cpu_model->suspend(action);
   else
     DIE_IMPOSSIBLE;
 }
@@ -174,9 +163,9 @@ static void action_suspend(surf_action_t action)
 static void action_resume(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.resume(action);
+    surf_network_model->resume(action);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.resume(action);
+    surf_cpu_model->resume(action);
   else
     DIE_IMPOSSIBLE;
 }
@@ -184,18 +173,18 @@ static void action_resume(surf_action_t action)
 static int action_is_suspended(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    return surf_network_model->common_public.is_suspended(action);
+    return surf_network_model->is_suspended(action);
   if (action->model_type == surf_cpu_model)
-    return surf_cpu_model->common_public.is_suspended(action);
+    return surf_cpu_model->is_suspended(action);
   DIE_IMPOSSIBLE;
 }
 
 static void action_set_max_duration(surf_action_t action, double duration)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.set_max_duration(action, duration);
+    surf_network_model->set_max_duration(action, duration);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.set_max_duration(action, duration);
+    surf_cpu_model->set_max_duration(action, duration);
   else
     DIE_IMPOSSIBLE;
 }
@@ -203,9 +192,9 @@ static void action_set_max_duration(surf_action_t action, double duration)
 static void action_set_priority(surf_action_t action, double priority)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->common_public.set_priority(action, priority);
+    surf_network_model->set_priority(action, priority);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->common_public.set_priority(action, priority);
+    surf_cpu_model->set_priority(action, priority);
   else
     DIE_IMPOSSIBLE;
 }
@@ -241,8 +230,8 @@ static double get_available_speed(void *workstation)
 
 static xbt_dict_t get_properties(void *workstation)
 {
-  return surf_cpu_model->
-    common_public.get_properties(((workstation_CLM03_t) workstation)->cpu);
+  return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)->
+                                        cpu);
 }
 
 static surf_action_t execute_parallel_task(int workstation_nb,
@@ -275,11 +264,6 @@ static int get_route_size(void *src, void *dst)
                            workstation_dst->network_card);
 }
 
-static const char *get_link_name(const void *link)
-{
-  return surf_network_model->extension.network.get_link_name(link);
-}
-
 static double get_link_bandwidth(const void *link)
 {
   return surf_network_model->extension.network.get_link_bandwidth(link);
@@ -298,48 +282,32 @@ static int link_shared(const void *link)
 static void finalize(void)
 {
   surf_model_exit(surf_workstation_model);
-
-  free(surf_workstation_model);
   surf_workstation_model = NULL;
 }
 
 static void surf_workstation_model_init_internal(void)
 {
-  surf_workstation_model = xbt_new0(s_surf_model_t, 1);
-
-  surf_model_init(surf_workstation_model);
-/*   surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
-
-  surf_workstation_model->common_public.get_resource_name = get_resource_name;
-  surf_workstation_model->common_public.action_get_state =
-    surf_action_get_state;
-  surf_workstation_model->common_public.action_get_start_time =
-    surf_action_get_start_time;
-  surf_workstation_model->common_public.action_get_finish_time =
-    surf_action_get_finish_time;
-  surf_workstation_model->common_public.action_free = action_free;
-  surf_workstation_model->common_public.action_use = action_use;
-  surf_workstation_model->common_public.action_cancel = action_cancel;
-  surf_workstation_model->common_public.action_change_state =
-    action_change_state;
-  surf_workstation_model->common_public.action_set_data =
-    surf_action_set_data;
-  surf_workstation_model->common_public.name = "Workstation";
-
-  surf_workstation_model->common_private->resource_used = resource_used;
-  surf_workstation_model->common_private->share_resources = share_resources;
-  surf_workstation_model->common_private->update_actions_state =
+  surf_workstation_model = surf_model_init();
+
+  surf_workstation_model->name = "Workstation";
+  surf_workstation_model->action_unref = action_unref;
+  surf_workstation_model->action_ref = action_ref;
+  surf_workstation_model->action_cancel = action_cancel;
+  surf_workstation_model->action_state_set = ws_action_state_set;
+
+  surf_workstation_model->model_private->resource_used = resource_used;
+  surf_workstation_model->model_private->share_resources = share_resources;
+  surf_workstation_model->model_private->update_actions_state =
     update_actions_state;
-  surf_workstation_model->common_private->update_resource_state =
+  surf_workstation_model->model_private->update_resource_state =
     update_resource_state;
-  surf_workstation_model->common_private->finalize = finalize;
+  surf_workstation_model->model_private->finalize = finalize;
 
-  surf_workstation_model->common_public.suspend = action_suspend;
-  surf_workstation_model->common_public.resume = action_resume;
-  surf_workstation_model->common_public.is_suspended = action_is_suspended;
-  surf_workstation_model->common_public.set_max_duration =
-    action_set_max_duration;
-  surf_workstation_model->common_public.set_priority = action_set_priority;
+  surf_workstation_model->suspend = action_suspend;
+  surf_workstation_model->resume = action_resume;
+  surf_workstation_model->is_suspended = action_is_suspended;
+  surf_workstation_model->set_max_duration = action_set_max_duration;
+  surf_workstation_model->set_priority = action_set_priority;
 
   surf_workstation_model->extension.workstation.execute = execute;
   surf_workstation_model->extension.workstation.sleep = action_sleep;
@@ -349,7 +317,7 @@ static void surf_workstation_model_init_internal(void)
     get_available_speed;
 
   /*manage the properties of the workstation */
-  surf_workstation_model->common_public.get_properties = get_properties;
+  surf_workstation_model->get_properties = get_properties;
 
   surf_workstation_model->extension.workstation.communicate = communicate;
   surf_workstation_model->extension.workstation.execute_parallel_task =
@@ -357,7 +325,6 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_route = get_route;
   surf_workstation_model->extension.workstation.get_route_size =
     get_route_size;
-  surf_workstation_model->extension.workstation.get_link_name = get_link_name;
   surf_workstation_model->extension.workstation.get_link_bandwidth =
     get_link_bandwidth;
   surf_workstation_model->extension.workstation.get_link_latency =