From b99975917585dc8973cc806a5da0aa3fc791b198 Mon Sep 17 00:00:00 2001 From: Tom Tsou Date: Fri, 21 Nov 2014 12:25:22 -0800 Subject: CommonLibs: Add thread cancellation capability For clean shutdown in the transceiver we need to cancel and join running threads for orderly unwinding. Thread cancellation points already exist, so we just need to be able to call on the threads to exit out when stopping or shutting down. Don't error when joining a NULL thread, which would be the case if a thread was stopped before ever being started to begin with. Signed-off-by: Tom Tsou --- CommonLibs/Threads.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h index a38a73a..47c7275 100644 --- a/CommonLibs/Threads.h +++ b/CommonLibs/Threads.h @@ -172,8 +172,15 @@ class Thread { void start(void *(*task)(void*), void *arg); /** Join a thread that will stop on its own. */ - void join() { int s = pthread_join(mThread,NULL); assert(!s); mThread = 0; } + void join() { + if (mThread) { + int s = pthread_join(mThread, NULL); + assert(!s); + } + } + /** Send cancelation to thread */ + void cancel() { pthread_cancel(mThread); } }; -- cgit v1.2.3