lkl: remove threads counter

tavip · tavip · commit 777bbe18f49a · 2017-01-26T18:25:26.000+02:00
Now that we have synchronous thread termination due to thread_join
ops, we don't need the threads_counter anymore.

Signed-off-by: Octavian Purdila &lt;tavi@cs.pub.ro&gt;
diff --git a/arch/lkl/include/asm/thread_info.h b/arch/lkl/include/asm/thread_info.h
@@ -49,7 +49,6 @@ void free_thread_stack(struct task_struct *tsk);
 
 void threads_init(void);
 void threads_cleanup(void);
-void threads_cnt_dec(void);
 
 #define TIF_SYSCALL_TRACE		0
 #define TIF_NOTIFY_RESUME		1
diff --git a/arch/lkl/kernel/setup.c b/arch/lkl/kernel/setup.c
@@ -160,7 +160,6 @@ static int lkl_run_init(struct linux_binprm *bprm)
 	init_pid_ns.child_reaper = 0;
 
 	syscalls_init();
-	threads_cnt_dec();
 
 	lkl_ops->sem_up(init_sem);
 	lkl_ops->thread_exit();
diff --git a/arch/lkl/kernel/threads.c b/arch/lkl/kernel/threads.c
@@ -5,8 +5,6 @@
 #include <asm/cpu.h>
 #include <asm/sched.h>
 
-static volatile int threads_counter;
-
 static int init_ti(struct thread_info *ti)
 {
 	ti->sched_sem = lkl_ops->sem_alloc(0);
@@ -122,10 +120,8 @@ struct task_struct *__switch_to(struct task_struct *prev,
 		lkl_ops->sem_down(_prev->sched_sem);
 	}
 
-	if (_prev->dead) {
-		__sync_fetch_and_sub(&threads_counter, 1);
+	if (_prev->dead)
 		lkl_ops->thread_exit();
-	}
 
 	return abs_prev;
 }
@@ -193,8 +189,6 @@ int copy_thread(unsigned long clone_flags, unsigned long esp,
 		return -ENOMEM;
 	}
 
-	__sync_fetch_and_add(&threads_counter, 1);
-
 	return 0;
 }
 
@@ -218,11 +212,6 @@ void threads_init(void)
 	ti->tid = lkl_ops->thread_self();
 }
 
-void threads_cnt_dec(void)
-{
-	__sync_fetch_and_sub(&threads_counter, 1);
-}
-
 void threads_cleanup(void)
 {
 	struct task_struct *p, *t;
@@ -239,8 +228,5 @@ void threads_cleanup(void)
 		kill_thread(ti);
 	}
 
-	while (threads_counter)
-		;
-
 	lkl_ops->sem_free(init_thread_union.thread_info.sched_sem);
 }

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`#include <asm/cpu.h>`
`6`	`6`	`#include <asm/sched.h>`
`7`	`7`
`8`		`-static volatile int threads_counter;`
`9`		`-`
`10`	`8`	`static int init_ti(struct thread_info *ti)`
`11`	`9`	`{`
`12`	`10`	`ti->sched_sem = lkl_ops->sem_alloc(0);`
`@@ -122,10 +120,8 @@ struct task_struct __switch_to(struct task_struct prev,`
`122`	`120`	`lkl_ops->sem_down(_prev->sched_sem);`
`123`	`121`	`}`
`124`	`122`
`125`		`- if (_prev->dead) {`
`126`		`- __sync_fetch_and_sub(&threads_counter, 1);`
	`123`	`+ if (_prev->dead)`
`127`	`124`	`lkl_ops->thread_exit();`
`128`		`- }`
`129`	`125`
`130`	`126`	`return abs_prev;`
`131`	`127`	`}`
`@@ -193,8 +189,6 @@ int copy_thread(unsigned long clone_flags, unsigned long esp,`
`193`	`189`	`return -ENOMEM;`
`194`	`190`	`}`
`195`	`191`
`196`		`- __sync_fetch_and_add(&threads_counter, 1);`
`197`		`-`
`198`	`192`	`return 0;`
`199`	`193`	`}`
`200`	`194`
`@@ -218,11 +212,6 @@ void threads_init(void)`
`218`	`212`	`ti->tid = lkl_ops->thread_self();`
`219`	`213`	`}`
`220`	`214`
`221`		`-void threads_cnt_dec(void)`
`222`		`-{`
`223`		`- __sync_fetch_and_sub(&threads_counter, 1);`
`224`		`-}`
`225`		`-`
`226`	`215`	`void threads_cleanup(void)`
`227`	`216`	`{`
`228`	`217`	`struct task_struct p, t;`
`@@ -239,8 +228,5 @@ void threads_cleanup(void)`
`239`	`228`	`kill_thread(ti);`
`240`	`229`	`}`
`241`	`230`
`242`		`- while (threads_counter)`
`243`		`- ;`
`244`		`-`
`245`	`231`	`lkl_ops->sem_free(init_thread_union.thread_info.sched_sem);`
`246`	`232`	`}`