From 5e8312cc82a2af4c4152384e4cd9adb98f9e6a25 Mon Sep 17 00:00:00 2001 From: maroy Date: Thu, 18 Nov 2004 15:44:11 +0000 Subject: [PATCH] fixed bug #0000452, where the thread was crashing after exit --- livesupport/modules/core/etc/Makefile.in | 8 ++++---- livesupport/modules/core/src/Thread.cxx | 4 ++-- livesupport/modules/playlistExecutor/src/HelixPlayer.cxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 9002e97f0..82a38e40b 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.11 $ +# Version : $Revision: 1.12 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -92,14 +92,14 @@ CORE_LIB_OBJS = ${TMP_DIR}/UniqueId.o \ ${TMP_DIR}/TimeConversion.o \ ${TMP_DIR}/Thread.o -TEST_RUNNER_OBJS = ${TMP_DIR}/AudioClipTest.o \ +TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ + ${TMP_DIR}/AudioClipTest.o \ ${TMP_DIR}/FadeInfoTest.o \ ${TMP_DIR}/PlaylistElementTest.o \ ${TMP_DIR}/PlaylistTest.o \ ${TMP_DIR}/TimeConversionTest.o \ ${TMP_DIR}/TestRunnable.o \ - ${TMP_DIR}/ThreadTest.o \ - ${TMP_DIR}/TestRunner.o + ${TMP_DIR}/ThreadTest.o TEST_RUNNER_LIBS = -l${CORE_LIB} -lxml++-1.0 -lboost_date_time-gcc \ -lcppunit -ldl diff --git a/livesupport/modules/core/src/Thread.cxx b/livesupport/modules/core/src/Thread.cxx index 29357922c..082d3270b 100644 --- a/livesupport/modules/core/src/Thread.cxx +++ b/livesupport/modules/core/src/Thread.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Thread.cxx,v $ ------------------------------------------------------------------------------*/ @@ -75,7 +75,7 @@ Thread :: posixThreadFunction(void * thread) throw () pThread->runnable->run(); - pthread_exit(0); + return 0; } diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx index b0df58803..bcccef9ee 100644 --- a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx +++ b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayer.cxx,v $ ------------------------------------------------------------------------------*/ @@ -91,7 +91,7 @@ LiveSupport::PlaylistExecutor::eventHandlerThread(void * helixPlayer) usleep(10000); } - pthread_exit(0); + return 0; }