projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SSH more safely from configure
[oweals/gnunet.git]
/
src
/
util
/
test_scheduler.c
diff --git
a/src/util/test_scheduler.c
b/src/util/test_scheduler.c
index 9832ade6f7ebdad64e4a02e68c0a026845e8a407..4b6a8a80f939a986895cfedabd63fdce23fa3ef7 100644
(file)
--- a/
src/util/test_scheduler.c
+++ b/
src/util/test_scheduler.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009 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,20
+14,21
@@
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.
*/
/**
* @file util/test_scheduler.c
* @brief tests for the scheduler
*/
#include "platform.h"
*/
/**
* @file util/test_scheduler.c
* @brief tests for the scheduler
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
+
+
+struct GNUNET_DISK_PipeHandle *p;
+
+static const struct GNUNET_DISK_FileHandle *fds[2];
-#define VERBOSE GNUNET_NO
static void
task2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
task2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@
-51,9
+52,6
@@
task3 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
(*ok) = 4;
}
(*ok) = 4;
}
-struct GNUNET_DISK_PipeHandle *p;
-static const struct GNUNET_DISK_FileHandle *fds[2];
-
static void
taskWrt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
taskWrt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@
-74,6
+72,7
@@
taskNeverRun (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_assert (0);
}
GNUNET_assert (0);
}
+
static void
taskLast (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
taskLast (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@
-84,6
+83,7
@@
taskLast (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
(*ok) = 0;
}
(*ok) = 0;
}
+
static void
taskRd (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
taskRd (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@
-132,7
+132,6
@@
task1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
}
}
-
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
@@
-175,6
+174,7
@@
checkShutdown ()
}
}
+#ifndef MINGW
static void
taskSig (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
taskSig (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@
-183,7
+183,7
@@
taskSig (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_assert (1 == *ok);
*ok = 8;
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &taskLast, cls);
GNUNET_assert (1 == *ok);
*ok = 8;
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &taskLast, cls);
- GNUNET_break (0 == PLIBC_KILL (getpid (),
SIGTERM
));
+ GNUNET_break (0 == PLIBC_KILL (getpid (),
GNUNET_TERM_SIG
));
}
}
@@
-200,6
+200,7
@@
checkSignal ()
GNUNET_SCHEDULER_run (&taskSig, &ok);
return ok;
}
GNUNET_SCHEDULER_run (&taskSig, &ok);
return ok;
}
+#endif
static void
static void
@@
-229,7
+230,6
@@
checkCancel ()
}
}
-
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{