adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

lockdep: Introduce match function to BFS

Browse source 
1,introduce match() to BFS in order to make it usable to
match different pattern;

2,also rename some functions to make them more suitable.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1246201486-7308-4-git-send-email-tom.leiming@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ming Lei 2009-07-16 15:44:29 +02:00 committed by Peter Zijlstra
parent d588e46155
commit 9e2d551ea0
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kernel/lockdep.c
View file

@ -900,17 +900,18 @@ static int add_lock_to_list(struct lock_class *class, struct lock_class *this,
unsigned long bfs_accessed[BITS_TO_LONGS(MAX_LOCKDEP_ENTRIES)]; unsigned long bfs_accessed[BITS_TO_LONGS(MAX_LOCKDEP_ENTRIES)];
static struct circular_queue lock_cq; static struct circular_queue lock_cq;
static int __search_shortest_path(struct lock_list *source_entry, static int __bfs(struct lock_list *source_entry,
struct lock_class *target, void *data,
struct lock_list **target_entry, int (*match)(struct lock_list *entry, void *data),
int forward) struct lock_list **target_entry,
int forward)
{ {
struct lock_list *entry; struct lock_list *entry;
struct list_head *head; struct list_head *head;
struct circular_queue *cq = &lock_cq; struct circular_queue *cq = &lock_cq;
int ret = 1; int ret = 1;
if (source_entry->class == target) { if (match(source_entry, data)) {
*target_entry = source_entry; *target_entry = source_entry;
ret = 0; ret = 0;
goto exit; goto exit;
@ -945,7 +946,7 @@ static int __search_shortest_path(struct lock_list *source_entry,
list_for_each_entry(entry, head, entry) { list_for_each_entry(entry, head, entry) {
if (!lock_accessed(entry)) { if (!lock_accessed(entry)) {
mark_lock_accessed(entry, lock); mark_lock_accessed(entry, lock);
if (entry->class == target) { if (match(entry, data)) {
*target_entry = entry; *target_entry = entry;
ret = 0; ret = 0;
goto exit; goto exit;
@ -962,19 +963,21 @@ exit:
return ret; return ret;
} }
static inline int __search_forward_shortest_path(struct lock_list *src_entry, static inline int __bfs_forward(struct lock_list *src_entry,
struct lock_class *target, void *data,
struct lock_list **target_entry) int (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry)
{ {
return __search_shortest_path(src_entry, target, target_entry, 1); return __bfs(src_entry, data, match, target_entry, 1);
} }
static inline int __search_backward_shortest_path(struct lock_list *src_entry, static inline int __bfs_backward(struct lock_list *src_entry,
struct lock_class *target, void *data,
struct lock_list **target_entry) int (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry)
{ {
return __search_shortest_path(src_entry, target, target_entry, 0); return __bfs(src_entry, data, match, target_entry, 0);
} }
@ -1035,6 +1038,11 @@ print_circular_bug_header(struct lock_list *entry, unsigned int depth)
return 0; return 0;
} }
static inline int class_equal(struct lock_list *entry, void *data)
{
return entry->class == data;
}
static noinline int print_circular_bug(void) static noinline int print_circular_bug(void)
{ {
struct task_struct *curr = current; struct task_struct *curr = current;
@ -1052,9 +1060,10 @@ static noinline int print_circular_bug(void)
if (!save_trace(&this.trace)) if (!save_trace(&this.trace))
return 0; return 0;
result = __search_forward_shortest_path(&this, result = __bfs_forward(&this,
hlock_class(check_target), hlock_class(check_target),
&target); class_equal,
&target);
if (result) { if (result) {
printk("\n%s:search shortest path failed:%d\n", __func__, printk("\n%s:search shortest path failed:%d\n", __func__,
result); result);