projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate KX short cut
[oweals/gnunet.git]
/
src
/
testbed
/
test_testbed_api_testbed_run.c
diff --git
a/src/testbed/test_testbed_api_testbed_run.c
b/src/testbed/test_testbed_api_testbed_run.c
index 30acf268feb78c4f0a83ca9795e2d42e4f9579b1..45c9f5adf36cf12785fdf87657f7be012797f440 100644
(file)
--- a/
src/testbed/test_testbed_api_testbed_run.c
+++ b/
src/testbed/test_testbed_api_testbed_run.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-25,7
+25,7
@@
*/
#include "platform.h"
*/
#include "platform.h"
-#include "gnunet_
common
.h"
+#include "gnunet_
util_lib
.h"
#include "gnunet_testbed_service.h"
/**
#include "gnunet_testbed_service.h"
/**
@@
-46,7
+46,7
@@
static struct GNUNET_TESTBED_Operation *op;
/**
* Abort task identifier
*/
/**
* Abort task identifier
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
abort_task;
+static
struct GNUNET_SCHEDULER_Task *
abort_task;
/**
* Current peer id
/**
* Current peer id
@@
-68,12
+68,11
@@
static int wait_forever;
* Shutdown nicely
*
* @param cls NULL
* Shutdown nicely
*
* @param cls NULL
- * @param tc the task context
*/
static void
*/
static void
-do_shutdown (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+do_shutdown (void *cls)
{
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= abort_task)
+ if (
NULL
!= abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
GNUNET_SCHEDULER_cancel (abort_task);
GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
@@
-83,14
+82,14
@@
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* abort task to run on test timed out
*
* @param cls NULL
* abort task to run on test timed out
*
* @param cls NULL
- * @param tc the task context
*/
static void
*/
static void
-do_abort (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+do_abort (void *cls)
{
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
- (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ abort_task = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Test timed out -- Aborting\n");
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
}
@@
-117,12
+116,11
@@
test_master (void *cls,
result = GNUNET_OK;
if (GNUNET_YES == wait_forever)
{
result = GNUNET_OK;
if (GNUNET_YES == wait_forever)
{
- if (
GNUNET_SCHEDULER_NO_TASK
== abort_task)
+ if (
NULL
== abort_task)
return; /* abort already scheduled */
GNUNET_SCHEDULER_cancel (abort_task);
return; /* abort already scheduled */
GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
- (void) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_shutdown, NULL);
+ abort_task = NULL;
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
return;
}
GNUNET_assert (NULL != peers[0]);
return;
}
GNUNET_assert (NULL != peers[0]);
@@
-170,7
+168,9
@@
controller_event_cb (void *cls,
* @param cfg the configuration file handle
*/
static void
* @param cfg the configuration file handle
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
uint64_t event_mask;
const struct GNUNET_CONFIGURATION_Handle *config)
{
uint64_t event_mask;
@@
-178,11
+178,13
@@
run (void *cls, char *const *args, const char *cfgfile,
event_mask = 0;
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
event_mask = 0;
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
- GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
- NULL, &test_master, NULL);
+ GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask,
+ &controller_event_cb, NULL,
+ &test_master, NULL);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
+ (GNUNET_TIME_UNIT_SECONDS, 300),
+ &do_abort,
NULL);
}
NULL);
}