summaryrefslogtreecommitdiffstats
path: root/runtime/obj.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-06 12:56:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-06 12:56:53 +0200
commit290f41f9470d06e4f207ca38c3175c578f6202ec (patch)
treefe59487a0ae804350ffbe5d6faf55a2bf1ec4940 /runtime/obj.h
parente593f6a22fbebe7a06dd4b08b378ab5d12e7d8ad (diff)
downloadrsyslog-290f41f9470d06e4f207ca38c3175c578f6202ec.tar.gz
rsyslog-290f41f9470d06e4f207ca38c3175c578f6202ec.tar.xz
rsyslog-290f41f9470d06e4f207ca38c3175c578f6202ec.zip
bugfix: potential hang due to mutex deadlock
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
Diffstat (limited to 'runtime/obj.h')
-rw-r--r--runtime/obj.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/obj.h b/runtime/obj.h
index be97f20e..32f7ef09 100644
--- a/runtime/obj.h
+++ b/runtime/obj.h
@@ -122,4 +122,8 @@ rsRetVal objGetObjInterface(obj_if_t *pIf);
PROTOTYPEObjClassInit(obj);
PROTOTYPEObjClassExit(obj);
+
+/* the following definition is only for "friends" */
+extern pthread_mutex_t mutObjGlobalOp; /* mutex to guard global operations of the object system */
+
#endif /* #ifndef OBJ_H_INCLUDED */