diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 12:56:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 12:56:53 +0200 |
| commit | 290f41f9470d06e4f207ca38c3175c578f6202ec (patch) | |
| tree | fe59487a0ae804350ffbe5d6faf55a2bf1ec4940 /runtime/obj.c | |
| parent | e593f6a22fbebe7a06dd4b08b378ab5d12e7d8ad (diff) | |
| download | rsyslog-290f41f9470d06e4f207ca38c3175c578f6202ec.tar.gz rsyslog-290f41f9470d06e4f207ca38c3175c578f6202ec.tar.bz2 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.c')
| -rw-r--r-- | runtime/obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index 29ca8117..f9afecd8 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -97,7 +97,7 @@ DEFobjCurrIf(module) DEFobjCurrIf(errmsg) DEFobjCurrIf(strm) static objInfo_t *arrObjInfo[OBJ_NUM_IDS]; /* array with object information pointers */ -static pthread_mutex_t mutObjGlobalOp; /* mutex to guard global operations of the object system */ +pthread_mutex_t mutObjGlobalOp; /* mutex to guard global operations of the object system */ /* cookies for serialized lines */ @@ -1319,7 +1319,7 @@ objClassInit(modInfo_t *pModInfo) } /* the mutex must be recursive, because objects may call into other - * object identifieres recursively. + * object identifiers recursively. */ pthread_mutexattr_init(&mutAttr); pthread_mutexattr_settype(&mutAttr, PTHREAD_MUTEX_RECURSIVE); |