#include "xbt/str.h"
#include "xbt/log.h"
-typedef struct network_card_Constant {
- s_surf_resource_t generic_resource;
- int id;
-} s_network_card_Constant_t, *network_card_Constant_t;
-
typedef struct surf_action_network_Constant {
s_surf_action_t generic_action;
double latency;
double lat_init;
int suspended;
- network_card_Constant_t src;
- network_card_Constant_t dst;
} s_surf_action_network_Constant_t, *surf_action_network_Constant_t;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static int card_number = 0;
static int host_number = 0;
-static int network_card_new(const char *card_name)
-{
- network_card_Constant_t card =
- surf_model_resource_by_name(surf_network_model, card_name);
-
- if (!card) {
- card = xbt_new0(s_network_card_Constant_t, 1);
- 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,
- surf_resource_free);
- }
- return card->id;
-}
-
-static int src_id = -1;
-static int dst_id = -1;
-
-static void parse_route_set_endpoints(void)
-{
- src_id = network_card_new(A_surfxml_route_src);
- dst_id = network_card_new(A_surfxml_route_dst);
- route_action = A_surfxml_route_action;
-}
-
-static void parse_route_set_route(void)
-{
- char *name;
- if (src_id != -1 && dst_id != -1) {
- name = bprintf("%x#%x", src_id, dst_id);
- manage_route(route_table, name, route_action, 0);
- free(name);
- }
-}
-
static void count_hosts(void)
{
host_number++;
{
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
- surfxml_add_callback(STag_surfxml_route_cb_list,
- &parse_route_set_endpoints);
- surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
}
static int resource_used(void *resource_id)
return 0;
}
-static void action_ref(surf_action_t action)
-{
- action->refcount++;
-}
-
static void action_cancel(surf_action_t action)
{
return;
DIE_IMPOSSIBLE;
}
-static surf_action_t communicate(void *src, void *dst, double size,
- double rate)
+static surf_action_t communicate(const char *src_name,const char *dst_name,int src, int dst, double size,
+ double rate)
{
surf_action_network_Constant_t action = NULL;
- network_card_Constant_t card_src = src;
- network_card_Constant_t card_dst = dst;
- XBT_IN4("(%s,%s,%g,%g)", card_src->generic_resource.name, card_dst->generic_resource.name, size, rate);
+ XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
action = xbt_new0(s_surf_action_network_Constant_t, 1);
}
/* returns an array of link_Constant_t */
-static const void **get_route(void *src, void *dst)
+static xbt_dynar_t get_route(void *src, void *dst)
{
- xbt_assert0(0, "Calling this function does not make any sense");
- return (const void **) NULL;
-}
-
-static int get_route_size(void *src, void *dst)
-{
- xbt_assert0(0, "Calling this function does not make any sense");
- return 0;
+ xbt_die("Calling this function does not make any sense");
}
static double get_link_bandwidth(const void *link)
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_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.network.get_link_latency = get_link_latency;