From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEWQW-0000mz-NZ for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEWQT-0007GP-Fk for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:18:36 -0500 Received: from mail.ispras.ru ([83.149.199.45]:52870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEWQT-0007Fo-40 for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:18:33 -0500 From: Pavel Dovgalyuk Date: Tue, 14 Nov 2017 11:18:40 +0300 Message-ID: <20171114081840.27640.76952.stgit@pasha-VirtualBox> In-Reply-To: <20171114081630.27640.53933.stgit@pasha-VirtualBox> References: <20171114081630.27640.53933.stgit@pasha-VirtualBox> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC PATCH v2 23/26] util/qemu-thread-*: add qemu_lock, locked and unlock trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, boost.lists@gmail.com, quintela@redhat.com, jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, alex.bennee@linaro.org From: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e --- v1 - fix merge conflicts with existing tracing - add trylock/cond_wait traces --- include/qemu/thread.h | 14 ++++++++++---- util/qemu-thread-posix.c | 21 ++++++++++++--------- util/trace-events | 7 ++++--- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 9910f49..c51a7f1 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -22,9 +22,13 @@ typedef struct QemuThread QemuThread; =20 void qemu_mutex_init(QemuMutex *mutex); void qemu_mutex_destroy(QemuMutex *mutex); -void qemu_mutex_lock(QemuMutex *mutex); -int qemu_mutex_trylock(QemuMutex *mutex); -void qemu_mutex_unlock(QemuMutex *mutex); +int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const in= t line); +void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int = line); +void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const in= t line); + +#define qemu_mutex_lock(mutex) qemu_mutex_lock_impl(mutex, __FILE__, __L= INE__) +#define qemu_mutex_trylock(mutex) qemu_mutex_trylock_impl(mutex, __FILE_= _, __LINE__) +#define qemu_mutex_unlock(mutex) qemu_mutex_unlock_impl(mutex, __FILE__,= __LINE__) =20 /* Prototypes for other functions are in thread-posix.h/thread-win32.h. = */ void qemu_rec_mutex_init(QemuRecMutex *mutex); @@ -39,7 +43,9 @@ void qemu_cond_destroy(QemuCond *cond); */ void qemu_cond_signal(QemuCond *cond); void qemu_cond_broadcast(QemuCond *cond); -void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex); +void qemu_cond_wait_impl(QemuCond *cond, QemuMutex *mutex, const char *f= ile, const int line); + +#define qemu_cond_wait(cond, mutex) qemu_cond_wait_impl(cond, mutex, __F= ILE__, __LINE__) =20 void qemu_sem_init(QemuSemaphore *sem, int init); void qemu_sem_post(QemuSemaphore *sem); diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 7306475..1a838a9 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -57,26 +57,28 @@ void qemu_mutex_destroy(QemuMutex *mutex) error_exit(err, __func__); } =20 -void qemu_mutex_lock(QemuMutex *mutex) +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); + err =3D pthread_mutex_lock(&mutex->lock); if (err) error_exit(err, __func__); =20 - trace_qemu_mutex_locked(mutex); + trace_qemu_mutex_locked(mutex, file, line); } =20 -int qemu_mutex_trylock(QemuMutex *mutex) +int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const in= t line) { int err; =20 assert(mutex->initialized); err =3D pthread_mutex_trylock(&mutex->lock); if (err =3D=3D 0) { - trace_qemu_mutex_locked(mutex); + trace_qemu_mutex_locked(mutex, file, line); return 0; } if (err !=3D EBUSY) { @@ -85,15 +87,16 @@ int qemu_mutex_trylock(QemuMutex *mutex) return -EBUSY; } =20 -void qemu_mutex_unlock(QemuMutex *mutex) +void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const in= t line) { int err; =20 assert(mutex->initialized); - trace_qemu_mutex_unlocked(mutex); 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) @@ -152,14 +155,14 @@ void qemu_cond_broadcast(QemuCond *cond) error_exit(err, __func__); } =20 -void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex) +void qemu_cond_wait_impl(QemuCond *cond, QemuMutex *mutex, const char *f= ile, const int line) { int err; =20 assert(cond->initialized); - trace_qemu_mutex_unlocked(mutex); + trace_qemu_mutex_unlock(mutex, file, line); err =3D pthread_cond_wait(&cond->cond, &mutex->lock); - trace_qemu_mutex_locked(mutex); + trace_qemu_mutex_locked(mutex, file, line); if (err) error_exit(err, __func__); } diff --git a/util/trace-events b/util/trace-events index 025499f..515e625 100644 --- a/util/trace-events +++ b/util/trace-events @@ -56,6 +56,7 @@ lockcnt_futex_wait(const void *lockcnt, int val) "lockc= nt %p waiting on %d" lockcnt_futex_wait_resume(const void *lockcnt, int new) "lockcnt %p afte= r wait: %d" lockcnt_futex_wake(const void *lockcnt) "lockcnt %p waking up one waiter= " =20 -# util/qemu-thread-posix.c -qemu_mutex_locked(void *lock) "locked mutex %p" -qemu_mutex_unlocked(void *lock) "unlocked mutex %p" +# util/qemu-thread.c +qemu_mutex_lock(void *mutex, const char *file, const int line) "waiting = on mutex %p (%s:%d)" +qemu_mutex_locked(void *mutex, const char *file, const int line) "taken = mutex %p (%s:%d)" +qemu_mutex_unlock(void *mutex, const char *file, const int line) "releas= ed mutex %p (%s:%d)"