/*
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 * shutdown_task;
/**
* Result of this test case
* 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_shutdown (void *cls)
{
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+ shutdown_task = NULL;
if (NULL != barrier)
{
GNUNET_TESTBED_barrier_cancel (barrier);
barrier = NULL;
}
-
+
GNUNET_SCHEDULER_shutdown ();
}
const char *emsg)
{
static enum GNUNET_TESTBED_BarrierStatus old_status;
-
+
GNUNET_assert (NULL == cls);
GNUNET_assert (_barrier == barrier);
switch (status)
old_status = status;
return;
case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
- LOG (GNUNET_ERROR_TYPE_ERROR, "Barrier initialisation failed: %s",
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Barrier initialisation failed: %s",
(NULL == emsg) ? "unknown reason" : emsg);
barrier = NULL;
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_SCHEDULER_shutdown ();
return;
case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
LOG (GNUNET_ERROR_TYPE_INFO, "Barrier crossed\n");
- if (old_status == GNUNET_TESTBED_BARRIERSTATUS_INITIALISED)
+ if (old_status == GNUNET_TESTBED_BARRIERSTATUS_INITIALISED)
result = GNUNET_OK;
barrier = NULL;
GNUNET_SCHEDULER_shutdown ();
&barrier_cb, NULL);
shutdown_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS,
+ (GNUNET_TIME_UNIT_SECONDS,
10 * (NUM_PEERS + 1)),
&do_shutdown, NULL);
}
+#ifndef PATH_MAX
+/**
+ * Assumed maximum path length (for the log file name).
+ */
+#define PATH_MAX 4096
+#endif
+
+
/**
* Main function
*/
result = GNUNET_SYSERR;
event_mask = 0;
cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_assert (GNUNET_YES ==
+ GNUNET_assert (GNUNET_YES ==
GNUNET_CONFIGURATION_parse (cfg,
"test_testbed_api_barriers.conf.in"));
if (NULL == getcwd (pwd, PATH_MAX))
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);
+ GNUNET_CONFIGURATION_destroy (cfg);
cfg = NULL;
GNUNET_free (binary);
binary = NULL;