Rename model methods action_use/free to action_ref/unref

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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 8ac0021..2c91cc3 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -13,7 +13,7 @@
 #include "xbt/log.h"
 
 typedef struct network_card_Constant {
-  char *name;
+  s_surf_resource_t generic_resource;
   int id;
 } s_network_card_Constant_t, *network_card_Constant_t;
 
@@ -31,22 +31,17 @@ static random_data_t random_latency = NULL;
 static int card_number = 0;
 static int host_number = 0;
 
-static void network_card_free(void *nw_card)
-{
-  free(((network_card_Constant_t) nw_card)->name);
-  free(nw_card);
-}
-
 static int network_card_new(const char *card_name)
 {
   network_card_Constant_t card =
-         surf_model_resource_by_name(surf_network_model,card_name);
+    surf_model_resource_by_name(surf_network_model, card_name);
 
   if (!card) {
     card = xbt_new0(s_network_card_Constant_t, 1);
-    card->name = xbt_strdup(card_name);
+    card->generic_resource.name = xbt_strdup(card_name);
     card->id = card_number++;
-    xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card, network_card_free);
+    xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
+                 surf_resource_free);
   }
   return card->id;
 }
@@ -85,17 +80,12 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
 }
 
-static const char *get_resource_name(void *resource_id)
-{
-  return ((network_card_Constant_t) resource_id)->name;
-}
-
 static int resource_used(void *resource_id)
 {
   return 0;
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -106,7 +96,7 @@ 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)
 {
   action->refcount++;
 }
@@ -121,18 +111,10 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-static void action_change_state(surf_action_t action,
-                                e_surf_action_state_t state)
-{
-  surf_action_change_state(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   surf_action_network_Constant_t action = NULL;
-  xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
   double min = -1.0;
 
   xbt_swag_foreach(action, running_actions) {
@@ -151,8 +133,7 @@ static void update_actions_state(double now, double delta)
 {
   surf_action_network_Constant_t action = NULL;
   surf_action_network_Constant_t next_action = NULL;
-  xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     if (action->latency > 0) {
@@ -169,11 +150,11 @@ static void update_actions_state(double now, double delta)
 
     if (action->generic_action.remains <= 0) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
                (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -194,7 +175,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   network_card_Constant_t card_src = src;
   network_card_Constant_t card_dst = dst;
 
-  XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
+  XBT_IN4("(%s,%s,%g,%g)", card_src->generic_resource.name, card_dst->generic_resource.name, size, rate);
 
   action = xbt_new0(s_surf_action_network_Constant_t, 1);
 
@@ -204,7 +185,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   action->generic_action.max_duration = NO_MAX_DURATION;
   action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
-  action->generic_action.model_type = (surf_model_t) surf_network_model;
+  action->generic_action.model_type = surf_network_model;
   action->suspended = 0;
 
   action->latency = random_generate(random_latency);
@@ -212,10 +193,10 @@ static surf_action_t communicate(void *src, void *dst, double size,
 
   if (action->latency <= 0.0)
     action->generic_action.state_set =
-      surf_network_model->common_public.states.done_action_set;
+      surf_network_model->states.done_action_set;
   else
     action->generic_action.state_set =
-      surf_network_model->common_public.states.running_action_set;
+      surf_network_model->states.running_action_set;
 
   xbt_swag_insert(action, action->generic_action.state_set);
 
@@ -238,11 +219,6 @@ static int get_route_size(void *src, void *dst)
   return 0;
 }
 
-static const char *get_link_name(const void *link)
-{
-  DIE_IMPOSSIBLE;
-}
-
 static double get_link_bandwidth(const void *link)
 {
   DIE_IMPOSSIBLE;
@@ -286,11 +262,7 @@ static void action_set_max_duration(surf_action_t action, double duration)
 
 static void finalize(void)
 {
-  surf_model_exit((surf_model_t)surf_network_model);
-
-  free(surf_network_model->extension_public);
-
-  free(surf_network_model);
+  surf_model_exit(surf_network_model);
   surf_network_model = NULL;
 
   card_number = 0;
@@ -298,51 +270,36 @@ static void finalize(void)
 
 static void surf_network_model_init_internal(void)
 {
-  surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
-  surf_model_init((surf_model_t)surf_network_model);
-
-  surf_network_model->extension_public =
-    xbt_new0(s_surf_network_model_extension_public_t, 1);
-
-  surf_network_model->common_public.get_resource_name = get_resource_name;
-  surf_network_model->common_public.action_get_state = surf_action_get_state;
-  surf_network_model->common_public.action_get_start_time =
-    surf_action_get_start_time;
-  surf_network_model->common_public.action_get_finish_time =
-    surf_action_get_finish_time;
-  surf_network_model->common_public.action_free = action_free;
-  surf_network_model->common_public.action_use = action_use;
-  surf_network_model->common_public.action_cancel = action_cancel;
-  surf_network_model->common_public.action_recycle = action_recycle;
-  surf_network_model->common_public.action_change_state =
-    action_change_state;
-  surf_network_model->common_public.action_set_data = surf_action_set_data;
-  surf_network_model->common_public.name = "network";
-
-  surf_network_model->common_private->resource_used = resource_used;
-  surf_network_model->common_private->share_resources = share_resources;
-  surf_network_model->common_private->update_actions_state =
+  surf_network_model = surf_model_init();
+
+  surf_network_model->name = "network constant";
+  surf_network_model->action_unref = action_unref;
+  surf_network_model->action_ref = action_ref;
+  surf_network_model->action_cancel = action_cancel;
+  surf_network_model->action_recycle = action_recycle;
+
+  surf_network_model->model_private->resource_used = resource_used;
+  surf_network_model->model_private->share_resources = share_resources;
+  surf_network_model->model_private->update_actions_state =
     update_actions_state;
-  surf_network_model->common_private->update_resource_state =
+  surf_network_model->model_private->update_resource_state =
     update_resource_state;
-  surf_network_model->common_private->finalize = finalize;
-
-  surf_network_model->common_public.suspend = action_suspend;
-  surf_network_model->common_public.resume = action_resume;
-  surf_network_model->common_public.is_suspended = action_is_suspended;
-  surf_cpu_model->common_public.set_max_duration = action_set_max_duration;
-
-  surf_network_model->extension_public->communicate = communicate;
-  surf_network_model->extension_public->get_route = get_route;
-  surf_network_model->extension_public->get_route_size = get_route_size;
-  surf_network_model->extension_public->get_link_name = get_link_name;
-  surf_network_model->extension_public->get_link_bandwidth =
+  surf_network_model->model_private->finalize = finalize;
+
+  surf_network_model->suspend = action_suspend;
+  surf_network_model->resume = action_resume;
+  surf_network_model->is_suspended = action_is_suspended;
+  surf_cpu_model->set_max_duration = action_set_max_duration;
+
+  surf_network_model->extension.network.communicate = communicate;
+  surf_network_model->extension.network.get_route = get_route;
+  surf_network_model->extension.network.get_route_size = get_route_size;
+  surf_network_model->extension.network.get_link_bandwidth =
     get_link_bandwidth;
-  surf_network_model->extension_public->get_link_latency = get_link_latency;
-  surf_network_model->extension_public->link_shared = link_shared;
+  surf_network_model->extension.network.get_link_latency = get_link_latency;
+  surf_network_model->extension.network.link_shared = link_shared;
 
-  surf_network_model->common_public.get_properties = get_properties;
+  surf_network_model->get_properties = get_properties;
 
   if (!random_latency)
     random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
@@ -358,5 +315,5 @@ void surf_network_model_init_Constant(const char *filename)
   xbt_dynar_push(model_list, &surf_network_model);
 
   update_model_description(surf_network_model_description,
-                           "Constant", (surf_model_t) surf_network_model);
+                           "Constant", surf_network_model);
 }