/*
- This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
+ This file is part of GNUnet
+ (C) 2008--2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
/**
* @file testbed/testbed_api_testbed.c
/**
* Generic loggins shorthand
*/
-#define LOG(kind,...) \
+#define LOG(kind,...) \
GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__)
/**
for (peer = 0; peer < rc->num_peers; peer++)
{
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_start (rc->peers[peer]);
+ dll_op->op = GNUNET_TESTBED_peer_start (rc->peers[peer], NULL, NULL);
dll_op->cls = rc->peers[peer];
GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail, dll_op);
}
}
call_cc:
- if (NULL != rc->cc)
+ if ((0 != (rc->event_mask && (1LL << event->type))) && (NULL != rc->cc))
rc->cc (rc->cc_cls, event);
if (GNUNET_TESTBED_ET_PEER_START != event->type)
return;
{
struct RunContext *rc = cls;
struct DLLOperation *dll_op;
+ uint64_t event_mask;
unsigned int peer;
if (status != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
return;
}
+ event_mask = rc->event_mask;
+ event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
+ event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
rc->c =
- GNUNET_TESTBED_controller_connect (cfg, rc->h, rc->event_mask, &event_cb,
- rc);
+ GNUNET_TESTBED_controller_connect (cfg, rc->h, event_mask, &event_cb, rc);
rc->peers =
GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *) * rc->num_peers);
GNUNET_assert (NULL != rc->c);
/**
* Stops the testbed run and releases any used resources
*
- * @param rc the tesbed run handle
+ * @param cls the tesbed run handle
* @param tc the task context from scheduler
*/
void
if (NULL != rc->peers)
{
rc->peer_count = 0;
+ /* Check if some peers are stopped */
+ for (peer = 0; peer < rc->num_peers; peer++)
+ {
+ if (PS_STOPPED != rc->peers[peer]->state)
+ break;
+ }
+ if (peer == rc->num_peers)
+ {
+ /* All peers are stopped */
+ rc->state = RC_PEERS_STOPPED;
+ 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;
+ }
+ /* Some peers are stopped */
for (peer = 0; peer < rc->num_peers; peer++)
{
if (PS_STARTED != rc->peers[peer]->state)
continue;
}
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_stop (rc->peers[peer]);
+ dll_op->op = GNUNET_TESTBED_peer_stop (rc->peers[peer], NULL, NULL);
dll_op->cls = rc->peers[peer];
GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
dll_op);
* or-ed values of "1LL" shifted by the
* respective 'enum GNUNET_TESTBED_EventType'
* (i.e. "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
- * @param cc controller callback to invoke on events
+ * @param cc controller callback to invoke on events; This callback is called
+ * for all peer start events even if GNUNET_TESTBED_ET_PEER_START isn't
+ * set in the event_mask as this is the only way get access to the
+ * handle of each peer
* @param cc_cls closure for cc
* @param master task to run once the testbed is ready
+ * @param master_cls
*/
void
GNUNET_TESTBED_run (const char *host_filename,
{
struct RunContext *rc;
- event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
- event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
- event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
- rc = GNUNET_malloc (sizeof (struct RunContext));
GNUNET_break (NULL == host_filename); /* Currently we do not support host
* files */
GNUNET_assert (NULL != cc);
+ GNUNET_assert (num_peers > 0);
host_filename = NULL;
+ rc = GNUNET_malloc (sizeof (struct RunContext));
rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
GNUNET_assert (NULL != rc->h);
rc->cproc =
GNUNET_assert (NULL != rc->cproc);
rc->num_peers = num_peers;
rc->event_mask = event_mask;
+ rc->event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
rc->cc = cc;
rc->cc_cls = cc_cls;
rc->master = master;
projects / oweals / gnunet.git / blobdiff