Revision: 41773
http://brlcad.svn.sourceforge.net/brlcad/?rev=41773&view=rev
Author: davidloman
Date: 2010-12-22 14:57:42 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Made PortalManager take a localNodeName parameter. Made Portal lookup
localNodeName on its associated PortalManager rather than the Config system.
This will allow multiple PortalManager's (with different node names) to exist
in the same application. Also standardizes LocalNodeName access.
Modified Paths:
--------------
rt^3/trunk/include/GSClient.h
rt^3/trunk/include/PortalManager.h
rt^3/trunk/src/GS/GSClient.cxx
rt^3/trunk/src/GS/GeometryService.cxx
rt^3/trunk/src/GS/geoclient.cxx
rt^3/trunk/src/libNet/Portal.cxx
rt^3/trunk/src/libNet/PortalManager.cxx
rt^3/trunk/tests/libNet/libNetTest.cxx
Modified: rt^3/trunk/include/GSClient.h
===================================================================
--- rt^3/trunk/include/GSClient.h 2010-12-22 14:54:38 UTC (rev 41772)
+++ rt^3/trunk/include/GSClient.h 2010-12-22 14:57:42 UTC (rev 41773)
@@ -43,7 +43,7 @@
friend class LogoutCmd;
public:
- GSClient();
+ GSClient(QString localNodeName);
virtual ~GSClient();
int run();
Modified: rt^3/trunk/include/PortalManager.h
===================================================================
--- rt^3/trunk/include/PortalManager.h 2010-12-22 14:54:38 UTC (rev 41772)
+++ rt^3/trunk/include/PortalManager.h 2010-12-22 14:57:42 UTC (rev 41773)
@@ -43,17 +43,19 @@
class PortalManager : public ControlledThread, public INetMsgHandler
{
public:
- PortalManager(quint16 port = 0);
+ PortalManager(QString localNodeName, quint16 port = 0);
~PortalManager();
Portal* connectToHost(QString host, quint16 port);
void disconnect(Portal* p);
bool handleNetMsg(NetMsg* msg);
+ QString getLocalNodeName();
protected:
void _run();
private:
+ QString localNodeName;
Logger* log;
quint16 port;
PkgTcpServer* tcpServer;
Modified: rt^3/trunk/src/GS/GSClient.cxx
===================================================================
--- rt^3/trunk/src/GS/GSClient.cxx 2010-12-22 14:54:38 UTC (rev 41772)
+++ rt^3/trunk/src/GS/GSClient.cxx 2010-12-22 14:57:42 UTC (rev 41773)
@@ -35,13 +35,13 @@
const std::string GSClient::defaultPrompt ="geoclient> ";
-GSClient::GSClient() {
+GSClient::GSClient(QString localNodeName) {
this->ccReg = ClientCmdRegistry::getInstance();
this->log = Logger::getInstance();
this->jobMan = JobManager::getInstance();
this->jobMan->startup();
- this->portMan = new PortalManager();
+ this->portMan = new PortalManager(localNodeName);
this->portMan->start();
GSThread::msleep(100);
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-12-22 14:54:38 UTC (rev
41772)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-12-22 14:57:42 UTC (rev
41773)
@@ -36,7 +36,7 @@
this->log = Logger::getInstance();
this->log->logINFO("GeometryService", localNodeName + " is starting
up...");
- this->portalMan = new PortalManager(listenPort);
+ this->portalMan = new PortalManager(localNodeName, listenPort);
this->registerMsgRoutes();
this->dataMan = DataManager::getInstance();
Modified: rt^3/trunk/src/GS/geoclient.cxx
===================================================================
--- rt^3/trunk/src/GS/geoclient.cxx 2010-12-22 14:54:38 UTC (rev 41772)
+++ rt^3/trunk/src/GS/geoclient.cxx 2010-12-22 14:57:42 UTC (rev 41773)
@@ -28,7 +28,7 @@
int
main(int argc, char* argv[])
{
- GSClient gsClient;
+ GSClient gsClient("TestingLocalNodeName");
return gsClient.run();
}
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-12-22 14:54:38 UTC (rev 41772)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-12-22 14:57:42 UTC (rev 41773)
@@ -83,8 +83,7 @@
void
Portal::sendGSNodeName() {
- QString localNodeName = Config::getInstance()->getConfigValue(
- "LocalNodeName");
+ QString localNodeName = this->pm->getLocalNodeName();
if (localNodeName.length() == 0) {
localNodeName = QUuid::createUuid().toString();
Modified: rt^3/trunk/src/libNet/PortalManager.cxx
===================================================================
--- rt^3/trunk/src/libNet/PortalManager.cxx 2010-12-22 14:54:38 UTC (rev
41772)
+++ rt^3/trunk/src/libNet/PortalManager.cxx 2010-12-22 14:57:42 UTC (rev
41773)
@@ -32,8 +32,9 @@
#include <stdio.h>
#include <errno.h>
-PortalManager::PortalManager(quint16 port) :
- ControlledThread("PortalManager") {
+PortalManager::PortalManager(QString localNodeName, quint16 port) :
+ ControlledThread(localNodeName + "PortMan") {
+ this->localNodeName = localNodeName;
this->port = port;
this->tcpServer = new PkgTcpServer();
this->fdPortalMap = new QMap<int, Portal*> ();
@@ -314,6 +315,11 @@
this->disconnect(origin);
}
+QString
+PortalManager::getLocalNodeName()
+{
+ return this->localNodeName;
+}
/*
* Local Variables:
* mode: C
Modified: rt^3/trunk/tests/libNet/libNetTest.cxx
===================================================================
--- rt^3/trunk/tests/libNet/libNetTest.cxx 2010-12-22 14:54:38 UTC (rev
41772)
+++ rt^3/trunk/tests/libNet/libNetTest.cxx 2010-12-22 14:57:42 UTC (rev
41773)
@@ -118,7 +118,7 @@
logInfo(s);
if (isServer) {
- PortalManager pm(port);
+ PortalManager pm("TestServer", port);
pm.start();
/* listen for a loooong time. */
@@ -127,7 +127,7 @@
pm.shutdown();
} else {
- PortalManager pm;
+ PortalManager pm("TestClient");
pm.start();
GSThread::sleep(2);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
