Merged revisions 89045 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89045 | tilghman | 2007-11-06 13:09:06 -0600 (Tue, 06 Nov 2007) | 2 lines

We went to the trouble of creating a method of tracking failed trylocks, then never turned it on (oops).

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89049 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index abd91fb307c0e66d6cf196268be4822c2f72ac1c..2a2ec9b1745a4ef9dd2b91ad4ee753d1f27e1345 100644 (file)
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -422,7 +422,7 @@ static inline int __ast_pthread_mutex_trylock(const char *filename, int lineno,
                if (t->track)
                        ast_mark_lock_acquired();
        } else if (t->track) {
-                       ast_remove_lock_info(&t->mutex);
+               ast_mark_lock_failed();
        }
 
        return res;