[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12873 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12873 - gnunet/src/fs |
Date: |
Tue, 7 Sep 2010 10:58:33 +0200 |
Author: grothoff
Date: 2010-09-07 10:58:33 +0200 (Tue, 07 Sep 2010)
New Revision: 12873
Modified:
gnunet/src/fs/fs_test_lib.c
gnunet/src/fs/fs_test_lib.h
gnunet/src/fs/test_gnunet_service_fs_migration.c
Log:
fix
Modified: gnunet/src/fs/fs_test_lib.c
===================================================================
--- gnunet/src/fs/fs_test_lib.c 2010-09-07 08:43:47 UTC (rev 12872)
+++ gnunet/src/fs/fs_test_lib.c 2010-09-07 08:58:33 UTC (rev 12873)
@@ -328,12 +328,16 @@
struct StartContext *sctx = cls;
unsigned int i;
- GNUNET_TESTING_daemons_stop (sctx->group,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30),
&shutdown_callback, NULL);
+ GNUNET_TESTING_daemons_stop (sctx->group,
+
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30),
+ &shutdown_callback,
+ NULL);
for (i=0;i<sctx->total;i++)
{
if (i < sctx->have)
GNUNET_CONFIGURATION_destroy (sctx->daemons[i]->cfg);
GNUNET_free (sctx->daemons[i]);
+ sctx->daemons[i] = NULL;
}
GNUNET_CONFIGURATION_destroy (sctx->cfg);
GNUNET_SCHEDULER_add_continuation (sctx->sched,
Modified: gnunet/src/fs/fs_test_lib.h
===================================================================
--- gnunet/src/fs/fs_test_lib.h 2010-09-07 08:43:47 UTC (rev 12872)
+++ gnunet/src/fs/fs_test_lib.h 2010-09-07 08:58:33 UTC (rev 12873)
@@ -48,7 +48,10 @@
* @param total number of daemons to start
* @param daemons array of 'total' entries to be initialized
* (array must already be allocated, will be filled)
- * @param cont function to call when done
+ * @param cont function to call when done; note that if 'cont'
+ * is called with reason "TIMEOUT", then starting the
+ * daemons has failed and the client MUST NOT call
+ * 'GNUNET_FS_TEST_daemons_stop'!
* @param cont_cls closure for cont
*/
void
Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c 2010-09-07 08:43:47 UTC
(rev 12872)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c 2010-09-07 08:58:33 UTC
(rev 12873)
@@ -196,7 +196,6 @@
fprintf (stderr,
"Daemons failed to start!\n");
GNUNET_break (0);
- GNUNET_FS_TEST_daemons_stop (sched, 2, daemons);
ok = 1;
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12873 - gnunet/src/fs,
gnunet <=