From: tip-bot for Sasha Levin <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, sasha.levin@oracle.com,
hpa@zytor.com, mingo@kernel.org, peterz@infradead.org,
tglx@linutronix.de
Subject: [tip:core/locking] liblockdep: Add public headers for pthread_rwlock_t implementation
Date: Wed, 27 Nov 2013 06:09:09 -0800 [thread overview]
Message-ID: <tip-5a52c9b480e09a782618dbf08de57f9ca54c8b49@git.kernel.org> (raw)
In-Reply-To: <1371163284-6346-6-git-send-email-sasha.levin@oracle.com>
Commit-ID: 5a52c9b480e09a782618dbf08de57f9ca54c8b49
Gitweb: http://git.kernel.org/tip/5a52c9b480e09a782618dbf08de57f9ca54c8b49
Author: Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Thu, 13 Jun 2013 18:41:20 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 27 Nov 2013 11:55:23 +0100
liblockdep: Add public headers for pthread_rwlock_t implementation
Both pthreads and lockdep support dealing with rwlocks, so
here's the liblockdep implementation for those.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: torvalds@linux-foundation.org
Link: http://lkml.kernel.org/r/1371163284-6346-6-git-send-email-sasha.levin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/tools/lib/lockdep/include/liblockdep/rwlock.h b/tools/lib/lockdep/include/liblockdep/rwlock.h
new file mode 100644
index 0000000..a680ab8
--- /dev/null
+++ b/tools/lib/lockdep/include/liblockdep/rwlock.h
@@ -0,0 +1,86 @@
+#ifndef _LIBLOCKDEP_RWLOCK_H
+#define _LIBLOCKDEP_RWLOCK_H
+
+#include <pthread.h>
+#include "common.h"
+
+struct liblockdep_pthread_rwlock {
+ pthread_rwlock_t rwlock;
+ struct lockdep_map dep_map;
+};
+
+typedef struct liblockdep_pthread_rwlock liblockdep_pthread_rwlock_t;
+
+#define LIBLOCKDEP_PTHREAD_RWLOCK_INITIALIZER(rwl) \
+ (struct liblockdep_pthread_rwlock) { \
+ .rwlock = PTHREAD_RWLOCK_INITIALIZER, \
+ .dep_map = STATIC_LOCKDEP_MAP_INIT(#rwl, &((&(rwl))->dep_map)), \
+}
+
+static inline int __rwlock_init(liblockdep_pthread_rwlock_t *lock,
+ const char *name,
+ struct lock_class_key *key,
+ const pthread_rwlockattr_t *attr)
+{
+ lockdep_init_map(&lock->dep_map, name, key, 0);
+
+ return pthread_rwlock_init(&lock->rwlock, attr);
+}
+
+#define liblockdep_pthread_rwlock_init(lock, attr) \
+({ \
+ static struct lock_class_key __key; \
+ \
+ __rwlock_init((lock), #lock, &__key, (attr)); \
+})
+
+static inline int liblockdep_pthread_rwlock_rdlock(liblockdep_pthread_rwlock_t *lock)
+{
+ lock_acquire(&lock->dep_map, 0, 0, 2, 2, NULL, (unsigned long)_RET_IP_);
+ return pthread_rwlock_rdlock(&lock->rwlock);
+
+}
+
+static inline int liblockdep_pthread_rwlock_unlock(liblockdep_pthread_rwlock_t *lock)
+{
+ lock_release(&lock->dep_map, 0, (unsigned long)_RET_IP_);
+ return pthread_rwlock_unlock(&lock->rwlock);
+}
+
+static inline int liblockdep_pthread_rwlock_wrlock(liblockdep_pthread_rwlock_t *lock)
+{
+ lock_acquire(&lock->dep_map, 0, 0, 0, 2, NULL, (unsigned long)_RET_IP_);
+ return pthread_rwlock_wrlock(&lock->rwlock);
+}
+
+static inline int liblockdep_pthread_rwlock_tryrdlock(liblockdep_pthread_rwlock_t *lock)
+{
+ lock_acquire(&lock->dep_map, 0, 1, 2, 2, NULL, (unsigned long)_RET_IP_);
+ return pthread_rwlock_tryrdlock(&lock->rwlock) == 0 ? 1 : 0;
+}
+
+static inline int liblockdep_pthread_rwlock_trywlock(liblockdep_pthread_rwlock_t *lock)
+{
+ lock_acquire(&lock->dep_map, 0, 1, 0, 2, NULL, (unsigned long)_RET_IP_);
+ return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
+}
+
+static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
+{
+ return pthread_rwlock_destroy(&lock->rwlock);
+}
+
+#ifdef __USE_LIBLOCKDEP
+
+#define pthread_rwlock_t liblockdep_pthread_rwlock_t
+#define pthread_rwlock_init liblockdep_pthread_rwlock_init
+#define pthread_rwlock_rdlock liblockdep_pthread_rwlock_rdlock
+#define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock
+#define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock
+#define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock
+#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock
+#define pthread_rwlock_destroy liblockdep_rwlock_destroy
+
+#endif
+
+#endif
next prev parent reply other threads:[~2013-11-27 14:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 22:41 [Patch v5 0/9] liblockdep: userspace lockdep Sasha Levin
2013-06-13 22:41 ` [Patch v5 1/9] lockdep: Be nice about building from userspace Sasha Levin
2013-06-13 22:41 ` [Patch v5 2/9] liblockdep: Wrap kernel/lockdep.c to allow usage " Sasha Levin
2013-11-27 14:08 ` [tip:core/locking] liblockdep: Wrap kernel/locking/ lockdep.c " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 3/9] liblockdep: Add public headers for pthread_mutex_t implementation Sasha Levin
2013-11-27 14:08 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 4/9] liblockdep: Add pthread_mutex_t test suite Sasha Levin
2013-11-27 14:08 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 5/9] liblockdep: Add public headers for pthread_rwlock_t implementation Sasha Levin
2013-11-27 14:09 ` tip-bot for Sasha Levin [this message]
2013-06-13 22:41 ` [Patch v5 6/9] liblockdep: Add pthread_rwlock_t test suite Sasha Levin
2013-11-27 14:09 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 7/9] liblockdep: Support using LD_PRELOAD Sasha Levin
2013-11-27 14:09 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 8/9] liblockdep: Add the 'lockdep' user-space utility Sasha Levin
2013-11-27 14:09 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-13 22:41 ` [Patch v5 9/9] liblockdep: Add a MAINTAINERS entry Sasha Levin
2013-11-27 14:09 ` [tip:core/locking] " tip-bot for Sasha Levin
2013-06-26 12:24 ` [Patch v5 0/9] liblockdep: userspace lockdep Peter Zijlstra
2013-06-26 15:53 ` Ingo Molnar
2013-06-26 19:38 ` Sasha Levin
2013-06-27 9:05 ` Ingo Molnar
2013-06-27 9:07 ` Ingo Molnar
2013-06-27 13:55 ` Sasha Levin
2013-07-08 1:14 ` Sasha Levin
2013-07-08 8:39 ` Ingo Molnar
2013-09-12 17:40 ` Sasha Levin
2013-09-12 18:01 ` Ingo Molnar
2013-09-14 16:59 ` Sasha Levin
2013-11-08 17:04 ` Sasha Levin
2013-11-09 16:01 ` Peter Zijlstra
2013-11-11 15:56 ` Peter Zijlstra
-- strict thread matches above, loose matches on Subject: below --
2013-02-04 1:50 [PATCH v3 4/7] liblockdep: public headers for rwlock implementation Sasha Levin
2013-02-04 13:53 ` [tip:core/locking] liblockdep: Add public headers for pthread_rwlock_t implementation tip-bot for Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5a52c9b480e09a782618dbf08de57f9ca54c8b49@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sasha.levin@oracle.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).