From: leslie <unknown>
Date: Sun, 31 Jan 2010 20:46:11 +0000 (+0100)
Subject: sasc: update cThread implementation
X-Git-Tag: upstream/620~104
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=153101072b1742811440f45f1c380c0ca5e1ca6a;p=sasc-ng.git

sasc: update cThread implementation
---

diff --git a/contrib/sasc-ng/sc/thread.cpp b/contrib/sasc-ng/sc/thread.cpp
index 9d1eb8c..4e1df56 100644
--- a/contrib/sasc-ng/sc/thread.cpp
+++ b/contrib/sasc-ng/sc/thread.cpp
@@ -242,21 +242,29 @@ void cMutex::Unlock(void)
 	  return NULL;
 	}
 
-	extern pthread_attr_t default_attr;
+	#define THREAD_STOP_TIMEOUT  3000 // ms to wait for a thread to stop before newly starting it
+	#define THREAD_STOP_SLEEP      30 // ms to sleep while waiting for a thread to stop
+
 	bool cThread::Start(void)
 	{
-	  if (!active) {
-	     active = running = true;
-	     if (pthread_create(&childTid, &default_attr, (void *(*) (void *))&StartThread, (void *)this) == 0) {
-		struct sched_param param;
-		memset(&param, 0, sizeof(param));
-		pthread_detach(childTid); // auto-reap
-		pthread_setschedparam(childTid, SCHED_RR, &param);
+	  if (!running) {
+	     if (active) {
+		// Wait until the previous incarnation of this thread has completely ended
+		// before starting it newly:
+		cTimeMs RestartTimeout;
+		while (!running && active && RestartTimeout.Elapsed() < THREAD_STOP_TIMEOUT)
+		      cCondWait::SleepMs(THREAD_STOP_SLEEP);
 		}
-	     else {
-		LOG_ERROR;
-		active = running = false;
-		return false;
+	     if (!active) {
+		active = running = true;
+		if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
+		   pthread_detach(childTid); // auto-reap
+		   }
+		else {
+		   LOG_ERROR;
+		   active = running = false;
+		   return false;
+		   }
 		}
 	     }
 	  return true;
@@ -295,14 +303,14 @@ void cMutex::Unlock(void)
 	void cThread::Cancel(int WaitSeconds)
 	{
 	  running = false;
-	  if (active) {
+	  if (active && WaitSeconds > -1) {
 	     if (WaitSeconds > 0) {
 		for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
 		    if (!Active())
 		       return;
 		    cCondWait::SleepMs(10);
 		    }
-		esyslog("ERROR: thread %ld won't end (waited %d seconds) - canceling it...", childTid, WaitSeconds);
+		esyslog("ERROR: %s thread %d won't end (waited %d seconds) - canceling it...", description ? description : "", (int)childTid, WaitSeconds);
 		}
 	     pthread_cancel(childTid);
 	     childTid = 0;