Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e62074 authored by Sasha Levin's avatar Sasha Levin Committed by Ingo Molnar
Browse files

liblockdep: Add public headers for pthread_mutex_t implementation 



These headers provide the same API as their pthread mutex
counterparts.

The design here is to allow to easily switch to liblockdep lock
validation just by adding a "liblockdep_" to pthread_mutex_*()
calls, which means that it's easy to integrate liblockdep into
existing codebases.

Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: torvalds@linux-foundation.org
Link: http://lkml.kernel.org/r/1371163284-6346-4-git-send-email-sasha.levin@oracle.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5634bd7d

tools/lib/lockdep/include/liblockdep/common.h

0 → 100644
+50 −0
Original line number Diff line number Diff line 
#ifndef _LIBLOCKDEP_COMMON_H

#define _LIBLOCKDEP_COMMON_H



#include <pthread.h>



#define NR_LOCKDEP_CACHING_CLASSES 2

#define MAX_LOCKDEP_SUBCLASSES 8UL



#ifndef CALLER_ADDR0

#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#endif



#ifndef _RET_IP_

#define _RET_IP_ CALLER_ADDR0

#endif



#ifndef _THIS_IP_

#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })

#endif



struct lockdep_subclass_key {

	char __one_byte;

};



struct lock_class_key {

	struct lockdep_subclass_key subkeys[MAX_LOCKDEP_SUBCLASSES];

};



struct lockdep_map {

	struct lock_class_key	*key;

	struct lock_class	*class_cache[NR_LOCKDEP_CACHING_CLASSES];

	const char		*name;

#ifdef CONFIG_LOCK_STAT

	int			cpu;

	unsigned long		ip;

#endif

};



void lockdep_init_map(struct lockdep_map *lock, const char *name,

			struct lock_class_key *key, int subclass);

void lock_acquire(struct lockdep_map *lock, unsigned int subclass,

			int trylock, int read, int check,

			struct lockdep_map *nest_lock, unsigned long ip);

void lock_release(struct lockdep_map *lock, int nested,

			unsigned long ip);



#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \

	{ .name = (_name), .key = (void *)(_key), }



#endif

tools/lib/lockdep/include/liblockdep/mutex.h

0 → 100644
+70 −0
Original line number Diff line number Diff line 
#ifndef _LIBLOCKDEP_MUTEX_H

#define _LIBLOCKDEP_MUTEX_H



#include <pthread.h>

#include "common.h"



struct liblockdep_pthread_mutex {

	pthread_mutex_t mutex;

	struct lockdep_map dep_map;

};



typedef struct liblockdep_pthread_mutex liblockdep_pthread_mutex_t;



#define LIBLOCKDEP_PTHREAD_MUTEX_INITIALIZER(mtx)			\

		(const struct liblockdep_pthread_mutex) {		\

	.mutex = PTHREAD_MUTEX_INITIALIZER,				\

	.dep_map = STATIC_LOCKDEP_MAP_INIT(#mtx, &((&(mtx))->dep_map)),	\

}



static inline int __mutex_init(liblockdep_pthread_mutex_t *lock,

				const char *name,

				struct lock_class_key *key,

				const pthread_mutexattr_t *__mutexattr)

{

	lockdep_init_map(&lock->dep_map, name, key, 0);

	return pthread_mutex_init(&lock->mutex, __mutexattr);

}



#define liblockdep_pthread_mutex_init(mutex, mutexattr)		\

({								\

	static struct lock_class_key __key;			\

								\

	__mutex_init((mutex), #mutex, &__key, (mutexattr));	\

})



static inline int liblockdep_pthread_mutex_lock(liblockdep_pthread_mutex_t *lock)

{

	lock_acquire(&lock->dep_map, 0, 0, 0, 2, NULL, (unsigned long)_RET_IP_);

	return pthread_mutex_lock(&lock->mutex);

}



static inline int liblockdep_pthread_mutex_unlock(liblockdep_pthread_mutex_t *lock)

{

	lock_release(&lock->dep_map, 0, (unsigned long)_RET_IP_);

	return pthread_mutex_unlock(&lock->mutex);

}



static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *lock)

{

	lock_acquire(&lock->dep_map, 0, 1, 0, 2, NULL, (unsigned long)_RET_IP_);

	return pthread_mutex_trylock(&lock->mutex) == 0 ? 1 : 0;

}



static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock)

{

	return pthread_mutex_destroy(&lock->mutex);

}



#ifdef __USE_LIBLOCKDEP



#define pthread_mutex_t         liblockdep_pthread_mutex_t

#define pthread_mutex_init      liblockdep_pthread_mutex_init

#define pthread_mutex_lock      liblockdep_pthread_mutex_lock

#define pthread_mutex_unlock    liblockdep_pthread_mutex_unlock

#define pthread_mutex_trylock   liblockdep_pthread_mutex_trylock

#define pthread_mutex_destroy   liblockdep_pthread_mutex_destroy



#endif



#endif