[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31734 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r31734 - gnunet/src/ats |
|
Date: |
Tue, 24 Dec 2013 14:26:22 +0100 |
Author: LRN
Date: 2013-12-24 14:26:21 +0100 (Tue, 24 Dec 2013)
New Revision: 31734
Modified:
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_performance.c
gnunet/src/ats/gnunet-service-ats_scheduling.c
gnunet/src/ats/perf_ats_solver.c
gnunet/src/ats/test_ats_mlp_averaging.c
gnunet/src/ats/test_ats_simplistic_pref_aging.c
gnunet/src/ats/test_ats_solver_request_and_delete_address.c
Log:
value__ is uint32_t, use %lu to print
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2013-12-24 13:07:50 UTC
(rev 31733)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2013-12-24 13:26:21 UTC
(rev 31734)
@@ -1384,10 +1384,10 @@
}
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Active address in %s with (in/out) %u/%u Bps\n",
- GNUNET_ATS_print_network_type (net),
- (unsigned int) ntohl (addr->assigned_bw_in.value__),
- (unsigned int) ntohl (addr->assigned_bw_out.value__));
+ "Active address in %s with (in/out) %lu/%lu Bps\n",
+ GNUNET_ATS_print_network_type (net),
+ ntohl (addr->assigned_bw_in.value__),
+ ntohl (addr->assigned_bw_out.value__));
}
return GNUNET_OK;
}
@@ -2060,9 +2060,9 @@
else
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Sending bandwidth update for peer `%s': %llu %llu\n",
- GNUNET_i2s (&address->peer), address->assigned_bw_out,
- address->assigned_bw_out);
+ "Sending bandwidth update for peer `%s': %lu %lu\n",
+ GNUNET_i2s (&address->peer), address->assigned_bw_out.value__,
+ address->assigned_bw_out.value__);
}
/* *Notify scheduling clients about suggestion */
Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c 2013-12-24 13:07:50 UTC
(rev 31733)
+++ gnunet/src/ats/gnunet-service-ats_performance.c 2013-12-24 13:26:21 UTC
(rev 31734)
@@ -261,7 +261,7 @@
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n",
+ "Callback for peer `%s' plugin `%s' BW out %lu, BW in %lu \n",
GNUNET_i2s (id),
plugin_name,
ntohl (bandwidth_out.value__),
@@ -405,23 +405,23 @@
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Callback for %s peer `%s' plugin `%s' BW out %u, BW in %u \n",
+ "Callback for %s peer `%s' plugin `%s' BW out %lu, BW in %lu
\n",
(active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
GNUNET_i2s (id),
plugin_name,
- (unsigned int) ntohl (bandwidth_out.value__),
- (unsigned int) ntohl (bandwidth_in.value__));
+ ntohl (bandwidth_out.value__),
+ ntohl (bandwidth_in.value__));
/* Transmit result */
if ((GNUNET_YES == ai->all) || (GNUNET_YES == active))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending result for %s peer `%s' plugin `%s' BW out %u, BW
in %u \n",
+ "Sending result for %s peer `%s' plugin `%s' BW out %lu, BW
in %lu \n",
(active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
GNUNET_i2s (id),
plugin_name,
- (unsigned int) ntohl (bandwidth_out.value__),
- (unsigned int) ntohl (bandwidth_in.value__));
+ ntohl (bandwidth_out.value__),
+ ntohl (bandwidth_in.value__));
transmit_req_addr (cls,
id,
plugin_name,
Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c 2013-12-24 13:07:50 UTC
(rev 31733)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c 2013-12-24 13:26:21 UTC
(rev 31734)
@@ -146,7 +146,7 @@
strcpy (&addrp[plugin_addr_len], plugin_name);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ATS sends quota for peer `%s': (in/out) %u/%u\n",
+ "ATS sends quota for peer `%s': (in/out) %lu/%lu\n",
GNUNET_i2s (peer), ntohl (bandwidth_in.value__),
ntohl (bandwidth_out.value__));
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2013-12-24 13:07:50 UTC (rev 31733)
+++ gnunet/src/ats/perf_ats_solver.c 2013-12-24 13:26:21 UTC (rev 31734)
@@ -300,7 +300,7 @@
return;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Bandwidth changed addresses %s %p to %llu Bps out / %llu Bps in\n",
+ "Bandwidth changed addresses %s %p to %lu Bps out / %lu Bps in\n",
GNUNET_i2s (&address->peer),
address,
ntohl(address->assigned_bw_out.value__),
Modified: gnunet/src/ats/test_ats_mlp_averaging.c
===================================================================
--- gnunet/src/ats/test_ats_mlp_averaging.c 2013-12-24 13:07:50 UTC (rev
31733)
+++ gnunet/src/ats/test_ats_mlp_averaging.c 2013-12-24 13:26:21 UTC (rev
31734)
@@ -218,7 +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]->plugin, ntohl(res[0]->assigned_bw_out.value__));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound
bandwidth: %lu 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]);
Modified: gnunet/src/ats/test_ats_simplistic_pref_aging.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_pref_aging.c 2013-12-24 13:07:50 UTC
(rev 31733)
+++ gnunet/src/ats/test_ats_simplistic_pref_aging.c 2013-12-24 13:26:21 UTC
(rev 31734)
@@ -169,7 +169,7 @@
/* Callback for initial suggestion */
if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
@@ -180,7 +180,7 @@
}
if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
@@ -205,7 +205,7 @@
/* Callback due to preference change */
if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
@@ -222,7 +222,7 @@
}
if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
@@ -256,7 +256,7 @@
/* Callback due to preference aging */
if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 0 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
@@ -273,7 +273,7 @@
}
if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %llu/%llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u:
Callback for peer 1 `%s': (in/out) %lu/%lu\n",
stage,
GNUNET_i2s (&address->peer),
ntohl (bandwidth_in.value__),
Modified: gnunet/src/ats/test_ats_solver_request_and_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2013-12-24
13:07:50 UTC (rev 31733)
+++ gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2013-12-24
13:26:21 UTC (rev 31734)
@@ -159,7 +159,7 @@
/* Expecting disconnect */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Received sugggestion for peer `%s': %llu %llu\n",
+ "Received sugggestion for peer `%s': %lu %lu\n",
GNUNET_i2s (&address->peer),
ntohl(bandwidth_in.value__),
ntohl(bandwidth_out.value__));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31734 - gnunet/src/ats,
gnunet <=