/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file testbed/test_testbed_api_barriers.c
* @brief testcase binary for testing testbed barriers API
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
#include "platform.h"
/**
* Identifier for the shutdown task
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* Result of this test case
static int result;
+/**
+ * Handle SIGINT and SIGTERM
+ */
+static void
+shutdown_handler(void *cls)
+{
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel(timeout_task);
+ timeout_task = NULL;
+ }
+}
+
+
/**
* Shutdown this test case when it takes too long
*
* @param cls NULL
- * @param tc scheduler task context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_timeout (void *cls)
{
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
- if (NULL != barrier)
- {
- GNUNET_TESTBED_barrier_cancel (barrier);
- barrier = NULL;
- }
-
+ timeout_task = NULL;
+ if (barrier != NULL)
+ GNUNET_TESTBED_barrier_cancel (barrier);
GNUNET_SCHEDULER_shutdown ();
}
* @param cls the closure given to GNUNET_TESTBED_barrier_init()
* @param name the name of the barrier
* @param barrier the barrier handle
- * @param status status of the barrier; GNUNET_OK if the barrier is crossed;
- * GNUNET_SYSERR upon error
- * @param emsg if the status were to be GNUNET_SYSERR, this parameter has the
+ * @param status status of the barrier; #GNUNET_OK if the barrier is crossed;
+ * #GNUNET_SYSERR upon error
+ * @param emsg if the status were to be #GNUNET_SYSERR, this parameter has the
* error messsage
*/
static void
const char *emsg)
{
static enum GNUNET_TESTBED_BarrierStatus old_status;
-
+
GNUNET_assert (NULL == cls);
GNUNET_assert (_barrier == barrier);
switch (status)
{
- case BARRIER_STATUS_INITIALISED:
- LOG (GNUNET_ERROR_TYPE_INFO, "Barrier initialised\n");
+ case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED:
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Barrier initialised\n");
old_status = status;
return;
- case BARRIER_STATUS_ERROR:
- LOG (GNUNET_ERROR_TYPE_ERROR, "Barrier initialisation failed: %s",
+ case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Barrier initialisation failed: %s",
(NULL == emsg) ? "unknown reason" : emsg);
- barrier = NULL;
- GNUNET_SCHEDULER_shutdown ();
- return;
- case BARRIER_STATUS_CROSSED:
- LOG (GNUNET_ERROR_TYPE_INFO, "Barrier crossed\n");
- if (old_status == BARRIER_STATUS_INITIALISED)
+ break;
+ case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Barrier crossed\n");
+ if (old_status == GNUNET_TESTBED_BARRIERSTATUS_INITIALISED)
result = GNUNET_OK;
- barrier = NULL;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ break;
default:
GNUNET_assert (0);
+ return;
}
+ barrier = NULL;
+ GNUNET_SCHEDULER_shutdown ();
}
GNUNET_assert (NULL == cls);
if (NULL == peers_)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failing test due to timeout\n");
return;
}
GNUNET_assert (NUM_PEERS == num_peers);
c = GNUNET_TESTBED_run_get_controller_handle (h);
- barrier = GNUNET_TESTBED_barrier_init (c, TEST_BARRIER_NAME, 100,
- &barrier_cb, NULL);
- shutdown_task =
+ barrier = GNUNET_TESTBED_barrier_init (c,
+ TEST_BARRIER_NAME,
+ 100,
+ &barrier_cb,
+ NULL);
+ timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS,
+ (GNUNET_TIME_UNIT_SECONDS,
10 * (NUM_PEERS + 1)),
- &do_shutdown, NULL);
+ &do_timeout, NULL);
+ GNUNET_SCHEDULER_add_shutdown(&shutdown_handler, NULL);
}
+#ifndef PATH_MAX
+/**
+ * Assumed maximum path length (for the log file name).
+ */
+#define PATH_MAX 4096
+#endif
+
+
/**
* Main function
*/
int
main (int argc, char **argv)
{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ char pwd[PATH_MAX];
+ char *binary;
uint64_t event_mask;
result = GNUNET_SYSERR;
event_mask = 0;
+ cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONFIGURATION_parse (cfg,
+ "test_testbed_api_barriers.conf.in"));
+ if (NULL == getcwd (pwd, PATH_MAX))
+ return 1;
+ GNUNET_assert (0 < GNUNET_asprintf (&binary, "%s/%s", pwd,
+ "gnunet-service-test-barriers"));
+ GNUNET_CONFIGURATION_set_value_string (cfg, "test-barriers","BINARY", binary);
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write
+ (cfg, "test_testbed_api_barriers.conf"));
+ GNUNET_CONFIGURATION_destroy (cfg);
+ cfg = NULL;
+ GNUNET_free (binary);
+ binary = NULL;
(void) GNUNET_TESTBED_test_run ("test_testbed_api_barriers",
"test_testbed_api_barriers.conf", NUM_PEERS,
event_mask, NULL, NULL,
&test_master, NULL);
+ (void) unlink ("test_testbed_api_barriers.conf");
if (GNUNET_OK != result)
return 1;
return 0;