Bug fix on threads (patch provided by C.P.)

lelandaisb · lelandaisb · commit 16e4bf0dcf4a · 2023-03-10T09:45:05.000+01:00
diff --git a/src/TkUtil/Threads.cpp b/src/TkUtil/Threads.cpp
@@ -41,9 +41,9 @@ Mutex					ThreadIfc::_mutex;
 
 
 ThreadIfc::ThreadIfc (size_t concurrencyFlag)
-	: _concurrencyFlag (concurrencyFlag), _thread (0),
-	  _running (false), _cancelled (false)
-{
+	: _concurrencyFlag (concurrencyFlag), _thread (0), _running (true), _cancelled (false)	// v 6.2.0
+{	// v 6.2.0 : true est affecté d'emblée à _running car il pouvait arriver que join soit invoqué avant que startTask
+	// n'aie appelé run_thread ou que tout au moins que run_thread n'aie affecté true à running.
 	registerThread (this);
 }	// ThreadIfc::ThreadIfc
 
@@ -104,8 +104,7 @@ ThreadIfc* ThreadIfc::withId (pthread_t id)
 
 	AutoMutex	mutex (&_mutex);
 
-	for (vector<ThreadIfc*>::iterator it = _threads.begin ( );
-	     _threads.end ( ) != it; it++)
+	for (vector<ThreadIfc*>::iterator it = _threads.begin ( ); _threads.end ( ) != it; it++)
 	{
 		CHECK_NULL_PTR_ERROR (*it)
 		if ((*it)->getId ( ) == id)
@@ -132,8 +131,7 @@ void ThreadIfc::unregisterThread (ThreadIfc* thread)
 	AutoMutex	mutex (&_mutex);
 
 	CHECK_NULL_PTR_ERROR (thread)
-	for (vector<ThreadIfc*>::iterator it = _threads.begin ( );
-	     _threads.end ( ) != it; it++)
+	for (vector<ThreadIfc*>::iterator it = _threads.begin ( ); _threads.end ( ) != it; it++)
 	{
 		if (*it == thread)
 		{
@@ -155,8 +153,7 @@ void* ThreadIfc::run_thread (void* t)
 
 	try
 	{
-		// ThreadManager::instance ( ) lève une exception si l'API n'est pas
-		// initialisée.
+		// ThreadManager::instance ( ) lève une exception si l'API n'est pas initialisée.
 		ThreadManager::instance ( ).taskCompleted (thread);
 	}
 	catch (...)
@@ -250,8 +247,7 @@ void JoinableThread::startTask ( )
 #ifdef FORCE_THREADS_STACK_SIZE
 	CHECK_POSIX_CALL (pthread_attr_setstacksize(&attr,(2*PTHREAD_STACK_MIN)), "pthread_attr_setstacksize")
 #endif	// FORCE_THREADS_STACK_SIZE
-	CHECK_POSIX_CALL (pthread_create (&getPosixThread ( ), &attr,
-			                  ThreadIfc::run_thread, this), "pthread_create")
+	CHECK_POSIX_CALL (pthread_create (&getPosixThread ( ), &attr, ThreadIfc::run_thread, this), "pthread_create")
 	CHECK_POSIX_CALL (pthread_attr_destroy (&attr), "pthread_attr_destroy")
 }	// JoinableThread::startTask
 
@@ -261,8 +257,7 @@ void JoinableThread::join ( )
 	if (true == isRunning ( ))
 	{
 		void*	status	= 0;
-		CHECK_POSIX_CALL(
-					pthread_join (getPosixThread ( ), &status), "pthread_join")
+		CHECK_POSIX_CALL(pthread_join (getPosixThread ( ), &status), "pthread_join")
 	}	// if (true == isRunning ( ))
 }	// JoinableThread::join
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -41,8 +41,7 @@ add_test(NAME exceptions COMMAND $<TARGET_FILE:exceptions>)
 add_test(NAME fileinfos COMMAND $<TARGET_FILE:fileinfos> /etc/os-release)
 add_test(NAME fileopts COMMAND $<TARGET_FILE:fileopts>)
 add_test(NAME hostinfos COMMAND $<TARGET_FILE:hostinfos>)
-# joinable often triggers SEGFAULT on github CI... don't understand why
-# add_test(NAME joinable COMMAND $<TARGET_FILE:joinable>)
+add_test(NAME joinable COMMAND $<TARGET_FILE:joinable>)
 add_test(NAME logs COMMAND $<TARGET_FILE:logs>)
 add_test(NAME memory COMMAND $<TARGET_FILE:memory>)
 execute_process (COMMAND bash -c "touch /tmp/my_empty_file")
diff --git a/src/tests/joinable.cpp b/src/tests/joinable.cpp
@@ -117,68 +117,62 @@ int main (int argc, char* argv[])
 cout << "THR " << (unsigned long)current << " PRIORITY : " << param.__sched_priority << " POLICY : " << policy << endl; */
 	try
 	{
-		const size_t	nbProcs	= MachineData::instance ( ).getProcessorsNum ( );
-
-		cout << "Computer " << NetworkData::getCurrentHostName ( ) << " has "
-			<< nbProcs << " processors." << endl;
-
-		vector <JoinableThread*>	tasks;
-		size_t						i	= 0;
-		const size_t				max	= 10;
-		Writer						writer (stdout);
-		cout << "Creation of " << (unsigned long)max
-			<< " joinable writing tasks without mutex ..." << endl;
-		for (i = 0; i < max; i++)
-			tasks.push_back (new WriterThread (max, writer));
-		cout << "Running tasks ..." << endl;
-		for (i = 0; i < max; i++)
-			tasks [i]->startTask ( );
-		// Rem : sched_yield important, on peut sinon observer des plantages,
-		// probablement à cause de tâches qui ne se sont pas encore lancées.
-		sched_yield ( );
-		cout << "Joining tasks ..." << endl;
-		for (i = 0; i < max; i++)
-		{
-			tasks [i]->join ( );
-		}
-		cout << "Joinable writing tasks without mutex completed." << endl;
-		cout << "Deleting tasks ..." << endl;
-		for (i = 0; i < max; i++)
-			delete tasks [i];
-		cout << endl << endl;
-
-		tasks.clear ( );
-		ProtectedWriter			pwriter (stdout);
-		cout << "Creation of " << (unsigned long)max
-			<< " joinable writing tasks with mutexes ..." << endl;
-		for (i = 0; i < max; i++)
-			tasks.push_back (new WriterThread (max, pwriter));
-		cout << "Running tasks ..." << endl;
-		for (i = 0; i < max; i++)
-			tasks [i]->startTask ( );
-		sched_yield ( );
-		cout << "Joining tasks ..." << endl;
-		for (i = 0; i < max; i++)
-		{
-			tasks [i]->join ( );
-			//		delete tasks [i];
-			cout << "Deleting tasks." << endl;
-		}
-		for (i = 0; i < max; i++)
-		{
-			delete tasks [i];
-		}
-		cout << "Joinable writing tasks with mutexes completed." << endl;
+
+	const size_t	nbProcs	= MachineData::instance ( ).getProcessorsNum ( );
+
+	cout << "Computer " << NetworkData::getCurrentHostName ( ) << " has " << nbProcs << " processors." << endl;
+
+	vector <JoinableThread*>	tasks;
+	size_t						i	= 0;
+	const size_t				max	= 10;
+	Writer						writer (stdout);
+	cout << "Creation of " << (unsigned long)max << " joinable writing tasks without mutex ..." << endl;
+	for (i = 0; i < max; i++)
+		tasks.push_back (new WriterThread (max, writer));
+	cout << "Running tasks ..." << endl;
+	for (i = 0; i < max; i++)
+		tasks [i]->startTask ( );
+	// Rem : sched_yield important, on peut sinon observer des plantages, probablement à cause de tâches qui ne se sont pas encore lancées.
+//	sched_yield ( );	// v 6.2.0 : not still usefull
+	cout << "Joining tasks ..." << endl;
+	for (i = 0; i < max; i++)
+	{
+		tasks [i]->join ( );
+	}
+	cout << "Joinable writing tasks without mutex completed." << endl;
+	cout << "Deleting tasks ..." << endl;
+	for (i = 0; i < max; i++)
+		delete tasks [i];
+	cout << endl << endl;
+
+	tasks.clear ( );
+	ProtectedWriter			pwriter (stdout);
+	cout << "Creation of " << (unsigned long)max << " joinable writing tasks with mutexes ..." << endl;
+	for (i = 0; i < max; i++)
+		tasks.push_back (new WriterThread (max, pwriter));
+	cout << "Running tasks ..." << endl;
+	for (i = 0; i < max; i++)
+		tasks [i]->startTask ( );
+//	sched_yield ( );	// v 6.2.0 : not still usefull
+	cout << "Joining tasks ..." << endl;
+	for (i = 0; i < max; i++)
+	{
+		tasks [i]->join ( );
+//		delete tasks [i];
+cout << "Deleting tasks." << endl;
+	}
+	for (i = 0; i < max; i++)
+		delete tasks [i];
+	cout << "Joinable writing tasks with mutexes completed." << endl;
+
 	}
 	catch (const Exception& exc)
 	{
 		cout << "Exception caught : " << exc.getFullMessage ( ) << endl;
-		return -1;
 	}
 	catch (...)
 	{
 		cout << "Unexpected error caught." << endl;
-		return -1;
 	}
 
 	return 0;
