[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25255 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25255 - gnunet/src/ats |
Date: |
Wed, 5 Dec 2012 15:18:26 +0100 |
Author: wachs
Date: 2012-12-05 15:18:25 +0100 (Wed, 05 Dec 2012)
New Revision: 25255
Modified:
gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
gnunet/src/ats/perf_ats_mlp.c
gnunet/src/ats/test_ats_mlp.c
gnunet/src/ats/test_ats_mlp_averaging.c
Log:
fix tests
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-12-05 14:06:58 UTC
(rev 25254)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c 2012-12-05 14:18:25 UTC
(rev 25255)
@@ -1685,19 +1685,19 @@
mlp_get_preferred_address_it (void *cls, const struct GNUNET_HashCode * key,
void *value)
{
- struct ATS_PreferedAddress *aa = (struct ATS_PreferedAddress *) cls;
+ struct ATS_Address *aa = (struct ATS_Address *) cls;
struct ATS_Address *addr = value;
struct MLP_information *mlpi = addr->mlp_information;
if (mlpi == NULL)
return GNUNET_YES;
if (mlpi->n == GNUNET_YES)
{
- aa->address = addr;
+ aa = addr;
if (mlpi->b > (double) UINT32_MAX)
- aa->bandwidth_out = UINT32_MAX;
+ aa->assigned_bw_out.value__ = htonl (UINT32_MAX);
else
- aa->bandwidth_out = (uint32_t) mlpi->b;
- aa->bandwidth_in = 0;
+ aa->assigned_bw_out.value__ = htonl((uint32_t) mlpi->b);
+ aa->assigned_bw_in.value__ = htonl(0);
return GNUNET_NO;
}
return GNUNET_YES;
@@ -1712,7 +1712,7 @@
* @param peer the peer
* @return suggested address
*/
-struct ATS_Address *
+const struct ATS_Address *
GAS_mlp_get_preferred_address (void *solver,
struct GNUNET_CONTAINER_MultiHashMap *
addresses,
const struct GNUNET_PeerIdentity *peer)
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-12-05 14:06:58 UTC
(rev 25254)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-12-05 14:18:25 UTC
(rev 25255)
@@ -64,13 +64,6 @@
struct ATS_Address *tail;
};
-struct ATS_PreferedAddress
-{
- uint32_t bandwidth_out;
- uint32_t bandwidth_in;
- struct ATS_Address *address;
-};
-
struct GAS_MLP_SolutionContext
{
int lp_result;
@@ -383,7 +376,7 @@
* @param peer the peer
* @return suggested address
*/
-struct ATS_Address *
+const struct ATS_Address *
GAS_mlp_get_preferred_address (void *solver,
struct GNUNET_CONTAINER_MultiHashMap *
addresses,
const struct GNUNET_PeerIdentity *peer);
Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c 2012-12-05 14:06:58 UTC (rev 25254)
+++ gnunet/src/ats/perf_ats_mlp.c 2012-12-05 14:18:25 UTC (rev 25255)
@@ -250,7 +250,7 @@
{
in_dest[c] = UINT32_MAX;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
}
return GNUNET_ATS_NetworkTypeCount;
Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c 2012-12-05 14:06:58 UTC (rev 25254)
+++ gnunet/src/ats/test_ats_mlp.c 2012-12-05 14:18:25 UTC (rev 25255)
@@ -137,7 +137,7 @@
{
in_dest[c] = UINT32_MAX;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
}
return GNUNET_ATS_NetworkTypeCount;
Modified: gnunet/src/ats/test_ats_mlp_averaging.c
===================================================================
--- gnunet/src/ats/test_ats_mlp_averaging.c 2012-12-05 14:06:58 UTC (rev
25254)
+++ gnunet/src/ats/test_ats_mlp_averaging.c 2012-12-05 14:18:25 UTC (rev
25255)
@@ -136,7 +136,7 @@
{
in_dest[c] = UINT32_MAX;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota: %s %u, %s %u\n",
entry_in, in_dest[c], entry_out, out_dest[c]);
}
return GNUNET_ATS_NetworkTypeCount;
@@ -152,7 +152,7 @@
return;
#endif
struct ATS_Address addr[10];
- struct ATS_PreferedAddress *res[10];
+ struct ATS_Address *res[10];
int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
@@ -218,8 +218,7 @@
GNUNET_assert (GNUNET_OK == ctx.mlp_result);
res[0] = GAS_mlp_get_preferred_address(mlp, addresses, &p[0]);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound
bandwidth: %u Bps\n",res[0]->address->plugin, res[0]->bandwidth_out);
- GNUNET_free (res[0]);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound
bandwidth: %u Bps\n",res[0]->plugin, ntohl(res[0]->assigned_bw_out.value__));
/* Delete an address */
GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey,
&addr[0]);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25255 - gnunet/src/ats,
gnunet <=