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

reverted progressconnector code to use threading. attempt to fix linux crash issue opening preview

Browse Source
This commit is contained in:
askvortsov
2010-09-24 09:04:40 -07:00
parent 8311ab62ba
commit b6b3b17802
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rtgui/progressconnector.h
View File

@@ -22,7 +22,6 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <gtkmm.h> #include <gtkmm.h>
#include <rtengine.h> #include <rtengine.h>
#include <simpleprocess.h>
#undef THREAD_PRIORITY_NORMAL #undef THREAD_PRIORITY_NORMAL
@@ -75,52 +74,38 @@ 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 ();
sigc::signal0<bool>* opEnd = (sigc::signal0<bool>*) data; sigc::signal0<bool>* opEnd = (sigc::signal0<bool>*) data;
int r = opEnd->emit (); int r = opEnd->emit ();
delete opEnd; delete opEnd;
//gdk_threads_leave (); gdk_threads_leave ();
return r; return r;
} }
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 ) , qMutex(NULL) { } ProgressConnector ():workThread( 0 ) { }
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 ){
opStart.connect (startHandler); opStart.connect (startHandler);
opEnd.connect (endHandler); opEnd.connect (endHandler);
// rtengine::batchThread->yield(); workThread = Glib::Thread::create(sigc::mem_fun(*this, &ProgressConnector<T>::workingThread), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
workingThread();
// workThread = Glib::Thread::create(sigc::mem_fun(*this, &ProgressConnector<T>::workingThread), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
} }
if (qMutex)
{
delete qMutex;
qMutex = NULL;
}
} }
T returnValue(){ T returnValue(){