From nobody Tue Feb 10 12:58:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524199458656264.84723569834875; Thu, 19 Apr 2018 21:44:18 -0700 (PDT) Received: from localhost ([::1]:51013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9Nu5-0005Z7-Ay for importer@patchew.org; Fri, 20 Apr 2018 00:44:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9NsR-0004Yr-1u for qemu-devel@nongnu.org; Fri, 20 Apr 2018 00:42:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9NsP-00077v-K3 for qemu-devel@nongnu.org; Fri, 20 Apr 2018 00:42:27 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60978 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f9NsP-00077N-Et for qemu-devel@nongnu.org; Fri, 20 Apr 2018 00:42:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07CB07D83F; Fri, 20 Apr 2018 04:42:25 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-54.pek2.redhat.com [10.72.12.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C6B92023238; Fri, 20 Apr 2018 04:42:21 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 20 Apr 2018 12:42:10 +0800 Message-Id: <20180420044212.28765-2-peterx@redhat.com> In-Reply-To: <20180420044212.28765-1-peterx@redhat.com> References: <20180420044212.28765-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 20 Apr 2018 04:42:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 20 Apr 2018 04:42:25 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 1/3] qemu-thread: introduce qemu-thread-common.[ch] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Emilio G . Cota" , Fam Zheng , peterx@redhat.com, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Put all the shared qemu-thread implementations into these files. The header should be internal to qemu-thread but not for qemu-thread users. Introduce some hooks correspondingly for the shared part. Note that in qemu_mutex_unlock_impl() we moved the call before unlock operation which should make more sense. And we don't need qemu_mutex_post_unlock() hook. Currently the hooks only calls the tracepoints. Signed-off-by: Peter Xu --- util/qemu-thread-common.h | 23 +++++++++++++++++++++++ util/qemu-thread-common.c | 30 ++++++++++++++++++++++++++++++ util/qemu-thread-posix.c | 17 +++++++---------- util/qemu-thread-win32.c | 15 +++++++-------- util/Makefile.objs | 4 ++-- 5 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 util/qemu-thread-common.h create mode 100644 util/qemu-thread-common.c diff --git a/util/qemu-thread-common.h b/util/qemu-thread-common.h new file mode 100644 index 0000000000..f3f66613e9 --- /dev/null +++ b/util/qemu-thread-common.h @@ -0,0 +1,23 @@ +/* + * Common qemu-thread implementation header file. + * + * Copyright Red Hat, Inc. 2018 + * + * Authors: + * Peter Xu , + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#ifndef __QEMU_THREAD_COMMON_H__ +#define __QEMU_THREAD_COMMON_H__ + +#include "qemu/typedefs.h" +#include "qemu/thread.h" + +void qemu_mutex_pre_lock(QemuMutex *mutex, const char *file, int line); +void qemu_mutex_post_lock(QemuMutex *mutex, const char *file, int line); +void qemu_mutex_pre_unlock(QemuMutex *mutex, const char *file, int line); + +#endif diff --git a/util/qemu-thread-common.c b/util/qemu-thread-common.c new file mode 100644 index 0000000000..fc1f1aa969 --- /dev/null +++ b/util/qemu-thread-common.c @@ -0,0 +1,30 @@ +/* + * Common qemu-thread implementation shared for all platforms. + * + * Copyright Red Hat, Inc. 2018 + * + * Authors: + * Peter Xu , + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu-thread-common.h" +#include "trace.h" + +void qemu_mutex_pre_lock(QemuMutex *mutex, const char *file, int line) +{ + trace_qemu_mutex_lock(mutex, file, line); +} + +void qemu_mutex_post_lock(QemuMutex *mutex, const char *file, int line) +{ + trace_qemu_mutex_locked(mutex, file, line); +} + +void qemu_mutex_pre_unlock(QemuMutex *mutex, const char *file, int line) +{ + trace_qemu_mutex_unlock(mutex, file, line); +} diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index b789cf32e9..b0e7008db3 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -14,7 +14,7 @@ #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/notify.h" -#include "trace.h" +#include "qemu-thread-common.h" =20 static bool name_threads; =20 @@ -62,13 +62,11 @@ void qemu_mutex_lock_impl(QemuMutex *mutex, const char = *file, const int line) int err; =20 assert(mutex->initialized); - trace_qemu_mutex_lock(mutex, file, line); - + qemu_mutex_pre_lock(mutex, file, line); err =3D pthread_mutex_lock(&mutex->lock); if (err) error_exit(err, __func__); - - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); } =20 int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int = line) @@ -78,7 +76,7 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char = *file, const int line) assert(mutex->initialized); err =3D pthread_mutex_trylock(&mutex->lock); if (err =3D=3D 0) { - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); return 0; } if (err !=3D EBUSY) { @@ -92,11 +90,10 @@ void qemu_mutex_unlock_impl(QemuMutex *mutex, const cha= r *file, const int line) int err; =20 assert(mutex->initialized); + qemu_mutex_pre_unlock(mutex, file, line); err =3D pthread_mutex_unlock(&mutex->lock); if (err) error_exit(err, __func__); - - trace_qemu_mutex_unlock(mutex, file, line); } =20 void qemu_rec_mutex_init(QemuRecMutex *mutex) @@ -160,9 +157,9 @@ void qemu_cond_wait_impl(QemuCond *cond, QemuMutex *mut= ex, const char *file, con int err; =20 assert(cond->initialized); - trace_qemu_mutex_unlock(mutex, file, line); + qemu_mutex_pre_unlock(mutex, file, line); err =3D pthread_cond_wait(&cond->cond, &mutex->lock); - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); if (err) error_exit(err, __func__); } diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index ab60c0d557..f9fb0581f2 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -19,7 +19,7 @@ #include "qemu-common.h" #include "qemu/thread.h" #include "qemu/notify.h" -#include "trace.h" +#include "qemu-thread-common.h" #include =20 static bool name_threads; @@ -59,10 +59,9 @@ void qemu_mutex_destroy(QemuMutex *mutex) void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int li= ne) { assert(mutex->initialized); - trace_qemu_mutex_lock(mutex, file, line); - + qemu_mutex_pre_lock(mutex, file, line); AcquireSRWLockExclusive(&mutex->lock); - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); } =20 int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int = line) @@ -72,7 +71,7 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char = *file, const int line) assert(mutex->initialized); owned =3D TryAcquireSRWLockExclusive(&mutex->lock); if (owned) { - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); return 0; } return -EBUSY; @@ -81,7 +80,7 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char = *file, const int line) void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int = line) { assert(mutex->initialized); - trace_qemu_mutex_unlock(mutex, file, line); + qemu_mutex_pre_unlock(mutex, file, line); ReleaseSRWLockExclusive(&mutex->lock); } =20 @@ -145,9 +144,9 @@ void qemu_cond_broadcast(QemuCond *cond) void qemu_cond_wait_impl(QemuCond *cond, QemuMutex *mutex, const char *fil= e, const int line) { assert(cond->initialized); - trace_qemu_mutex_unlock(mutex, file, line); + qemu_mutex_pre_unlock(mutex, file, line); SleepConditionVariableSRW(&cond->var, &mutex->lock, INFINITE, 0); - trace_qemu_mutex_locked(mutex, file, line); + qemu_mutex_post_lock(mutex, file, line); } =20 void qemu_sem_init(QemuSemaphore *sem, int init) diff --git a/util/Makefile.objs b/util/Makefile.objs index 728c3541db..04d6713daf 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -9,12 +9,12 @@ util-obj-$(CONFIG_POSIX) +=3D event_notifier-posix.o util-obj-$(CONFIG_POSIX) +=3D mmap-alloc.o util-obj-$(CONFIG_POSIX) +=3D oslib-posix.o util-obj-$(CONFIG_POSIX) +=3D qemu-openpty.o -util-obj-$(CONFIG_POSIX) +=3D qemu-thread-posix.o +util-obj-$(CONFIG_POSIX) +=3D qemu-thread-posix.o qemu-thread-common.o util-obj-$(CONFIG_POSIX) +=3D memfd.o util-obj-$(CONFIG_WIN32) +=3D aio-win32.o util-obj-$(CONFIG_WIN32) +=3D event_notifier-win32.o util-obj-$(CONFIG_WIN32) +=3D oslib-win32.o -util-obj-$(CONFIG_WIN32) +=3D qemu-thread-win32.o +util-obj-$(CONFIG_WIN32) +=3D qemu-thread-win32.o qemu-thread-common.o util-obj-y +=3D envlist.o path.o module.o util-obj-y +=3D host-utils.o util-obj-y +=3D bitmap.o bitops.o hbitmap.o --=20 2.14.3