From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WILfX-0004cu-AO for qemu-devel@nongnu.org; Tue, 25 Feb 2014 12:19:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WILfR-0003hG-9u for qemu-devel@nongnu.org; Tue, 25 Feb 2014 12:19:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WILfR-0003h1-0V for qemu-devel@nongnu.org; Tue, 25 Feb 2014 12:19:41 -0500 From: Stefan Hajnoczi Date: Tue, 25 Feb 2014 18:19:33 +0100 Message-Id: <1393348774-14663-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1393348774-14663-1-git-send-email-stefanha@redhat.com> References: <1393348774-14663-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/2] iothread: stash thread ID away List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , "Shergill, Gurinder" , "Vinod, Chegu" , Luiz Capitulino Keep the thread ID around so we can report it via QMP. There's only one problem: qemu_get_thread_id() (gettid() wrapper on Linux) must be called from the thread itself. There is no way to get the thread ID outside the thread. This patch uses a condvar to wait for iothread_run() to populate the thread_id inside the thread. Signed-off-by: Stefan Hajnoczi --- iothread.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/iothread.c b/iothread.c index 033de7f..36cb4cf 100644 --- a/iothread.c +++ b/iothread.c @@ -25,7 +25,10 @@ struct IOThread { Object parent; QemuThread thread; AioContext *ctx; + QemuMutex init_done_lock; + QemuCond init_done_cond; /* is thread initialization done? */ bool stopping; + int thread_id; }; #define IOTHREAD_GET_CLASS(obj) \ @@ -37,6 +40,13 @@ static void *iothread_run(void *opaque) { IOThread *iothread = opaque; + iothread->thread_id = qemu_get_thread_id(); + + /* Signal that initialization is done */ + qemu_mutex_lock(&iothread->init_done_lock); + qemu_cond_signal(&iothread->init_done_cond); + qemu_mutex_unlock(&iothread->init_done_lock); + while (!iothread->stopping) { aio_context_acquire(iothread->ctx); while (!iothread->stopping && aio_poll(iothread->ctx, true)) { @@ -54,6 +64,8 @@ static void iothread_instance_finalize(Object *obj) iothread->stopping = true; aio_notify(iothread->ctx); qemu_thread_join(&iothread->thread); + qemu_cond_destroy(&iothread->init_done_cond); + qemu_mutex_destroy(&iothread->init_done_lock); aio_context_unref(iothread->ctx); } @@ -64,11 +76,20 @@ static void iothread_complete(UserCreatable *obj, Error **errp) iothread->stopping = false; iothread->ctx = aio_context_new(); + qemu_mutex_init(&iothread->init_done_lock); + qemu_cond_init(&iothread->init_done_cond); + /* This assumes we are called from a thread with useful CPU affinity for us * to inherit. */ qemu_thread_create(&iothread->thread, iothread_run, iothread, QEMU_THREAD_JOINABLE); + + /* Wait for initialization to complete */ + qemu_mutex_lock(&iothread->init_done_lock); + qemu_cond_wait(&iothread->init_done_cond, + &iothread->init_done_lock); + qemu_mutex_unlock(&iothread->init_done_lock); } static void iothread_class_init(ObjectClass *klass, void *class_data) -- 1.8.5.3