Commit 886adbed authored by Bart Van Assche's avatar Bart Van Assche Committed by Ingo Molnar

tools/lib/lockdep/tests: Test the lockdep_reset_lock() implementation

This patch makes sure that the lockdep_reset_lock() function gets
tested.
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: johannes.berg@intel.com
Cc: tj@kernel.org
Link: https://lkml.kernel.org/r/20181207011148.251812-8-bvanassche@acm.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ac862d9b
...@@ -44,6 +44,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, ...@@ -44,6 +44,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
struct lockdep_map *nest_lock, unsigned long ip); struct lockdep_map *nest_lock, unsigned long ip);
void lock_release(struct lockdep_map *lock, int nested, void lock_release(struct lockdep_map *lock, int nested,
unsigned long ip); unsigned long ip);
void lockdep_reset_lock(struct lockdep_map *lock);
extern void debug_check_no_locks_freed(const void *from, unsigned long len); extern void debug_check_no_locks_freed(const void *from, unsigned long len);
#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \ #define STATIC_LOCKDEP_MAP_INIT(_name, _key) \
......
...@@ -54,6 +54,7 @@ static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *l ...@@ -54,6 +54,7 @@ static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *l
static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock) static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock)
{ {
lockdep_reset_lock(&lock->dep_map);
return pthread_mutex_destroy(&lock->mutex); return pthread_mutex_destroy(&lock->mutex);
} }
......
...@@ -11,4 +11,7 @@ void main(void) ...@@ -11,4 +11,7 @@ void main(void)
LOCK_UNLOCK_2(a, b); LOCK_UNLOCK_2(a, b);
LOCK_UNLOCK_2(b, a); LOCK_UNLOCK_2(b, a);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -13,4 +13,8 @@ void main(void) ...@@ -13,4 +13,8 @@ void main(void)
LOCK_UNLOCK_2(a, b); LOCK_UNLOCK_2(a, b);
LOCK_UNLOCK_2(b, c); LOCK_UNLOCK_2(b, c);
LOCK_UNLOCK_2(c, a); LOCK_UNLOCK_2(c, a);
pthread_mutex_destroy(&c);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -15,4 +15,9 @@ void main(void) ...@@ -15,4 +15,9 @@ void main(void)
LOCK_UNLOCK_2(b, c); LOCK_UNLOCK_2(b, c);
LOCK_UNLOCK_2(c, d); LOCK_UNLOCK_2(c, d);
LOCK_UNLOCK_2(d, a); LOCK_UNLOCK_2(d, a);
pthread_mutex_destroy(&d);
pthread_mutex_destroy(&c);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -13,4 +13,8 @@ void main(void) ...@@ -13,4 +13,8 @@ void main(void)
LOCK_UNLOCK_2(a, b); LOCK_UNLOCK_2(a, b);
LOCK_UNLOCK_2(c, a); LOCK_UNLOCK_2(c, a);
LOCK_UNLOCK_2(b, c); LOCK_UNLOCK_2(b, c);
pthread_mutex_destroy(&c);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -15,4 +15,9 @@ void main(void) ...@@ -15,4 +15,9 @@ void main(void)
LOCK_UNLOCK_2(c, d); LOCK_UNLOCK_2(c, d);
LOCK_UNLOCK_2(b, c); LOCK_UNLOCK_2(b, c);
LOCK_UNLOCK_2(d, a); LOCK_UNLOCK_2(d, a);
pthread_mutex_destroy(&d);
pthread_mutex_destroy(&c);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -15,4 +15,9 @@ void main(void) ...@@ -15,4 +15,9 @@ void main(void)
LOCK_UNLOCK_2(c, d); LOCK_UNLOCK_2(c, d);
LOCK_UNLOCK_2(b, d); LOCK_UNLOCK_2(b, d);
LOCK_UNLOCK_2(d, a); LOCK_UNLOCK_2(d, a);
pthread_mutex_destroy(&d);
pthread_mutex_destroy(&c);
pthread_mutex_destroy(&b);
pthread_mutex_destroy(&a);
} }
...@@ -10,4 +10,6 @@ void main(void) ...@@ -10,4 +10,6 @@ void main(void)
pthread_mutex_lock(&a); pthread_mutex_lock(&a);
pthread_mutex_unlock(&a); pthread_mutex_unlock(&a);
pthread_mutex_unlock(&a); pthread_mutex_unlock(&a);
pthread_mutex_destroy(&a);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment