projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forget to commit some files
[oweals/gnunet.git]
/
src
/
testbed
/
test_testbed_api_test.c
diff --git
a/src/testbed/test_testbed_api_test.c
b/src/testbed/test_testbed_api_test.c
index 94e94cc372096b76060f0f362faed11722e07ed7..f4e80ab6f87f6f6291c42318fdb38e1e97fd4357 100644
(file)
--- a/
src/testbed/test_testbed_api_test.c
+++ b/
src/testbed/test_testbed_api_test.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 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
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.
*/
/**
*/
/**
@@
-38,7
+38,7
@@
/**
* Number of peers we want to start
*/
/**
* Number of peers we want to start
*/
-#define NUM_PEERS 2
5
+#define NUM_PEERS 2
/**
* Array of peers
/**
* Array of peers
@@
-53,12
+53,12
@@
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;
/**
* shutdown task identifier
*/
/**
* shutdown task identifier
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
shutdown_task;
+static
struct GNUNET_SCHEDULER_Task *
shutdown_task;
/**
* Testing result
/**
* Testing result
@@
-75,8
+75,8
@@
static int result;
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- shutdown_task =
GNUNET_SCHEDULER_NO_TASK
;
- if (
GNUNET_SCHEDULER_NO_TASK
!= abort_task)
+ shutdown_task =
NULL
;
+ if (
NULL
!= abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
if (NULL != op)
GNUNET_TESTBED_operation_done (op);
GNUNET_SCHEDULER_cancel (abort_task);
if (NULL != op)
GNUNET_TESTBED_operation_done (op);
@@
-89,10
+89,10
@@
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
#define FAIL_TEST(cond) do { \
if (!(cond)) { \
GNUNET_break(0); \
#define FAIL_TEST(cond) do { \
if (!(cond)) { \
GNUNET_break(0); \
- if (
GNUNET_SCHEDULER_NO_TASK
!= abort_task) \
+ if (
NULL
!= abort_task) \
GNUNET_SCHEDULER_cancel (abort_task); \
GNUNET_SCHEDULER_cancel (abort_task); \
- abort_task =
GNUNET_SCHEDULER_NO_TASK
; \
- if (
GNUNET_SCHEDULER_NO_TASK
== shutdown_task) \
+ abort_task =
NULL
; \
+ if (
NULL
== shutdown_task) \
shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \
return; \
} \
shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \
return; \
} \
@@
-109,8
+109,8
@@
static void
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- abort_task =
GNUNET_SCHEDULER_NO_TASK
;
- if (
GNUNET_SCHEDULER_NO_TASK
!= shutdown_task)
+ abort_task =
NULL
;
+ if (
NULL
!= shutdown_task)
GNUNET_SCHEDULER_cancel (shutdown_task);
do_shutdown (cls, tc);
}
GNUNET_SCHEDULER_cancel (shutdown_task);
do_shutdown (cls, tc);
}