[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28355 - gnunet/src/experimentation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28355 - gnunet/src/experimentation |
Date: |
Thu, 1 Aug 2013 16:49:08 +0200 |
Author: wachs
Date: 2013-08-01 16:49:08 +0200 (Thu, 01 Aug 2013)
New Revision: 28355
Modified:
gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
gnunet/src/experimentation/test_experimentation_clique_run.c
Log:
fixes for list queues
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-08-01 14:39:10 UTC (rev 28354)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-08-01 14:49:08 UTC (rev 28355)
@@ -428,7 +428,6 @@
update_stats (nodes_active);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s' as active
node\n"),
GNUNET_i2s (&n->id));
-return;
/* Request experiments for this node to start them */
for (c1 = 0; c1 < n->issuer_count; c1++)
{
@@ -1077,6 +1076,12 @@
void
GED_nodes_stop ()
{
+ if (NULL != ch)
+ {
+ GNUNET_CORE_disconnect (ch);
+ ch = NULL;
+ }
+
if (NULL != nodes_requested)
{
GNUNET_CONTAINER_multihashmap_iterate (nodes_requested,
@@ -1106,11 +1111,6 @@
GNUNET_CONTAINER_multihashmap_destroy (nodes_inactive);
nodes_inactive = NULL;
}
- if (NULL != ch)
- {
- GNUNET_CORE_disconnect (ch);
- ch = NULL;
- }
}
/* end of gnunet-daemon-experimentation_nodes.c */
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-08-01 14:39:10 UTC (rev 28354)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-08-01 14:49:08 UTC (rev 28355)
@@ -258,11 +258,14 @@
"START_ACK", GNUNET_i2s (&n->id), e->name);
if (GNUNET_SCHEDULER_NO_TASK != se->task)
+ {
GNUNET_SCHEDULER_cancel (se->task); /* *Canceling timeout task
*/
+ se->task = GNUNET_SCHEDULER_NO_TASK;
+ }
/* Remove from waiting list, add to running list */
GNUNET_CONTAINER_DLL_remove (waiting_out_head, waiting_out_tail, se);
- GNUNET_CONTAINER_DLL_insert (running_out_head, waiting_out_tail, se);
+ GNUNET_CONTAINER_DLL_insert (running_out_head, running_out_tail, se);
/* Change state and schedule to run */
se->state = STARTED;
Modified: gnunet/src/experimentation/test_experimentation_clique_run.c
===================================================================
--- gnunet/src/experimentation/test_experimentation_clique_run.c
2013-08-01 14:39:10 UTC (rev 28354)
+++ gnunet/src/experimentation/test_experimentation_clique_run.c
2013-08-01 14:49:08 UTC (rev 28355)
@@ -179,7 +179,7 @@
if (t_running_experiments == (NUM_PEERS * NUM_EXPERIMENTS))
{
fprintf (stderr, "\n");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All %u peers are
running experiments\n", NUM_PEERS);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "All %u peers are
running experiments\n", NUM_PEERS);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28355 - gnunet/src/experimentation,
gnunet <=