diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cram/test_runqueue.t | 46 | ||||
| -rw-r--r-- | tests/test-runqueue.c | 67 |
2 files changed, 85 insertions, 28 deletions
diff --git a/tests/cram/test_runqueue.t b/tests/cram/test_runqueue.t index 227f414..cd9d96b 100644 --- a/tests/cram/test_runqueue.t +++ b/tests/cram/test_runqueue.t @@ -2,25 +2,35 @@ check that runqueue is producing expected results: $ [ -n "$TEST_BIN_DIR" ] && export PATH="$TEST_BIN_DIR:$PATH" $ valgrind --quiet --leak-check=full test-runqueue - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' + [1/1] start 'sleep 1' (killer) + [1/1] killing process (killer) + [0/1] finish 'sleep 1' (killer) + [0/1] finish 'sleep 1' (killer) + [0/1] finish 'sleep 1' (killer) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) All done! $ test-runqueue-san - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' - [1/1] start 'sleep 1' - [1/1] cancel 'sleep 1' - [0/1] finish 'sleep 1' + [1/1] start 'sleep 1' (killer) + [1/1] killing process (killer) + [0/1] finish 'sleep 1' (killer) + [0/1] finish 'sleep 1' (killer) + [0/1] finish 'sleep 1' (killer) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) + [1/1] start 'sleep 1' (sleeper) + [1/1] cancel 'sleep 1' (sleeper) + [0/1] finish 'sleep 1' (sleeper) All done! diff --git a/tests/test-runqueue.c b/tests/test-runqueue.c index 13ab864..fb99892 100644 --- a/tests/test-runqueue.c +++ b/tests/test-runqueue.c @@ -16,6 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -26,8 +27,10 @@ static struct runqueue q; struct sleeper { - struct runqueue_process proc; int val; + bool kill; + struct uloop_timeout t; + struct runqueue_process proc; }; static void q_empty(struct runqueue *q) @@ -36,13 +39,19 @@ static void q_empty(struct runqueue *q) uloop_end(); } +static const char* sleeper_type(struct sleeper *s) +{ + return s->kill ? "killer" : "sleeper"; +} + static void q_sleep_run(struct runqueue *q, struct runqueue_task *t) { struct sleeper *s = container_of(t, struct sleeper, proc.task); char str[32]; pid_t pid; - fprintf(stderr, "[%d/%d] start 'sleep %d'\n", q->running_tasks, q->max_running_tasks, s->val); + fprintf(stderr, "[%d/%d] start 'sleep %d' (%s)\n", q->running_tasks, + q->max_running_tasks, s->val, sleeper_type(s)); pid = fork(); if (pid < 0) @@ -62,7 +71,8 @@ static void q_sleep_cancel(struct runqueue *q, struct runqueue_task *t, int type { struct sleeper *s = container_of(t, struct sleeper, proc.task); - fprintf(stderr, "[%d/%d] cancel 'sleep %d'\n", q->running_tasks, q->max_running_tasks, s->val); + fprintf(stderr, "[%d/%d] cancel 'sleep %d' (%s)\n", q->running_tasks, + q->max_running_tasks, s->val, sleeper_type(s)); runqueue_process_cancel_cb(q, t, type); } @@ -70,10 +80,40 @@ static void q_sleep_complete(struct runqueue *q, struct runqueue_task *p) { struct sleeper *s = container_of(p, struct sleeper, proc.task); - fprintf(stderr, "[%d/%d] finish 'sleep %d'\n", q->running_tasks, q->max_running_tasks, s->val); + fprintf(stderr, "[%d/%d] finish 'sleep %d' (%s) \n", q->running_tasks, + q->max_running_tasks, s->val, sleeper_type(s)); free(s); } +static void my_runqueue_process_kill_cb(struct runqueue *q, struct runqueue_task *p) +{ + struct sleeper *s = container_of(p, struct sleeper, proc.task); + + fprintf(stderr, "[%d/%d] killing process (%s)\n", q->running_tasks, + q->max_running_tasks, sleeper_type(s)); + runqueue_process_kill_cb(q, p); +} + +static void timer_cb(struct uloop_timeout *t) +{ + struct sleeper *s = container_of(t, struct sleeper, t); + if (s->kill) + runqueue_task_kill(&s->proc.task); +} + +static struct sleeper* create_sleeper(int val, const struct runqueue_task_type *type, bool kill) +{ + struct sleeper *s = calloc(1, sizeof(*s)); + s->kill = kill; + s->t.cb = timer_cb; + s->proc.task.type = type; + s->proc.task.run_timeout = 500; + s->proc.task.complete = q_sleep_complete; + s->val = val; + + return s; +} + static void add_sleeper(int val) { static const struct runqueue_task_type sleeper_type = { @@ -81,13 +121,19 @@ static void add_sleeper(int val) .cancel = q_sleep_cancel, .kill = runqueue_process_kill_cb, }; - struct sleeper *s; - s = calloc(1, sizeof(*s)); - s->proc.task.type = &sleeper_type; - s->proc.task.run_timeout = 500; - s->proc.task.complete = q_sleep_complete; - s->val = val; + static const struct runqueue_task_type killer_type = { + .run = q_sleep_run, + .cancel = q_sleep_cancel, + .kill = my_runqueue_process_kill_cb, + }; + + struct sleeper *k = create_sleeper(val, &killer_type, true); + uloop_timeout_set(&k->t, 100); + uloop_timeout_add(&k->t); + runqueue_task_add(&q, &k->proc.task, false); + + struct sleeper *s = create_sleeper(val, &sleeper_type, false); runqueue_task_add(&q, &s->proc.task, false); } @@ -105,6 +151,7 @@ int main(int argc, char **argv) add_sleeper(1); add_sleeper(1); add_sleeper(1); + uloop_run(); uloop_done(); |