#define VERY_BIG_DOUBLE_VALUE 100000000000LL
+#define ATS_NEW 0
+#define ATS_Q_UPDATED 1
+#define ATS_C_UPDATED 2
+#define ATS_QC_UPDATED 3
+#define ATS_UNMODIFIED 4
+
/**
* List of addresses of other peers
*/
int t;
};
-struct ATS_result
+struct ATS_stat
{
- int c_mechs;
- int c_peers;
+ /**
+ * result of last GLPK run
+ * 5 == OPTIMAL
+ */
int solution;
+
+ /**
+ * 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;
+
+ int col_d;
+ int col_u;
+ int col_r;
+ int col_qm;
+ int col_cr;
};
struct ATS_ressource_entry
/**
* Regular intervall when execution is triggered
*/
- struct GNUNET_TIME_Relative exec_intervall;
+ struct GNUNET_TIME_Relative exec_interval;
/**
* Maximum execution time per calculation
*/
struct GNUNET_TIME_Relative max_exec_duration;
+
+#if HAVE_LIBGLPK
+ /**
+ * GLPK (MLP) problem object
+ */
+ glp_prob *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;
+
/**
* 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;
/**
- * Ressource costs or quality metrics changed, update matrix
+ * 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;
+
+ /**
+ * 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
+ * Peers have connected or disconnected
+ * problem has to be recreated
*/
int modified_addr;
+ /**
+ * Was the available basis invalid and we needed to rerun simplex?
+ */
+ int simplex_rerun_required;
+
+ /**
+ * Diversity weight
+ */
double D;
+
+ /**
+ * Utility weight
+ */
double U;
+
+ /**
+ * Relativity weight
+ */
double R;
- int v_b_min;
- int v_n_min;
- GNUNET_SCHEDULER_TaskIdentifier ats_task;
+ /**
+ * Minimum bandwidth per peer
+ */
+ int v_b_min;
- struct ATS_result res;
-#if HAVE_LIBGLPK
- glp_prob *prob;
-#endif
+ /**
+ * Minimum number of connections per peer
+ */
+ int v_n_min;
};
*/
static void try_transmission_to_peer (struct NeighbourList *n);
+static void ats_shutdown ( );
-void ats_init ();
-
-void ats_shutdown ( );
-
-void ats_notify_peer_connect (
+static void ats_notify_peer_connect (
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
+ const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count);
-void ats_notify_peer_disconnect (
+static void ats_notify_peer_disconnect (
const struct GNUNET_PeerIdentity *peer);
-void ats_notify_ats_data (
+#if 0
+static void ats_notify_ats_data (
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
+#endif
struct ForeignAddressList * ats_get_preferred_address (
struct NeighbourList *n);
+static void
+ats_calculate_bandwidth_distribution ();
+
/**
* Find an entry in the neighbour list for a particular peer.
*
return head;
}
-static void update_addr_ats (struct ForeignAddressList *fal, const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count)
-{
- int c1, c2;
- for (c1=0; c1<ats_count; c1++)
- {
- for (c2=0; c2<available_quality_metrics; c2++)
- {
- if (ntohl(ats_data[c1].type) == qm[c2].atis_index)
- {
- fal->quality[c2].values[0] = fal->quality[c2].values[1];
- fal->quality[c2].values[1] = fal->quality[c2].values[2];
- fal->quality[c2].values[2] = ntohl(ats_data[c1].value);
- }
- }
- }
-}
-
-static void update_addr_value (struct ForeignAddressList *fal, uint32_t value , int ats_index)
+static int update_addr_value (struct ForeignAddressList *fal, uint32_t value , int ats_index)
{
int c;
+ int set = GNUNET_NO;
for (c=0; c<available_quality_metrics; c++)
{
if (ats_index == qm[c].atis_index)
fal->quality[c].values[0] = fal->quality[c].values[1];
fal->quality[c].values[1] = fal->quality[c].values[2];
fal->quality[c].values[2] = value;
+ set = GNUNET_YES;
+ ats->modified_quality = GNUNET_YES;
}
}
+ if (set == GNUNET_NO)
+ {
+ for (c=0; c<available_ressources; c++)
+ {
+ if (ats_index == ressources[c].atis_index)
+ {
+ fal->ressources[c].c = value;
+ set = GNUNET_YES;
+ ats->modified_resources = GNUNET_YES;
+ }
+ }
+ }
+
+ return set;
+}
+
+static int update_addr_ats (struct ForeignAddressList *fal, const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count)
+{
+ int c1, set;
+ set = GNUNET_NO;
+ for (c1=0; c1<ats_count; c1++)
+ {
+ set = update_addr_value(fal, ntohl(ats_data[c1].value), ntohl(ats_data[c1].type));
+ }
+ return set;
}
/**
GNUNET_CONTAINER_DLL_insert_after (client->message_queue_head,
client->message_queue_tail,
client->message_queue_tail,
- q);
+ q);
client->message_count++;
if (client->th == NULL)
{
* expired
*/
static void
-update_addresses (struct TransportPlugin *plugin,
+update_addresses (struct TransportPlugin *plugin,
int fresh)
{
static struct GNUNET_TIME_Absolute last_update;
Furthermore, the same mechanism (or small variation) could be used
to switch to a better-performing plugin (ATS).
- Finally, this needs to be tested throughly... */
+ Finally, this needs to be tested throughly... */
/*
* GNUNET_NO in the call below makes transport disconnect the peer,
GNUNET_SCHEDULER_cancel (pos->revalidate_task);
pos->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
}
+ GNUNET_free_non_null(pos->ressources);
+ GNUNET_free_non_null(pos->quality);
GNUNET_free (pos);
if (nl->received_pong == GNUNET_NO)
return; /* nothing to do, never connected... */
al = p->addresses;
while (al != NULL)
{
- if ( (addrlen == al->addrlen) &&
+ if ( (addrlen == al->addrlen) &&
(0 == memcmp (addr, &al[1], addrlen)) )
- {
+ {
al->expires = abex;
update_addresses (p, GNUNET_NO);
return;
memcpy (&cim->id, peer, sizeof (struct GNUNET_PeerIdentity));
/* notify ats about connecting peer */
- ats_notify_peer_connect (peer, &(cim->ats));
+ ats_notify_peer_connect (peer, &(cim->ats), 2);
cpos = clients;
while (cpos != NULL)
if (bl == NULL)
{
bc->cont (bc->cont_cls,
- setup_new_neighbour (&bc->peer, bc->do_hello));
+ setup_new_neighbour (&bc->peer, bc->do_hello));
GNUNET_free (bc);
return;
}
size_t tsize;
peer_address->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
tp = peer_address->ready_list->plugin;
neighbour = peer_address->ready_list->neighbour;
{
delay = GNUNET_TIME_UNIT_ZERO;
fal->estimated = GNUNET_YES;
- }
+ }
if (GNUNET_YES == fal->connected)
{
delay = GNUNET_TIME_relative_min (delay,
{
n->quota_violation_count++;
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Bandwidth quota (%u b/s) violation detected (total of %u).\n",
n->in_tracker.available_bytes_per_s__,
n->quota_violation_count);
#endif
/* Discount 32k per violation */
GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker,
- - 32 * 1024);
+ - 32 * 1024);
}
else
{
a2s (ve->transport_name,
&addr[slen],
alen));
- return GNUNET_NO;
+ return GNUNET_NO;
}
if (GNUNET_OK !=
GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_USING,
GNUNET_CONTAINER_DLL_remove (chvc_head,
chvc_tail,
chvc);
- GNUNET_free (chvc);
+ GNUNET_free (chvc);
}
return;
}
peer_pos->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free(peer_pos->ressources);
+ peer_pos->ressources = NULL;
GNUNET_free(peer_pos->quality);
- GNUNET_free(peer_pos);
+ peer_pos->ressources = NULL;
+ GNUNET_free(peer_pos);
}
GNUNET_free (rpos);
}
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_rsa_sign (my_private_key,
&pong->purpose,
- &oal->pong_signature));
+ &oal->pong_signature));
memcpy (&pong->signature,
&oal->pong_signature,
sizeof (struct GNUNET_CRYPTO_RsaSignature));
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_rsa_sign (my_private_key,
&pong->purpose,
- &pong->signature));
+ &pong->signature));
}
else
{
distance = ntohl(ats_data[c].value);
}
}
+
/* notify ATS about incoming data */
//ats_notify_ats_data(peer, ats_data);
+
if (message != NULL)
{
if ( (session != NULL) ||
}
/* update traffic received amount ... */
msize = ntohs (message->size);
+
GNUNET_STATISTICS_update (stats,
gettext_noop ("# bytes received from other peers"),
msize,
GNUNET_NO);
return GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT;
}
+ if ((ntohs(message->type) == GNUNET_MESSAGE_TYPE_TRANSPORT_ATS) &&
+ (ntohs(message->size) == (sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t))))
+ {
+ uint32_t value = ntohl(*((uint32_t *) &message[1]));
+ //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GNUNET_MESSAGE_TYPE_TRANSPORT_ATS: %i \n", value);
+ /* Force ressource and quality update */
+ if (value == 4)
+ {
+ ats->modified_resources = GNUNET_YES;
+ ats->modified_quality = GNUNET_YES;
+ }
+ /* Force cost update */
+ if (value == 3)
+ ats->modified_resources = GNUNET_YES;
+ /* Force quality update */
+ if (value == 2)
+ ats->modified_quality = GNUNET_YES;
+ /* Force full rebuild */
+ if (value == 1)
+ ats->modified_addr = GNUNET_YES;
+ }
#if DEBUG_PING_PONG
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
handle_pong (plugin, message, peer, sender_address, sender_address_len);
break;
+ case GNUNET_MESSAGE_TYPE_TRANSPORT_ATS:
+ break;
default:
handle_payload_message (message, n);
break;
if (bc->th != NULL)
{
GNUNET_CONNECTION_notify_transmit_ready_cancel (bc->th);
- bc->th = NULL;
+ bc->th = NULL;
}
if (bc->task == GNUNET_SCHEDULER_NO_TASK)
bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
GNUNET_log (error_kind, "%s , Search terminated by application ", problem);
break;
case GLP_EITLIM : /* iteration limit exceeded */
- GNUNET_log (error_kind, "%s Iteration limit exceeded ", problem);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Iteration limit exceeded ", problem);
break;
break;
case GLP_ETMLIM : /* time limit exceeded */
- GNUNET_log (error_kind, "%s Time limit exceeded ", problem);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Time limit exceeded ", problem);
break;
case GLP_ENOPFS : /* no primal feasible solution */
case GLP_ENODFS : /* no dual feasible solution */
cont=GNUNET_YES;
break;
case GLP_FEAS:
- GNUNET_log (error_kind, "%s solution is integer feasible, however, its optimality (or non-optimality) has not been proven, \n", problem);
+ 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"));
cont=GNUNET_YES;
break;
case GLP_NOFEAS:
- GNUNET_log (error_kind, "%s problem has no integer feasible solution\n", problem);
+ GNUNET_log (error_kind, "%s problem has no %sfeasible solution\n", problem, (0==strcmp(problem,"LP")?"":"integer "));
break;
+ case GLP_INFEAS:
+ GNUNET_log (error_kind, "%s problem is infeasible \n", problem);
break;
+ case GLP_UNBND:
+ GNUNET_log (error_kind, "%s problem is unbounded \n", problem);
default:
break;
}
return cont;
}
-#endif
-static void ats_solve_problem (unsigned int max_it, unsigned int max_dur, unsigned int c_peers, unsigned int c_mechs, struct ATS_result *res)
+static void ats_solve_problem (unsigned int max_it, unsigned int max_dur, unsigned int c_peers, unsigned int c_mechs, struct ATS_stat *stat)
{
-#if HAVE_LIBGLPK
int result;
- int solution;
+ int lp_solution;
+ int mlp_solution;
// Solving simplex
- glp_prob *prob = ats->prob;
- /*
+
glp_smcp opt_lp;
glp_init_smcp(&opt_lp);
#if VERBOSE_ATS
#else
opt_lp.msg_lev = GLP_MSG_OFF;
#endif
- opt_lp.presolve = GLP_ON;
- result = glp_simplex(prob, &opt_lp);
- solution = glp_get_status (prob);
-
- if (GNUNET_YES == ats_evaluate_results(result, solution, "LP"))
- {*/
- /* Solving mlp */
- glp_iocp opt_mlp;
- glp_init_iocp(&opt_mlp);
- /* maximum duration */
- opt_mlp.presolve = GLP_ON;
- opt_mlp.tm_lim = max_dur;
- /* output level */
+
+ // setting iteration limit
+ opt_lp.it_lim = max_it;
+ // maximum duration
+ opt_lp.tm_lim = max_dur;
+
+ if (ats->modified_addr == GNUNET_YES)
+ opt_lp.presolve = GLP_ON;
+ result = glp_simplex(ats->prob, &opt_lp);
+ lp_solution = glp_get_status (ats->prob);
+
+ if ((result == GLP_ETMLIM) || (result == GLP_ETMLIM))
+ {
+ 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->simplex_rerun_required = GNUNET_YES;
+ opt_lp.presolve = GLP_ON;
+ result = glp_simplex(ats->prob, &opt_lp);
+ lp_solution = glp_get_status (ats->prob);
+
+ // TODO: Remove if this does not appear until release
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "EXECUTED SIMPLEX WITH PRESOLVER! %i", 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);
+ glp_write_lp (ats->prob, NULL, filename);
+ GNUNET_free (filename);
+ stat->valid = GNUNET_NO;
+ return;
+ }
+ stat->valid = GNUNET_YES;
+ }
+
+ // Solving mlp
+ glp_iocp opt_mlp;
+ glp_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 = glp_intopt (prob, &opt_mlp);
- solution = glp_mip_status (prob);
- res->solution = solution;
- res->valid = GNUNET_NO;
- if (ats_evaluate_results(result, solution, "MLP") == GNUNET_YES)
- res->valid = GNUNET_YES;
- /* done */
- //}
-
- if ((ats->save_mlp == GNUNET_YES) && (c_peers > 1))
+
+ result = glp_intopt (ats->prob, &opt_mlp);
+ mlp_solution = glp_mip_status (ats->prob);
+ stat->solution = mlp_solution;
+
+ if (ats_evaluate_results(result, mlp_solution, "MLP") == GNUNET_YES)
{
- char * filename;
- GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_llu.mlp",c_peers, c_mechs, GNUNET_TIME_absolute_get().abs_value);
- if (GNUNET_NO == GNUNET_DISK_file_test(filename))
- glp_write_mip (prob, filename);
- GNUNET_free (filename);
+ stat->valid = GNUNET_YES;
}
- if ((ats->save_solution == GNUNET_YES) && (c_peers > 1))
+ else
{
- char * filename;
- GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%llu.sol",c_peers, c_mechs, GNUNET_TIME_absolute_get().abs_value);
- if (GNUNET_NO == GNUNET_DISK_file_test(filename))
- glp_print_sol (prob, filename);
- GNUNET_free (filename);
+ // TODO: Remove if this does not appear until release
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP SOLUTION INVALID: %i\n", lp_solution);
+ stat->valid = GNUNET_NO;
}
- /*
+/*
int check;
int error = GNUNET_NO;
double bw;
}*/
#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(prob,2*c_mechs+3+c), glp_get_col_prim(prob,2*c_mechs+3+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));
+ }
+#endif
+}
+
+static void ats_delete_problem ()
+{
+ int c;
+
+ 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;
+ }
+ if (ats->peers!=NULL)
+ {
+ GNUNET_free(ats->peers);
+ ats->peers = NULL;
+ }
+
+ if (ats->prob != NULL)
+ {
+ glp_delete_prob(ats->prob);
+ ats->prob = NULL;
+ }
+
+ ats->stat.begin_cr = GNUNET_SYSERR;
+ ats->stat.begin_qm = GNUNET_SYSERR;
+ ats->stat.c_mechs = 0;
+ ats->stat.c_peers = 0;
+ ats->stat.end_cr = GNUNET_SYSERR;
+ ats->stat.end_qm = GNUNET_SYSERR;
+ ats->stat.solution = GNUNET_SYSERR;
+ ats->stat.valid = GNUNET_SYSERR;
+}
+
+
+static void ats_update_problem_qm ()
+{
+ 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));
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n");
+#endif
+ 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
+
+ glp_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;
+
+ if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
+ {
+ double v0, v1, v2;
+ 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, v1, v2;
+ 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]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, row_index, ja[array_index], ar[array_index]);
+#endif
+ array_index++;
+ }
+ ja[array_index] = ats->stat.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, row_index, ja[array_index], ar[array_index]);
+ #endif
+ glp_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);
+}
+
+
+static void ats_update_problem_cr ()
+{
+
+ 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));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n");
+ row_index = ats->stat.begin_cr;
+
+ for (c=0; c<available_ressources; c++)
+ {
+ ct_max = ressources[c].c_max;
+ ct_min = ressources[c].c_min;
+#if VERBOSE_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] %f..%f\n",row_index, ct_min, ct_max);
+#endif
+ glp_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;
+ 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]);
+#endif
+ array_index++;
+ }
+ glp_set_mat_row (ats->prob, row_index, array_index, ja, ar);
+
+ row_index ++;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(prob,2*c_mechs+1), glp_get_col_prim(prob,2*c_mechs+1));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(prob,2*c_mechs+2), glp_get_col_prim(prob,2*c_mechs+2));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(prob,2*c_mechs+3), glp_get_col_prim(prob,2*c_mechs+3));
+
+
+ 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));
+#if DEBUG_ATS
+ 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; c<available_quality_metrics; c++)
+ {
+
+ c_old = glp_get_mat_row (ats->prob, row_index, old_ja, old_ar);
+
+ glp_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
+ }
+ glp_set_mat_row (ats->prob, row_index, c_old, ja, ar);
+ row_index ++;
+ }
+
+ GNUNET_free_non_null (ja);
+ GNUNET_free_non_null (ar);
}
+#endif
+
/** solve the bandwidth distribution problem
* @param max_it maximum iterations
* @param R weight for relativity
* @param v_b_min minimal bandwidth per peer
* @param v_n_min minimum number of connections
- * @param res result struct
+ * @param stat result struct
* @return GNUNET_SYSERR if glpk is not available, number of mechanisms used
*/
-static int ats_create_problem (double D, double U, double R, int v_b_min, int v_n_min, struct ATS_result *res)
+static int ats_create_problem (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_ERROR, "no glpk installed\n");
- return GNUNET_SYSERR;
-#else
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "glpk installed\n");
-#endif
-
if (ats->prob != NULL)
glp_delete_prob(ats->prob);
#if DEBUG_ATS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No addresses for bw distribution available\n", c_peers);
#endif
- res->valid = GNUNET_NO;
+ stat->valid = GNUNET_NO;
+ stat->c_peers = 0;
+ stat->c_mechs = 0;
return GNUNET_SYSERR;
}
- struct ATS_mechanism * mechanisms = GNUNET_malloc((1+c_mechs) * sizeof (struct ATS_mechanism));
- struct ATS_peer * peers = GNUNET_malloc((1+c_peers) * sizeof (struct ATS_peer));
+ ats->mechanisms = GNUNET_malloc((1+c_mechs) * sizeof (struct ATS_mechanism));
+ ats->peers = GNUNET_malloc((1+c_peers) * sizeof (struct ATS_peer));
+
+ struct ATS_mechanism * mechanisms = ats->mechanisms;
+ struct ATS_peer * peers = ats->peers;
c_mechs = 1;
c_peers = 1;
glp_set_col_name(ats->prob, c, name);
GNUNET_free (name);
glp_set_col_bnds(ats->prob, c, GLP_LO, 0.0, 0.0);
- glp_set_obj_coef(ats->prob, c, 1);
+ glp_set_obj_coef(ats->prob, c, 0);
}
/* adding n_t cols */
}
int c2;
/* Constraint 4: max ressource capacity */
- /* V cr: bt * ct_r <= cr_maxsolution
+ /* V cr: bt * ct_r <= cr_max
* */
glp_add_rows(ats->prob, available_ressources);
double ct_max = VERY_BIG_DOUBLE_VALUE;
double ct_min = 0.0;
+ stat->begin_cr = array_index;
+
for (c=0; c<available_ressources; c++)
{
ct_max = ressources[c].c_max;
}
row_index ++;
}
+ stat->end_cr = array_index--;
/* Constraint 5: min number of connections*/
glp_add_rows(ats->prob, 1);
}
row_index ++;
- /* optimisation constraints*/
+ // optimisation constraints
- /* adding columns */
- glp_add_cols(ats->prob, 3 + c_q_metrics);
-
- glp_set_col_name(ats->prob, (2*c_mechs) + 1, "d");
- glp_set_obj_coef(ats->prob, (2*c_mechs) + 1, D);
- glp_set_col_bnds(ats->prob, (2*c_mechs) + 1, GLP_LO, 0.0, 0.0);
- glp_set_col_name(ats->prob, (2*c_mechs) + 2, "u");
- glp_set_obj_coef(ats->prob, (2*c_mechs) + 2, U);
- glp_set_col_bnds(ats->prob, (2*c_mechs) + 2, GLP_LO, 0.0, 0.0);
- glp_set_col_name(ats->prob, (2*c_mechs) + 3, "r");
- glp_set_obj_coef(ats->prob, (2*c_mechs) + 3, R);
- glp_set_col_bnds(ats->prob, (2*c_mechs) + 3, GLP_LO, 0.0, 0.0);
-
- for (c=1; c<= c_q_metrics; c++)
- {
- GNUNET_asprintf(&name, "Q_%s",qm[c-1].name);
- glp_set_col_name(ats->prob, (2*c_mechs) + 3 + c, name);
- glp_set_col_bnds(ats->prob, (2*c_mechs) + 3 + c, GLP_LO, 0.0, 0.0);
- GNUNET_free (name);
- glp_set_obj_coef(ats->prob, (2*c_mechs) + 3 + c, Q[c]);
- }
+ // adding columns
// Constraint 6: optimize for diversity
+ int col_d;
+ col_d = glp_add_cols(ats->prob, 1);
+ stat->col_d = col_d;
+ //GNUNET_assert (col_d == (2*c_mechs) + 1);
+ glp_set_col_name(ats->prob, col_d, "d");
+ glp_set_obj_coef(ats->prob, col_d, D);
+ glp_set_col_bnds(ats->prob, col_d, GLP_LO, 0.0, 0.0);
glp_add_rows(ats->prob, 1);
#if VERBOSE_ATS
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
array_index++;
}
ia[array_index] = row_index;
- ja[array_index] = (2*c_mechs) + 1;
+ 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]);
// Constraint 7: optimize for quality
+ int col_qm;
+ col_qm = glp_add_cols(ats->prob, c_q_metrics);
+ stat->col_qm = col_qm;
+ //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);
+ glp_set_col_name(ats->prob, col_qm + c, name);
+ glp_set_col_bnds(ats->prob, col_qm + c, GLP_LO, 0.0, 0.0);
+ GNUNET_free (name);
+ glp_set_obj_coef(ats->prob, col_qm + c, Q[c]);
+ }
glp_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);
#endif
+ double value = 1;
glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
-
for (c2=1; c2<=c_mechs; c2++)
{
- double value = 0;
+
ia[array_index] = row_index;
ja[array_index] = c2;
if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
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)
{
}
ia[array_index] = row_index;
- ja[array_index] = (2*c_mechs) + 3 +c;
+ 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]);
array_index++;
row_index++;
}
+ stat->end_qm = row_index-1;
// Constraint 8: optimize bandwidth utility
+ int col_u;
+ col_u = glp_add_cols(ats->prob, 1);
+ stat->col_u = col_u;
+ //GNUNET_assert (col_u == (2*c_mechs) + 2);
+ glp_set_col_name(ats->prob, col_u, "u");
+ glp_set_obj_coef(ats->prob, col_u, U);
+ glp_set_col_bnds(ats->prob, col_u, GLP_LO, 0.0, 0.0);
glp_add_rows(ats->prob, 1);
#if VERBOSE_ATS
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
array_index++;
}
ia[array_index] = row_index;
- ja[array_index] = (2*c_mechs) + 2;
+ 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]);
row_index ++;
// Constraint 9: optimize relativity
+ int col_r;
+ col_r = glp_add_cols(ats->prob, 1);
+ stat->col_r = col_r;
+ //GNUNET_assert (col_r == (2*c_mechs) + 3);
+ glp_set_col_name(ats->prob, col_r, "r");
+ glp_set_obj_coef(ats->prob, col_r, R);
+ glp_set_col_bnds(ats->prob, col_r, GLP_LO, 0.0, 0.0);
glp_add_rows(ats->prob, c_peers);
for (c=1; c<=c_peers; c++)
{
{
ia[array_index] = row_index;
ja[array_index] = m->col_index;
- ar[array_index] = 1;
+ 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
m = m->next;
}
ia[array_index] = row_index;
- ja[array_index] = (2*c_mechs) + 3;
+ 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]);
row_index++;
}
+
/* Loading the matrix */
glp_load_matrix(ats->prob, array_index-1, ia, ja, ar);
- res->c_mechs = c_mechs;
- res->c_peers = c_peers;
- res->solution = 0;
- res->valid = GNUNET_YES;
+ stat->c_mechs = c_mechs;
+ stat->c_peers = c_peers;
+ stat->solution = 0;
+ stat->valid = GNUNET_YES;
/* clean up */
GNUNET_free (ia);
GNUNET_free (ar);
- for (c=0; c<c_mechs; c++)
- GNUNET_free_non_null (mechanisms[c].rc);
-
- GNUNET_free(mechanisms);
- GNUNET_free(peers);
return GNUNET_OK;
+
+}
+
+void ats_notify_ats_data (
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
+{
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_BULK, "ATS_notify_ats_data: %s\n",GNUNET_i2s(peer));
#endif
+ ats_calculate_bandwidth_distribution();
}
+#endif //END: HAVE_LIBGLPK
-void ats_calculate_bandwidth_distribution ()
+static void
+ats_calculate_bandwidth_distribution ()
{
#if HAVE_LIBGLPK
struct GNUNET_TIME_Absolute start;
- struct GNUNET_TIME_Relative duration;
+ 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());
+ 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
dur = INT_MAX;
else
dur = (int) ats->max_exec_duration.rel_value;
-
-
+ ats->simplex_rerun_required = GNUNET_NO;
start = GNUNET_TIME_absolute_get();
if ((ats->modified_addr == GNUNET_YES) || (ats->prob==NULL))
{
+ text = "new";
+ ats->modified_addr = GNUNET_YES;
+ ats_delete_problem ();
+ ats_create_problem (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... have to recreate problem\n");
+ 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
- ats->modified_addr = GNUNET_NO;
- ats->res.c_mechs = 0;
- ats->res.c_peers = 0;
- ats->res.solution = 0;
- ats->res.valid = GNUNET_NO;
- ats_create_problem (ats->D, ats->U, ats->R, ats->v_b_min, ats->v_n_min, &ats->res);
}
- else if (ats->modified_resources)
+ else if ((ats->modified_addr == GNUNET_NO) && (ats->modified_resources == GNUNET_YES) && (ats->stat.valid == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "RESSOURCE...modified problem\n");
- /* TODO */
+ ats_update_problem_cr();
+ text = "modified resources";
}
- else if (ats->modified_quality)
+ else if ((ats->modified_addr == GNUNET_NO) && (ats->modified_quality == GNUNET_YES) && (ats->stat.valid == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "RESSOURCE...quality problem\n");
- /* TODO */
+ ats_update_problem_qm();
+ //ats_update_problem_qm_TEST ();
+ text = "modified quality";
}
#if DEBUG_ATS
else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Problem is unmodified\n");
#endif
- if (ats->res.valid == GNUNET_YES)
+ creation = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get());
+ start = GNUNET_TIME_absolute_get();
+
+ if (ats->stat.valid == GNUNET_YES)
{
- ats_solve_problem(ats->max_iterations, ats->max_exec_duration.rel_value, ats->res.c_peers, ats->res.c_mechs, &ats->res);
+ ats->stat.solution = GNUNET_SYSERR;
+ ats_solve_problem(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());
- duration = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get());
-
- if ((ats->res.valid == GNUNET_YES))
+ if (ats->stat.valid == GNUNET_YES)
{
#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP execution time in [ms] for %i mechanisms: %llu %llu \n", res, duration.rel_value, ats->res.solution);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP %s: creation time in [ms] %llu execution time in [ms] %llu for %i mechanisms: simplex rerun: %s\n",
+ text, creation.rel_value, solving.rel_value,
+ ats->stat.c_mechs,
+ (ats->simplex_rerun_required == GNUNET_NO) ? " NO" : "YES");
#endif
- GNUNET_STATISTICS_set (stats, "ATS duration", duration.rel_value, GNUNET_NO);
- GNUNET_STATISTICS_set (stats, "ATS mechanisms", ats->res.c_mechs, GNUNET_NO);
- GNUNET_STATISTICS_set (stats, "ATS peers", ats->res.c_peers, GNUNET_NO);
- GNUNET_STATISTICS_set (stats, "ATS solution", ats->res.solution, 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->modified_addr == GNUNET_YES) || (ats->prob==NULL))
+ GNUNET_STATISTICS_set (stats, "ATS state",ATS_NEW, GNUNET_NO);
+ else if ((ats->modified_resources == GNUNET_YES) &&
+ (ats->modified_quality == GNUNET_NO))
+ GNUNET_STATISTICS_set (stats, "ATS state", ATS_C_UPDATED, GNUNET_NO);
+ else if ((ats->modified_resources == GNUNET_NO) &&
+ (ats->modified_quality == GNUNET_YES) &&
+ (ats->simplex_rerun_required == GNUNET_NO))
+ GNUNET_STATISTICS_set (stats, "ATS state", ATS_Q_UPDATED, GNUNET_NO);
+ else if ((ats->modified_resources == GNUNET_YES) &&
+ (ats->modified_quality == GNUNET_YES) &&
+ (ats->simplex_rerun_required == GNUNET_NO))
+ GNUNET_STATISTICS_set (stats, "ATS state", ATS_QC_UPDATED, GNUNET_NO);
+ else if (ats->simplex_rerun_required == GNUNET_NO)
+ GNUNET_STATISTICS_set (stats, "ATS state", ATS_UNMODIFIED, GNUNET_NO);
}
-#if DEBUG_ATS
- else if (res == 0)
+
+ 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);
+ glp_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 );
+ glp_write_lp (ats->prob, NULL, filename);
+ }
+ 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))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP not executed: no addresses\n");
+ 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);
}
-#endif
ats->last = GNUNET_TIME_absolute_get();
-
ats->modified_addr = GNUNET_NO;
ats->modified_resources = GNUNET_NO;
ats->modified_quality = GNUNET_NO;
-
#endif
}
-
-
-void
+static void
ats_schedule_calculation (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ATS_info *ats = (struct ATS_info *) cls;
- if (ats==NULL)
- return;
+ if (ats==NULL) return;
ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
ats_calculate_bandwidth_distribution (ats);
- ats->ats_task = GNUNET_SCHEDULER_add_delayed (ats->exec_intervall,
+ ats->ats_task = GNUNET_SCHEDULER_add_delayed (ats->exec_interval,
&ats_schedule_calculation, ats);
}
void ats_init ()
{
+ int c = 0;
+ unsigned long long value;
+ char * section;
+
ats = GNUNET_malloc(sizeof (struct ATS_info));
ats->min_delta = ATS_MIN_INTERVAL;
- ats->exec_intervall = ATS_EXEC_INTERVAL;
+ ats->exec_interval = ATS_EXEC_INTERVAL;
ats->max_exec_duration = ATS_MAX_EXEC_DURATION;
ats->max_iterations = ATS_MAX_ITERATIONS;
ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
#if !HAVE_LIBGLPK
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, ATS not active");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "GLPK not installed, ATS not active\n");
return;
#endif
ats->R = 1.0;
ats->v_b_min = 64000;
ats->v_n_min = 10;
+ ats->dump_min_peers = 1;
+ ats->dump_min_addr = 1;
+ ats->dump_overwrite = GNUNET_NO;
+
#if HAVE_LIBGLPK
ats->prob = NULL;
#endif
- int c = 0;
- unsigned long long value;
- char * section;
/* loading cost ressources */
for (c=0; c<available_ressources; c++)
{
if (GNUNET_CONFIGURATION_have_value(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");
+ if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_PEERS"))
+ {
+ 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"))
+ {
+ 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"))
+ {
+ 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"))
+ {
+ 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"))
+ {
+ 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;
+ }
ats->ats_task = GNUNET_SCHEDULER_add_now(&ats_schedule_calculation, ats);
}
-void ats_shutdown ()
+static void ats_shutdown ()
{
#if DEBUG_ATS
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_destroy\n");
GNUNET_SCHEDULER_cancel(ats->ats_task);
ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
#if HAVE_LIBGLPK
- if (ats->prob != NULL)
- {
- glp_delete_prob(ats->prob);
- ats->prob = NULL;
- }
+ ats_delete_problem ();
#endif
GNUNET_free (ats);
}
void ats_notify_peer_connect (
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
+ const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count)
{
- int c = 0;
#if DEBUG_ATS
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_notify_peer_connect: %s\n",GNUNET_i2s(peer));
#endif
- while (ntohl(ats_data[c].type)!=0)
- {
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats type [%i]: %i\n",ntohl(ats_data[c].type), ntohl(ats_data[c].value));
-#endif
- c++;
- }
+ //update_addr_ats();
ats->modified_addr = GNUNET_YES;
ats_calculate_bandwidth_distribution(ats);
ats_calculate_bandwidth_distribution (ats);
}
-
-void ats_notify_ats_data (
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
-{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_BULK, "ATS_notify_ats_data: %s\n",GNUNET_i2s(peer));
-#endif
- ats_calculate_bandwidth_distribution(ats);
-}
-
struct ForeignAddressList * ats_get_preferred_address (
struct NeighbourList *n)
{
if (peerinfo == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Could not access PEERINFO service. Exiting.\n"));
+ _("Could not access PEERINFO service. Exiting.\n"));
GNUNET_SCHEDULER_shutdown ();
if (stats != NULL)
{
projects / oweals / gnunet.git / blobdiff