#define VERBOSE GNUNET_NO
-static void
-task2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- int *ok = cls;
- GNUNET_assert (2 == *ok);
- (*ok) = 3;
-}
-
static void
task3 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
(*ok) = 4;
}
+
+static void
+task2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ int *ok = cls;
+ GNUNET_assert (2 == *ok);
+ (*ok) = 3;
+ /* t3 will go before t4: higher priority */
+ GNUNET_SCHEDULER_add_with_priority (tc->sched,
+ GNUNET_SCHEDULER_PRIORITY_UI,
+ &task3, cls);
+}
+
static void
task4 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_assert (GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, fds[0]));
GNUNET_assert (1 == GNUNET_DISK_file_read (fds[0], &c, 1));
(*ok) = 8;
- GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_UI,
- 0, &taskNeverRun, NULL);
- GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_YES,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- 0, &taskLast, cls);
+ GNUNET_SCHEDULER_add_with_priority (tc->sched,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &taskLast, cls);
GNUNET_SCHEDULER_shutdown (tc->sched);
}
fds[0] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_READ);
fds[1] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_WRITE);
GNUNET_SCHEDULER_add_read_file (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_UNIT_FOREVER_REL,
fds[0], &taskRd, cls);
GNUNET_SCHEDULER_add_write_file (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_UNIT_FOREVER_REL,
fds[1], &taskWrt, cls);
}
(*ok) = 2;
/* t2 will go first -- prereq for all */
t2 = GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
GNUNET_SCHEDULER_NO_TASK, &task2, cls);
- /* t3 will go before t4: higher priority */
- t4 = GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- t2, &task4, cls);
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- t2,
- GNUNET_TIME_relative_get_zero (),
- &task3, cls);
- /* t4 will go first: lower prio, but prereq! */
- GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_UI, t4, &task5, cls);
+ /* t4 will go after t2 ('add after') and after t3 (priority) */
+ t4 = GNUNET_SCHEDULER_add_after (tc->sched, t2, &task4, cls);
+ /* t5 will go last (after p4) */
+ GNUNET_SCHEDULER_add_after (tc->sched, t4, &task5, cls);
}
}
+static void
+taskShutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ int *ok = cls;
+ GNUNET_assert (1 == *ok);
+ *ok = 8;
+ GNUNET_SCHEDULER_add_delayed (tc->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL, &taskLast, cls);
+ GNUNET_SCHEDULER_shutdown (tc->sched);
+}
+
+
+/**
+ * Main method, starts scheduler with task1,
+ * checks that "ok" is correct at the end.
+ */
+static int
+checkShutdown ()
+{
+ int ok;
+
+ ok = 1;
+ GNUNET_SCHEDULER_run (&taskShutdown, &ok);
+ return ok;
+}
+
+
static void
taskSig (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
int *ok = cls;
GNUNET_assert (1 == *ok);
*ok = 8;
- GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_UI,
- 0, &taskNeverRun, NULL);
- GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_YES,
- GNUNET_SCHEDULER_PRIORITY_UI,
- 0, &taskLast, cls);
+ GNUNET_SCHEDULER_add_delayed (tc->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL, &taskLast, cls);
GNUNET_break (0 == PLIBC_KILL (getpid (), SIGTERM));
}
}
-
-
static void
taskCancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
*ok = 0;
GNUNET_SCHEDULER_cancel (tc->sched,
GNUNET_SCHEDULER_add_after (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_UI,
- 0,
+ GNUNET_SCHEDULER_NO_TASK,
&taskNeverRun, NULL));
}
GNUNET_log_setup ("test_scheduler", "WARNING", NULL);
ret += check ();
+#ifndef MINGW
ret += checkSignal ();
+#endif
+ ret += checkShutdown ();
ret += checkCancel ();
GNUNET_DISK_pipe_close (p);