[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32669 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32669 - gnunet/src/mesh |
Date: |
Mon, 17 Mar 2014 12:02:44 +0100 |
Author: bartpolot
Date: 2014-03-17 12:02:44 +0100 (Mon, 17 Mar 2014)
New Revision: 32669
Modified:
gnunet/src/mesh/gnunet-mesh-profiler.c
Log:
- fix disconnect task scheduling
Modified: gnunet/src/mesh/gnunet-mesh-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh-profiler.c 2014-03-17 11:02:42 UTC (rev
32668)
+++ gnunet/src/mesh/gnunet-mesh-profiler.c 2014-03-17 11:02:44 UTC (rev
32669)
@@ -242,8 +242,7 @@
unsigned int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "disconnecting mesh service of peers, called from line %ld\n",
- line);
+ "disconnecting mesh service, called from line %ld\n", line);
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
for (i = 0; i < TOTAL_PEERS; i++)
{
@@ -254,9 +253,16 @@
continue;
if (NULL != peers[i].ch)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u: channel %p\n", i, peers[i].ch);
GNUNET_MESH_channel_destroy (peers[i].ch);
+ }
if (NULL != peers[i].incoming_ch)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u: incoming channel %p\n",
+ i, peers[i].incoming_ch);
GNUNET_MESH_channel_destroy (peers[i].incoming_ch);
+ }
}
GNUNET_MESH_TEST_cleanup (test_ctx);
if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)
@@ -344,7 +350,6 @@
if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
return;
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Start collecting statistics...\n");
stats_op = GNUNET_TESTBED_get_statistics (TOTAL_PEERS, testbed_handles,
NULL, NULL,
@@ -645,18 +650,12 @@
peer = GNUNET_CONTAINER_multipeermap_get (ids, initiator);
GNUNET_assert (NULL != peer);
+ GNUNET_assert (peer == peers[n].incoming);
+ GNUNET_assert (peer->dest == &peers[n]);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u <= %u %p\n",
n, get_index (peer), channel);
peers[n].incoming_ch = channel;
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
- &disconnect_mesh_peers,
- (void *) __LINE__);
- }
-
return NULL;
}
@@ -717,12 +716,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Start profiler\n");
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
- &disconnect_mesh_peers,
- (void *) __LINE__);
-
flags = GNUNET_MESH_OPTION_DEFAULT;
for (i = 0; i < TOTAL_PEERS; i++)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32669 - gnunet/src/mesh,
gnunet <=