[brlcad-commits] SF.net SVN: brlcad:[41959] rt^3/trunk/src/GS/GeometryService.cxx

[<dav...@us...>]

Revision: 41959
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41959&view=rev
Author:   davidloman
Date:     2011-01-05 20:55:00 +0000 (Wed, 05 Jan 2011)

Log Message:
-----------
Cascading changes from ControlledThread changes in last commit.  Fixed bug in main loop that prevented it from ever exiting.

Modified Paths:
--------------
    rt^3/trunk/src/GS/GeometryService.cxx

Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx	2011-01-05 20:53:06 UTC (rev 41958)
+++ rt^3/trunk/src/GS/GeometryService.cxx	2011-01-05 20:55:00 UTC (rev 41959)
@@ -31,7 +31,7 @@
 
 
 GeometryService::GeometryService(const QString localNodeName, const quint16 listenPort, const QHostAddress listenAddy) :
-localNodeName(localNodeName), listenPort(listenPort), listenAddy(listenAddy)
+ControlledThread(localNodeName), localNodeName(localNodeName), listenPort(listenPort), listenAddy(listenAddy)
 {
     this->log = Logger::getInstance();
     this->log->logINFO("GeometryService", localNodeName + " is starting up...");
@@ -86,11 +86,11 @@
 	this->log->logINFO("GeometryService", "Starting PortalManager");
 	this->portalMan->start();
 
-	while (this->getRunStatus()) {
-		GSThread::msleep(100);
+	while (this->getRunCmd() == true) {
+		this->msleep(50);
 	}
 
-	this->portalMan->shutdown();
+	this->portalMan->shutdown(true);
 }
 
 bool
@@ -108,8 +108,8 @@
 	switch(type) {
 	case CMD_SHUTDOWN:
 		log->logINFO("GeometryService", "Remote Shutdown Initiated.");
-		this->portalMan->terminate(false);
-		this->terminate(false);
+		this->portalMan->shutdown();
+		this->shutdown();
 		return true;
 	case FAILURE:
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.