aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-03-20 13:17:45 +0000
committerChristian Grothoff <christian@grothoff.org>2013-03-20 13:17:45 +0000
commit6ede35cba06d876aa19180c7e7118bd44b3eb579 (patch)
tree9cc22e0260ad0d907888c601b928e5a680cd89a6 /src/testbed
parentfae95de0d0fb9a48857f9199f63b83fd12cd0c6c (diff)
downloadgnunet-6ede35cba06d876aa19180c7e7118bd44b3eb579.tar.gz
gnunet-6ede35cba06d876aa19180c7e7118bd44b3eb579.zip
-hopefully no longer needed...
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/testbed_api_statistics.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index 247aa6824..bf401e0ed 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -190,13 +190,6 @@ iteration_completion_cb (void *cls, int success)
190 struct PeerGetStatsContext *peer_sc = cls; 190 struct PeerGetStatsContext *peer_sc = cls;
191 struct GetStatsContext *sc; 191 struct GetStatsContext *sc;
192 192
193 if (NULL == peer_sc->get_handle)
194 {
195 /* We are being called synchronously in call to GNUNET_STATISTICS_destroy()
196 in statistics_da() after we cancelled the GetHandle */
197 GNUNET_assert (GNUNET_SYSERR == success);
198 return;
199 }
200 GNUNET_break (GNUNET_OK == success); 193 GNUNET_break (GNUNET_OK == success);
201 sc = peer_sc->sc; 194 sc = peer_sc->sc;
202 peer_sc->get_handle = NULL; 195 peer_sc->get_handle = NULL;
@@ -301,14 +294,14 @@ static void
301statistics_da (void *cls, void *op_result) 294statistics_da (void *cls, void *op_result)
302{ 295{
303 struct PeerGetStatsContext *peer_sc = cls; 296 struct PeerGetStatsContext *peer_sc = cls;
297 struct GNUNET_STATISTICS_Handle *sh = op_result;
304 298
305 if (NULL != peer_sc->get_handle) 299 if (NULL != peer_sc->get_handle)
306 { 300 {
307 GNUNET_STATISTICS_get_cancel (peer_sc->get_handle); 301 GNUNET_STATISTICS_get_cancel (peer_sc->get_handle);
308 peer_sc->get_handle = NULL; 302 peer_sc->get_handle = NULL;
309 } 303 }
310 GNUNET_STATISTICS_destroy ((struct GNUNET_STATISTICS_Handle *) op_result, 304 GNUNET_STATISTICS_destroy (sh, GNUNET_NO);
311 GNUNET_NO);
312 if (GNUNET_SCHEDULER_NO_TASK != peer_sc->op_done_task_id) 305 if (GNUNET_SCHEDULER_NO_TASK != peer_sc->op_done_task_id)
313 GNUNET_SCHEDULER_cancel (peer_sc->op_done_task_id); 306 GNUNET_SCHEDULER_cancel (peer_sc->op_done_task_id);
314 GNUNET_free (peer_sc); 307 GNUNET_free (peer_sc);