[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23528 - in gnunet/src: include testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23528 - in gnunet/src: include testbed |
Date: |
Fri, 31 Aug 2012 09:52:40 +0200 |
Author: harsha
Date: 2012-08-31 09:52:40 +0200 (Fri, 31 Aug 2012)
New Revision: 23528
Added:
gnunet/src/testbed/x64_misc.supp
Modified:
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/test_testbed_api_testbed_run.c
gnunet/src/testbed/testbed_api_testbed.c
Log:
Removed RunHandle return from GNUNET_TESTBED_run
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-08-30 19:54:48 UTC (rev
23527)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-08-31 07:52:40 UTC (rev
23528)
@@ -1114,12 +1114,6 @@
/**
- * Opaque handle to testbed run
- */
-struct GNUNET_TESTBED_RunHandle;
-
-
-/**
* Convenience method for running a testbed with
* a single call. Underlay and overlay topology
* are configured using the "UNDERLAY" and "OVERLAY"
@@ -1127,7 +1121,8 @@
* (with possible options given in "UNDERLAY_XXX" and/or
* "OVERLAY_XXX").
*
- * The testbed is to be terminated using a calling
GNUNET_TESTBED_shutdown_run()
+ * The testbed is to be terminated using a call to
+ * "GNUNET_SCHEDULER_shutdown".
*
* @param host_filename name of the file with the 'hosts', NULL
* to run everything on 'localhost'
@@ -1144,9 +1139,8 @@
* @param cc_cls closure for cc
* @param master task to run once the testbed is ready
* @param master_cls closure for 'task'.
- * @return the handle for this testbed run
*/
-struct GNUNET_TESTBED_RunHandle *
+void
GNUNET_TESTBED_run (const char *host_filename,
const struct GNUNET_CONFIGURATION_Handle *cfg,
unsigned int num_peers,
@@ -1158,15 +1152,6 @@
/**
- * Stops the testbed run and releases any used resources
- *
- * @param rh the tesbed run handle
- */
-void
-GNUNET_TESTBED_shutdown_run (struct GNUNET_TESTBED_RunHandle *rh);
-
-
-/**
* Signature of a main function for a testcase.
*
* @param cls closure
@@ -1185,9 +1170,9 @@
* "[testbed]" section of the configuration (with possible options
* given in "UNDERLAY_XXX" and/or "OVERLAY_XXX").
*
- * The test is to be terminated by calling GNUNET_TESTBED_shutdown_run()
- * If starting the test fails, the program is stopped without 'master' ever
- * being run
+ * The test is to be terminated using a call to
+ * "GNUNET_SCHEDULER_shutdown". If starting the test fails,
+ * the program is stopped without 'master' ever being run.
*
* NOTE: this function should be called from 'main', NOT from
* within a GNUNET_SCHEDULER-loop. This function will initialze
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-08-30 19:54:48 UTC (rev
23527)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-08-31 07:52:40 UTC (rev
23528)
@@ -1898,7 +1898,7 @@
GNUNET_TESTING_peer_stop (peer->details.local.peer))
{
send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Failed to stop peer");
+ "Peer not running");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
Modified: gnunet/src/testbed/test_testbed_api_testbed_run.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run.c 2012-08-30 19:54:48 UTC
(rev 23527)
+++ gnunet/src/testbed/test_testbed_api_testbed_run.c 2012-08-31 07:52:40 UTC
(rev 23528)
@@ -29,16 +29,26 @@
#include "gnunet_testbed_service.h"
/**
- * Testbed run handle
+ * Number of peers we want to start
*/
-static struct GNUNET_TESTBED_RunHandle *rh;
+#define NUM_PEERS 2
/**
+ * The array of peers; we fill this as the peers are given to us by the testbed
+ */
+static struct GNUNET_TESTBED_Peer *peers[NUM_PEERS];
+
+/**
* Abort task identifier
*/
static GNUNET_SCHEDULER_TaskIdentifier abort_task;
/**
+ * Current peer id
+ */
+unsigned int peer_id;
+
+/**
* Testing result
*/
static int result;
@@ -55,8 +65,7 @@
{
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- if (NULL != rh)
- GNUNET_TESTBED_shutdown_run (rh);
+ GNUNET_SCHEDULER_shutdown ();
}
@@ -67,7 +76,7 @@
* @param tc the task context
*/
static void
-do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
@@ -101,9 +110,17 @@
controller_event_cb (void *cls,
const struct GNUNET_TESTBED_EventInformation *event)
{
- if (GNUNET_TESTBED_ET_PEER_START == event->type)
- return;
- GNUNET_break (0);
+
+ switch (event->type)
+ {
+ case GNUNET_TESTBED_ET_PEER_START:
+ GNUNET_assert (NULL == peers[peer_id]);
+ GNUNET_assert (NULL != event->details.peer_start.peer);
+ peers[peer_id++] = event->details.peer_start.peer;
+ break;
+ default:
+ GNUNET_break (0);
+ }
}
@@ -127,7 +144,7 @@
event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
- rh = GNUNET_TESTBED_run (NULL, config, 2, event_mask, &controller_event_cb,
+ GNUNET_TESTBED_run (NULL, config, 2, event_mask, &controller_event_cb,
NULL, &master_task, NULL);
abort_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort,
NULL);
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2012-08-30 19:54:48 UTC (rev
23527)
+++ gnunet/src/testbed/testbed_api_testbed.c 2012-08-31 07:52:40 UTC (rev
23528)
@@ -56,7 +56,7 @@
/**
* Context information for GNUNET_TESTBED_run()
*/
- struct GNUNET_TESTBED_RunHandle *rh;
+ struct RunContext *rc;
/**
* Closure
@@ -78,7 +78,7 @@
/**
* Testbed Run Handle
*/
-struct GNUNET_TESTBED_RunHandle
+struct RunContext
{
/**
* The controller handle
@@ -239,19 +239,19 @@
static void
start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_TESTBED_RunHandle *rh = cls;
+ struct RunContext *rc = cls;
struct DLLOperation *dll_op;
unsigned int peer;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting Peers\n");
- for (peer = 0; peer < rh->num_peers; peer++)
+ for (peer = 0; peer < rc->num_peers; peer++)
{
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_start (rh->peers[peer]);
- dll_op->cls = rh->peers[peer];
- GNUNET_CONTAINER_DLL_insert_tail (rh->dll_op_head, rh->dll_op_tail,
dll_op);
+ dll_op->op = GNUNET_TESTBED_peer_start (rc->peers[peer]);
+ dll_op->cls = rc->peers[peer];
+ GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
dll_op);
}
- rh->peer_count = 0;
+ rc->peer_count = 0;
}
@@ -268,12 +268,12 @@
peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
{
struct DLLOperation *dll_op = cls;
- struct GNUNET_TESTBED_RunHandle *rh;
+ struct RunContext *rc;
GNUNET_assert (NULL != dll_op);
- rh = dll_op->rh;
- GNUNET_assert (NULL != rh);
- GNUNET_CONTAINER_DLL_remove (rh->dll_op_head, rh->dll_op_tail, dll_op);
+ rc = dll_op->rc;
+ GNUNET_assert (NULL != rc);
+ GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_free (dll_op);
if (NULL == peer)
@@ -284,12 +284,12 @@
/* FIXME: GNUNET_TESTBED_shutdown_run()? */
return;
}
- rh->peers[rh->peer_count] = peer;
- rh->peer_count++;
- if (rh->peer_count < rh->num_peers)
+ rc->peers[rc->peer_count] = peer;
+ rc->peer_count++;
+ if (rc->peer_count < rc->num_peers)
return;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Required peers created successfully\n");
- GNUNET_SCHEDULER_add_now (&start_peers_task, rh);
+ GNUNET_SCHEDULER_add_now (&start_peers_task, rc);
}
@@ -300,30 +300,30 @@
* @param tc the task context from scheduler
*/
static void
-shutdown_run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_TESTBED_RunHandle *rh = cls;
+ struct RunContext *rc = cls;
struct DLLOperation *dll_op;
- GNUNET_assert (NULL == rh->peers);
- if (NULL != rh->c)
- GNUNET_TESTBED_controller_disconnect (rh->c);
- if (NULL != rh->cproc)
- GNUNET_TESTBED_controller_stop (rh->cproc);
- if (NULL != rh->h)
- GNUNET_TESTBED_host_destroy (rh->h);
- if (NULL != rh->dll_op_head)
+ GNUNET_assert (NULL == rc->peers);
+ if (NULL != rc->c)
+ GNUNET_TESTBED_controller_disconnect (rc->c);
+ if (NULL != rc->cproc)
+ GNUNET_TESTBED_controller_stop (rc->cproc);
+ if (NULL != rc->h)
+ GNUNET_TESTBED_host_destroy (rc->h);
+ if (NULL != rc->dll_op_head)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Some operations are still pending. Cancelling them\n"));
- while (NULL != (dll_op = rh->dll_op_head))
+ while (NULL != (dll_op = rc->dll_op_head))
{
GNUNET_TESTBED_operation_cancel (dll_op->op);
- GNUNET_CONTAINER_DLL_remove (rh->dll_op_head, rh->dll_op_tail, dll_op);
+ GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
GNUNET_free (dll_op);
}
}
- GNUNET_free (rh);
+ GNUNET_free (rc);
}
@@ -337,49 +337,49 @@
static void
event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
{
- struct GNUNET_TESTBED_RunHandle *rh = cls;
+ struct RunContext *rc = cls;
struct DLLOperation *dll_op;
- if ((GNUNET_YES == rh->in_shutdown) &&
+ if ((GNUNET_YES == rc->in_shutdown) &&
(GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type))
{
- for (dll_op = rh->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
+ for (dll_op = rc->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
{
if (event->details.operation_finished.operation == dll_op->op)
break;
}
if (NULL == dll_op)
goto call_cc;
- GNUNET_CONTAINER_DLL_remove (rh->dll_op_head, rh->dll_op_tail, dll_op);
+ GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_free (dll_op);
- rh->peer_count++;
- if (rh->peer_count < rh->num_peers)
+ rc->peer_count++;
+ if (rc->peer_count < rc->num_peers)
return;
- GNUNET_free (rh->peers);
- rh->peers = NULL;
+ GNUNET_free (rc->peers);
+ rc->peers = NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully destroyed\n");
- GNUNET_SCHEDULER_add_now (&shutdown_run_task, rh);
+ GNUNET_SCHEDULER_add_now (&cleanup_task, rc);
return;
}
call_cc:
- rh->cc (rh->cc_cls, event);
+ rc->cc (rc->cc_cls, event);
if (GNUNET_TESTBED_ET_PEER_START != event->type)
return;
- for (dll_op = rh->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
+ for (dll_op = rc->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
if ((NULL != dll_op->cls) &&
(event->details.peer_start.peer == dll_op->cls))
break;
GNUNET_assert (NULL != dll_op);
- GNUNET_CONTAINER_DLL_remove (rh->dll_op_head, rh->dll_op_tail, dll_op);
+ GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_free (dll_op);
- rh->peer_count++;
- if (rh->peer_count < rh->num_peers)
+ rc->peer_count++;
+ if (rc->peer_count < rc->num_peers)
return;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers started successfully\n");
- GNUNET_SCHEDULER_add_continuation (rh->master, rh->master_cls,
+ GNUNET_SCHEDULER_add_continuation (rc->master, rc->master_cls,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
@@ -398,7 +398,7 @@
controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
int status)
{
- struct GNUNET_TESTBED_RunHandle *rh = cls;
+ struct RunContext *rc = cls;
struct DLLOperation *dll_op;
unsigned int peer;
@@ -407,24 +407,57 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
return;
}
- rh->c = GNUNET_TESTBED_controller_connect (cfg, rh->h, rh->event_mask,
- &event_cb, rh);
- rh->peers = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *)
- * rh->num_peers);
- GNUNET_assert (NULL != rh->c);
- rh->peer_count = 0;
- for (peer = 0; peer < rh->num_peers; peer++)
+ rc->c = GNUNET_TESTBED_controller_connect (cfg, rc->h, rc->event_mask,
+ &event_cb, rc);
+ rc->peers = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *)
+ * rc->num_peers);
+ GNUNET_assert (NULL != rc->c);
+ rc->peer_count = 0;
+ for (peer = 0; peer < rc->num_peers; peer++)
{
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->rh = rh;
- dll_op->op = GNUNET_TESTBED_peer_create (rh->c, rh->h, cfg, peer_create_cb,
+ dll_op->rc = rc;
+ dll_op->op = GNUNET_TESTBED_peer_create (rc->c, rc->h, cfg, peer_create_cb,
dll_op);
- GNUNET_CONTAINER_DLL_insert_tail (rh->dll_op_head, rh->dll_op_tail,
dll_op);
+ GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
dll_op);
}
}
/**
+ * Stops the testbed run and releases any used resources
+ *
+ * @param rc the tesbed run handle
+ * @param tc the task context from scheduler
+ */
+void
+shutdown_run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct RunContext *rc = cls;
+ struct DLLOperation *dll_op;
+ unsigned int peer;
+
+ rc->in_shutdown = GNUNET_YES;
+ if (NULL != rc->c)
+ {
+ if (NULL != rc->peers)
+ {
+ rc->peer_count = 0;
+ for (peer = 0; peer < rc->num_peers; peer++)
+ {
+ dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
+ dll_op->op = GNUNET_TESTBED_peer_destroy (rc->peers[peer]);
+ GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
+ dll_op);
+ }
+ return;
+ }
+ }
+ GNUNET_SCHEDULER_add_now (&cleanup_task, rc);
+}
+
+
+/**
* Convenience method for running a testbed with
* a single call. Underlay and overlay topology
* are configured using the "UNDERLAY" and "OVERLAY"
@@ -446,9 +479,8 @@
* @param cc controller callback to invoke on events
* @param cc_cls closure for cc
* @param master task to run once the testbed is ready
- * @return the handle for this testbed run
*/
-struct GNUNET_TESTBED_RunHandle *
+void
GNUNET_TESTBED_run (const char *host_filename,
const struct GNUNET_CONFIGURATION_Handle *cfg,
unsigned int num_peers,
@@ -458,57 +490,27 @@
GNUNET_SCHEDULER_Task master,
void *master_cls)
{
- struct GNUNET_TESTBED_RunHandle *rh;
+ struct RunContext *rc;
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
- rh = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_RunHandle));
+ rc = GNUNET_malloc (sizeof (struct RunContext));
GNUNET_break (NULL == host_filename); /* Currently we do not support host
files */
host_filename = NULL;
- rh->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
- GNUNET_assert (NULL != rh->h);
- rh->cproc = GNUNET_TESTBED_controller_start ("127.0.0.1", rh->h, cfg,
- &controller_status_cb, rh);
- GNUNET_assert (NULL != rh->cproc);
- rh->num_peers = num_peers;
- rh->event_mask = event_mask;
- rh->cc = cc;
- rh->cc_cls = cc_cls;
- rh->master = master;
- rh->master_cls = master_cls;
- rh->in_shutdown = GNUNET_NO;
- return rh;
+ rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
+ GNUNET_assert (NULL != rc->h);
+ rc->cproc = GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, cfg,
+ &controller_status_cb, rc);
+ GNUNET_assert (NULL != rc->cproc);
+ rc->num_peers = num_peers;
+ rc->event_mask = event_mask;
+ rc->cc = cc;
+ rc->cc_cls = cc_cls;
+ rc->master = master;
+ rc->master_cls = master_cls;
+ rc->in_shutdown = GNUNET_NO;
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_run_task, rc);
}
-
-/**
- * Stops the testbed run and releases any used resources
- *
- * @param rh the tesbed run handle
- */
-void
-GNUNET_TESTBED_shutdown_run (struct GNUNET_TESTBED_RunHandle *rh)
-{
- struct DLLOperation *dll_op;
- unsigned int peer;
-
- rh->in_shutdown = GNUNET_YES;
- if (NULL != rh->c)
- {
- if (NULL != rh->peers)
- {
- rh->peer_count = 0;
- for (peer = 0; peer < rh->num_peers; peer++)
- {
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_destroy (rh->peers[peer]);
- GNUNET_CONTAINER_DLL_insert_tail (rh->dll_op_head, rh->dll_op_tail,
- dll_op);
- }
- return;
- }
- }
- GNUNET_SCHEDULER_add_now (&shutdown_run_task, rh);
-}
-
/* end of testbed_api_testbed.c */
Added: gnunet/src/testbed/x64_misc.supp
===================================================================
--- gnunet/src/testbed/x64_misc.supp (rev 0)
+++ gnunet/src/testbed/x64_misc.supp 2012-08-31 07:52:40 UTC (rev 23528)
@@ -0,0 +1,24 @@
+{
+ <unknown invalid free>
+ Memcheck:Free
+ fun:free
+ fun:free_mem
+ fun:__libc_freeres
+ fun:_vgnU_freeres
+ fun:__run_exit_handlers
+ fun:exit
+ fun:(below main)
+}
+{
+ <gnunet_crypto_init>
+ Memcheck:Leak
+ fun:malloc
+ obj:/usr/lib/libgcrypt.so.11.5.3
+ ...
+ obj:/usr/lib/libgcrypt.so.11.5.3
+ fun:gcry_control
+ fun:GNUNET_CRYPTO_random_init
+ obj:/home/harsha/repos/gnunet/src/util/.libs/libgnunetutil.so.8.0.0
+ obj:/home/harsha/repos/gnunet/src/util/.libs/libgnunetutil.so.8.0.0
+}
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23528 - in gnunet/src: include testbed,
gnunet <=