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
Surf: factorize resource sets into common_public
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
2c747b2
..
32a30ba
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-103,7
+103,7
@@
static int network_card_new(const char *name)
XBT_IN1("(%s)", name);
/* KF: Check that we haven't seen the network card before */
XBT_IN1("(%s)", name);
/* KF: Check that we haven't seen the network card before */
- network_card_GTNETS_t card =
xbt_dict_get_or_null(network_card_set
, name);
+ network_card_GTNETS_t card =
surf_model_resource_by_name(surf_network_model
, name);
if (!card) {
/* KF: Increment the card counter for GTNetS */
if (!card) {
/* KF: Increment the card counter for GTNetS */
@@
-113,7
+113,7
@@
static int network_card_new(const char *name)
card = xbt_new0(s_network_card_GTNETS_t, 1);
card->name = xbt_strdup(name);
card->id = card_count;
card = xbt_new0(s_network_card_GTNETS_t, 1);
card->name = xbt_strdup(name);
card->id = card_count;
- xbt_dict_set(
network_card_set
, name, card, network_card_free);
+ xbt_dict_set(
surf_model_resource_set(surf_network_model)
, name, card, network_card_free);
}
LOG1(xbt_log_priority_trace, " return %d", card->id);
}
LOG1(xbt_log_priority_trace, " return %d", card->id);
@@
-307,11
+307,6
@@
static void define_callbacks(const char *file)
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
}
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
}
-static void *name_service(const char *name)
-{
- return xbt_dict_get_or_null(network_card_set, name);
-}
-
static const char *get_resource_name(void *resource_id)
{
return ((network_card_GTNETS_t) resource_id)->name;
static const char *get_resource_name(void *resource_id)
{
return ((network_card_GTNETS_t) resource_id)->name;
@@
-531,7
+526,6
@@
static int action_is_suspended(surf_action_t action)
static void finalize(void)
{
static void finalize(void)
{
- xbt_dict_free(&network_card_set);
xbt_dict_free(&link_set);
surf_model_exit((surf_model_t)surf_network_model);
xbt_dict_free(&link_set);
surf_model_exit((surf_model_t)surf_network_model);
@@
-585,7
+579,6
@@
static void surf_network_model_init_internal(void)
surf_network_model->common_public.get_properties = get_properties;
link_set = xbt_dict_new();
surf_network_model->common_public.get_properties = get_properties;
link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
/* KF: Added the initialization for GTNetS interface */
if (gtnets_initialize()) {
/* KF: Added the initialization for GTNetS interface */
if (gtnets_initialize()) {