#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;
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 =
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);
+ surf_resource_free);
}
return card->id;
}
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) {
return 0;
}
-static void action_use(surf_action_t action)
+static void action_ref(surf_action_t action)
{
action->refcount++;
}
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;
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);
}
}
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);
return 0;
}
-static const char *get_link_name(const void *link)
-{
- DIE_IMPOSSIBLE;
-}
-
static double get_link_bandwidth(const void *link)
{
DIE_IMPOSSIBLE;
{
surf_network_model = surf_model_init();
- surf_network_model->get_resource_name = get_resource_name;
- surf_network_model->action_get_state = surf_action_get_state;
- surf_network_model->action_get_start_time = surf_action_get_start_time;
- surf_network_model->action_get_finish_time = surf_action_get_finish_time;
- surf_network_model->action_free = action_free;
- surf_network_model->action_use = action_use;
+ 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->action_change_state = action_change_state;
- surf_network_model->action_set_data = surf_action_set_data;
- surf_network_model->name = "network";
surf_network_model->model_private->resource_used = resource_used;
surf_network_model->model_private->share_resources = share_resources;
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_name = get_link_name;
surf_network_model->extension.network.get_link_bandwidth =
get_link_bandwidth;
surf_network_model->extension.network.get_link_latency = get_link_latency;