Revision: 41438
http://brlcad.svn.sourceforge.net/brlcad/?rev=41438&view=rev
Author: davidloman
Date: 2010-11-23 15:48:00 +0000 (Tue, 23 Nov 2010)
Log Message:
-----------
Clean up some debug printing calls. Changed the bu_bomb() call in
Portal::callbackSpringboard() to a ERROR log call. We don't want to take the
whole app down if one buffer reference comes thru as null.
Modified Paths:
--------------
rt^3/trunk/src/libNet/Portal.cxx
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-11-23 15:44:30 UTC (rev 41437)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-11-23 15:48:00 UTC (rev 41438)
@@ -51,19 +51,16 @@
Portal::send(NetMsg* msg) {
QByteArray* ba = msg->serialize();
+/*
QString s("Sending msg. Type: ");
s.append(QString::number(msg->getMsgType()));
s.append(" len: ");
s.append(QString::number(ba->size()));
log->logDEBUG("Portal", s);
+*/
int retval = this->pkgClient->send(PKG_MAGIC2, ba->data(), ba->size());
-// s = "Sent ";
-// s.append(QString::number(retval));
-// s.append(" bytes.");
-// log->logDEBUG("Portal", s);
-
delete ba;
return retval;
}
@@ -76,9 +73,6 @@
localNodeName = QUuid::createUuid().toString();
}
-// QString s("Sending my localNodename: ");
-// s.append(localNodeName);
-// this->log->logDEBUG("Portal", s);
RemoteNodenameSetMsg* msg = new RemoteNodenameSetMsg(localNodeName);
this->send(msg);
@@ -143,8 +137,6 @@
s.append(this->remoteNodeName);
this->log->logDEBUG("Portal", s);
- //reply
- //this->sendGSNodeName();
}
delete msg;
return true;
@@ -164,7 +156,9 @@
/* Check to see if we got a good Buffer and Portal Object */
if (buf == 0) {
- bu_bomb("pkg callback returned a NULL buffer!\n");
+ log->logERROR("Portal", "pkg callback returned a NULL buffer!");
+ // bu_bomb("pkg callback returned a NULL buffer!\n");
+ return;
}
int len = conn->pkc_inend - sizeof(pkg_header);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
