* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_private.h"
+#include "network_common.h"
#include "xbt/dict.h"
#include "xbt/str.h"
#include "xbt/log.h"
+#define CONSTANT_VALUE 1.0
typedef struct network_card_Constant {
char *name;
int id;
static lmm_system_t network_maxmin_system = NULL;
static void (*network_solve) (lmm_system_t) = NULL;
-static xbt_dict_t network_card_set = NULL;
-
static int card_number = 0;
static int host_number = 0;
-static link_Constant_t **routing_table = NULL;
-static int *routing_table_size = NULL;
-static link_Constant_t loopback = NULL;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
-
-static void create_routing_table(void)
-{
- routing_table =
- xbt_new0(link_Constant_t *, /*card_number * card_number */ host_number * host_number);
- routing_table_size = xbt_new0(int, /*card_number * card_number*/ host_number * host_number);
-}
static void link_free(void *nw_link)
{
return card->id;
}
-static void route_new(int src_id, int dst_id,
- link_Constant_t * link_list, int nb_link)
-{
- ROUTE_SIZE(src_id, dst_id) = nb_link;
- ROUTE(src_id, dst_id) = link_list =
- xbt_realloc(link_list, sizeof(link_Constant_t) * nb_link);
-}
-
static void parse_link_init(void)
{
char *name_link;
}
}
-static void add_loopback(void)
-{
- int i;
- /* Adding loopback if needed */
- for (i = 0; i < host_number; i++)
- if (!ROUTE_SIZE(i, i)) {
- if (!loopback)
- loopback = link_new(xbt_strdup("__MSG_loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_LINK_ON, NULL,
- SURF_LINK_FATPIPE,NULL);
- ROUTE_SIZE(i, i) = 1;
- ROUTE(i, i) = xbt_new0(link_Constant_t, 1);
- ROUTE(i, i)[0] = loopback;
- }
-}
-
-static void add_route(void)
-{
- xbt_ex_t e;
- int nb_link = 0;
- unsigned int cpt = 0;
- int link_list_capacity = 0;
- link_Constant_t *link_list = NULL;
- xbt_dict_cursor_t cursor = NULL;
- char *key,*data, *end;
- const char *sep = "#";
- xbt_dynar_t links, keys;
-
- if (routing_table == NULL) create_routing_table();
-
- xbt_dict_foreach(route_table, cursor, key, data) {
- char* link = NULL;
- nb_link = 0;
- links = (xbt_dynar_t)data;
- keys = xbt_str_split_str(key, sep);
-
- link_list_capacity = xbt_dynar_length(links);
- link_list = xbt_new(link_Constant_t, link_list_capacity);
-
- src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
-
- xbt_dynar_foreach (links, cpt, link) {
- TRY {
- link_list[nb_link++] = xbt_dict_get(link_set, link);
- }
- CATCH(e) {
- RETHROW1("Link %s not found (dict raised this exception: %s)", link);
- }
- }
- route_new(src_id, dst_id, link_list, nb_link);
- }
-
- xbt_dict_free(&route_table);
-
-}
-
static void count_hosts(void)
{
host_number++;
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
static double share_resources(double now)
{
- s_surf_action_network_Constant_t s_action;
surf_action_network_Constant_t action = NULL;
xbt_swag_t running_actions =
surf_network_model->common_public->states.running_action_set;
- double min;
-
- min = generic_maxmin_share_resources(running_actions,
- xbt_swag_offset(s_action,
- variable),
- network_maxmin_system,
- network_solve);
+ double min = -1.0;
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
static void update_actions_state(double now, double delta)
{
- double deltap = 0.0;
surf_action_network_Constant_t action = NULL;
surf_action_network_Constant_t next_action = NULL;
xbt_swag_t running_actions =
surf_network_model->common_public->states.running_action_set;
- /*
- xbt_swag_t failed_actions =
- surf_network_model->common_public->states.failed_action_set;
- */
xbt_swag_foreach_safe(action, next_action, running_actions) {
- deltap = delta;
if (action->latency > 0) {
- if (action->latency > deltap) {
- double_update(&(action->latency), deltap);
- deltap = 0.0;
+ if (action->latency > delta) {
+ double_update(&(action->latency), delta);
} else {
- double_update(&(deltap), action->latency);
action->latency = 0.0;
}
- if ((action->latency == 0.0) && !(action->suspended))
- lmm_update_variable_weight(network_maxmin_system, action->variable,
- action->lat_current);
}
double_update(&(action->generic_action.remains),
- lmm_variable_getvalue(action->variable) * deltap);
+ action->generic_action.cost * delta/ CONSTANT_VALUE);
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
- /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
-
- if ((action->generic_action.remains <= 0) &&
- (lmm_get_variable_weight(action->variable) > 0)) {
+ if (action->generic_action.remains <= 0) {
action->generic_action.finish = surf_get_clock();
action_change_state((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);
- } else { /* Need to check that none of the model has failed */
- lmm_constraint_t cnst = NULL;
- int i = 0;
- link_Constant_t nw_link = NULL;
-
- while ((cnst =
- lmm_get_cnst_from_var(network_maxmin_system,
- action->variable, i++))) {
- nw_link = lmm_constraint_id(cnst);
- if (nw_link->state_current == SURF_LINK_OFF) {
- action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
- break;
- }
- }
- }
+ }
}
return;
double rate)
{
surf_action_network_Constant_t action = NULL;
- /* LARGE PLATFORMS HACK:
- Add a link_Constant_t *link and a int link_nb to network_card_Constant_t. It will represent local links for this node
- Use the cluster_id for ->id */
network_card_Constant_t card_src = src;
network_card_Constant_t card_dst = dst;
- int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
- link_Constant_t *route = ROUTE(card_src->id, card_dst->id);
- /* LARGE PLATFORMS HACK:
- total_route_size = route_size + src->link_nb + dst->nb */
- int i;
XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
- /* LARGE PLATFORMS HACK:
- assert on total_route_size */
- xbt_assert2(route_size,
- "You're trying to send data from %s to %s but there is no connexion between these two cards.",
- card_src->name, card_dst->name);
action = xbt_new0(s_surf_action_network_Constant_t, 1);
xbt_swag_insert(action, action->generic_action.state_set);
action->rate = rate;
- action->latency = 0.0;
- for (i = 0; i < route_size; i++)
- action->latency += route[i]->lat_current;
- /* LARGE PLATFORMS HACK:
- Add src->link and dst->link latencies */
+ action->latency = CONSTANT_VALUE;
action->lat_current = action->latency;
- /* LARGE PLATFORMS HACK:
- lmm_variable_new(..., total_route_size)*/
- if (action->latency > 0)
- action->variable =
- lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
- route_size);
- else
- action->variable =
- lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,
- route_size);
-
- if (action->rate < 0) {
- if (action->lat_current > 0)
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->lat_current));
- else
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- -1.0);
- } else {
- if (action->lat_current > 0)
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- min(action->rate,
- SG_TCP_CTE_GAMMA / (2.0 *
- action->
- lat_current)));
- else
- lmm_update_variable_bound(network_maxmin_system, action->variable,
- action->rate);
- }
- lmm_update_variable_latency(network_maxmin_system, action->variable,
- action->latency);
-
- for (i = 0; i < route_size; i++)
- lmm_expand(network_maxmin_system, route[i]->constraint,
- action->variable, 1.0);
- /* LARGE PLATFORMS HACK:
- expand also with src->link and dst->link */
-
XBT_OUT;
return (surf_action_t) action;
/* returns an array of link_Constant_t */
static const void **get_route(void *src, void *dst)
{
- network_card_Constant_t card_src = src;
- network_card_Constant_t card_dst = dst;
- return (const void **) ROUTE(card_src->id, card_dst->id);
+ xbt_assert0(0, "Calling this function does not make any sense");
+ return (const void **) NULL;
}
static int get_route_size(void *src, void *dst)
{
- network_card_Constant_t card_src = src;
- network_card_Constant_t card_dst = dst;
- return ROUTE_SIZE(card_src->id, card_dst->id);
+ xbt_assert0(0, "Calling this function does not make any sense");
+ return 0;
}
static const char *get_link_name(const void *link)
static void finalize(void)
{
- int i, j;
-
xbt_dict_free(&network_card_set);
xbt_dict_free(&link_set);
xbt_swag_free(surf_network_model->common_public->states.
free(surf_network_model);
surf_network_model = NULL;
- loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
- free(ROUTE(i, j));
- free(routing_table);
- routing_table = NULL;
- free(routing_table_size);
- routing_table_size = NULL;
card_number = 0;
}
