aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-06 19:16:02 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-06 19:16:02 +0000
commitc0f25b1bf2842892861b00772994ffdbac489778 (patch)
tree407397947ce2afc9a839e7bb099f79a92183599f
parentbeb1ba78131e9723805d6410631a3752dbe076b7 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@89049 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--include/asterisk/lock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index abd91fb30..2a2ec9b17 100644
--- 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;