[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19281 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19281 - gnunet/src/ats |
Date: |
Fri, 20 Jan 2012 14:08:24 +0100 |
Author: wachs
Date: 2012-01-20 14:08:24 +0100 (Fri, 20 Jan 2012)
New Revision: 19281
Modified:
gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
gnunet/src/ats/test_ats_mlp.c
Log:
- quality updates
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-01-20 12:49:55 UTC
(rev 19280)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-01-20 13:08:24 UTC
(rev 19281)
@@ -593,6 +593,7 @@
while (addr != NULL)
{
+ mlpi = addr->mlp_information;
/* lookup ATS information */
int index = mlp_lookup_ats(addr, mlp->q[c]);
@@ -607,8 +608,12 @@
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Quality %i with ATS property
`%s' not existing\n", c, mlp_ats_to_string(mlp->q[c]), index);
#endif
+ mlpi = addr->mlp_information;
- mlpi = addr->mlp_information;
+ mlpi->r_q[c] = mlp->r_q[c];
+ mlpi->c_q[c] = mlpi->c_b;
+ mlpi->q[c] = value;
+
ia[mlp->ci] = mlp->r_q[c];
ja[mlp->ci] = mlpi->c_b;
ar[mlp->ci] = p->f * value;
@@ -924,7 +929,7 @@
return GNUNET_OK;
}
-int mlp_solve_problem (struct GAS_MLP_Handle *mlp);
+int GAS_mlp_solve_problem (struct GAS_MLP_Handle *mlp);
static void
mlp_scheduler (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -940,7 +945,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Scheduled problem solving\n");
#endif
if (mlp->addr_in_problem != 0)
- mlp_solve_problem(mlp);
+ GAS_mlp_solve_problem(mlp);
}
@@ -951,7 +956,7 @@
* @return GNUNET_OK if could be solved, GNUNET_SYSERR on failure
*/
int
-mlp_solve_problem (struct GAS_MLP_Handle *mlp)
+GAS_mlp_solve_problem (struct GAS_MLP_Handle *mlp)
{
int res;
mlp->last_execution = GNUNET_TIME_absolute_get ();
@@ -1128,6 +1133,7 @@
mlp->stats = (struct GNUNET_STATISTICS_Handle *) stats;
mlp->max_iterations = max_iterations;
mlp->max_exec_duration = max_duration;
+ mlp->auto_solve = GNUNET_YES;
/* Redirect GLPK output to GNUnet logging */
glp_error_hook((void *) mlp, &mlp_term_hook);
@@ -1165,6 +1171,7 @@
return mlp;
}
+
/**
* Updates a single address in the MLP problem
*
@@ -1184,7 +1191,6 @@
{
int new;
struct MLP_information *mlpi;
- int c;
GNUNET_STATISTICS_update (mlp->stats,"# LP address updates", 1, GNUNET_NO);
@@ -1198,6 +1204,15 @@
if (new == GNUNET_YES)
{
mlpi = GNUNET_malloc (sizeof (struct MLP_information));
+
+ int c;
+ for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
+ {
+ mlpi->c_q[c] = 0;
+ mlpi->r_q[c] = 0;
+ mlpi->q[c] = 0.0;
+ }
+
address->mlp_information = mlpi;
mlp->addr_in_problem ++;
@@ -1206,12 +1221,14 @@
if (peer == NULL)
{
#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding new peer `%s'\n",
GNUNET_i2s (&address->peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding new peer `%s'\n",
+ GNUNET_i2s (&address->peer));
#endif
peer = GNUNET_malloc (sizeof (struct ATS_Peer));
peer->head = NULL;
peer->tail = NULL;
+ int c;
for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
{
peer->f_q[c] = 1.0;
@@ -1228,7 +1245,8 @@
else
{
#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding address to peer `%s'\n",
GNUNET_i2s (&address->peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding address to peer `%s'\n",
+ GNUNET_i2s (&address->peer));
#endif
GNUNET_CONTAINER_DLL_insert (peer->head, peer->tail, address);
}
@@ -1236,10 +1254,71 @@
else
{
#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating existing address to peer
`%s'\n", GNUNET_i2s (&address->peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating existing address to peer
`%s'\n",
+ GNUNET_i2s (&address->peer));
#endif
mlpi = address->mlp_information;
+ int c;
+ for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
+ {
+ int index = mlp_lookup_ats(address, mlp->q[c]);
+ if ((index != GNUNET_SYSERR) && (mlpi->c_q[c] != 0) && (mlpi->r_q[c] !=
0))
+ {
+ if (mlpi->q[c] == (double) address->ats[index].value)
+ break;
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating address for peer `%s'
value `%s'from %f to %f\n",
+ GNUNET_i2s (&address->peer),
+ mlp_ats_to_string(mlp->q[c]),
+ mlpi->q[c],
+ (double) address->ats[index].value);
+#endif
+ switch (mlp->q[c])
+ {
+ case GNUNET_ATS_QUALITY_NET_DELAY:
+ mlpi->q[c] = (double) address->ats[index].value;
+ break;
+ case GNUNET_ATS_QUALITY_NET_DISTANCE:
+ mlpi->q[c] = (double) address->ats[index].value;
+ break;
+ default:
+ break;
+ }
+ /* Get current number of columns */
+ int cols = glp_get_num_cols(mlp->prob);
+ int *ind = GNUNET_malloc (cols * sizeof (int));
+ double *val = GNUNET_malloc (cols * sizeof (double));
+
+ /* Get the matrix row of quality */
+ cols = glp_get_mat_row(mlp->prob, mlp->r_q[c], ind, val);
+
+ int c2;
+ /* Get the index if matrix row of quality */
+ for (c2 = 1; c2 <= cols; c2++ )
+ {
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Existing element column %i :
%f\n",
+ ind[c2], val[c2]);
+#endif
+ if ((mlpi->c_b == ind[c2]) && (val[c2] != mlpi->q[c]))
+ {
+ /* Update the value */
+ val[c2] = mlpi->q[c];
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New element column %i :
%f\n",
+ ind[c2], val[c2]);
+#endif
+ }
+ }
+
+ /* Get the index if matrix row of quality */
+ glp_set_mat_row (mlp->prob, mlpi->r_q[c], cols, ind, val);
+
+ GNUNET_free (ind);
+ GNUNET_free (val);
+ }
+ }
}
/* Recalculate */
@@ -1249,7 +1328,8 @@
mlp_create_problem (mlp, addresses);
mlp->presolver_required = GNUNET_YES;
}
- mlp_solve_problem (mlp);
+ if (mlp->auto_solve == GNUNET_YES)
+ GAS_mlp_solve_problem (mlp);
}
/**
@@ -1302,7 +1382,8 @@
/* Recalculate */
mlp->presolver_required = GNUNET_YES;
- mlp_solve_problem (mlp);
+ if (mlp->auto_solve == GNUNET_YES)
+ GAS_mlp_solve_problem (mlp);
}
}
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-01-20 12:49:55 UTC
(rev 19280)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-01-20 13:08:24 UTC
(rev 19281)
@@ -112,6 +112,13 @@
*/
unsigned int max_iterations;
+ /**
+ * Solve the problem automatically when updates occur?
+ * Default: GNUNET_YES
+ * Can be disabled for test and measurements
+ */
+ int auto_solve;
+
/* state information */
/**
@@ -257,6 +264,15 @@
/* constraint 3: minimum bandwidth */
unsigned int r_c3;
+
+ /* Quality information row indices */
+ unsigned int r_q[GNUNET_ATS_QualityPropertiesCount];
+
+ /* Quality information column indices */
+ unsigned int c_q[GNUNET_ATS_QualityPropertiesCount];
+
+ /* Quality information */
+ double q[GNUNET_ATS_QualityPropertiesCount];
};
@@ -275,7 +291,16 @@
struct GNUNET_TIME_Relative max_duration,
unsigned int max_iterations);
+/**
+ * Solves the MLP problem on demand
+ *
+ * @param mlp the MLP Handle
+ * @return GNUNET_OK if could be solved, GNUNET_SYSERR on failure
+ */
+int
+GAS_mlp_solve_problem (struct GAS_MLP_Handle *mlp);
+
/**
* Updates a single address in the MLP problem
*
Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c 2012-01-20 12:49:55 UTC (rev 19280)
+++ gnunet/src/ats/test_ats_mlp.c 2012-01-20 13:08:24 UTC (rev 19281)
@@ -88,14 +88,16 @@
GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK,
&addr[1].peer.hashPubKey);
struct GNUNET_ATS_Information a2_ats[3];
- set_ats (&a2_ats[0], GNUNET_ATS_QUALITY_NET_DELAY, 32);
- set_ats (&a2_ats[1], GNUNET_ATS_QUALITY_NET_DISTANCE, 1);
- set_ats (&a2_ats[2], GNUNET_ATS_ARRAY_TERMINATOR, 0);
+ set_ats (&a2_ats[0], GNUNET_ATS_ARRAY_TERMINATOR, 0);
+ set_ats (&a2_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 32);
+ set_ats (&a2_ats[2], GNUNET_ATS_QUALITY_NET_DISTANCE, 1);
+
create_address (&addr[1], "dummy2", 3, &a2_ats[0]);
GNUNET_CONTAINER_multihashmap_put(addresses, &addr[0].peer.hashPubKey,
&addr[0], GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
mlp = GAS_mlp_init (cfg, NULL, MLP_MAX_EXEC_DURATION, MLP_MAX_ITERATIONS);
+ mlp->auto_solve = GNUNET_NO;
/* Add a new address */
GAS_mlp_address_update (mlp, addresses, &addr[0]);
@@ -104,6 +106,7 @@
GNUNET_assert (mlp->addr_in_problem == 1);
/* Update an new address */
+ set_ats (&a1_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 20);
GAS_mlp_address_update (mlp, addresses, &addr[0]);
GNUNET_assert (mlp->addr_in_problem == 1);
@@ -112,6 +115,8 @@
GAS_mlp_address_update (mlp, addresses, &addr[1]);
GNUNET_assert (mlp->addr_in_problem == 2);
+ GNUNET_assert (GNUNET_OK == GAS_mlp_solve_problem(mlp));
+
/* Delete an address */
GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey,
&addr[0]);
GAS_mlp_address_delete (mlp, addresses, &addr[0]);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19281 - gnunet/src/ats,
gnunet <=