chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better thread shutdown

Browse Source
This commit is contained in:
Mark Watkins 2011-09-01 13:43:47 +10:00
parent 958208f36d
commit a76a7a6df3
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Graphs/gGraphView.cpp
View File

@ -296,12 +296,23 @@ gThread::gThread(gGraph *g)
graph=g; graph=g;
mutex.lock(); mutex.lock();
} }
gThread::~gThread()
{
if (isRunning()) {
m_running=false;
mutex.unlock();
wait();
terminate();
}
}
void gThread::run() void gThread::run()
{ {
m_running=true; m_running=true;
while (m_running) { while (m_running) {
//mutex.lock(); //mutex.lock();
if (mutex.tryLock(500)) { if (mutex.tryLock(500)) {
if (!m_running) break;
int originX=m_lastbounds.x(); int originX=m_lastbounds.x();
int originY=m_lastbounds.y(); int originY=m_lastbounds.y();
int width=m_lastbounds.width(); int width=m_lastbounds.width();
@ -346,11 +357,6 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
} }
gGraph::~gGraph() gGraph::~gGraph()
{ {
if (m_thread->isRunning()) {
m_thread->die();
m_thread->wait();
m_thread->exit();
}
delete m_thread; delete m_thread;
delete quad; delete quad;
} }

2
Graphs/gGraphView.h
View File

@ -161,6 +161,8 @@ class gThread:public QThread
{ {
public: public:
gThread(gGraph *g); gThread(gGraph *g);
~gThread();
void run(); void run();
void paint(int originX, int originY, int width, int height); void paint(int originX, int originY, int width, int height);
void die() { m_running=false; } void die() { m_running=false; }