[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20989 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20989 - gnunet/src/ats |
Date: |
Tue, 17 Apr 2012 09:57:10 +0200 |
Author: wachs
Date: 2012-04-17 09:57:10 +0200 (Tue, 17 Apr 2012)
New Revision: 20989
Modified:
gnunet/src/ats/Makefile.am
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
gnunet/src/ats/perf_ats_mlp.c
Log:
- update
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2012-04-16 20:34:36 UTC (rev 20988)
+++ gnunet/src/ats/Makefile.am 2012-04-17 07:57:10 UTC (rev 20989)
@@ -87,7 +87,7 @@
perf_ats_mlp_LDADD = \
$(GN_LIBGLPK) \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
endif
test_ats_api_scheduling_SOURCES = \
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2012-04-16 20:34:36 UTC
(rev 20988)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2012-04-17 07:57:10 UTC
(rev 20989)
@@ -748,7 +748,7 @@
mode = GNUNET_CONFIGURATION_get_value_yesno (cfg, "ats", "MLP");
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP mode %u", mode);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP mode %u", mode);
switch (mode)
{
/* MLP = YES */
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-04-16 20:34:36 UTC
(rev 20988)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-04-17 07:57:10 UTC
(rev 20989)
@@ -1341,7 +1341,11 @@
{
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->mlp_information);
GNUNET_assert (NULL != address->ats);
+
struct MLP_information *mlpi = address->mlp_information;
struct GNUNET_ATS_Information *ats = address->ats;
GNUNET_assert (mlpi != NULL);
Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c 2012-04-16 20:34:36 UTC (rev 20988)
+++ gnunet/src/ats/perf_ats_mlp.c 2012-04-17 07:57:10 UTC (rev 20989)
@@ -100,31 +100,46 @@
mlp->auto_solve = GNUNET_NO;
for (c=0; c < peers; c++)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Setting up peer %u\n", c);
GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK,
&p[c].id.hashPubKey);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "peer %s\n",
GNUNET_h2s_full(&p[c].id.hashPubKey));
for (c2=0; c2 < addresses; c2++)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Setting up address %u for peer
%u\n", c2, c);
+ a[ca].mlp_information = NULL;
a[ca].peer = p[c].id;
a[ca].plugin = strdup("test");
- a[ca].addr = GNUNET_HELLO_address_allocate(&a[ca].peer, a[ca].plugin,
NULL, 0);
- a[ca].addr_len = GNUNET_HELLO_address_get_size(a[ca].addr);
- a[ca].ats = NULL;
+ //a[ca].addr = GNUNET_HELLO_address_allocate(&a[ca].peer, a[ca].plugin,
NULL, 0);
+ //a[ca].addr_len = GNUNET_HELLO_address_get_size(a[ca].addr);
+ a[ca].ats = GNUNET_malloc (2 * sizeof (struct GNUNET_ATS_Information));
+ a[ca].ats[0].type = GNUNET_ATS_QUALITY_NET_DELAY;
+ a[ca].ats[0].value = 20;
+ a[ca].ats[1].type = GNUNET_ATS_QUALITY_NET_DISTANCE;
+ a[ca].ats[1].value = 2;
+ a[ca].ats_count = 2;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Setting up address %u\n", ca);
ca++;
- GAS_mlp_address_update(mlp, amap, &a[c2]);
+ /*
+ GNUNET_CONTAINER_multihashmap_put (amap, &a[ca].peer.hashPubKey, &a[ca],
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GAS_mlp_address_update(mlp, amap, &a[ca]);
+ */
}
+
}
- GAS_mlp_solve_problem(mlp);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Problem contains %u peers and %u
adresses\n", mlp->c_p, mlp->addr_in_problem);
+ /* Solving the problem */
+ //GAS_mlp_solve_problem(mlp);
- GAS_mlp_done (mlp);
- for (c2=0; c2 < (peers * addresses); c2++)
+ //GAS_mlp_done (mlp);
+
+ for (ca=0; ca < (peers * addresses); ca++)
{
- GNUNET_free (a[c2].plugin);
- GNUNET_free (a[c2].addr);
-// GAS_mlp_address_update(mlp, amap, &a[c2]);
+ GNUNET_free (a[ca].plugin);
+ GNUNET_free (a[ca].ats);
+ // GNUNET_free ((void *) a[c2].addr);
}
ret = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20989 - gnunet/src/ats,
gnunet <=