From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlRNy-0003cC-Ag for qemu-devel@nongnu.org; Mon, 25 Jul 2011 16:04:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlRNw-0001yP-BS for qemu-devel@nongnu.org; Mon, 25 Jul 2011 16:04:18 -0400 Received: from mtagate2.uk.ibm.com ([194.196.100.162]:40682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlRNw-0001y6-1M for qemu-devel@nongnu.org; Mon, 25 Jul 2011 16:04:16 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p6PK4FfX030763 for ; Mon, 25 Jul 2011 20:04:15 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6PK4F6A2052250 for ; Mon, 25 Jul 2011 21:04:15 +0100 Received: from d06av07.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6PK4E11024104 for ; Mon, 25 Jul 2011 14:04:14 -0600 From: Stefan Hajnoczi Date: Mon, 25 Jul 2011 21:04:08 +0100 Message-Id: <1311624250-1670-3-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1311624250-1670-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1311624250-1670-1-git-send-email-stefanha@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v7 2/4] coroutine: implement coroutines using gthread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi , Blue Swirl , "Aneesh Kumar K.V" , Venkateswararao Jujjuri From: "Aneesh Kumar K.V" On platforms that don't support makecontext(3) use gthread based coroutine implementation. Darwin has makecontext(3) but getcontext(3) is stubbed out to return ENOTSUP. Andreas F=C3=A4rber debugged this and contributed the ./configure test which solves the issue for Darwin/ppc64 (and ppc) v10.5. [Original patch by Aneesh, made consistent with coroutine-ucontext.c and switched to GStaticPrivate by Stefan. Tested on Linux and OpenBSD.] Signed-off-by: Aneesh Kumar K.V Signed-off-by: Stefan Hajnoczi --- Makefile.objs | 4 ++ configure | 18 +++++++ coroutine-gthread.c | 131 +++++++++++++++++++++++++++++++++++++++++++++= ++++++ 3 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 coroutine-gthread.c diff --git a/Makefile.objs b/Makefile.objs index 28e1762..5679e1f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -13,7 +13,11 @@ oslib-obj-$(CONFIG_POSIX) +=3D oslib-posix.o qemu-thre= ad-posix.o ####################################################################### # coroutines coroutine-obj-y =3D qemu-coroutine.o +ifeq ($(CONFIG_UCONTEXT_COROUTINE),y) coroutine-obj-$(CONFIG_POSIX) +=3D coroutine-ucontext.o +else +coroutine-obj-$(CONFIG_POSIX) +=3D coroutine-gthread.o +endif coroutine-obj-$(CONFIG_WIN32) +=3D coroutine-win32.o =20 ####################################################################### diff --git a/configure b/configure index 600da9b..1b6ad87 100755 --- a/configure +++ b/configure @@ -2499,6 +2499,20 @@ if test "$trace_backend" =3D "dtrace"; then fi =20 ########################################## +# check if we have makecontext + +ucontext_coroutine=3Dno +if test "$darwin" !=3D "yes"; then + cat > $TMPC << EOF +#include +int main(void) { makecontext(0, 0, 0); } +EOF + if compile_prog "" "" ; then + ucontext_coroutine=3Dyes + fi +fi + +########################################## # End of CC checks # After here, no more $cc or $ld runs =20 @@ -2970,6 +2984,10 @@ if test "$rbd" =3D "yes" ; then echo "CONFIG_RBD=3Dy" >> $config_host_mak fi =20 +if test "$ucontext_coroutine" =3D "yes" ; then + echo "CONFIG_UCONTEXT_COROUTINE=3Dy" >> $config_host_mak +fi + # USB host support case "$usb" in linux) diff --git a/coroutine-gthread.c b/coroutine-gthread.c new file mode 100644 index 0000000..f09877e --- /dev/null +++ b/coroutine-gthread.c @@ -0,0 +1,131 @@ +/* + * GThread coroutine initialization code + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2011 Aneesh Kumar K.V + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.0 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include +#include "qemu-common.h" +#include "qemu-coroutine-int.h" + +typedef struct { + Coroutine base; + GThread *thread; + bool runnable; + CoroutineAction action; +} CoroutineGThread; + +static GCond *coroutine_cond; +static GStaticMutex coroutine_lock =3D G_STATIC_MUTEX_INIT; +static GStaticPrivate coroutine_key =3D G_STATIC_PRIVATE_INIT; + +static void __attribute__((constructor)) coroutine_init(void) +{ + if (!g_thread_supported()) { + g_thread_init(NULL); + } + + coroutine_cond =3D g_cond_new(); +} + +static void coroutine_wait_runnable_locked(CoroutineGThread *co) +{ + while (!co->runnable) { + g_cond_wait(coroutine_cond, g_static_mutex_get_mutex(&coroutine_= lock)); + } +} + +static void coroutine_wait_runnable(CoroutineGThread *co) +{ + g_static_mutex_lock(&coroutine_lock); + coroutine_wait_runnable_locked(co); + g_static_mutex_unlock(&coroutine_lock); +} + +static gpointer coroutine_thread(gpointer opaque) +{ + CoroutineGThread *co =3D opaque; + + g_static_private_set(&coroutine_key, co, NULL); + coroutine_wait_runnable(co); + co->base.entry(co->base.entry_arg); + qemu_coroutine_switch(&co->base, co->base.caller, COROUTINE_TERMINAT= E); + return NULL; +} + +Coroutine *qemu_coroutine_new(void) +{ + CoroutineGThread *co; + + co =3D qemu_mallocz(sizeof(*co)); + co->thread =3D g_thread_create_full(coroutine_thread, co, 0, TRUE, T= RUE, + G_THREAD_PRIORITY_NORMAL, NULL); + if (!co->thread) { + qemu_free(co); + return NULL; + } + return &co->base; +} + +void qemu_coroutine_delete(Coroutine *co_) +{ + CoroutineGThread *co =3D DO_UPCAST(CoroutineGThread, base, co_); + + g_thread_join(co->thread); + qemu_free(co); +} + +CoroutineAction qemu_coroutine_switch(Coroutine *from_, + Coroutine *to_, + CoroutineAction action) +{ + CoroutineGThread *from =3D DO_UPCAST(CoroutineGThread, base, from_); + CoroutineGThread *to =3D DO_UPCAST(CoroutineGThread, base, to_); + + g_static_mutex_lock(&coroutine_lock); + from->runnable =3D false; + from->action =3D action; + to->runnable =3D true; + to->action =3D action; + g_cond_broadcast(coroutine_cond); + + if (action !=3D COROUTINE_TERMINATE) { + coroutine_wait_runnable_locked(from); + } + g_static_mutex_unlock(&coroutine_lock); + return from->action; +} + +Coroutine *qemu_coroutine_self(void) +{ + CoroutineGThread *co =3D g_static_private_get(&coroutine_key); + + if (!co) { + co =3D qemu_mallocz(sizeof(*co)); + co->runnable =3D true; + g_static_private_set(&coroutine_key, co, (GDestroyNotify)qemu_fr= ee); + } + + return &co->base; +} + +bool qemu_in_coroutine(void) +{ + CoroutineGThread *co =3D g_static_private_get(&coroutine_key); + + return co && co->base.caller; +} --=20 1.7.5.4