A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make GTNETS compatible with new parsing and variable name convention.
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
e30d059
..
e3f081d
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-7,6
+7,7
@@
#include "network_gtnets_private.h"
#include "gtnets/gtnets_interface.h"
#include "network_gtnets_private.h"
#include "gtnets/gtnets_interface.h"
+#include "xbt/str.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
"Logging specific to the SURF network module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
"Logging specific to the SURF network module");
@@
-24,7
+25,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
/* Free memory for a network link */
static void link_free(void *nw_link)
{
/* Free memory for a network link */
static void link_free(void *nw_link)
{
- free(((link_GTNETS_t) nw_link)->name);
+ free(((
network_
link_GTNETS_t) nw_link)->name);
free(nw_link);
}
free(nw_link);
}
@@
-35,7
+36,7
@@
static void link_free(void *nw_link)
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
{
static int link_count = -1;
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
{
static int link_count = -1;
- link_GTNETS_t gtnets_link;
+
network_
link_GTNETS_t gtnets_link;
/* If link already exists, nothing to do (FIXME: check that multiple definition match?) */
if (xbt_dict_get_or_null(link_set, name)) {
/* If link already exists, nothing to do (FIXME: check that multiple definition match?) */
if (xbt_dict_get_or_null(link_set, name)) {
@@
-68,7
+69,7
@@
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
}
/* KF: Insert entry in the dictionary */
}
/* KF: Insert entry in the dictionary */
- gtnets_link = xbt_new0(s_link_GTNETS_t, 1);
+ gtnets_link = xbt_new0(s_
network_
link_GTNETS_t, 1);
gtnets_link->name = name;
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
gtnets_link->name = name;
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
@@
-116,12
+117,12
@@
static int network_card_new(const char *name)
static void route_new(int src_id, int dst_id, char **links, int nb_link)
{
#if 0
static void route_new(int src_id, int dst_id, char **links, int nb_link)
{
#if 0
- link_GTNETS_t *link_list = NULL;
+
network_
link_GTNETS_t *link_list = NULL;
int i;
ROUTE_SIZE(src_id, dst_id) = nb_link;
link_list = (ROUTE(src_id, dst_id) =
int i;
ROUTE_SIZE(src_id, dst_id) = nb_link;
link_list = (ROUTE(src_id, dst_id) =
- xbt_new0(link_GTNETS_t, nb_link));
+ xbt_new0(
network_
link_GTNETS_t, nb_link));
for (i = 0; i < nb_link; i++) {
link_list[i] = xbt_dict_get_or_null(link_set, links[i]);
free(links[i]);
for (i = 0; i < nb_link; i++) {
link_list[i] = xbt_dict_get_or_null(link_set, links[i]);
free(links[i]);
@@
-135,7
+136,7
@@
static void route_new(int src_id, int dst_id, char **links, int nb_link)
gtnets_links = (int *) calloc(nb_link, sizeof(int));
for (i = 0; i < nb_link; i++) {
gtnets_links[i] =
gtnets_links = (int *) calloc(nb_link, sizeof(int));
for (i = 0; i < nb_link; i++) {
gtnets_links[i] =
- ((link_GTNETS_t)
+ ((
network_
link_GTNETS_t)
(xbt_dict_get(link_set, links[i])))->id;
}
(xbt_dict_get(link_set, links[i])))->id;
}
@@
-157,7
+158,7
@@
static void route_onehop_new(int src_id, int dst_id, char **links,
/* KF: Build the list of gtnets link IDs */
linkid =
/* KF: Build the list of gtnets link IDs */
linkid =
- ((link_GTNETS_t)
+ ((
network_
link_GTNETS_t)
(xbt_dict_get(link_set, links[0])))->id;
/* KF: Create the GTNets route */
(xbt_dict_get(link_set, links[0])))->id;
/* KF: Create the GTNets route */
@@
-176,10
+177,10
@@
static void parse_link_init(void)
double lat;
e_surf_link_state_t state;
double lat;
e_surf_link_state_t state;
- name = xbt_strdup(A_surfxml_link_
name
);
+ name = xbt_strdup(A_surfxml_link_
id
);
surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
surf_parse_get_double(&lat, A_surfxml_link_latency);
surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
surf_parse_get_double(&lat, A_surfxml_link_latency);
- state = SURF_
link
_ON;
+ state = SURF_
LINK
_ON;
/* Print values when no traces are specified */
{
/* Print values when no traces are specified */
{
@@
-223,13
+224,13
@@
static void parse_route_set_endpoints(void)
/* nb_link = 0;
link_name = NULL;
*/
/* nb_link = 0;
link_name = NULL;
*/
- route_link_list = xbt_dynar_new(sizeof(char *), &
free_string
);
+ route_link_list = xbt_dynar_new(sizeof(char *), &
xbt_free_ref
);
}
/* KF*/
static void parse_route_set_routers(void)
{
}
/* KF*/
static void parse_route_set_routers(void)
{
- int id = network_card_new(A_surfxml_router_
name
);
+ int id = network_card_new(A_surfxml_router_
id
);
/* KF: Create the GTNets router */
if (gtnets_add_router(id)) {
/* KF: Create the GTNets router */
if (gtnets_add_router(id)) {
@@
-253,7
+254,7
@@
static void parse_route_set_route(void)
/* if (nb_link > 1)
route_new(src_id, dst_id, link_name, nb_link);
*/
/* if (nb_link > 1)
route_new(src_id, dst_id, link_name, nb_link);
*/
- name = bprintf("%x#%x",src_id, dst_id);
+
char *
name = bprintf("%x#%x",src_id, dst_id);
xbt_dict_set(route_table, name, route_link_list, NULL);
free(name);
}
xbt_dict_set(route_table, name, route_link_list, NULL);
free(name);
}
@@
-272,7
+273,7
@@
static void add_route()
unsigned int cpt = 0;
int i = 0;
xbt_dict_cursor_t cursor = NULL;
unsigned int cpt = 0;
int i = 0;
xbt_dict_cursor_t cursor = NULL;
- char *key,*data;
+ char *key,*data
, *end
;
const char *sep = "#";
xbt_dynar_t links, keys;
const char *sep = "#";
xbt_dynar_t links, keys;
@@
-284,8
+285,8
@@
static void add_route()
nb_link = xbt_dynar_length(links);
link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
nb_link = xbt_dynar_length(links);
link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
- src_id =
atoi(xbt_dynar_get_as(keys, 0, char*)
);
- dst_id =
atoi(xbt_dynar_get_as(keys, 1, char*)
);
+ src_id =
strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16
);
+ dst_id =
strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16
);
i = 0;
char* link = NULL;
i = 0;
char* link = NULL;
@@
-301,7
+302,6
@@
static void add_route()
route_new(src_id, dst_id, link_name, nb_link);
if (nb_link == 1)
route_onehop_new(src_id, dst_id, link_name, nb_link);
route_new(src_id, dst_id, link_name, nb_link);
if (nb_link == 1)
route_onehop_new(src_id, dst_id, link_name, nb_link);
- xbt_dynar_free(&links);
}
xbt_dict_free(&route_table);
}
xbt_dict_free(&route_table);
@@
-314,7
+314,7
@@
static void define_callbacks(const char *file)
surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers);
surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers);
surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
- surfxml_add_callback(ETag_surfxml_
route_element
_cb_list, &parse_route_elem);
+ surfxml_add_callback(ETag_surfxml_
link_c_ctn
_cb_list, &parse_route_elem);
/* surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_onehop_route);*/
surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
/* surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_onehop_route);*/
surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
@@
-465,7
+465,7
@@
static void update_actions_state(double now, double delta)
/* UNUSED HERE: no traces */
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
/* UNUSED HERE: no traces */
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
- double value)
+ double value
, double date
)
{
xbt_assert0(0, "Cannot update model state for GTNetS simulation");
return;
{
xbt_assert0(0, "Cannot update model state for GTNetS simulation");
return;
@@
-480,7
+480,7
@@
static surf_action_t communicate(void *src, void *dst, double size,
network_card_GTNETS_t card_dst = dst;
/*
int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
network_card_GTNETS_t card_dst = dst;
/*
int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
- link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
+
network_
link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
*/
/*
*/
/*
@@
-613,8
+613,7
@@
static void surf_network_model_init_internal(void)
surf_network_model->common_private->share_resources = share_resources;
surf_network_model->common_private->update_actions_state =
update_actions_state;
surf_network_model->common_private->share_resources = share_resources;
surf_network_model->common_private->update_actions_state =
update_actions_state;
- surf_network_model->common_private->update_resource_state =
- update_resource_state;
+ surf_network_model->common_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_private->finalize = finalize;
surf_network_model->common_public->suspend = action_suspend;