X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=runqueue.c;h=a1d013361aabe4cfb1b067430ce592e396b94d54;hp=5cc37bbe70adbd6531d1075705fd5d2dcabd9c40;hb=fd57eea9f37e447814afbf934db626288aac23c4;hpb=cb6c1718e711db77f7b6a06c8bc51fe392509bbc

diff --git a/runqueue.c b/runqueue.c
index 5cc37bb..a1d0133 100644
--- a/runqueue.c
+++ b/runqueue.c
@@ -145,7 +145,7 @@ __runqueue_task_timeout(struct uloop_timeout *timeout)
 		runqueue_task_cancel(t, t->cancel_type);
 }
 
-void runqueue_task_add(struct runqueue *q, struct runqueue_task *t, bool running)
+static void _runqueue_task_add(struct runqueue *q, struct runqueue_task *t, bool running, bool first)
 {
 	struct safe_list *head;
 
@@ -166,7 +166,10 @@ void runqueue_task_add(struct runqueue *q, struct runqueue_task *t, bool running
 
 	t->timeout.cb = __runqueue_task_timeout;
 	t->q = q;
-	safe_list_add(&t->list, head);
+	if (first)
+		safe_list_add_first(&t->list, head);
+	else
+		safe_list_add(&t->list, head);
 	t->cancelled = false;
 	t->queued = true;
 	t->running = running;
@@ -175,6 +178,16 @@ void runqueue_task_add(struct runqueue *q, struct runqueue_task *t, bool running
 	runqueue_start_next(q);
 }
 
+void runqueue_task_add(struct runqueue *q, struct runqueue_task *t, bool running)
+{
+	_runqueue_task_add(q, t, running, 0);
+}
+
+void runqueue_task_add_first(struct runqueue *q, struct runqueue_task *t, bool running)
+{
+	_runqueue_task_add(q, t, running, 1);
+}
+
 void runqueue_task_kill(struct runqueue_task *t)
 {
 	struct runqueue *q = t->q;
@@ -203,28 +216,31 @@ void runqueue_resume(struct runqueue *q)
 
 void runqueue_task_complete(struct runqueue_task *t)
 {
+	struct runqueue *q = t->q;
+
 	if (!t->queued)
 		return;
 
 	if (t->running)
 		t->q->running_tasks--;
 
+	uloop_timeout_cancel(&t->timeout);
+
 	safe_list_del(&t->list);
 	t->queued = false;
 	t->running = false;
 	t->cancelled = false;
-	runqueue_start_next(t->q);
+	if (t->complete)
+		t->complete(q, t);
+	runqueue_start_next(q);
 }
 
 static void
 __runqueue_proc_cb(struct uloop_process *p, int ret)
 {
 	struct runqueue_process *t = container_of(p, struct runqueue_process, proc);
-	struct runqueue *q = t->task.q;
 
 	runqueue_task_complete(&t->task);
-	if (t->complete)
-		t->complete(q, t, ret);
 }
 
 void runqueue_process_cancel_cb(struct runqueue *q, struct runqueue_task *t, int type)
@@ -243,7 +259,6 @@ void runqueue_process_kill_cb(struct runqueue *q, struct runqueue_task *t)
 
 	uloop_process_delete(&p->proc);
 	kill(p->proc.pid, SIGKILL);
-	__runqueue_proc_cb(&p->proc, -1);
 }
 
 static const struct runqueue_task_type runqueue_proc_type = {