This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 12d4de225330e2394331dc6ced4b1b10bb2e0db5 (commit)
from b954c9424f2048655529f35b1196a926bafee72e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 12d4de225330e2394331dc6ced4b1b10bb2e0db5
Author: Dave Heller <hel...@us...>
Date: Sun Jan 5 14:23:11 2014 -0500
[sfcb-tix:#94] Increase sigChldWaitTime
-----------------------------------------------------------------------
Summary of changes:
sfcBroker.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sfcBroker.c b/sfcBroker.c
index 5063415..49204a1 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -193,6 +193,9 @@ static pthread_cond_t sdCnd = PTHREAD_COND_INITIALIZER;
static int stopping = 0;
extern int remSem();
+/* secs to wait for a process to die during shutdown [sfcb#94] */
+static int sigChldWaitTime = 3;
+
static void
stopBroker(void *p)
{
@@ -232,7 +235,7 @@ stopBroker(void *p)
if (adaptersStopped == 0) {
pthread_mutex_lock(&sdMtx);
- waitTime.tv_sec = time(NULL) + 1; //5
+ waitTime.tv_sec = time(NULL) + sigChldWaitTime;
waitTime.tv_nsec = 0;
if (sa == 0)
fprintf(stderr, "--- Stopping adapters\n");
@@ -251,7 +254,7 @@ stopBroker(void *p)
if (adaptersStopped) {
pthread_mutex_lock(&sdMtx);
- waitTime.tv_sec = time(NULL) + 1; //5
+ waitTime.tv_sec = time(NULL) + sigChldWaitTime;
waitTime.tv_nsec = 0;
if (sp == 0)
fprintf(stderr, "--- Stopping providers\n");
@@ -436,7 +439,7 @@ handleSigUsr2(int __attribute__ ((unused)) sig)
}
while(!adaptersStopped) {
pthread_mutex_lock(&sdMtx);
- waitTime.tv_sec=time(NULL)+1; //5
+ waitTime.tv_sec=time(NULL) + sigChldWaitTime;
waitTime.tv_nsec=0;
if (sa==0) fprintf(stderr,"--- Stopping http adapters\n");
sa++;
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
