[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26212 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26212 - gnunet/src/ats |
|
Date: |
Wed, 27 Feb 2013 14:43:00 +0100 |
Author: wachs
Date: 2013-02-27 14:43:00 +0100 (Wed, 27 Feb 2013)
New Revision: 26212
Added:
gnunet/src/ats/test_ats_mlp_update.c
Modified:
gnunet/src/ats/Makefile.am
gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
Log:
new test
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2013-02-27 09:59:15 UTC (rev 26211)
+++ gnunet/src/ats/Makefile.am 2013-02-27 13:43:00 UTC (rev 26212)
@@ -18,7 +18,8 @@
if HAVE_LIBGLPK
GN_LIBGLPK = -lglpk
GN_MLP_SRC = gnunet-service-ats_addresses_mlp.c
gnunet-service-ats_addresses_mlp.h
- GN_MLP_TEST = test_ats_mlp
+ GN_MLP_TEST = test_ats_mlp
+ GN_MLP_TEST_UPDATE = test_ats_mlp_update
GN_MLP_TEST_AVG = test_ats_mlp_averaging
GN_MLP_PERF = perf_ats_mlp
endif
@@ -74,7 +75,7 @@
test_ats_simplistic_change_preference \
test_ats_simplistic_pref_aging \
test_ats_api_performance \
- $(GN_MLP_TEST) $(GN_MLP_PERF)
+ $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
# $(GN_MLP_TEST_AVG)
# test_ats_api_scheduling_get_type
# test_ats_api_bandwidth_consumption
@@ -201,7 +202,16 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/ats/libgnunetats.la
+
+test_ats_mlp_update_SOURCES = \
+ $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c
+test_ats_mlp_update_LDADD = \
+ $(GN_LIBGLPK) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/ats/libgnunetats.la
+
perf_ats_mlp_SOURCES = \
$(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c
perf_ats_mlp_LDADD = \
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2013-02-27 09:59:15 UTC
(rev 26211)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2013-02-27 13:43:00 UTC
(rev 26212)
@@ -348,202 +348,8 @@
}
-#if 0
-#if 0
-/**
- * Find the required ATS information for an address
- *
- * @param addr the address
- * @param ats_index the desired ATS index
- *
- * @return the index on success, otherwise GNUNET_SYSERR
- */
-static int
-mlp_lookup_ats (struct ATS_Address *addr, int ats_index)
-{
- struct GNUNET_ATS_Information * ats = addr->ats;
- int c = 0;
- int found = GNUNET_NO;
- for (c = 0; c < addr->ats_count; c++)
- {
- if (ats[c].type == ats_index)
- {
- found = GNUNET_YES;
- break;
- }
- }
- if (found == GNUNET_YES)
- return c;
- else
- return GNUNET_SYSERR;
-}
-#endif
-static void
-update_quality (struct GAS_MLP_Handle *mlp, struct ATS_Address * address)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating quality metrics for peer
`%s'\n",
- GNUNET_i2s (&address->peer));
-
- GNUNET_assert (NULL != address);
- GNUNET_assert (NULL != address->solver_information);
-// GNUNET_assert (NULL != address->ats);
-
- struct MLP_information *mlpi = address->solver_information;
- //struct GNUNET_ATS_Information *ats = address->ats;
- GNUNET_assert (mlpi != NULL);
-
- int c;
- for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
- {
-
- /* FIXME int index = mlp_lookup_ats(address, mlp->q[c]); */
- int index = GNUNET_SYSERR;
-
- if (index == GNUNET_SYSERR)
- continue;
- /* FIXME
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating address for peer `%s' value
`%s': %f\n",
- GNUNET_i2s (&address->peer),
- mlp_ats_to_string(mlp->q[c]),
- (double) ats[index].value);
-
- int i = mlpi->q_avg_i[c];*/
- double * qp = mlpi->q[c];
- /* FIXME
- qp[i] = (double) ats[index].value;
- */
-
- int t;
- for (t = 0; t < MLP_AVERAGING_QUEUE_LENGTH; t++)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' queue[%u]: %f\n",
- GNUNET_i2s (&address->peer),
- mlp_ats_to_string(mlp->q[c]),
- t,
- qp[t]);
- }
-
- if (mlpi->q_avg_i[c] + 1 < (MLP_AVERAGING_QUEUE_LENGTH))
- mlpi->q_avg_i[c] ++;
- else
- mlpi->q_avg_i[c] = 0;
-
-
- int c2;
- int c3;
- double avg = 0.0;
- switch (mlp->q[c])
- {
- case GNUNET_ATS_QUALITY_NET_DELAY:
- c3 = 0;
- for (c2 = 0; c2 < MLP_AVERAGING_QUEUE_LENGTH; c2++)
- {
- if (mlpi->q[c][c2] != -1)
- {
- double * t2 = mlpi->q[c] ;
- avg += t2[c2];
- c3 ++;
- }
- }
- if ((c3 > 0) && (avg > 0))
- /* avg = 1 / ((q[0] + ... + q[l]) /c3) => c3 / avg*/
- mlpi->q_averaged[c] = (double) c3 / avg;
- else
- mlpi->q_averaged[c] = 0.0;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' average sum: %f,
average: %f, weight: %f\n",
- GNUNET_i2s (&address->peer),
- mlp_ats_to_string(mlp->q[c]),
- avg,
- avg / (double) c3,
- mlpi->q_averaged[c]);
-
- break;
- case GNUNET_ATS_QUALITY_NET_DISTANCE:
- c3 = 0;
- for (c2 = 0; c2 < MLP_AVERAGING_QUEUE_LENGTH; c2++)
- {
- if (mlpi->q[c][c2] != -1)
- {
- double * t2 = mlpi->q[c] ;
- avg += t2[c2];
- c3 ++;
- }
- }
- if ((c3 > 0) && (avg > 0))
- /* avg = 1 / ((q[0] + ... + q[l]) /c3) => c3 / avg*/
- mlpi->q_averaged[c] = (double) c3 / avg;
- else
- mlpi->q_averaged[c] = 0.0;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' average sum: %f,
average: %f, weight: %f\n",
- GNUNET_i2s (&address->peer),
- mlp_ats_to_string(mlp->q[c]),
- avg,
- avg / (double) c3,
- mlpi->q_averaged[c]);
-
- break;
- default:
- break;
- }
-
- if ((mlpi->c_b != 0) && (mlpi->r_q[c] != 0))
- {
-
- /* Get current number of columns */
- int found = GNUNET_NO;
- int cols = glp_get_num_cols(mlp->prob);
- int *ind = GNUNET_malloc (cols * sizeof (int) + 1);
- double *val = GNUNET_malloc (cols * sizeof (double) + 1);
-
- /* Get the matrix row of quality */
- int length = glp_get_mat_row(mlp->prob, mlp->r_q[c], ind, val);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "cols %i, length %i c_b %i\n",
cols, length, mlpi->c_b);
- int c4;
- /* Get the index if matrix row of quality */
- for (c4 = 1; c4 <= length; c4++ )
- {
- if (mlpi->c_b == ind[c4])
- {
- /* Update the value */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating quality `%s' column
`%s' row `%s' : %f -> %f\n",
- mlp_ats_to_string(mlp->q[c]),
- glp_get_col_name (mlp->prob, ind[c4]),
- glp_get_row_name (mlp->prob, mlp->r_q[c]),
- val[c4],
- mlpi->q_averaged[c]);
- val[c4] = mlpi->q_averaged[c];
- found = GNUNET_YES;
- break;
- }
- }
-
- if (found == GNUNET_NO)
- {
-
- ind[length+1] = mlpi->c_b;
- val[length+1] = mlpi->q_averaged[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%i ind[%i] val[%i]: %i %f\n",
length+1, length+1, length+1, mlpi->c_b, mlpi->q_averaged[c]);
- glp_set_mat_row (mlp->prob, mlpi->r_q[c], length+1, ind, val);
- }
- else
- {
- /* Get the index if matrix row of quality */
- glp_set_mat_row (mlp->prob, mlpi->r_q[c], length, ind, val);
- }
-
- GNUNET_free (ind);
- GNUNET_free (val);
- }
- }
-}
-
-#endif
-
-
struct CountContext
{
struct GNUNET_CONTAINER_MultiHashMap * peers;
@@ -1220,6 +1026,217 @@
GAS_mlp_solve_problem (solver, addresses);
}
+
+static void
+mlp_update_quality (struct GAS_MLP_Handle *mlp, struct ATS_Address * address,
+
const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+ struct MLP_information *mlpi = address->solver_information;
+ unsigned int c;
+ unsigned int c2;
+ unsigned int type_index;
+ unsigned int avg_index;
+ uint32_t type;
+ uint32_t value;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating quality metrics for peer
`%s'\n",
+ GNUNET_i2s (&address->peer));
+
+ GNUNET_assert (NULL != address);
+ GNUNET_assert (NULL != address->solver_information);
+ GNUNET_assert (NULL != ats);
+
+ for (c = 0; c < ats_count; c++)
+ {
+ type = ntohl (ats[c].type);
+ value = ntohl (ats[c].value);
+
+ /* Find index for this ATS type */
+ for (c2 = 0; c < ats_count; c++)
+ {
+ if (type == mlp->pv.q[c2])
+ {
+ type_index = c2;
+ break;
+ }
+ }
+ if (type_index > ats_count)
+ continue; /* quality index not found */
+
+ /* Get average queue index */
+ avg_index = mlpi->q_avg_i[type_index];
+
+ /* Update averaging queue */
+ mlpi->q[type_index][avg_index] = value;
+
+ /* Update averaging index */
+ if (mlpi->q_avg_i[c] + 1 < (MLP_AVERAGING_QUEUE_LENGTH))
+ mlpi->q_avg_i[c] ++;
+ else
+ mlpi->q_avg_i[c] = 0;
+
+ /* Update average */
+
+ /* Update problem matrix */
+
+ }
+
+
+#if 0
+// GNUNET_assert (NULL != address->ats);
+
+
+ //struct GNUNET_ATS_Information *ats = address->ats;
+ GNUNET_assert (mlpi != NULL);
+
+ int c;
+ for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
+ {
+
+ /* FIXME int index = mlp_lookup_ats(address, mlp->q[c]); */
+ int type_index = GNUNET_SYSERR;
+
+ if (type_index == GNUNET_SYSERR)
+ continue;
+ /* FIXME
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating address for peer `%s' value
`%s': %f\n",
+ GNUNET_i2s (&address->peer),
+ mlp_ats_to_string(mlp->q[c]),
+ (double) ats[index].value);
+
+ int i = mlpi->q_avg_i[c];*/
+ double * qp = mlpi->q[c];
+ /* FIXME
+ qp[i] = (double) ats[index].value;
+ */
+
+ int t;
+ for (t = 0; t < MLP_AVERAGING_QUEUE_LENGTH; t++)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' queue[%u]: %f\n",
+ GNUNET_i2s (&address->peer),
+ mlp_ats_to_string(mlp->q[c]),
+ t,
+ qp[t]);
+ }
+
+ if (mlpi->q_avg_i[c] + 1 < (MLP_AVERAGING_QUEUE_LENGTH))
+ mlpi->q_avg_i[c] ++;
+ else
+ mlpi->q_avg_i[c] = 0;
+
+
+ int c2;
+ int c3;
+ double avg = 0.0;
+ switch (mlp->q[c])
+ {
+ case GNUNET_ATS_QUALITY_NET_DELAY:
+ c3 = 0;
+ for (c2 = 0; c2 < MLP_AVERAGING_QUEUE_LENGTH; c2++)
+ {
+ if (mlpi->q[c][c2] != -1)
+ {
+ double * t2 = mlpi->q[c] ;
+ avg += t2[c2];
+ c3 ++;
+ }
+ }
+ if ((c3 > 0) && (avg > 0))
+ /* avg = 1 / ((q[0] + ... + q[l]) /c3) => c3 / avg*/
+ mlpi->q_averaged[c] = (double) c3 / avg;
+ else
+ mlpi->q_averaged[c] = 0.0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' average sum: %f,
average: %f, weight: %f\n",
+ GNUNET_i2s (&address->peer),
+ mlp_ats_to_string(mlp->q[c]),
+ avg,
+ avg / (double) c3,
+ mlpi->q_averaged[c]);
+
+ break;
+ case GNUNET_ATS_QUALITY_NET_DISTANCE:
+ c3 = 0;
+ for (c2 = 0; c2 < MLP_AVERAGING_QUEUE_LENGTH; c2++)
+ {
+ if (mlpi->q[c][c2] != -1)
+ {
+ double * t2 = mlpi->q[c] ;
+ avg += t2[c2];
+ c3 ++;
+ }
+ }
+ if ((c3 > 0) && (avg > 0))
+ /* avg = 1 / ((q[0] + ... + q[l]) /c3) => c3 / avg*/
+ mlpi->q_averaged[c] = (double) c3 / avg;
+ else
+ mlpi->q_averaged[c] = 0.0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s': `%s' average sum: %f,
average: %f, weight: %f\n",
+ GNUNET_i2s (&address->peer),
+ mlp_ats_to_string(mlp->q[c]),
+ avg,
+ avg / (double) c3,
+ mlpi->q_averaged[c]);
+
+ break;
+ default:
+ break;
+ }
+
+ if ((mlpi->c_b != 0) && (mlpi->r_q[c] != 0))
+ {
+
+ /* Get current number of columns */
+ int found = GNUNET_NO;
+ int cols = glp_get_num_cols(mlp->prob);
+ int *ind = GNUNET_malloc (cols * sizeof (int) + 1);
+ double *val = GNUNET_malloc (cols * sizeof (double) + 1);
+
+ /* Get the matrix row of quality */
+ int length = glp_get_mat_row(mlp->prob, mlp->r_q[c], ind, val);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "cols %i, length %i c_b %i\n",
cols, length, mlpi->c_b);
+ int c4;
+ /* Get the index if matrix row of quality */
+ for (c4 = 1; c4 <= length; c4++ )
+ {
+ if (mlpi->c_b == ind[c4])
+ {
+ /* Update the value */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating quality `%s' column
`%s' row `%s' : %f -> %f\n",
+ mlp_ats_to_string(mlp->q[c]),
+ glp_get_col_name (mlp->prob, ind[c4]),
+ glp_get_row_name (mlp->prob, mlp->r_q[c]),
+ val[c4],
+ mlpi->q_averaged[c]);
+ val[c4] = mlpi->q_averaged[c];
+ found = GNUNET_YES;
+ break;
+ }
+ }
+
+ if (found == GNUNET_NO)
+ {
+
+ ind[length+1] = mlpi->c_b;
+ val[length+1] = mlpi->q_averaged[c];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%i ind[%i] val[%i]: %i %f\n",
length+1, length+1, length+1, mlpi->c_b, mlpi->q_averaged[c]);
+ glp_set_mat_row (mlp->prob, mlpi->r_q[c], length+1, ind, val);
+ }
+ else
+ {
+ /* Get the index if matrix row of quality */
+ glp_set_mat_row (mlp->prob, mlpi->r_q[c], length, ind, val);
+ }
+
+ GNUNET_free (ind);
+ GNUNET_free (val);
+ }
+ }
+#endif
+}
+
/**
* Updates a single address in the MLP problem
*
@@ -1248,13 +1265,19 @@
{
struct ATS_Peer *p;
struct GAS_MLP_Handle *mlp = solver;
+ struct MLP_information *mlpi = address->solver_information;
GNUNET_assert (NULL != solver);
GNUNET_assert (NULL != addresses);
GNUNET_assert (NULL != address);
GNUNET_assert ((NULL != atsi) || (0 == atsi_count));
- /* TODO Update address here */
+ if (NULL == mlpi)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, _("Updating address for peer `%s' not
added before\n"), GNUNET_i2s(&address->peer));
+ return;
+ }
+ mlp_update_quality (mlp, address, atsi, atsi_count);
/* Is this peer included in the problem? */
if (NULL == (p = GNUNET_CONTAINER_multihashmap_get (mlp->peers,
&address->peer.hashPubKey)))
@@ -1269,93 +1292,6 @@
if (GNUNET_YES == mlp->mlp_auto_solve)
GAS_mlp_solve_problem (solver, addresses);
return;
-
-#if 0
- GNUNET_STATISTICS_update (mlp->stats, "# MLP address updates", 1, GNUNET_NO);
-
- /* We add a new address */
- if (address->solver_information == NULL)
- new = GNUNET_YES;
- else
- new = GNUNET_NO;
-
- /* Do the update */
- if (new == GNUNET_YES)
- {
- mlpi = GNUNET_malloc (sizeof (struct MLP_information));
-
- int c;
- for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++)
- {
- int c2;
- mlpi->r_q[c] = 0;
- for (c2 = 0; c2 < MLP_AVERAGING_QUEUE_LENGTH; c2++)
- mlpi->q[c][c2] = -1.0; /* -1.0: invalid value */
- mlpi->q_avg_i[c] = 0;
- mlpi->q_averaged[c] = 0.0;
- }
-
- address->solver_information = mlpi;
- mlp->num_addresses ++;
- GNUNET_STATISTICS_update (mlp->stats, "# addresses in MLP", 1, GNUNET_NO);
-
- /* Check for and add peer */
- struct ATS_Peer *peer = mlp_find_peer (mlp, &address->peer);
- if (peer == NULL)
- {
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding new peer `%s'\n",
- GNUNET_i2s (&address->peer));
-
- 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;
- }
- peer->f = 1.0;
-
- memcpy (&peer->id, &address->peer, sizeof (struct GNUNET_PeerIdentity));
- GNUNET_assert(address->prev == NULL);
- GNUNET_assert(address->next == NULL);
- GNUNET_CONTAINER_DLL_insert (peer->head, peer->tail, address);
- GNUNET_CONTAINER_DLL_insert (mlp->peer_head, mlp->peer_tail, peer);
- mlp->c_p ++;
- GNUNET_STATISTICS_update (mlp->stats, "# peers in MLP", 1, GNUNET_NO);
- }
- else
- {
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding address to peer `%s'\n",
- GNUNET_i2s (&address->peer));
-
- GNUNET_CONTAINER_DLL_insert (peer->head, peer->tail, address);
- }
- update_quality (mlp, address);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating existing address to peer
`%s'\n",
- GNUNET_i2s (&address->peer));
-
- update_quality (mlp, address);
- }
-
- /* Recalculate */
- if (new == GNUNET_YES)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Recreating problem: new address\n");
-
- mlp_delete_problem (mlp);
- mlp_create_problem (mlp, peers);
- mlp->presolver_required = GNUNET_YES;
- }
- if (mlp->auto_solve == GNUNET_YES)
- GAS_mlp_solve_problem (mlp, &ctx);
-#endif
}
/**
Added: gnunet/src/ats/test_ats_mlp_update.c
===================================================================
--- gnunet/src/ats/test_ats_mlp_update.c (rev 0)
+++ gnunet/src/ats/test_ats_mlp_update.c 2013-02-27 13:43:00 UTC (rev
26212)
@@ -0,0 +1,255 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file ats/test_ats_mlp_updating.c
+ * @brief basic test for updating ATS in MLP solver
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_statistics_service.h"
+#include "gnunet_ats_service.h"
+#include "gnunet-service-ats_addresses_mlp.h"
+#include "test_ats_api_common.h"
+
+/**
+ * Return value
+ */
+static int ret;
+
+/**
+ * MLP solver handle
+ */
+struct GAS_MLP_Handle *mlp;
+
+
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle * stats;
+
+/**
+ * Hashmap containing addresses
+ */
+struct GNUNET_CONTAINER_MultiHashMap * addresses;
+
+/**
+ * Peer
+ */
+struct GNUNET_PeerIdentity p[2];
+
+/**
+ * ATS Address
+ */
+struct ATS_Address *address[3];
+
+/**
+ * Timeout task
+ */
+GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+
+int addr_it (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
+{
+ struct ATS_Address *address = (struct ATS_Address *) value;
+ GAS_mlp_address_delete (mlp, addresses, address, GNUNET_NO);
+ GNUNET_CONTAINER_multihashmap_remove (addresses, key, value);
+ GNUNET_free (address);
+ return GNUNET_OK;
+}
+
+
+static void
+end_now (int res)
+{
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != stats)
+ {
+ GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
+ stats = NULL;
+ }
+ if (NULL != addresses)
+ {
+ GNUNET_CONTAINER_multihashmap_iterate (addresses, &addr_it,
NULL);
+ GNUNET_CONTAINER_multihashmap_destroy (addresses);
+ addresses = NULL ;
+ }
+ if (NULL != mlp)
+ {
+ GAS_mlp_done (mlp);
+ mlp = NULL;
+ }
+
+ ret = res;
+}
+
+static void
+end_correctly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Test ending with success\n"));
+ end_now (0);
+}
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_break (0);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Test ending with timeout\n"));
+ end_now (1);
+}
+
+
+static void
+bandwidth_changed_cb (void *cls, struct ATS_Address *address)
+{
+ static int cb_p0 = GNUNET_NO;
+
+ unsigned long long in = ntohl(address->assigned_bw_in.value__);
+ unsigned long long out = ntohl(address->assigned_bw_out.value__);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP suggests for peer `%s' address
`%s':`%s' in %llu out %llu \n",
+ GNUNET_i2s(&address->peer),
+ address->plugin,
+ address->addr,
+ in, out);
+
+ if ((in > 0) && (out > 0) &&
+ (0 == memcmp(&p[0], &address->peer, sizeof (address->peer))))
+ cb_p0 ++;
+
+ if (1 == cb_p0)
+ GNUNET_SCHEDULER_add_now (&end_correctly, NULL);
+}
+
+
+static void
+check (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
+ unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
+ unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
+ struct GNUNET_ATS_Information ats;
+
+#if !HAVE_LIBGLPK
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!");
+ ret = 1;
+ return;
+#endif
+
+ timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+ stats = GNUNET_STATISTICS_create("ats", cfg);
+ if (NULL == stats)
+ {
+ GNUNET_break (0);
+ end_now (1);
+ return;
+ }
+
+ /* Load quotas */
+ if (GNUNET_ATS_NetworkTypeCount != load_quotas (cfg, quotas_out, quotas_in,
+ GNUNET_ATS_NetworkTypeCount))
+ {
+ GNUNET_break (0);
+ end_now (1);
+ return;
+ }
+
+ /* Setup address hashmap */
+ addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+
+ /* Init MLP solver */
+ mlp = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
+ GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+ if (NULL == mlp)
+ {
+ GNUNET_break (0);
+ end_now (1);
+ return;
+ }
+ mlp->mlp_auto_solve = GNUNET_NO;
+
+ /* Create peer 0 */
+ if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0,
&p[0].hashPubKey))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+ end_now (1);
+ return;
+ }
+
+ /* Create address 0 */
+ address[0] = create_address (&p[0], "test_plugin0", "test_addr0",
strlen("test_addr0")+1, 0);
+ if (NULL == address[0])
+ {
+ GNUNET_break (0);
+ end_now (1);
+ return;
+ }
+ GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[0],
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ /* Adding address 0 */
+ GAS_mlp_address_add (mlp, addresses, address[0]);
+
+ /* Updating address 0*/
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl (GNUNET_ATS_NET_WAN);
+ GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, &ats, 1);
+
+ /* Retrieving preferred address for peer and wait for callback */
+ GAS_mlp_get_preferred_address (mlp, addresses, &p[0]);
+
+ GAS_mlp_solve_problem (mlp, addresses);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+
+ static char *const argv2[] = { "test_ats_mlp_updating",
+ "-c",
+ "test_ats_mlp.conf",
+ "-L", "WARNING",
+ NULL
+ };
+
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+ "test_ats_mlp_updating", "nohelp", options,
+ &check, NULL);
+
+
+ return ret;
+}
+
+/* end of file test_ats_mlp_updating.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26212 - gnunet/src/ats,
gnunet <=