[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33654 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33654 - gnunet/src/ats |
Date: |
Thu, 12 Jun 2014 17:18:35 +0200 |
Author: grothoff
Date: 2014-06-12 17:18:35 +0200 (Thu, 12 Jun 2014)
New Revision: 33654
Modified:
gnunet/src/ats/plugin_ats_mlp.c
gnunet/src/ats/plugin_ats_proportional.c
Log:
-revert 33649, see #3426
Modified: gnunet/src/ats/plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/plugin_ats_mlp.c 2014-06-12 09:59:00 UTC (rev 33653)
+++ gnunet/src/ats/plugin_ats_mlp.c 2014-06-12 15:18:35 UTC (rev 33654)
@@ -24,8 +24,6 @@
* @author Matthias Wachs
* @author Christian Grothoff
*/
-
-#include "plugin_ats_mlp.h"
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_ats_service.h"
Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c 2014-06-12 09:59:00 UTC (rev
33653)
+++ gnunet/src/ats/plugin_ats_proportional.c 2014-06-12 15:18:35 UTC (rev
33654)
@@ -561,9 +561,8 @@
remaining_quota_in = net->total_quota_in - (net->active_addresses * min_bw);
remaining_quota_out = net->total_quota_out - (net->active_addresses *
min_bw);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Remaining bandwidth : (in/out): %llu/%llu \n",
- remaining_quota_in, remaining_quota_out);
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Remaining bandwidth : (in/out): %llu/%llu \n",
+ remaining_quota_in, remaining_quota_out);
sum_relative_peer_prefences = 0.0;
/* Calculate sum of relative preference for active addresses in this network
*/
@@ -583,22 +582,18 @@
if (count_addresses != net->active_addresses)
{
- LOG ( (count_addresses > net->active_addresses)
- ? GNUNET_ERROR_TYPE_WARNING
- : GNUNET_ERROR_TYPE_INFO,
- "%s: Counted %u active addresses, but network says to have %u active
addresses \n",
- net->desc,
- count_addresses,
- net->active_addresses);
+ GNUNET_break (0);
+ LOG(GNUNET_ERROR_TYPE_WARNING,
+ "%s: Counted %u active addresses, but network says to have %u active
addresses \n",
+ net->desc, count_addresses, net->active_addresses);
for (cur_address = net->head; NULL != cur_address; cur_address =
cur_address->next)
{
if (GNUNET_YES != cur_address->addr->active)
continue;
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Active: `%s' `%s' length %u\n",
- GNUNET_i2s (&cur_address->addr->peer),
- cur_address->addr->plugin,
- cur_address->addr->addr_len);
+
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Active: `%s' `%s' length %u\n",
+ GNUNET_i2s (&cur_address->addr->peer), cur_address->addr->plugin,
+ cur_address->addr->addr_len);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33654 - gnunet/src/ats,
gnunet <=