liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protect progressconnector thread with mutex just in case

Browse Source
This commit is contained in:
Andrey Skvortsov
2010-09-18 22:41:37 -07:00
parent 51fd0898cd
commit 19fbfe818c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/progressconnector.h
View File

@@ -74,12 +74,13 @@ class PLDBridge : public rtengine::ProgressListener {
}; };
template<class T> template<class T>
class ProgressConnector { class ProgressConnector {
sigc::signal0<T> opStart; sigc::signal0<T> opStart;
sigc::signal0<bool> opEnd; sigc::signal0<bool> opEnd;
T retval; T retval;
Glib::Thread *workThread; Glib::Thread *workThread;
Glib::Mutex* qMutex;
static int emitEndSignal (void* data) { static int emitEndSignal (void* data) {
gdk_threads_enter (); gdk_threads_enter ();
@@ -91,14 +92,19 @@ class ProgressConnector {
} }
void workingThread () { void workingThread () {
if (!qMutex)
qMutex = new Glib::Mutex ();
qMutex->lock();
retval = opStart.emit (); retval = opStart.emit ();
g_idle_add (ProgressConnector<T>::emitEndSignal, new sigc::signal0<bool> (opEnd)); g_idle_add (ProgressConnector<T>::emitEndSignal, new sigc::signal0<bool> (opEnd));
workThread = 0; workThread = 0;
qMutex->unlock();
} }
public: public:
ProgressConnector ():workThread( 0 ) { } ProgressConnector ():workThread( 0 ) , qMutex(NULL) { }
void startFunc (const sigc::slot0<T>& startHandler, const sigc::slot0<bool>& endHandler ) { void startFunc (const sigc::slot0<T>& startHandler, const sigc::slot0<bool>& endHandler ) {
if( !workThread ){ if( !workThread ){
@@ -106,6 +112,9 @@ class ProgressConnector {
opEnd.connect (endHandler); opEnd.connect (endHandler);
workThread = Glib::Thread::create(sigc::mem_fun(*this, &ProgressConnector<T>::workingThread), 0, true, true, Glib::THREAD_PRIORITY_NORMAL); workThread = Glib::Thread::create(sigc::mem_fun(*this, &ProgressConnector<T>::workingThread), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
} }
if (qMutex)
delete qMutex;
} }
T returnValue(){ T returnValue(){