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
cosmetics
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
22d234a
..
ebc840f
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-17,12
+17,9
@@
surf_network_resource_t surf_network_resource = NULL;
static xbt_dict_t network_link_set = NULL;
xbt_dict_t network_card_set = NULL;
static xbt_dict_t network_link_set = NULL;
xbt_dict_t network_card_set = NULL;
-static int card_number = 0;
-static network_link_CM02_t **routing_table = NULL;
-static int *routing_table_size = NULL;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+int card_number = 0;
+network_link_CM02_t **routing_table = NULL;
+int *routing_table_size = NULL;
static void create_routing_table(void)
{
static void create_routing_table(void)
{
@@
-32,8
+29,8
@@
static void create_routing_table(void)
static void network_link_free(void *nw_link)
{
static void network_link_free(void *nw_link)
{
-
xbt_
free(((network_link_CM02_t)nw_link)->name);
-
xbt_
free(nw_link);
+ free(((network_link_CM02_t)nw_link)->name);
+ free(nw_link);
}
static network_link_CM02_t network_link_new(char *name,
}
static network_link_CM02_t network_link_new(char *name,
@@
-73,8
+70,8
@@
static network_link_CM02_t network_link_new(char *name,
static void network_card_free(void *nw_card)
{
static void network_card_free(void *nw_card)
{
-
xbt_
free(((network_card_CM02_t)nw_card)->name);
-
xbt_
free(nw_card);
+ free(((network_card_CM02_t)nw_card)->name);
+ free(nw_card);
}
static int network_card_new(const char *card_name)
}
static int network_card_new(const char *card_name)
@@
-101,9
+98,9
@@
static void route_new(int src_id, int dst_id, char **links, int nb_link)
link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_CM02_t, nb_link));
for (i = 0; i < nb_link; i++) {
xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_CM02_t, nb_link));
for (i = 0; i < nb_link; i++) {
xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
-
xbt_
free(links[i]);
+ free(links[i]);
}
}
-
xbt_
free(links);
+ free(links);
}
static void parse_network_link(void)
}
static void parse_network_link(void)
@@
-208,14
+205,22
@@
static int resource_used(void *resource_id)
((network_link_CM02_t) resource_id)->constraint);
}
((network_link_CM02_t) resource_id)->constraint);
}
-static
void
action_free(surf_action_t action)
+static
int
action_free(surf_action_t action)
{
{
- xbt_swag_remove(action, action->state_set);
- if(((surf_action_network_CM02_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
- xbt_free(action);
+ action->using--;
+ if(!action->using) {
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_network_CM02_t)action)->variable)
+ lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
+ free(action);
+ return 1;
+ }
+ return 0;
+}
- return;
+static void action_use(surf_action_t action)
+{
+ action->using++;
}
static void action_cancel(surf_action_t action)
}
static void action_cancel(surf_action_t action)
@@
-231,11
+236,11
@@
static void action_recycle(surf_action_t action)
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
- if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
- if(((surf_action_network_CM02_t)action)->variable) {
- lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
- ((surf_action_network_CM02_t)action)->variable = NULL;
- }
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_network_CM02_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
+/* ((surf_action_network_CM02_t)action)->variable = NULL; */
+/* } */
surf_action_change_state(action, state);
return;
surf_action_change_state(action, state);
return;
@@
-370,6
+375,7
@@
static surf_action_t communicate(void *src, void *dst, double size, double rate)
action = xbt_new0(s_surf_action_network_CM02_t, 1);
action = xbt_new0(s_surf_action_network_CM02_t, 1);
+ action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
@@
-377,7
+383,8
@@
static surf_action_t communicate(void *src, void *dst, double size, double rate)
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_network_resource;
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_network_resource;
-
+ action->suspended = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
action->generic_action.state_set =
surf_network_resource->common_public->states.running_action_set;
action->generic_action.state_set =
surf_network_resource->common_public->states.running_action_set;
@@
-432,6
+439,11
@@
static int action_is_suspended(surf_action_t action)
return ((surf_action_network_CM02_t) action)->suspended;
}
return ((surf_action_network_CM02_t) action)->suspended;
}
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+ action->max_duration = duration;
+}
+
static void finalize(void)
{
int i,j;
static void finalize(void)
{
int i,j;
@@
-446,19
+458,19
@@
static void finalize(void)
failed_action_set);
xbt_swag_free(surf_network_resource->common_public->states.
done_action_set);
failed_action_set);
xbt_swag_free(surf_network_resource->common_public->states.
done_action_set);
-
xbt_
free(surf_network_resource->common_public);
-
xbt_
free(surf_network_resource->common_private);
-
xbt_
free(surf_network_resource->extension_public);
+ free(surf_network_resource->common_public);
+ free(surf_network_resource->common_private);
+ free(surf_network_resource->extension_public);
-
xbt_
free(surf_network_resource);
+ free(surf_network_resource);
surf_network_resource = NULL;
for (i = 0; i < card_number; i++)
for (j = 0; j < card_number; j++)
surf_network_resource = NULL;
for (i = 0; i < card_number; i++)
for (j = 0; j < card_number; j++)
-
xbt_
free(ROUTE(i,j));
-
xbt_
free(routing_table);
+ free(ROUTE(i,j));
+ free(routing_table);
routing_table = NULL;
routing_table = NULL;
-
xbt_
free(routing_table_size);
+ free(routing_table_size);
routing_table_size = NULL;
card_number = 0;
}
routing_table_size = NULL;
card_number = 0;
}
@@
-491,6
+503,7
@@
static void surf_network_resource_init_internal(void)
surf_network_resource->common_public->action_get_state =
surf_action_get_state;
surf_network_resource->common_public->action_free = action_free;
surf_network_resource->common_public->action_get_state =
surf_action_get_state;
surf_network_resource->common_public->action_free = action_free;
+ surf_network_resource->common_public->action_use = action_use;
surf_network_resource->common_public->action_cancel = action_cancel;
surf_network_resource->common_public->action_recycle = action_recycle;
surf_network_resource->common_public->action_change_state =
surf_network_resource->common_public->action_cancel = action_cancel;
surf_network_resource->common_public->action_recycle = action_recycle;
surf_network_resource->common_public->action_change_state =
@@
-509,6
+522,7
@@
static void surf_network_resource_init_internal(void)
surf_network_resource->common_public->suspend = action_suspend;
surf_network_resource->common_public->resume = action_resume;
surf_network_resource->common_public->is_suspended = action_is_suspended;
surf_network_resource->common_public->suspend = action_suspend;
surf_network_resource->common_public->resume = action_resume;
surf_network_resource->common_public->is_suspended = action_is_suspended;
+ surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
surf_network_resource->extension_public->communicate = communicate;
surf_network_resource->extension_public->communicate = communicate;