[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35196 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35196 - gnunet/src/ats |
Date: |
Mon, 9 Feb 2015 16:12:41 +0100 |
Author: grothoff
Date: 2015-02-09 16:12:40 +0100 (Mon, 09 Feb 2015)
New Revision: 35196
Modified:
gnunet/src/ats/perf_ats_solver.c
gnunet/src/ats/plugin_ats_proportional.c
Log:
perform proper locking and unlocking
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2015-02-09 14:28:45 UTC (rev 35195)
+++ gnunet/src/ats/perf_ats_solver.c 2015-02-09 15:12:40 UTC (rev 35196)
@@ -1189,6 +1189,11 @@
&do_delete_address,
NULL);
}
+ if (GNUNET_NO == ph.bulk_running)
+ {
+ ph.sf->s_bulk_stop (ph.sf->cls);
+ ph.bulk_running = GNUNET_NO;
+ }
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"Iteration done\n");
Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c 2015-02-09 14:28:45 UTC (rev
35195)
+++ gnunet/src/ats/plugin_ats_proportional.c 2015-02-09 15:12:40 UTC (rev
35196)
@@ -198,10 +198,6 @@
*/
unsigned int active_addresses;
- /**
- * Number of networks in @a network_entries
- */
- unsigned int network_count;
};
@@ -425,7 +421,7 @@
{
unsigned int i;
- if (GNUNET_YES == s->bulk_lock)
+ if (0 != s->bulk_lock)
{
s->bulk_requests++;
return;
@@ -461,11 +457,14 @@
}
else
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Redistributing bandwidth in all %u networks\n",
+ s->env->network_count);
s->env->info_cb (s->env->cls,
GAS_OP_SOLVE_START,
GAS_STAT_SUCCESS,
GAS_INFO_PROP_ALL);
- for (i = 0; i < s->network_count; i++)
+ for (i = 0; i < s->env->network_count; i++)
distribute_bandwidth (s,
&s->network_entries[i]);
s->env->info_cb (s->env->cls,
@@ -476,7 +475,7 @@
GAS_OP_SOLVE_UPDATE_NOTIFICATION_START,
GAS_STAT_SUCCESS,
GAS_INFO_PROP_ALL);
- for (i = 0; i < s->network_count; i++)
+ for (i = 0; i < s->env->network_count; i++)
propagate_bandwidth (s,
&s->network_entries[i]);
s->env->info_cb (s->env->cls,
@@ -816,7 +815,7 @@
}
/* We do have a new address, activate it */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Suggesting new address %p for peer `%s'\n",
+ "Selecting new address %p for peer `%s'\n",
best_address,
GNUNET_i2s (peer));
/* Mark address as active */
@@ -837,7 +836,6 @@
best_address,
GNUNET_i2s (peer));
-
if (GNUNET_NO ==
is_bandwidth_available_in_network (asi_best->network,
0))
@@ -1245,7 +1243,7 @@
struct AddressWrapper *next;
unsigned int c;
- for (c = 0; c < s->network_count; c++)
+ for (c = 0; c < s->env->network_count; c++)
{
GNUNET_break (0 == s->network_entries[c].total_addresses);
GNUNET_break (0 == s->network_entries[c].active_addresses);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35196 - gnunet/src/ats,
gnunet <=