Revision: 41776
http://brlcad.svn.sourceforge.net/brlcad/?rev=41776&view=rev
Author: davidloman
Date: 2010-12-22 15:37:05 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Comment out a handful of debug log points.
Modified Paths:
--------------
rt^3/trunk/src/GS/SessionManager.cxx
rt^3/trunk/src/libNet/NetMsgFactory.cxx
rt^3/trunk/src/libNet/NetMsgRouter.cxx
rt^3/trunk/src/libNet/Portal.cxx
rt^3/trunk/src/libNet/PortalManager.cxx
Modified: rt^3/trunk/src/GS/SessionManager.cxx
===================================================================
--- rt^3/trunk/src/GS/SessionManager.cxx 2010-12-22 15:21:24 UTC (rev
41775)
+++ rt^3/trunk/src/GS/SessionManager.cxx 2010-12-22 15:37:05 UTC (rev
41776)
@@ -142,7 +142,7 @@
*/
void SessionManager::handleNewSessionReqMsg(NewSessionReqMsg* msg)
{
- log->logINFO("SessionManager", "Recv'ed NewSessionReqMsg.");
+/* log->logINFO("SessionManager", "Recv'ed NewSessionReqMsg."); */
/* Check for a good pointer to msg */
if (msg == NULL) {
@@ -192,7 +192,7 @@
void
SessionManager::handleDisconnectReqMsg(TypeOnlyMsg* msg)
{
- log->logINFO("SessionManager", "Recv'ed DisconnectReqMsg.");
+/* log->logINFO("SessionManager", "Recv'ed DisconnectReqMsg."); */
Portal* origin = msg->getOrigin();
/* validate incoming data */
@@ -212,10 +212,12 @@
delete a;
}
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
+/*
+ * Local Variables: ***
+ * mode: C++ ***
+ * tab-width: 8 ***
+ * c-basic-offset: 2 ***
+ * indent-tabs-mode: t ***
+ * End: ***
+ * ex: shiftwidth=2 tabstop=8
+*/
Modified: rt^3/trunk/src/libNet/NetMsgFactory.cxx
===================================================================
--- rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-12-22 15:21:24 UTC (rev
41775)
+++ rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-12-22 15:37:05 UTC (rev
41776)
@@ -63,25 +63,13 @@
QDataStream temp(data);
quint16 msgType = 0;
temp >> msgType;
-
+/*
QString s("Got msg. type: 0x");
s.append(QString::number(msgType,16).toUpper());
- s.append(" len: ");
- s.append(QString::number(data.size()));
+ s.append(" (len: " + QString::number(data.size()));
+ s.append(") from node: '" + origin->getRemoteNodeName() + "'");
Logger::getInstance()->logDEBUG("NetMsgFactory", s);
-/*
- QString dstr("Bytes: ");
-
- data.data();
-
- for (int i = 0; i < data.size(); ++i) {
- quint8 b = data.data()[i];
- dstr.append(QString::number(b));
- dstr.append(", ");
- }
- Logger::getInstance()->logDEBUG("NetMsgFactory", dstr);
*/
-
QDataStream* qds = new QDataStream(data);
/* TODO Replace this with a map for registration scheme */
Modified: rt^3/trunk/src/libNet/NetMsgRouter.cxx
===================================================================
--- rt^3/trunk/src/libNet/NetMsgRouter.cxx 2010-12-22 15:21:24 UTC (rev
41775)
+++ rt^3/trunk/src/libNet/NetMsgRouter.cxx 2010-12-22 15:37:05 UTC (rev
41776)
@@ -59,6 +59,8 @@
/* First get the appropriate list: */
QList<INetMsgHandler*>* list =
this->getListOfHandlers(msg->getMsgType());
+ QString s;
+/*
QString s("Got a message whos origin is Portal: ");
Portal* origin = msg->getOrigin();
if (origin != 0) {
@@ -69,11 +71,10 @@
s.append(" and type: ");
s.append(QString::number(msg->getMsgType(),16).toUpper());
Logger::getInstance()->logINFO("NetMsgRouter", s);
+*/
if (list->length() == 0) {
- /* If no routing table, send back an error */
-/* FailureMsg failMsg(UNHANDLED_MSG_TYPE);*/
-/* origin->send(&failMsg);*/
+ /* If no routing table, print an error */
s.clear();
s.append("Msg type: ");
s.append(QString::number(msg->getMsgType(),16).toUpper());
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-12-22 15:21:24 UTC (rev 41775)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-12-22 15:37:05 UTC (rev 41776)
@@ -50,13 +50,13 @@
int
Portal::send(NetMsg* msg) {
QByteArray* ba = msg->serialize();
-
+/*
QString s("Sending msg. Type: 0x");
s.append(QString::number(msg->getMsgType(),16).toUpper());
s.append(" len: ");
s.append(QString::number(ba->size()));
log->logDEBUG("Portal", s);
-
+*/
int retval = this->pkgClient->send(PKG_MAGIC2, ba->data(), ba->size());
delete ba;
@@ -148,13 +148,17 @@
this->remoteNodeName = t->getRemoteNodename();
this->handshakeComplete = true;
+ /*
QString s("Recv-ed a RemoteNodename: ");
s.append(this->remoteNodeName);
this->log->logDEBUG("Portal", s);
+ */
}
+ /* Normally, the NetMsgRouter does the delete, but this opcode
never gets routed. */
delete msg;
return true;
+
} else if (type == RUALIVE) {
TypeOnlyMsg tom(IMALIVE);
this->send(&tom);
Modified: rt^3/trunk/src/libNet/PortalManager.cxx
===================================================================
--- rt^3/trunk/src/libNet/PortalManager.cxx 2010-12-22 15:21:24 UTC (rev
41775)
+++ rt^3/trunk/src/libNet/PortalManager.cxx 2010-12-22 15:37:05 UTC (rev
41776)
@@ -225,10 +225,11 @@
int newFD = p->pkgClient->getFileDescriptor();
this->fdPortalMap->insert(newFD, p);
this->portalsLock->unlock();
-
+/*
QString s("New Portal with FD: ");
s.append(QString::number(newFD));
log->logDEBUG("PortalManager", s);
+*/
/* Check maxFD and update if needed. */
if (newFD > fdmax) {
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
