From 8baa8015d7eb3bd684a3a0d22dc698837de13c7e Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 6 Jul 2011 15:46:07 +0000 Subject: [PATCH] changes to ats --- src/transport/transport_ats.c | 1833 ++++++++++++++++++++------------- src/transport/transport_ats.h | 568 +++++----- 2 files changed, 1402 insertions(+), 999 deletions(-) diff --git a/src/transport/transport_ats.c b/src/transport/transport_ats.c index cf558c038..fdd8126cd 100644 --- a/src/transport/transport_ats.c +++ b/src/transport/transport_ats.c @@ -30,6 +30,12 @@ #include "gnunet_statistics_service.h" #include "gnunet_container_lib.h" + +/* + * Temporary included structs and defines + */ + + /** * FIXME to be removed * Entry in linked list of all of our current neighbours. @@ -256,7 +262,9 @@ struct ForeignAddressList /** * Are we currently connected via this address? The first time we - * successfully transmit or receive data to a peer via a particular + * successfully transmit or receive data to a peer via a particularcurl: + * (56) Recv failure: Connection reset by peer + * * address, we set this to GNUNET_YES. If we later get an error * (disconnect notification, transmission failure, timeout), we set * it back to GNUNET_NO. @@ -308,6 +316,8 @@ struct ReadyList struct NeighbourList *neighbour; }; + +#if !HAVE_LIBGLPK /* optimization direction flag: */ #define GLP_MIN 1 /* minimization */ #define GLP_MAX 2 /* maximization */ @@ -357,6 +367,7 @@ struct ReadyList #define GLP_ON 1 /* enable something */ #define GLP_OFF 0 /* disable something */ + typedef struct { /* simplex method control parameters */ int msg_lev; /* message level: */ @@ -428,143 +439,325 @@ typedef struct #endif double foo_bar[29]; /* (reserved) */ } glp_iocp; +#endif + + +/* + * Wrappers for GLPK Functions + */ +void * _lp_create_prob ( void ) +{ +#if HAVE_LIBGLPK + return glp_create_prob( ); +#else + // Function not implemented + GNUNET_break (0); +#endif + return NULL; +} + +void _lp_set_obj_dir (void *P, int dir) +{ +#if HAVE_LIBGLPK + return glp_set_obj_dir (P, dir); +#else + // Function not implemented + GNUNET_break (0); +#endif +} + void _lp_set_prob_name (void *P, const char *name) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_set_prob_name(P, name); +#else + // Function not implemented + GNUNET_break (0); #endif } int _lp_add_cols (void *P, int ncs) { -#if HAVE_GLPK +#if HAVE_LIBGLPK return glp_add_cols(P, ncs); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } +int _lp_add_rows (void *P, int nrs) +{ +#if HAVE_LIBGLPK + return glp_add_rows (P, nrs); +#else + // Function not implemented + GNUNET_break (0); +#endif + return 0; +} + + void _lp_set_row_bnds (void *P, int i, int type, double lb, double ub) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_set_row_bnds(P, i , type, lb, ub); +#else + // Function not implemented + GNUNET_break (0); #endif } void _lp_init_smcp (void * parm) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_init_smcp(parm); +#else + // Function not implemented + GNUNET_break (0); #endif } void _lp_set_col_name (void *P, int j, const char *name) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_set_col_name (P, j, name); +#else + // Function not implemented + GNUNET_break (0); #endif } void _lp_set_col_bnds (void *P, int j, int type, double lb, double ub) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_set_col_bnds(P, j, type, lb, ub); +#else + // Function not implemented + GNUNET_break (0); #endif } void _lp_set_obj_coef(void *P, int j, double coef) { -#if HAVE_GLPK - _lp_set_obj_coef(P, j, coef); +#if HAVE_LIBGLPK + glp_set_obj_coef(P, j, coef); +#else + // Function not implemented + GNUNET_break (0); #endif } void _lp_delete_prob (void * P) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_delete_prob (P); +#else + // Function not implemented + GNUNET_break (0); #endif } -int _lp_simplex(void *P, void *parm) +static int _lp_simplex(void *P, void *parm) { -#if HAVE_GLPK +#if HAVE_LIBGLPK return glp_simplex (P, parm); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } -void _lp_load_matrix (void *P, int ne, const int ia[], +static void _lp_load_matrix (void *P, int ne, const int ia[], const int ja[], const double ar[]) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_load_matrix(P, ne, ia, ja, ar); +#else + // Function not implemented + GNUNET_break (0); #endif } -void _lp_set_mat_row (void *P, int i, int len, const int ind[], +static void _lp_set_mat_row (void *P, int i, int len, const int ind[], const double val[]) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_set_mat_row (P, i, len, ind, val); +#else + // Function not implemented + GNUNET_break (0); #endif } -int _lp_write_lp (void * *P, const void *parm, const char *fname) +static int _lp_write_lp (void *P, const void *parm, const char *fname) { -#if HAVE_GLPK - return glp_write_lp (P, parm, fname); +#if HAVE_LIBGLPK + return glp_write_lp ( P, parm, fname); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } -void _lp_init_iocp (void *parm) +static void _lp_init_iocp (void *parm) { -#if HAVE_GLPK +#if HAVE_LIBGLPK glp_init_iocp (parm); +#else + // Function not implemented + GNUNET_break (0); #endif } -int _lp_intopt (void *P, const void *parm) +static int _lp_intopt (void *P, const void *parm) { -#if HAVE_GLPK +#if HAVE_LIBGLPK return glp_intopt (P, parm); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } -int _lp_get_status (void *P) +static int _lp_get_status (void *P) { -#if HAVE_GLPK +#if HAVE_LIBGLPK return glp_get_status (P); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } -int _lp_mip_status(void *P) +static int _lp_mip_status (void *P) { -#if HAVE_GLPK +#if HAVE_LIBGLPK return glp_mip_status (P); +#else + // Function not implemented + GNUNET_break (0); #endif return 0; } +static void _lp_set_col_kind (void *P, int j, int kind) +{ +#if HAVE_LIBGLPK + glp_set_col_kind (P, j, kind); +#else + // Function not implemented + GNUNET_break (0); +#endif +} + +static void _lp_free_env (void) +{ +#if HAVE_LIBGLPK + glp_free_env (); +#else + // Function not implemented + GNUNET_break (0); +#endif +} + +static const char * _lp_get_col_name ( void *P, int j) +{ +#if HAVE_LIBGLPK + return glp_get_col_name (P, j); +#else + // Function not implemented + GNUNET_break (0); +#endif + return NULL; +} + +static double _lp_mip_obj_val (void *P) +{ +#if HAVE_LIBGLPK + return glp_mip_obj_val (P); +#else + // Function not implemented + GNUNET_break (0); +#endif + return 0.0; +} + + +static double _lp_get_col_prim (void *P, int j) +{ +#if HAVE_LIBGLPK + return glp_get_col_prim (P , j); +#else + // Function not implemented + GNUNET_break (0); +#endif + return 0.0; +} -struct ATS_info * ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) +static int _lp_print_sol(void *P, const char *fname) { +#if HAVE_LIBGLPK + return glp_print_sol (P, fname); +#else + // Function not implemented + GNUNET_break (0); +#endif + return 0; +} + +/* + * Dummy functions for CFLAGS + */ + +static void _dummy2 (); +static void _dummy () +{ + return; + _lp_get_col_name (NULL, 0); + _lp_mip_obj_val (NULL); + _lp_get_col_prim (NULL, 0); + _dummy2(); +} + +static void _dummy2 () +{ + _dummy(); +} + +/* + * ATS Functions + */ + + +/** + * Initialize ATS + * @param cfg configuration handle to retrieve configuration (to be removed) + * @return + */ + +struct ATS_Handle * ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + #if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return NULL; #endif - struct ATS_info * ats = NULL; + struct ATS_Handle * ats = NULL; int c = 0; unsigned long long value; char * section; - ats = GNUNET_malloc(sizeof (struct ATS_info)); + ats = GNUNET_malloc(sizeof (struct ATS_Handle)); ats->prob = NULL; @@ -627,43 +820,56 @@ struct ATS_info * ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) } if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MLP")) - ats->save_mlp = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_MLP"); + ats->save_mlp = GNUNET_CONFIGURATION_get_value_yesno (cfg, + "transport","DUMP_MLP"); if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_SOLUTION")) - ats->save_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_SOLUTION"); + ats->save_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg, + "transport","DUMP_SOLUTION"); if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_OVERWRITE")) - ats->dump_overwrite = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_OVERWRITE"); + ats->dump_overwrite = GNUNET_CONFIGURATION_get_value_yesno (cfg, + "transport","DUMP_OVERWRITE"); if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_PEERS")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_MIN_PEERS", &value); + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","DUMP_MIN_PEERS", &value); ats->dump_min_peers= value; } - if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_ADDRS")) + if (GNUNET_CONFIGURATION_have_value(cfg, + "transport", "DUMP_MIN_ADDRS")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_MIN_ADDRS", &value); - ats->dump_min_addr= value; + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","DUMP_MIN_ADDRS", &value); + ats->dump_min_addr= value; } - if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_OVERWRITE")) + if (GNUNET_CONFIGURATION_have_value(cfg, + "transport", "DUMP_OVERWRITE")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_OVERWRITE", &value); - ats->min_delta.rel_value = value; + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","DUMP_OVERWRITE", &value); + ats->min_delta.rel_value = value; } - if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_MIN_INTERVAL")) + if (GNUNET_CONFIGURATION_have_value(cfg, + "transport", "ATS_MIN_INTERVAL")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_MIN_INTERVAL", &value); - ats->min_delta.rel_value = value; + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","ATS_MIN_INTERVAL", &value); + ats->min_delta.rel_value = value; } - if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_EXEC_INTERVAL")) + if (GNUNET_CONFIGURATION_have_value(cfg, + "transport", "ATS_EXEC_INTERVAL")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_EXEC_INTERVAL", &value); - ats->exec_interval.rel_value = value; + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","ATS_EXEC_INTERVAL", &value); + ats->exec_interval.rel_value = value; } if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_MIN_INTERVAL")) { - GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_MIN_INTERVAL", &value); - ats->min_delta.rel_value = value; + GNUNET_CONFIGURATION_get_value_number(cfg, + "transport","ATS_MIN_INTERVAL", &value); + ats->min_delta.rel_value = value; } return ats; } @@ -680,16 +886,21 @@ struct ATS_info * ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) * @param stat result struct * @return GNUNET_SYSERR if glpk is not available, number of mechanisms used */ -int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, double D, double U, double R, int v_b_min, int v_n_min, struct ATS_stat *stat) +int ats_create_problem (struct ATS_Handle *ats, + struct NeighbourList *neighbours, + double D, + double U, + double R, + int v_b_min, + int v_n_min, + struct ATS_stat *stat) { #if !HAVE_LIBGLPK GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); return GNUNET_SYSERR; #endif -#if HAVE_LIBGLPK - ats->prob = glp_create_prob(); -#endif + ats->prob = _lp_create_prob(); int c; int c_peers = 0; @@ -728,7 +939,9 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, if (c_mechs==0) { #if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No addresses for bw distribution available\n", c_peers); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "No addresses for bw distribution available\n", + c_peers); #endif stat->valid = GNUNET_NO; stat->c_peers = 0; @@ -750,38 +963,40 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, next = neighbours; while (next!=NULL) { - int found_addresses = GNUNET_NO; - struct ReadyList *r_next = next->plugins; - while (r_next != NULL) - { - struct ForeignAddressList * a_next = r_next->addresses; - while (a_next != NULL) - { - if (found_addresses == GNUNET_NO) - { - peers[c_peers].peer = next->id; - peers[c_peers].m_head = NULL; - peers[c_peers].m_tail = NULL; - peers[c_peers].f = 1.0 / c_mechs; - } - - mechanisms[c_mechs].addr = a_next; - mechanisms[c_mechs].col_index = c_mechs; - mechanisms[c_mechs].peer = &peers[c_peers]; - mechanisms[c_mechs].next = NULL; - mechanisms[c_mechs].plugin = r_next->plugin; - - GNUNET_CONTAINER_DLL_insert_tail(peers[c_peers].m_head, peers[c_peers].m_tail, &mechanisms[c_mechs]); - found_addresses = GNUNET_YES; - c_mechs++; - - a_next = a_next->next; - } - r_next = r_next->next; - } - if (found_addresses == GNUNET_YES) - c_peers++; - next = next->next; + int found_addresses = GNUNET_NO; + struct ReadyList *r_next = next->plugins; + while (r_next != NULL) + { + struct ForeignAddressList * a_next = r_next->addresses; + while (a_next != NULL) + { + if (found_addresses == GNUNET_NO) + { + peers[c_peers].peer = next->id; + peers[c_peers].m_head = NULL; + peers[c_peers].m_tail = NULL; + peers[c_peers].f = 1.0 / c_mechs; + } + + mechanisms[c_mechs].addr = a_next; + mechanisms[c_mechs].col_index = c_mechs; + mechanisms[c_mechs].peer = &peers[c_peers]; + mechanisms[c_mechs].next = NULL; + mechanisms[c_mechs].plugin = r_next->plugin; + + GNUNET_CONTAINER_DLL_insert_tail(peers[c_peers].m_head, + peers[c_peers].m_tail, + &mechanisms[c_mechs]); + found_addresses = GNUNET_YES; + c_mechs++; + + a_next = a_next->next; + } + r_next = r_next->next; + } + if (found_addresses == GNUNET_YES) + c_peers++; + next = next->next; } c_mechs--; c_peers--; @@ -790,21 +1005,23 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, v_n_min = c_peers; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Creating problem with: %i peers, %i mechanisms, %i resource entries, %i quality metrics \n", c_peers, c_mechs, c_c_ressources, c_q_metrics); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Creating problem with: %i peers, %i mechanisms, %i resource entries, %i quality metrics \n", + c_peers, + c_mechs, + c_c_ressources, + c_q_metrics); #endif - int size = 1 + 3 + 10 *c_mechs + c_peers + (c_q_metrics*c_mechs)+ c_q_metrics + c_c_ressources * c_mechs ; + int size = 1 + 3 + 10 *c_mechs + c_peers + + (c_q_metrics*c_mechs)+ c_q_metrics + c_c_ressources * c_mechs ; int row_index; int array_index=1; int * ia = GNUNET_malloc (size * sizeof (int)); int * ja = GNUNET_malloc (size * sizeof (int)); double * ar = GNUNET_malloc(size* sizeof (double)); - _lp_set_prob_name (ats->prob, "gnunet ats bandwidth distribution"); -#if HAVE_LIBGLPK - glp_set_obj_dir(ats->prob, GLP_MAX); -#endif + _lp_set_obj_dir(ats->prob, GLP_MAX); /* adding columns */ char * name; @@ -812,97 +1029,104 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, /* adding b_t cols */ for (c=1; c <= c_mechs; c++) { -#if HAVE_LIBGLPK - GNUNET_asprintf(&name, "p_%s_b%i",GNUNET_i2s(&(mechanisms[c].peer->peer)), c); - _lp_set_col_name(ats->prob, c, name); - GNUNET_free (name); - _lp_set_col_bnds(ats->prob, c, GLP_LO, 0.0, 0.0); - glp_set_col_kind(ats->prob, c, GLP_CV); - _lp_set_obj_coef(ats->prob, c, 0); -#endif - + GNUNET_asprintf(&name, + "p_%s_b%i",GNUNET_i2s(&(mechanisms[c].peer->peer)), c); + _lp_set_col_name(ats->prob, c, name); + GNUNET_free (name); + _lp_set_col_bnds(ats->prob, c, GLP_LO, 0.0, 0.0); + _lp_set_col_kind(ats->prob, c, GLP_CV); + //_lp_set_obj_coef(ats->prob, c, 0); } + /* adding n_t cols */ for (c=c_mechs+1; c <= 2*c_mechs; c++) { -#if HAVE_LIBGLPK - GNUNET_asprintf(&name, "p_%s_n%i",GNUNET_i2s(&(mechanisms[c-c_mechs].peer->peer)),(c-c_mechs)); - _lp_set_col_name(ats->prob, c, name); - GNUNET_free (name); - _lp_set_col_bnds(ats->prob, c, GLP_DB, 0.0, 1.0); - glp_set_col_kind(ats->prob, c, GLP_IV); - _lp_set_obj_coef(ats->prob, c, 0); -#endif + GNUNET_asprintf(&name, + "p_%s_n%i",GNUNET_i2s(&(mechanisms[c-c_mechs].peer->peer)),(c-c_mechs)); + _lp_set_col_name(ats->prob, c, name); + GNUNET_free (name); + _lp_set_col_bnds(ats->prob, c, GLP_DB, 0.0, 1.0); + _lp_set_col_kind(ats->prob, c, GLP_IV); + _lp_set_obj_coef(ats->prob, c, 0); } /* feasibility constraints */ /* Constraint 1: one address per peer*/ row_index = 1; -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, c_peers); -#endif + + _lp_add_rows(ats->prob, c_peers); + for (c=1; c<=c_peers; c++) { #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n", + row_index); #endif -#if HAVE_LIBGLPK - _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 1.0, 1.0); -#endif - struct ATS_mechanism *m = peers[c].m_head; - while (m!=NULL) - { - ia[array_index] = row_index; - ja[array_index] = (c_mechs + m->col_index); - ar[array_index] = 1; + + _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 1.0, 1.0); + struct ATS_mechanism *m = peers[c].m_head; + while (m!=NULL) + { + ia[array_index] = row_index; + ja[array_index] = (c_mechs + m->col_index); + ar[array_index] = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); -#endif - array_index++; - m = m->next; - } - row_index++; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); +#endif + array_index++; + m = m->next; + } + row_index++; } /* Constraint 2: only active mechanism gets bandwidth assigned */ -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, c_mechs); -#endif + _lp_add_rows(ats->prob, c_mechs); for (c=1; c<=c_mechs; c++) { /* b_t - n_t * M <= 0 */ #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n", + row_index); #endif -#if HAVE_LIBGLPK _lp_set_row_bnds(ats->prob, row_index, GLP_UP, 0.0, 0.0); -#endif ia[array_index] = row_index; ja[array_index] = mechanisms[c].col_index; ar[array_index] = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; ia[array_index] = row_index; ja[array_index] = c_mechs + mechanisms[c].col_index; ar[array_index] = -M; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; row_index ++; } /* Constraint 3: minimum bandwidth*/ -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, c_mechs); -#endif + _lp_add_rows(ats->prob, c_mechs); + for (c=1; c<=c_mechs; c++) { /* b_t - n_t * b_min <= 0 */ #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n", + row_index); #endif #if HAVE_LIBGLPK _lp_set_row_bnds(ats->prob, row_index, GLP_LO, 0.0, 0.0); @@ -911,25 +1135,34 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, ja[array_index] = mechanisms[c].col_index; ar[array_index] = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; ia[array_index] = row_index; ja[array_index] = c_mechs + mechanisms[c].col_index; ar[array_index] = -v_b_min; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; row_index ++; } int c2; + /* Constraint 4: max ressource capacity */ /* V cr: bt * ct_r <= cr_max * */ -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, available_ressources); -#endif + + _lp_add_rows(ats->prob, available_ressources); + double ct_max = VERY_BIG_DOUBLE_VALUE; double ct_min = 0.0; @@ -937,48 +1170,56 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, for (c=0; cprob, row_index, GLP_DB, ct_min, ct_max); + _lp_set_row_bnds(ats->prob, row_index, GLP_DB, ct_min, ct_max); #endif - for (c2=1; c2<=c_mechs; c2++) - { - double value = 0; - ia[array_index] = row_index; - ja[array_index] = c2; - value = mechanisms[c2].addr->ressources[c].c; - ar[array_index] = value; + for (c2=1; c2<=c_mechs; c2++) + { + double value = 0; + ia[array_index] = row_index; + ja[array_index] = c2; + value = mechanisms[c2].addr->ressources[c].c; + ar[array_index] = value; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, ia[array_index], + ja[array_index], + ar[array_index]); #endif - array_index++; - } - row_index ++; + array_index++; + } + row_index ++; } stat->end_cr = array_index--; /* Constraint 5: min number of connections*/ -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, 1); -#endif + _lp_add_rows(ats->prob, 1); + for (c=1; c<=c_mechs; c++) { // b_t - n_t * b_min >= 0 #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n", + row_index); #endif -#if HAVE_LIBGLPK _lp_set_row_bnds(ats->prob, row_index, GLP_LO, v_n_min, 0.0); -#endif ia[array_index] = row_index; ja[array_index] = c_mechs + mechanisms[c].col_index; ar[array_index] = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; } @@ -990,39 +1231,45 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, // Constraint 6: optimize for diversity int col_d; - col_d = _lp_add_cols(ats->prob, 1); -#if HAVE_LIBGLPK + _lp_set_col_name(ats->prob, col_d, "d"); _lp_set_obj_coef(ats->prob, col_d, D); _lp_set_col_bnds(ats->prob, col_d, GLP_LO, 0.0, 0.0); - glp_add_rows(ats->prob, 1); + _lp_add_rows(ats->prob, 1); _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); -#endif + stat->col_d = col_d; #if VERBOSE_ATS GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); #endif for (c=1; c<=c_mechs; c++) { - ia[array_index] = row_index; - ja[array_index] = c_mechs + mechanisms[c].col_index; - ar[array_index] = 1; + ia[array_index] = row_index; + ja[array_index] = c_mechs + mechanisms[c].col_index; + ar[array_index] = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif - array_index++; + array_index++; } ia[array_index] = row_index; ja[array_index] = col_d; ar[array_index] = -1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; row_index ++; - // Constraint 7: optimize for quality int col_qm; col_qm = _lp_add_cols(ats->prob, c_q_metrics); @@ -1031,72 +1278,78 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, //GNUNET_assert (col_qm == (2*c_mechs) + 3 + 1); for (c=0; c< c_q_metrics; c++) { - GNUNET_asprintf(&name, "Q_%s",qm[c].name); - _lp_set_col_name (ats->prob, col_qm + c, name); - _lp_set_col_bnds (ats->prob, col_qm + c, GLP_LO, 0.0, 0.0); - GNUNET_free (name); - _lp_set_obj_coef (ats->prob, col_qm + c, Q[c]); + GNUNET_asprintf(&name, "Q_%s",qm[c].name); + _lp_set_col_name (ats->prob, col_qm + c, name); + _lp_set_col_bnds (ats->prob, col_qm + c, GLP_LO, 0.0, 0.0); + GNUNET_free (name); + _lp_set_obj_coef (ats->prob, col_qm + c, Q[c]); } -#if HAVE_LIBGLPK - glp_add_rows(ats->prob, available_quality_metrics); -#endif + + _lp_add_rows(ats->prob, available_quality_metrics); + stat->begin_qm = row_index; for (c=1; c <= c_q_metrics; c++) { #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n", + row_index); #endif - double value = 1; -#if HAVE_LIBGLPK - _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); -#endif - for (c2=1; c2<=c_mechs; c2++) + double value = 1; + _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); + for (c2=1; c2<=c_mechs; c2++) + { + ia[array_index] = row_index; + ja[array_index] = c2; + if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) { - - ia[array_index] = row_index; - ja[array_index] = c2; - if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) - { - double v0 = 0, v1 = 0, v2 = 0; - v0 = mechanisms[c2].addr->quality[c-1].values[0]; - if (v1 < 1) v0 = 0.1; - v1 = mechanisms[c2].addr->quality[c-1].values[1]; - if (v1 < 1) v0 = 0.1; - v2 = mechanisms[c2].addr->quality[c-1].values[2]; - if (v1 < 1) v0 = 0.1; - value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0); - value = 1; - } - if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) - { - double v0 = 0, v1 = 0, v2 = 0; - v0 = mechanisms[c2].addr->quality[c-1].values[0]; - if (v0 < 1) v0 = 1; - v1 = mechanisms[c2].addr->quality[c-1].values[1]; - if (v1 < 1) v1 = 1; - v2 = mechanisms[c2].addr->quality[c-1].values[2]; - if (v2 < 1) v2 = 1; - value = (v0 + 2 * v1 + 3 * v2) / 6.0; - if (value >= 1) - value = (double) 10 / value; - else - value = 10; - } - ar[array_index] = (mechanisms[c2].peer->f) * value ; -#if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, ia[array_index], ja[array_index], ar[array_index]); -#endif - array_index++; + double v0 = 0, v1 = 0, v2 = 0; + v0 = mechanisms[c2].addr->quality[c-1].values[0]; + if (v1 < 1) v0 = 0.1; + v1 = mechanisms[c2].addr->quality[c-1].values[1]; + if (v1 < 1) v0 = 0.1; + v2 = mechanisms[c2].addr->quality[c-1].values[2]; + if (v1 < 1) v0 = 0.1; + value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0); + value = 1; } - - ia[array_index] = row_index; - ja[array_index] = col_qm + c - 1; - ar[array_index] = -1; + if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) + { + double v0 = 0, v1 = 0, v2 = 0; + v0 = mechanisms[c2].addr->quality[c-1].values[0]; + if (v0 < 1) v0 = 1; + v1 = mechanisms[c2].addr->quality[c-1].values[1]; + if (v1 < 1) v1 = 1; + v2 = mechanisms[c2].addr->quality[c-1].values[2]; + if (v2 < 1) v2 = 1; + value = (v0 + 2 * v1 + 3 * v2) / 6.0; + if (value >= 1) + value = (double) 10 / value; + else + value = 10; + } + ar[array_index] = (mechanisms[c2].peer->f) * value ; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n", + array_index, + qm[c-1].name, + ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; - row_index++; + } + ia[array_index] = row_index; + ja[array_index] = col_qm + c - 1; + ar[array_index] = -1; +#if VERBOSE_ATS + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); +#endif + array_index++; + row_index++; } stat->end_qm = row_index-1; @@ -1104,12 +1357,11 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, int col_u; col_u = _lp_add_cols(ats->prob, 1); -#if HAVE_LIBGLPK + _lp_set_col_name(ats->prob, col_u, "u"); _lp_set_obj_coef(ats->prob, col_u, U); _lp_set_col_bnds(ats->prob, col_u, GLP_LO, 0.0, 0.0); - glp_add_rows(ats->prob, 1); -#endif + _lp_add_rows(ats->prob, 1); stat->col_u = col_u; #if VERBOSE_ATS GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); @@ -1117,19 +1369,26 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); for (c=1; c<=c_mechs; c++) { - ia[array_index] = row_index; - ja[array_index] = c; - ar[array_index] = mechanisms[c].peer->f; + ia[array_index] = row_index; + ja[array_index] = c; + ar[array_index] = mechanisms[c].peer->f; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); #endif - array_index++; + array_index++; } ia[array_index] = row_index; ja[array_index] = col_u; ar[array_index] = -1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, ia[array_index], + ja[array_index], + ar[array_index]); #endif array_index++; @@ -1139,37 +1398,44 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, int col_r; col_r = _lp_add_cols(ats->prob, 1); -#if HAVE_LIBGLPK + _lp_set_col_name(ats->prob, col_r, "r"); _lp_set_obj_coef(ats->prob, col_r, R); _lp_set_col_bnds(ats->prob, col_r, GLP_LO, 0.0, 0.0); - glp_add_rows(ats->prob, c_peers); -#endif + _lp_add_rows(ats->prob, c_peers); + stat->col_r = col_r; for (c=1; c<=c_peers; c++) { - _lp_set_row_bnds(ats->prob, row_index, GLP_LO, 0.0, 0.0); - - struct ATS_mechanism *m = peers[c].m_head; - while (m!=NULL) - { - ia[array_index] = row_index; - ja[array_index] = m->col_index; - ar[array_index] = 1 / mechanisms[c].peer->f; + _lp_set_row_bnds(ats->prob, row_index, GLP_LO, 0.0, 0.0); + struct ATS_mechanism *m = peers[c].m_head; + while (m!=NULL) + { + ia[array_index] = row_index; + ja[array_index] = m->col_index; + ar[array_index] = 1 / mechanisms[c].peer->f; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); -#endif - array_index++; - m = m->next; - } - ia[array_index] = row_index; - ja[array_index] = col_r; - ar[array_index] = -1; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); +#endif + array_index++; + m = m->next; + } + ia[array_index] = row_index; + ja[array_index] = col_r; + ar[array_index] = -1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]); -#endif - array_index++; - row_index++; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + ia[array_index], + ja[array_index], + ar[array_index]); +#endif + array_index++; + row_index++; } /* Loading the matrix */ @@ -1189,8 +1455,13 @@ int ats_create_problem (struct ATS_info *ats, struct NeighbourList *neighbours, } -void ats_delete_problem (struct ATS_info * ats) +void ats_delete_problem (struct ATS_Handle * ats) { +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; +#endif + #if DEBUG_ATS GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Deleting problem\n"); #endif @@ -1198,24 +1469,22 @@ void ats_delete_problem (struct ATS_info * ats) for (c=0; c< (ats->stat).c_mechs; c++) GNUNET_free_non_null (ats->mechanisms[c].rc); - - if (ats->mechanisms!=NULL) { - GNUNET_free(ats->mechanisms); - ats->mechanisms = NULL; + GNUNET_free(ats->mechanisms); + ats->mechanisms = NULL; } if (ats->peers!=NULL) { - GNUNET_free(ats->peers); - ats->peers = NULL; + GNUNET_free(ats->peers); + ats->peers = NULL; } if (ats->prob != NULL) { - _lp_delete_prob(ats->prob); - ats->prob = NULL; + _lp_delete_prob(ats->prob); + ats->prob = NULL; } ats->stat.begin_cr = GNUNET_SYSERR; @@ -1230,591 +1499,691 @@ void ats_delete_problem (struct ATS_info * ats) -void ats_solve_problem (struct ATS_info * ats, unsigned int max_it, unsigned int max_dur, unsigned int c_peers, unsigned int c_mechs, struct ATS_stat *stat) +void ats_solve_problem (struct ATS_Handle * ats, + unsigned int max_it, + unsigned int max_dur, + unsigned int c_peers, + unsigned int c_mechs, + struct ATS_stat *stat) { - int result = GNUNET_SYSERR; - int lp_solution = GNUNET_SYSERR; - int mlp_solution = GNUNET_SYSERR; +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; +#endif - // Solving simplex - glp_smcp opt_lp; + int result = GNUNET_SYSERR; + int lp_solution = GNUNET_SYSERR; + int mlp_solution = GNUNET_SYSERR; - _lp_init_smcp(&opt_lp); + // Solving simplex + + glp_smcp opt_lp; + _lp_init_smcp(&opt_lp); #if VERBOSE_ATS - opt_lp.msg_lev = GLP_MSG_ALL; + opt_lp.msg_lev = GLP_MSG_ALL; #else - opt_lp.msg_lev = GLP_MSG_OFF; + opt_lp.msg_lev = GLP_MSG_OFF; #endif + // setting iteration limit + opt_lp.it_lim = max_it; + // maximum duration + opt_lp.tm_lim = max_dur; - // setting iteration limit - opt_lp.it_lim = max_it; - // maximum duration - opt_lp.tm_lim = max_dur; + if (ats->stat.recreate_problem == GNUNET_YES) + opt_lp.presolve = GLP_ON; - if (ats->stat.recreate_problem == GNUNET_YES) - opt_lp.presolve = GLP_ON; - result = _lp_simplex(ats->prob, &opt_lp); - lp_solution = _lp_get_status (ats->prob); + result = _lp_simplex(ats->prob, &opt_lp); + lp_solution = _lp_get_status (ats->prob); - if ((result == GLP_ETMLIM) || (result == GLP_EITLIM)) - { - ats->stat.valid = GNUNET_NO; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS exceeded time or iteration limit!\n"); - return; - } + if ((result == GLP_ETMLIM) || (result == GLP_EITLIM)) + { + ats->stat.valid = GNUNET_NO; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "ATS exceeded time or iteration limit!\n"); + return; + } - if (ats_evaluate_results(result, lp_solution, "LP") == GNUNET_YES) - { - stat->valid = GNUNET_YES; - } - else - { - ats->stat.simplex_rerun_required = GNUNET_YES; - opt_lp.presolve = GLP_ON; - result = _lp_simplex(ats->prob, &opt_lp); - lp_solution = _lp_get_status (ats->prob); - - // TODO: Remove if this does not appear until release - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "EXECUTED SIMPLEX WITH PRESOLVER! %i \n", lp_solution); - - if (ats_evaluate_results(result, lp_solution, "LP") != GNUNET_YES) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "After execution simplex with presolver: STILL INVALID!\n"); - char * filename; - GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%llu.mlp",ats->stat.c_peers, ats->stat.c_mechs, GNUNET_TIME_absolute_get().abs_value); - _lp_write_lp (ats->prob, NULL, filename); - GNUNET_free (filename); - stat->valid = GNUNET_NO; - ats->stat.recreate_problem = GNUNET_YES; - return; - } - stat->valid = GNUNET_YES; - } + if (ats_evaluate_results(result, lp_solution, "LP") == GNUNET_YES) + { + stat->valid = GNUNET_YES; + } + else + { + ats->stat.simplex_rerun_required = GNUNET_YES; + opt_lp.presolve = GLP_ON; + result = _lp_simplex(ats->prob, &opt_lp); + lp_solution = _lp_get_status (ats->prob); - // Solving mlp - glp_iocp opt_mlp; - _lp_init_iocp(&opt_mlp); - // maximum duration - opt_mlp.tm_lim = max_dur; - // output level + // TODO: Remove if this does not appear until release + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "" + "EXECUTED SIMPLEX WITH PRESOLVER! %i \n", + lp_solution); + + if (ats_evaluate_results(result, lp_solution, "LP") != GNUNET_YES) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "After execution simplex with presolver: STILL INVALID!\n"); + char * filename; + GNUNET_asprintf (&filename, + "ats_mlp_p%i_m%i_%llu.mlp", + ats->stat.c_peers, + ats->stat.c_mechs, + GNUNET_TIME_absolute_get().abs_value); + _lp_write_lp ((void *)ats->prob, NULL, filename); + GNUNET_free (filename); + stat->valid = GNUNET_NO; + ats->stat.recreate_problem = GNUNET_YES; + return; + } + stat->valid = GNUNET_YES; + } + + // Solving mlp + glp_iocp opt_mlp; + _lp_init_iocp(&opt_mlp); + // maximum duration + opt_mlp.tm_lim = max_dur; + // output level #if VERBOSE_ATS - opt_mlp.msg_lev = GLP_MSG_ALL; + opt_mlp.msg_lev = GLP_MSG_ALL; #else - opt_mlp.msg_lev = GLP_MSG_OFF; + opt_mlp.msg_lev = GLP_MSG_OFF; #endif - result = _lp_intopt (ats->prob, &opt_mlp); - mlp_solution = _lp_mip_status (ats->prob); - stat->solution = mlp_solution; + result = _lp_intopt (ats->prob, &opt_mlp); + mlp_solution = _lp_mip_status (ats->prob); + stat->solution = mlp_solution; - if (ats_evaluate_results(result, mlp_solution, "MLP") == GNUNET_YES) - { - stat->valid = GNUNET_YES; - } - else - { - // TODO: Remove if this does not appear until release - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP solution for %i peers, %i mechs is invalid: %i\n", ats->stat.c_peers, ats->stat.c_mechs, mlp_solution); - stat->valid = GNUNET_NO; - } - -/* - int check; - int error = GNUNET_NO; - double bw; - struct ATS_mechanism *t = NULL; - for (c=1; c<= (c_peers); c++ ) - { - check = GNUNET_NO; - t = peers[c].m_head; - while (t!=NULL) - { - bw = glp_get_col_prim(prob, t->col_index); - if (bw > 1.0) - { -#if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[%i][%i] `%s' %s %s %f\n", c, t->col_index, GNUNET_h2s(&peers[c].peer.hashPubKey), t->plugin->short_name, glp_get_col_name(prob,t->col_index), bw); -#endif - if (check ==GNUNET_YES) - { - glp_write_sol(prob, "invalid_solution.mlp"); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid solution, check invalid_solution.mlp"); - GNUNET_STATISTICS_update (stats, "ATS invalid solutions", 1, GNUNET_NO); - error = GNUNET_YES; - } - if (check ==GNUNET_NO) - check = GNUNET_YES; - } - t = t->next; - } - }*/ + if (ats_evaluate_results(result, mlp_solution, "MLP") == GNUNET_YES) + { + stat->valid = GNUNET_YES; + } + else + { + // TODO: Remove if this does not appear until release + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "MLP solution for %i peers, %i mechs is invalid: %i\n", + ats->stat.c_peers, + ats->stat.c_mechs, + mlp_solution); + stat->valid = GNUNET_NO; + } #if VERBOSE_ATS - if (glp_get_col_prim(ats->prob,2*c_mechs+1) != 1) - { - int c; - for (c=1; c<= available_quality_metrics; c++ ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+3+c), glp_get_col_prim(ats->prob,2*c_mechs+3+c)); - } - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+1), glp_get_col_prim(ats->prob,2*c_mechs+1)); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+2), glp_get_col_prim(ats->prob,2*c_mechs+2)); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+3), glp_get_col_prim(ats->prob,2*c_mechs+3)); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "objective value: %f\n", glp_mip_obj_val(ats->prob)); - } + if (_lp_get_col_prim(ats->prob,2*c_mechs+1) != 1) + { + int c; + for (c=1; c<= available_quality_metrics; c++ ) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", + _lp_get_col_name(ats->prob,2*c_mechs+3+c), + _lp_get_col_prim(ats->prob,2*c_mechs+3+c)); + } + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", + _lp_get_col_name(ats->prob,2*c_mechs+1), + _lp_get_col_prim(ats->prob,2*c_mechs+1)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", + _lp_get_col_name(ats->prob,2*c_mechs+2), + _lp_get_col_prim(ats->prob,2*c_mechs+2)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", + _lp_get_col_name(ats->prob,2*c_mechs+3), + _lp_get_col_prim(ats->prob,2*c_mechs+3)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "objective value: %f\n", + _lp_mip_obj_val(ats->prob)); + } #endif } -void ats_shutdown (struct ATS_info * ats) +void ats_shutdown (struct ATS_Handle * ats) { -#if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_destroy\n"); +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; #endif - if (ats->ats_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel(ats->ats_task); - ats->ats_task = GNUNET_SCHEDULER_NO_TASK; -#if HAVE_LIBGLPK - ats_delete_problem (ats); - glp_free_env(); +#if DEBUG_ATS + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS shutdown\n"); #endif - GNUNET_free (ats); + if (ats->ats_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel(ats->ats_task); + ats->ats_task = GNUNET_SCHEDULER_NO_TASK; + ats_delete_problem (ats); + _lp_free_env(); + + GNUNET_free (ats); } -void ats_update_problem_qm (struct ATS_info * ats) +void ats_update_problem_qm (struct ATS_Handle * ats) { - int array_index; - int row_index; - int c, c2; - int c_q_metrics = available_quality_metrics; +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; +#endif + + int array_index; + int row_index; + int c, c2; + int c_q_metrics = available_quality_metrics; - int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int)); - double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double)); + int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (int)); + double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (double)); #if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n"); #endif - row_index = ats->stat.begin_qm; + row_index = ats->stat.begin_qm; - for (c=1; c <= c_q_metrics; c++) - { - array_index = 1; - double value = 1; -#if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); -#endif - - _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); - for (c2=1; c2<=ats->stat.c_mechs; c2++) - { - ja[array_index] = c2; - - GNUNET_assert (ats->mechanisms[c2].addr != NULL); - GNUNET_assert (ats->mechanisms[c2].peer != NULL); - - if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) - { - double v0 = 0, v1 = 0, v2 = 0; - - v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; - if (v1 < 1) v0 = 0.1; - v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; - if (v1 < 1) v0 = 0.1; - v2 = ats->mechanisms[c2].addr->quality[c-1].values[2]; - if (v1 < 1) v0 = 0.1; - value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0); - //value = 1; - } - if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) - { - double v0 = 0, v1 = 0, v2 = 0; - v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; - if (v0 < 1) v0 = 1; - v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; - if (v1 < 1) v1 = 1; - v2 = ats->mechanisms[c2].addr->quality[c-1].values[2]; - if (v2 < 1) v2 = 1; - value = (v0 + 2 * v1 + 3 * v2) / 6.0; - if (value >= 1) - value = (double) 10 / value; - else - value = 10; - } - ar[array_index] = (ats->mechanisms[c2].peer->f) * value; + for (c=1; c <= c_q_metrics; c++) + { + array_index = 1; + double value = 1; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, row_index, ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index); #endif - array_index++; - } - ja[array_index] = ats->stat.col_qm + c - 1; - ar[array_index] = -1; + _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); + for (c2=1; c2<=ats->stat.c_mechs; c2++) + { + ja[array_index] = c2; + GNUNET_assert (ats->mechanisms[c2].addr != NULL); + GNUNET_assert (ats->mechanisms[c2].peer != NULL); + if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) + { + double v0 = 0, v1 = 0, v2 = 0; + + v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; + if (v1 < 1) v0 = 0.1; + v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; + if (v1 < 1) v0 = 0.1; + v2 = ats->mechanisms[c2].addr->quality[c-1].values[2]; + if (v1 < 1) v0 = 0.1; + value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0); + //value = 1; + } + if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) + { + double v0 = 0, v1 = 0, v2 = 0; + v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; + if (v0 < 1) v0 = 1; + v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; + if (v1 < 1) v1 = 1; + v2 = ats->mechanisms[c2].addr->quality[c-1].values[2]; + if (v2 < 1) v2 = 1; + value = (v0 + 2 * v1 + 3 * v2) / 6.0; + if (value >= 1) + value = (double) 10 / value; + else + value = 10; + } + ar[array_index] = (ats->mechanisms[c2].peer->f) * value; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, row_index, ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n", + array_index, + qm[c-1].name, + row_index, + ja[array_index], + ar[array_index]); #endif - _lp_set_mat_row (ats->prob, row_index, array_index, ja, ar); - - array_index = 1; - row_index++; + array_index++; } + ja[array_index] = ats->stat.col_qm + c - 1; + ar[array_index] = -1; - GNUNET_free_non_null (ja); - GNUNET_free_non_null (ar); +#if VERBOSE_ATS + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + row_index, + ja[array_index], + ar[array_index]); +#endif + _lp_set_mat_row (ats->prob, row_index, array_index, ja, ar); + array_index = 1; + row_index++; + } + GNUNET_free_non_null (ja); + GNUNET_free_non_null (ar); } void -ats_calculate_bandwidth_distribution (struct ATS_info * ats, struct GNUNET_STATISTICS_Handle *stats, struct NeighbourList *neighbours) +ats_calculate_bandwidth_distribution (struct ATS_Handle * ats, + struct GNUNET_STATISTICS_Handle *stats, + struct NeighbourList *neighbours) { -#if HAVE_LIBGLPK +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; +#endif - struct GNUNET_TIME_Absolute start; - struct GNUNET_TIME_Relative creation; - struct GNUNET_TIME_Relative solving; - char *text = "unmodified"; + struct GNUNET_TIME_Absolute start; + struct GNUNET_TIME_Relative creation; + struct GNUNET_TIME_Relative solving; + char *text = "unmodified"; - struct GNUNET_TIME_Relative delta = GNUNET_TIME_absolute_get_difference (ats->last, GNUNET_TIME_absolute_get()); - if (delta.rel_value < ats->min_delta.rel_value) - { + struct GNUNET_TIME_Relative delta = GNUNET_TIME_absolute_get_difference (ats->last, + GNUNET_TIME_absolute_get()); + if (delta.rel_value < ats->min_delta.rel_value) + { #if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Minimum time between cycles not reached\n"); + GNUNET_log (GNUNET_ERROR_TYPE_BULK, + "Minimum time between cycles not reached\n"); #endif - return; - } + return; + } #if FIXME_WACHS - int dur; - if (INT_MAX < ats->max_exec_duration.rel_value) - dur = INT_MAX; - else - dur = (int) ats->max_exec_duration.rel_value; -#endif - - ats->stat.simplex_rerun_required = GNUNET_NO; - start = GNUNET_TIME_absolute_get(); - if ((ats->stat.recreate_problem == GNUNET_YES) || (ats->prob==NULL) || (ats->stat.valid == GNUNET_NO)) - { - text = "new"; - ats->stat.recreate_problem = GNUNET_YES; - ats_delete_problem (ats); - ats_create_problem (ats, neighbours, ats->D, ats->U, ats->R, ats->v_b_min, ats->v_n_min, &ats->stat); + int dur; + if (INT_MAX < ats->max_exec_duration.rel_value) + dur = INT_MAX; + else + dur = (int) ats->max_exec_duration.rel_value; +#endif + + ats->stat.simplex_rerun_required = GNUNET_NO; + start = GNUNET_TIME_absolute_get(); + if ((ats->stat.recreate_problem == GNUNET_YES) || + (ats->prob==NULL) || + (ats->stat.valid == GNUNET_NO)) + { + text = "new"; + ats->stat.recreate_problem = GNUNET_YES; + ats_delete_problem (ats); + ats_create_problem (ats, + neighbours, + ats->D, + ats->U, + ats->R, + ats->v_b_min, + ats->v_n_min, + &ats->stat); #if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers/Addresses were modified... new problem: %i peer, %i mechs\n", ats->stat.c_peers, ats->stat.c_mechs); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Peers/Addresses were modified... new problem: %i peer, %i mechs\n", + ats->stat.c_peers, + ats->stat.c_mechs); #endif - } - - else if ((ats->stat.recreate_problem == GNUNET_NO) && (ats->stat.modified_resources == GNUNET_YES) && (ats->stat.valid == GNUNET_YES)) - { - text = "modified resources"; - ats_update_problem_cr (ats); - } - else if ((ats->stat.recreate_problem == GNUNET_NO) && (ats->stat.modified_quality == GNUNET_YES) && (ats->stat.valid == GNUNET_YES)) - { - text = "modified quality"; - ats_update_problem_qm (ats); - //ats_update_problem_qm_TEST (); + } - } + else if ((ats->stat.recreate_problem == GNUNET_NO) && + (ats->stat.modified_resources == GNUNET_YES) && + (ats->stat.valid == GNUNET_YES)) + { + text = "modified resources"; + ats_update_problem_cr (ats); + } + else if ((ats->stat.recreate_problem == GNUNET_NO) && + (ats->stat.modified_quality == GNUNET_YES) && + (ats->stat.valid == GNUNET_YES)) + { + text = "modified quality"; + ats_update_problem_qm (ats); + //ats_update_problem_qm_TEST (); + } #if DEBUG_ATS - else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Problem is unmodified\n"); + else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Problem is unmodified\n"); #endif - creation = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get()); - start = GNUNET_TIME_absolute_get(); + creation = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get()); + start = GNUNET_TIME_absolute_get(); - ats->stat.solution = GLP_UNDEF; - if (ats->stat.valid == GNUNET_YES) - { - ats_solve_problem(ats, ats->max_iterations, ats->max_exec_duration.rel_value, ats->stat.c_peers, ats->stat.c_mechs, &ats->stat); - } - solving = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get()); + ats->stat.solution = GLP_UNDEF; + if (ats->stat.valid == GNUNET_YES) + { + ats_solve_problem(ats, + ats->max_iterations, + ats->max_exec_duration.rel_value, + ats->stat.c_peers, + ats->stat.c_mechs, + &ats->stat); + } + solving = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get()); - if (ats->stat.valid == GNUNET_YES) - { - int msg_type = GNUNET_ERROR_TYPE_DEBUG; + if (ats->stat.valid == GNUNET_YES) + { + int msg_type = GNUNET_ERROR_TYPE_DEBUG; #if DEBUG_ATS - msg_type = GNUNET_ERROR_TYPE_ERROR; -#endif - GNUNET_log (msg_type, "MLP %s: creation time: %llu, execution time: %llu, %i mechanisms, simplex rerun: %s, solution %s\n", - text, creation.rel_value, solving.rel_value, - ats->stat.c_mechs, - (ats->stat.simplex_rerun_required == GNUNET_NO) ? "NO" : "YES", (ats->stat.solution == 5) ? "OPTIMAL" : "INVALID"); - ats->successful_executions ++; - GNUNET_STATISTICS_set (stats, "# ATS successful executions", ats->successful_executions, GNUNET_NO); - - if ((ats->stat.recreate_problem == GNUNET_YES) || (ats->prob==NULL)) - GNUNET_STATISTICS_set (stats, "ATS state",ATS_NEW, GNUNET_NO); - else if ((ats->stat.modified_resources == GNUNET_YES) && - (ats->stat.modified_quality == GNUNET_NO)) - GNUNET_STATISTICS_set (stats, "ATS state", ATS_C_UPDATED, GNUNET_NO); - else if ((ats->stat.modified_resources == GNUNET_NO) && - (ats->stat.modified_quality == GNUNET_YES) && - (ats->stat.simplex_rerun_required == GNUNET_NO)) - GNUNET_STATISTICS_set (stats, "ATS state", ATS_Q_UPDATED, GNUNET_NO); - else if ((ats->stat.modified_resources == GNUNET_YES) && - (ats->stat.modified_quality == GNUNET_YES) && - (ats->stat.simplex_rerun_required == GNUNET_NO)) - GNUNET_STATISTICS_set (stats, "ATS state", ATS_QC_UPDATED, GNUNET_NO); - else if (ats->stat.simplex_rerun_required == GNUNET_NO) - GNUNET_STATISTICS_set (stats, "ATS state", ATS_UNMODIFIED, GNUNET_NO); + msg_type = GNUNET_ERROR_TYPE_ERROR; +#endif + GNUNET_log (msg_type, + "MLP %s: creation time: %llu, execution time: %llu, %i mechanisms, simplex rerun: %s, solution %s\n", + text, + creation.rel_value, + solving.rel_value, + ats->stat.c_mechs, + (ats->stat.simplex_rerun_required == GNUNET_NO) ? "NO" : "YES", + (ats->stat.solution == 5) ? "OPTIMAL" : "INVALID"); + ats->successful_executions ++; + GNUNET_STATISTICS_set (stats, "# ATS successful executions", + ats->successful_executions, + GNUNET_NO); + + if ((ats->stat.recreate_problem == GNUNET_YES) || (ats->prob==NULL)) + GNUNET_STATISTICS_set (stats, "ATS state",ATS_NEW, GNUNET_NO); + else if ((ats->stat.modified_resources == GNUNET_YES) && + (ats->stat.modified_quality == GNUNET_NO)) + GNUNET_STATISTICS_set (stats, "ATS state", ATS_C_UPDATED, GNUNET_NO); + else if ((ats->stat.modified_resources == GNUNET_NO) && + (ats->stat.modified_quality == GNUNET_YES) && + (ats->stat.simplex_rerun_required == GNUNET_NO)) + GNUNET_STATISTICS_set (stats, "ATS state", ATS_Q_UPDATED, GNUNET_NO); + else if ((ats->stat.modified_resources == GNUNET_YES) && + (ats->stat.modified_quality == GNUNET_YES) && + (ats->stat.simplex_rerun_required == GNUNET_NO)) + GNUNET_STATISTICS_set (stats, "ATS state", ATS_QC_UPDATED, GNUNET_NO); + else if (ats->stat.simplex_rerun_required == GNUNET_NO) + GNUNET_STATISTICS_set (stats, "ATS state", ATS_UNMODIFIED, GNUNET_NO); + } + else + { + if (ats->stat.c_peers != 0) + { + ats->invalid_executions ++; + GNUNET_STATISTICS_set (stats, "# ATS invalid executions", + ats->invalid_executions, GNUNET_NO); + } + else + { + GNUNET_STATISTICS_set (stats, "# ATS successful executions", + ats->successful_executions, GNUNET_NO); + } + } + + GNUNET_STATISTICS_set (stats, + "ATS duration", solving.rel_value + creation.rel_value, GNUNET_NO); + GNUNET_STATISTICS_set (stats, + "ATS mechanisms", ats->stat.c_mechs, GNUNET_NO); + GNUNET_STATISTICS_set (stats, + "ATS peers", ats->stat.c_peers, GNUNET_NO); + GNUNET_STATISTICS_set (stats, + "ATS solution", ats->stat.solution, GNUNET_NO); + GNUNET_STATISTICS_set (stats, + "ATS timestamp", start.abs_value, GNUNET_NO); + + if ((ats->save_mlp == GNUNET_YES) && + (ats->stat.c_mechs >= ats->dump_min_peers) && + (ats->stat.c_mechs >= ats->dump_min_addr)) + { + char * filename; + if (ats->dump_overwrite == GNUNET_NO) + { + GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.mlp", + ats->stat.c_peers, + ats->stat.c_mechs, + text, + GNUNET_TIME_absolute_get().abs_value); + _lp_write_lp ((void *) ats->prob, NULL, filename); } else { - if (ats->stat.c_peers != 0) - { - ats->invalid_executions ++; - GNUNET_STATISTICS_set (stats, "# ATS invalid executions", ats->invalid_executions, GNUNET_NO); - } - else - { - GNUNET_STATISTICS_set (stats, "# ATS successful executions", ats->successful_executions, GNUNET_NO); - } + GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.mlp", + ats->stat.c_peers, ats->stat.c_mechs ); + _lp_write_lp ((void *) ats->prob, NULL, filename); } - - GNUNET_STATISTICS_set (stats, "ATS duration", solving.rel_value + creation.rel_value, GNUNET_NO); - GNUNET_STATISTICS_set (stats, "ATS mechanisms", ats->stat.c_mechs, GNUNET_NO); - GNUNET_STATISTICS_set (stats, "ATS peers", ats->stat.c_peers, GNUNET_NO); - GNUNET_STATISTICS_set (stats, "ATS solution", ats->stat.solution, GNUNET_NO); - GNUNET_STATISTICS_set (stats, "ATS timestamp", start.abs_value, GNUNET_NO); - - if ((ats->save_mlp == GNUNET_YES) && (ats->stat.c_mechs >= ats->dump_min_peers) && (ats->stat.c_mechs >= ats->dump_min_addr)) + GNUNET_free (filename); + } + if ((ats->save_solution == GNUNET_YES) && + (ats->stat.c_mechs >= ats->dump_min_peers) && + (ats->stat.c_mechs >= ats->dump_min_addr)) + { + char * filename; + if (ats->dump_overwrite == GNUNET_NO) { - char * filename; - if (ats->dump_overwrite == GNUNET_NO) - { - GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.mlp", - ats->stat.c_peers, ats->stat.c_mechs, text, GNUNET_TIME_absolute_get().abs_value); - _lp_write_lp (ats->prob, NULL, filename); - } - else - { - GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.mlp", - ats->stat.c_peers, ats->stat.c_mechs ); - _lp_write_lp (ats->prob, NULL, filename); - } - GNUNET_free (filename); + GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.sol", + ats->stat.c_peers, + ats->stat.c_mechs, + text, + GNUNET_TIME_absolute_get().abs_value); + _lp_print_sol (ats->prob, filename); } - if ((ats->save_solution == GNUNET_YES) && (ats->stat.c_mechs >= ats->dump_min_peers) && (ats->stat.c_mechs >= ats->dump_min_addr)) + else { - char * filename; - if (ats->dump_overwrite == GNUNET_NO) - { - GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.sol", - ats->stat.c_peers, ats->stat.c_mechs, text, GNUNET_TIME_absolute_get().abs_value); - glp_print_sol (ats->prob, filename); - } - else - { - GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.sol", - ats->stat.c_peers, ats->stat.c_mechs); - glp_print_sol (ats->prob, filename); - } - GNUNET_free (filename); + GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.sol", + ats->stat.c_peers, ats->stat.c_mechs); + _lp_print_sol (ats->prob, filename); } - - ats->last = GNUNET_TIME_absolute_get(); - ats->stat.recreate_problem = GNUNET_NO; - ats->stat.modified_resources = GNUNET_NO; - ats->stat.modified_quality = GNUNET_NO; -#endif + GNUNET_free (filename); + } + ats->last = GNUNET_TIME_absolute_get(); + ats->stat.recreate_problem = GNUNET_NO; + ats->stat.modified_resources = GNUNET_NO; + ats->stat.modified_quality = GNUNET_NO; } +/** + * Evaluate the result of the last simplex or mlp solving + * @param result return value returned by the solver + * @param solution solution state + * @param problem mlp or lp + * @return GNUNET_NO if solution is invalid, GNUNET_YES if solution is + * valid + */ + int ats_evaluate_results (int result, int solution, char * problem) { - int cont = GNUNET_NO; +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return GNUNET_NO; +#endif + + int cont = GNUNET_NO; #if DEBUG_ATS || VERBOSE_ATS - int error_kind = GNUNET_ERROR_TYPE_DEBUG; + int error_kind = GNUNET_ERROR_TYPE_DEBUG; #endif #if VERBOSE_ATS - error_kind = GNUNET_ERROR_TYPE_ERROR; + error_kind = GNUNET_ERROR_TYPE_ERROR; #endif - - switch (result) { - case GNUNET_SYSERR : /* GNUNET problem, not GLPK related */ + switch (result) { + case GNUNET_SYSERR : /* GNUNET problem, not GLPK related */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s , GLPK solving not executed\n", problem); + GNUNET_log (error_kind, + "%s, GLPK solving not executed\n", problem); #endif - break; - case GLP_ESTOP : /* search terminated by application */ + break; + case GLP_ESTOP : /* search terminated by application */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s , Search terminated by application\n", problem); + GNUNET_log (error_kind, + "%s , Search terminated by application\n", problem); #endif - break; - case GLP_EITLIM : /* iteration limit exceeded */ + break; + case GLP_EITLIM : /* iteration limit exceeded */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Iteration limit exceeded\n", problem); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%s Iteration limit exceeded\n", problem); #endif - break; - case GLP_ETMLIM : /* time limit exceeded */ + break; + case GLP_ETMLIM : /* time limit exceeded */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Time limit exceeded\n", problem); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%s Time limit exceeded\n", problem); #endif - break; - case GLP_ENOPFS : /* no primal feasible solution */ - case GLP_ENODFS : /* no dual feasible solution */ + break; + case GLP_ENOPFS : /* no primal feasible solution */ + case GLP_ENODFS : /* no dual feasible solution */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s No feasible solution\n", problem); + GNUNET_log (error_kind, + "%s No feasible solution\n", problem); #endif break; - - case GLP_EBADB : /* invalid basis */ - case GLP_ESING : /* singular matrix */ - case GLP_ECOND : /* ill-conditioned matrix */ - case GLP_EBOUND : /* invalid bounds */ - case GLP_EFAIL : /* solver failed */ - case GLP_EOBJLL : /* objective lower limit reached */ - case GLP_EOBJUL : /* objective upper limit reached */ - case GLP_EROOT : /* root LP optimum not provided */ + case GLP_EBADB : /* invalid basis */ + case GLP_ESING : /* singular matrix */ + case GLP_ECOND : /* ill-conditioned matrix */ + case GLP_EBOUND : /* invalid bounds */ + case GLP_EFAIL : /* solver failed */ + case GLP_EOBJLL : /* objective lower limit reached */ + case GLP_EOBJUL : /* objective upper limit reached */ + case GLP_EROOT : /* root LP optimum not provided */ #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s Invalid Input data: %i\n", problem, result); + GNUNET_log (error_kind, + "%s Invalid Input data: %i\n", + problem, result); #endif break; - - case 0: + case 0: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s Problem has been solved\n", problem); + GNUNET_log (error_kind, + "%s Problem has been solved\n", problem); #endif - break; - } + break; + } - switch (solution) { - case GLP_UNDEF: + switch (solution) { + case GLP_UNDEF: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s solution is undefined\n", problem); + GNUNET_log (error_kind, + "%s solution is undefined\n", problem); #endif - break; - case GLP_OPT: + break; + case GLP_OPT: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s solution is optimal\n", problem); + GNUNET_log (error_kind, + "%s solution is optimal\n", problem); #endif - cont=GNUNET_YES; - break; - case GLP_FEAS: + cont=GNUNET_YES; + break; + case GLP_FEAS: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s solution is %s feasible, however, its optimality (or non-optimality) has not been proven, \n", problem, (0==strcmp(problem,"LP")?"":"integer")); + GNUNET_log (error_kind, + "%s solution is %s feasible, however, its optimality (or non-optimality) has not been proven\n", + problem, (0==strcmp(problem,"LP")?"":"integer")); #endif - cont=GNUNET_YES; - break; - case GLP_NOFEAS: + cont=GNUNET_YES; + break; + case GLP_NOFEAS: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s problem has no %sfeasible solution\n", problem, (0==strcmp(problem,"LP")?"":"integer ")); + GNUNET_log (error_kind, "%s problem has no %sfeasible solution\n", + problem, (0==strcmp(problem,"LP")?"":"integer ")); #endif - break; - case GLP_INFEAS: + break; + case GLP_INFEAS: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s problem is infeasible \n", problem); + GNUNET_log (error_kind, "%s problem is infeasible \n", problem); #endif - break; - case GLP_UNBND: + break; + case GLP_UNBND: #if DEBUG_ATS || VERBOSE_ATS - GNUNET_log (error_kind, "%s problem is unbounded \n", problem); + GNUNET_log (error_kind, "%s problem is unbounded \n", problem); #endif - default: - break; - } + default: + break; + } return cont; } -void ats_update_problem_cr (struct ATS_info * ats) +void ats_update_problem_cr (struct ATS_Handle * ats) { +#if !HAVE_LIBGLPK + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); + return; +#endif - int array_index; - int row_index; - int c, c2; - double ct_max, ct_min; + int array_index; + int row_index; + int c, c2; + double ct_max, ct_min; - int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int)); - double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double)); + int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (int)); + double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (double)); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n"); - row_index = ats->stat.begin_cr; - array_index = 1; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n"); + row_index = ats->stat.begin_cr; + array_index = 1; - for (c=0; cprob, row_index, GLP_DB, ct_min, ct_max); - - for (c2=1; c2<=ats->stat.c_mechs; c2++) - { - double value = 0; - - GNUNET_assert (ats->mechanisms[c2].addr != NULL); - GNUNET_assert (ats->mechanisms[c2].peer != NULL); + _lp_set_row_bnds(ats->prob, row_index, GLP_DB, ct_min, ct_max); + for (c2=1; c2<=ats->stat.c_mechs; c2++) + { + double value = 0; + GNUNET_assert (ats->mechanisms[c2].addr != NULL); + GNUNET_assert (ats->mechanisms[c2].peer != NULL); - ja[array_index] = c2; - value = ats->mechanisms[c2].addr->ressources[c].c; - ar[array_index] = value; + ja[array_index] = c2; + value = ats->mechanisms[c2].addr->ressources[c].c; + ar[array_index] = value; #if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, row_index, ja[array_index], ar[array_index]); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n", + array_index, + row_index, + ja[array_index], + ar[array_index]); #endif - array_index++; - } - _lp_set_mat_row (ats->prob, row_index, array_index, ja, ar); - - row_index ++; - } - - - GNUNET_free_non_null (ja); - GNUNET_free_non_null (ar); + array_index++; + } + _lp_set_mat_row (ats->prob, row_index, array_index, ja, ar); + row_index ++; + } + GNUNET_free_non_null (ja); + GNUNET_free_non_null (ar); } #if 0 static void ats_update_problem_qm_TEST () { - int row_index; - int c, c2; - - int old_ja[ats->stat.c_mechs + 2]; - double old_ar[ats->stat.c_mechs + 2]; - int c_old; - int changed = 0; - - int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int)); - double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double)); + int row_index; + int c + int c2; + int c_old; + int changed = 0; + + int old_ja[ats->stat.c_mechs + 2]; + double old_ar[ats->stat.c_mechs + 2]; + + int *ja = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (int)); + double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + + available_quality_metrics) * sizeof (double)); #if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics TEST\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Updating problem quality metrics TEST\n"); #endif - if (ats->stat.begin_qm >0) - row_index = ats->stat.begin_qm; - else - return; - - - for (c=0; cstat.begin_qm >0) + row_index = ats->stat.begin_qm; + else + return; + for (c=0; cprob, row_index, old_ja, old_ar); + _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); + for (c2=1; c2<=c_old; c2++) + { + ja[c2] = old_ja[c2]; + if ((changed < 3) && (c2>2) && (old_ar[c2] != -1)) { - - c_old = glp_get_mat_row (ats->prob, row_index, old_ja, old_ar); - - _lp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0); - - for (c2=1; c2<=c_old; c2++) - { - ja[c2] = old_ja[c2]; - if ((changed < 3) && (c2>2) && (old_ar[c2] != -1)) - { - ar[c2] = old_ar[c2] + 5 - changed; - changed ++; - } - else - ar[c2] = old_ar[c2]; -#if VERBOSE_ATS - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: old [%i,%i]=%f new [%i,%i]=%f\n",c2, row_index, old_ja[c2], old_ar[c2], row_index, ja[c2], ar[c2]); -#endif - } - _lp_set_mat_row (ats->prob, row_index, c_old, ja, ar); - - row_index ++; + ar[c2] = old_ar[c2] + 5 - changed; + changed ++; } - - GNUNET_free_non_null (ja); - GNUNET_free_non_null (ar); + else + ar[c2] = old_ar[c2]; +#if VERBOSE_ATS + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "[index]=[%i]: old [%i,%i]=%f new [%i,%i]=%f\n", + c2, + row_index, + old_ja[c2], + old_ar[c2], + row_index, + ja[c2], + ar[c2]); +#endif + } + _lp_set_mat_row (ats->prob, row_index, c_old, ja, ar); + row_index ++; + } + GNUNET_free_non_null (ja); + GNUNET_free_non_null (ar); } #endif diff --git a/src/transport/transport_ats.h b/src/transport/transport_ats.h index 33c0d1103..9c45a6fb6 100644 --- a/src/transport/transport_ats.h +++ b/src/transport/transport_ats.h @@ -37,292 +37,292 @@ #define ATS_UNMODIFIED 4 /* - * ATS data structures - */ +* ATS data structures +*/ struct ATS_stat { - /** - * result of last GLPK run - * 5 == OPTIMAL - */ - int solution; - - /** - * Ressource costs or quality metrics changed - * update problem before solving - */ - int modified_resources; - - /** - * Ressource costs or quality metrics changed, update matrix - * update problem before solving - */ - int modified_quality; - - /** - * Peers have connected or disconnected - * problem has to be recreated - */ - int recreate_problem; - - /** - * Was the available basis invalid and we needed to rerun simplex? - */ - int simplex_rerun_required; - - /** - * is problem currently valid and can it be solved - */ - int valid; - - /** - * Number of transport mechanisms in the problem - */ - int c_mechs; - - /** - * Number of transport mechanisms in the problem - */ - int c_peers; - - /** - * row index where quality related rows start - */ - int begin_qm; - - /** - * row index where quality related rows end - */ - int end_qm; - - /** - * row index where ressource cost related rows start - */ - int begin_cr; - - /** - * row index where ressource cost related rows end - */ - int end_cr; - - /** - * column index for objective function value d - */ - int col_d; - - /** - * column index for objective function value u - */ - int col_u; - - /** - * column index for objective function value r - */ - int col_r; - - /** - * column index for objective function value quality metrics - */ - int col_qm; - - /** - * column index for objective function value cost ressources - */ - int col_cr; + /** + * result of last GLPK run + * 5 == OPTIMAL + */ + int solution; + + /** + * Ressource costs or quality metrics changed + * update problem before solving + */ + int modified_resources; + + /** + * Ressource costs or quality metrics changed, update matrix + * update problem before solving + */ + int modified_quality; + + /** + * Peers have connected or disconnected + * problem has to be recreated + */ + int recreate_problem; + + /** + * Was the available basis invalid and we needed to rerun simplex? + */ + int simplex_rerun_required; + + /** + * is problem currently valid and can it be solved + */ + int valid; + + /** + * Number of transport mechanisms in the problem + */ + int c_mechs; + + /** + * Number of transport mechanisms in the problem + */ + int c_peers; + + /** + * row index where quality related rows start + */ + int begin_qm; + + /** + * row index where quality related rows end + */ + int end_qm; + + /** + * row index where ressource cost related rows start + */ + int begin_cr; + + /** + * row index where ressource cost related rows end + */ + int end_cr; + + /** + * column index for objective function value d + */ + int col_d; + + /** + * column index for objective function value u + */ + int col_u; + + /** + * column index for objective function value r + */ + int col_r; + + /** + * column index for objective function value quality metrics + */ + int col_qm; + + /** + * column index for objective function value cost ressources + */ + int col_cr; }; -struct ATS_info +struct ATS_Handle { - /** - * Time of last execution - */ - struct GNUNET_TIME_Absolute last; - /** - * Minimum intervall between two executions - */ - struct GNUNET_TIME_Relative min_delta; - /** - * Regular intervall when execution is triggered - */ - struct GNUNET_TIME_Relative exec_interval; - /** - * Maximum execution time per calculation - */ - struct GNUNET_TIME_Relative max_exec_duration; - - /** - * GLPK (MLP) problem object - */ + /** + * Time of last execution + */ + struct GNUNET_TIME_Absolute last; + /** + * Minimum intervall between two executions + */ + struct GNUNET_TIME_Relative min_delta; + /** + * Regular intervall when execution is triggered + */ + struct GNUNET_TIME_Relative exec_interval; + /** + * Maximum execution time per calculation + */ + struct GNUNET_TIME_Relative max_exec_duration; + + /** + * GLPK (MLP) problem object + */ #if HAVE_LIBGLPK - glp_prob *prob; + glp_prob *prob; #else - void * prob; + void * prob; #endif - /** - * task to recalculate the bandwidth assignment - */ - GNUNET_SCHEDULER_TaskIdentifier ats_task; - - /** - * Current state of the GLPK problem - */ - struct ATS_stat stat; - - /** - * mechanisms used in current problem - * needed for problem modification - */ - struct ATS_mechanism * mechanisms; - - /** - * peers used in current problem - * needed for problem modification - */ - struct ATS_peer * peers; - - /** - * number of successful executions - */ - int successful_executions; - - /** - * number with an invalid result - */ - int invalid_executions; - - /** - * Maximum number of LP iterations per calculation - */ - int max_iterations; - - /** - * Dump problem to a file? - */ - int save_mlp; - - /** - * Dump solution to a file - */ - int save_solution; - - /** - * Dump solution when minimum peers: - */ - int dump_min_peers; - - /** - * Dump solution when minimum addresses: - */ - int dump_min_addr; - - /** - * Dump solution overwrite file: - */ - int dump_overwrite; - - /** - * Diversity weight - */ - double D; - - /** - * Utility weight - */ - double U; - - /** - * Relativity weight - */ - double R; - - /** - * Minimum bandwidth per peer - */ - int v_b_min; - - /** - * Minimum number of connections per peer - */ - int v_n_min; + /** + * task to recalculate the bandwidth assignment + */ + GNUNET_SCHEDULER_TaskIdentifier ats_task; + + /** + * Current state of the GLPK problem + */ + struct ATS_stat stat; + + /** + * mechanisms used in current problem + * needed for problem modification + */ + struct ATS_mechanism * mechanisms; + + /** + * peers used in current problem + * needed for problem modification + */ + struct ATS_peer * peers; + + /** + * number of successful executions + */ + int successful_executions; + + /** + * number with an invalid result + */ + int invalid_executions; + + /** + * Maximum number of LP iterations per calculation + */ + int max_iterations; + + /** + * Dump problem to a file? + */ + int save_mlp; + + /** + * Dump solution to a file + */ + int save_solution; + + /** + * Dump solution when minimum peers: + */ + int dump_min_peers; + + /** + * Dump solution when minimum addresses: + */ + int dump_min_addr; + + /** + * Dump solution overwrite file: + */ + int dump_overwrite; + + /** + * Diversity weight + */ + double D; + + /** + * Utility weight + */ + double U; + + /** + * Relativity weight + */ + double R; + + /** + * Minimum bandwidth per peer + */ + int v_b_min; + + /** + * Minimum number of connections per peer + */ + int v_n_min; }; struct ATS_mechanism { - struct ATS_mechanism * prev; - struct ATS_mechanism * next; - struct ForeignAddressList * addr; - struct TransportPlugin * plugin; - struct ATS_peer * peer; - int col_index; - int id; - struct ATS_ressource_cost * rc; + struct ATS_mechanism * prev; + struct ATS_mechanism * next; + struct ForeignAddressList * addr; + struct TransportPlugin * plugin; + struct ATS_peer * peer; + int col_index; + int id; + struct ATS_ressource_cost * rc; }; struct ATS_peer { - int id; - struct GNUNET_PeerIdentity peer; - struct NeighbourList * n; - struct ATS_mechanism * m_head; - struct ATS_mechanism * m_tail; - - /* preference value f */ - double f; - int t; + int id; + struct GNUNET_PeerIdentity peer; + struct NeighbourList * n; + struct ATS_mechanism * m_head; + struct ATS_mechanism * m_tail; + + /* preference value f */ + double f; + int t; }; struct ATS_ressource { - /* index in ressources array */ - int index; - /* depending ATSi parameter to calculcate limits */ - int atis_index; - /* cfg option to load limits */ - char * cfg_param; - /* lower bound */ - double c_min; - /* upper bound */ - double c_max; - - /* cofficients for the specific plugins */ - double c_unix; - double c_tcp; - double c_udp; - double c_http; - double c_https; - double c_wlan; - double c_default; + /* index in ressources array */ + int index; + /* depending ATSi parameter to calculcate limits */ + int atis_index; + /* cfg option to load limits */ + char * cfg_param; + /* lower bound */ + double c_min; + /* upper bound */ + double c_max; + + /* cofficients for the specific plugins */ + double c_unix; + double c_tcp; + double c_udp; + double c_http; + double c_https; + double c_wlan; + double c_default; }; struct ATS_ressource_entry { - /* index in ressources array */ - int index; - /* depending ATSi parameter to calculcate limits */ - int atis_index; - /* lower bound */ - double c; + /* index in ressources array */ + int index; + /* depending ATSi parameter to calculcate limits */ + int atis_index; + /* lower bound */ + double c; }; struct ATS_quality_metric { - int index; - int atis_index; - char * name; + int index; + int atis_index; + char * name; }; struct ATS_quality_entry { - int index; - int atsi_index; - uint32_t values[3]; - int current; + int index; + int atsi_index; + uint32_t values[3]; + int current; }; /* @@ -333,15 +333,15 @@ struct ATS_quality_entry static struct ATS_ressource ressources[] = { - /* FIXME: the coefficients for the specific plugins */ - {1, 7, "LAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 1, 3}, - {2, 7, "WAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 2, 3}, - {3, 4, "WLAN_ENERGY_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 0, 0, 0, 0, 2, 1} + /* FIXME: the coefficients for the specific plugins */ + {1, 7, "LAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 1, 3}, + {2, 7, "WAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 2, 3}, + {3, 4, "WLAN_ENERGY_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 0, 0, 0, 0, 2, 1} /* - {4, 4, "COST_ENERGY_CONSUMPTION", VERY_BIG_DOUBLE_VALUE}, - {5, 5, "COST_CONNECT", VERY_BIG_DOUBLE_VALUE}, - {6, 6, "COST_BANDWITH_AVAILABLE", VERY_BIG_DOUBLE_VALUE}, - {7, 7, "COST_NETWORK_OVERHEAD", VERY_BIG_DOUBLE_VALUE},*/ + {4, 4, "COST_ENERGY_CONSUMPTION", VERY_BIG_DOUBLE_VALUE}, + {5, 5, "COST_CONNECT", VERY_BIG_DOUBLE_VALUE}, + {6, 6, "COST_BANDWITH_AVAILABLE", VERY_BIG_DOUBLE_VALUE}, + {7, 7, "COST_NETWORK_OVERHEAD", VERY_BIG_DOUBLE_VALUE},*/ }; /* @@ -350,8 +350,8 @@ static struct ATS_ressource ressources[] = static struct ATS_quality_metric qm[] = { - {1, 1028, "QUALITY_NET_DISTANCE"}, - {2, 1034, "QUALITY_NET_DELAY"}, + {1, 1028, "QUALITY_NET_DISTANCE"}, + {2, 1034, "QUALITY_NET_DELAY"}, }; #define available_quality_metrics 2 @@ -359,13 +359,47 @@ static struct ATS_quality_metric qm[] = /* * ATS functions */ -struct ATS_info * ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg); -void ats_shutdown (struct ATS_info * ats); -void ats_delete_problem (struct ATS_info * ats); -int ats_create_problem (struct ATS_info * ats, struct NeighbourList *n, double D, double U, double R, int v_b_min, int v_n_min, struct ATS_stat *stat); -void ats_calculate_bandwidth_distribution (struct ATS_info * ats, struct GNUNET_STATISTICS_Handle *stats, struct NeighbourList *neighbours); -void ats_solve_problem (struct ATS_info * ats, unsigned int max_it, unsigned int max_dur, unsigned int c_peers, unsigned int c_mechs, struct ATS_stat *stat); -int ats_evaluate_results (int result, int solution, char * problem); -void ats_update_problem_qm (struct ATS_info * ats); -void ats_update_problem_cr (struct ATS_info * ats); +struct ATS_Handle * +ats_init (const struct GNUNET_CONFIGURATION_Handle *cfg); + +void +ats_shutdown (struct ATS_Handle * ats); + +void +ats_delete_problem (struct ATS_Handle * ats); + +int +ats_create_problem (struct ATS_Handle * ats, + struct NeighbourList *n, + double D, + double U, + double R, + int v_b_min, + int v_n_min, + struct ATS_stat *stat); + +void +ats_calculate_bandwidth_distribution (struct ATS_Handle * ats, + struct GNUNET_STATISTICS_Handle *stats, + struct NeighbourList *neighbours); + +void +ats_solve_problem (struct ATS_Handle * ats, + unsigned int max_it, + unsigned int max_dur, + unsigned int c_peers, + unsigned int c_mechs, + struct ATS_stat *stat); + +int +ats_evaluate_results (int result, + int solution, + char * problem); + +void +ats_update_problem_qm (struct ATS_Handle * ats); + +void +ats_update_problem_cr (struct ATS_Handle * ats); + -- 2.25.1