X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=runqueue.c;h=1d9fa4b3a120d1231e9830868b92de686ad653cd;hp=1bdb48e157e88b611846f91819e3426a69198f76;hb=5326ce1046425154ab715387949728cfb09f4083;hpb=c4b79e4b5448abcd04c1848e212a237e8b17c3de

diff --git a/runqueue.c b/runqueue.c
index 1bdb48e..1d9fa4b 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;
@@ -186,8 +199,6 @@ void runqueue_task_kill(struct runqueue_task *t)
 	runqueue_task_complete(t);
 	if (running && t->type->kill)
 		t->type->kill(q, t);
-	if (t->complete)
-		t->complete(q, t);
 
 	runqueue_start_next(q);
 }
@@ -205,16 +216,22 @@ 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;
+	if (t->complete)
+		t->complete(q, t);
 	runqueue_start_next(t->q);
 }