From 037e7a68f504f019b409ec8cb92f0075019a90f5 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Mon, 31 Oct 2011 12:14:05 +0100 Subject: pipebuffer/debug: Fix a recursive mutex lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pb_debug_manager_dump was trying to take a lock already held by all callers. Signed-off-by: Thomas Hellstrom Signed-off-by: José Fonseca --- src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c index b9237359e6e..2ea63d6cc79 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c @@ -339,13 +339,11 @@ pb_debug_buffer_vtbl = { static void -pb_debug_manager_dump(struct pb_debug_manager *mgr) +pb_debug_manager_dump_locked(struct pb_debug_manager *mgr) { struct list_head *curr, *next; struct pb_debug_buffer *buf; - pipe_mutex_lock(mgr->mutex); - curr = mgr->list.next; next = curr->next; while(curr != &mgr->list) { @@ -359,7 +357,6 @@ pb_debug_manager_dump(struct pb_debug_manager *mgr) next = curr->next; } - pipe_mutex_unlock(mgr->mutex); } @@ -394,7 +391,7 @@ pb_debug_manager_create_buffer(struct pb_manager *_mgr, pipe_mutex_lock(mgr->mutex); debug_printf("%s: failed to create buffer\n", __FUNCTION__); if(!LIST_IS_EMPTY(&mgr->list)) - pb_debug_manager_dump(mgr); + pb_debug_manager_dump_locked(mgr); pipe_mutex_unlock(mgr->mutex); #endif return NULL; @@ -448,7 +445,7 @@ pb_debug_manager_destroy(struct pb_manager *_mgr) pipe_mutex_lock(mgr->mutex); if(!LIST_IS_EMPTY(&mgr->list)) { debug_printf("%s: unfreed buffers\n", __FUNCTION__); - pb_debug_manager_dump(mgr); + pb_debug_manager_dump_locked(mgr); } pipe_mutex_unlock(mgr->mutex); -- cgit v1.2.3