Revision: 40787
http://brlcad.svn.sourceforge.net/brlcad/?rev=40787&view=rev
Author: davidloman
Date: 2010-09-29 11:53:11 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
override GSThread::terminate() with ControlledThread::terminate() and make it
behave the same as ControlledThread::shutdown()
Modified Paths:
--------------
rt^3/trunk/include/ControlledThread.h
rt^3/trunk/src/utility/ControlledThread.cxx
Modified: rt^3/trunk/include/ControlledThread.h
===================================================================
--- rt^3/trunk/include/ControlledThread.h 2010-09-29 11:47:46 UTC (rev
40786)
+++ rt^3/trunk/include/ControlledThread.h 2010-09-29 11:53:11 UTC (rev
40787)
@@ -33,7 +33,10 @@
virtual ~ControlledThread();
void start();
- bool shutdown(bool block=true);
+
+ void shutdown();
+ void terminate();
+ void terminate(bool block);
QString getThreadName();
protected:
Modified: rt^3/trunk/src/utility/ControlledThread.cxx
===================================================================
--- rt^3/trunk/src/utility/ControlledThread.cxx 2010-09-29 11:47:46 UTC (rev
40786)
+++ rt^3/trunk/src/utility/ControlledThread.cxx 2010-09-29 11:53:11 UTC (rev
40787)
@@ -43,13 +43,23 @@
bool postRetVal = this->postStartupHook();
}
-bool ControlledThread::shutdown(bool block) {
+void
+ControlledThread::shutdown() {
+ this->terminate();
+}
+
+void
+ControlledThread::terminate() {
+ this->terminate(true);
+}
+
+void ControlledThread::terminate(bool block) {
bool preRetVal = this->preShutdownHook();
this->runCmd = false;
if (block)
while (this->isRunning()) {
- GSThread::msleep(100);
+ GSThread::msleep(100); //TODO need a failsafe here.
}
bool postRetVal = this->postShutdownHook();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
