aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-12-12 17:21:32 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-12 17:06:22 -0600
commit8763046b4b27f59ce0b639dbca896a01bf7b1388 (patch)
tree63882f1f7f066daa2cfa0adba488f9ad5ebc82af
parentcf218714791a78c91db34a4aa9e33348923ad659 (diff)
qemu-thread: implement joinable threads for POSIX
Allow to control if a QEMU thread is created joinable or not. Make it not joinable by default to avoid that we keep the associated resources around when terminating a thread without joining it (what we couldn't do so far for obvious reasons). The audio subsystem will need the join feature when converting it to QEMU threading/locking abstractions, so provide that service. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-thread-posix.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
index 49d3388a86..9e1b5fbdaa 100644
--- a/qemu-thread-posix.c
+++ b/qemu-thread-posix.c
@@ -121,17 +121,29 @@ void qemu_thread_create(QemuThread *thread,
{
sigset_t set, oldset;
int err;
+ pthread_attr_t attr;
- assert(mode == QEMU_THREAD_DETACHED);
+ err = pthread_attr_init(&attr);
+ if (err) {
+ error_exit(err, __func__);
+ }
+ if (mode == QEMU_THREAD_DETACHED) {
+ err = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ if (err) {
+ error_exit(err, __func__);
+ }
+ }
/* Leave signal handling to the iothread. */
sigfillset(&set);
pthread_sigmask(SIG_SETMASK, &set, &oldset);
- err = pthread_create(&thread->thread, NULL, start_routine, arg);
+ err = pthread_create(&thread->thread, &attr, start_routine, arg);
if (err)
error_exit(err, __func__);
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+
+ pthread_attr_destroy(&attr);
}
void qemu_thread_get_self(QemuThread *thread)
@@ -148,3 +160,15 @@ void qemu_thread_exit(void *retval)
{
pthread_exit(retval);
}
+
+void *qemu_thread_join(QemuThread *thread)
+{
+ int err;
+ void *ret;
+
+ err = pthread_join(thread->thread, &ret);
+ if (err) {
+ error_exit(err, __func__);
+ }
+ return ret;
+}