[brlcad-commits] SF.net SVN: brlcad:[43461] geomcore/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[43461] geomcore/trunk
|
From: <eri...@us...> - 2011-02-25 18:32:27
|
Revision: 43461
http://brlcad.svn.sourceforge.net/brlcad/?rev=43461&view=rev
Author: erikgreenwald
Date: 2011-02-25 18:32:21 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
eliminate DataStreamUtils
Modified Paths:
--------------
geomcore/trunk/include/DataStream.h
geomcore/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
geomcore/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
geomcore/trunk/src/libNet/netMsg/NetMsg.cxx
geomcore/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
geomcore/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
geomcore/trunk/src/utility/CMakeLists.txt
geomcore/trunk/src/utility/DataStream.cxx
Removed Paths:
-------------
geomcore/trunk/include/DataStreamUtils.h
geomcore/trunk/src/utility/DataStreamUtils.cxx
Modified: geomcore/trunk/include/DataStream.h
===================================================================
--- geomcore/trunk/include/DataStream.h 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/include/DataStream.h 2011-02-25 18:32:21 UTC (rev 43461)
@@ -27,6 +27,7 @@
#define __DATASTREAM_H__
#include <stdio.h>
+#include <string>
#include <bu.h>
@@ -42,6 +43,10 @@
char *get(int);
void advance(int);
void append(const char *data, int len);
+
+ std::string* getString();
+ void putString(std::string str);
+ void putString(std::string *str);
private:
bu_vlb vlb;
int ind;
Deleted: geomcore/trunk/include/DataStreamUtils.h
===================================================================
--- geomcore/trunk/include/DataStreamUtils.h 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/include/DataStreamUtils.h 2011-02-25 18:32:21 UTC (rev 43461)
@@ -1,66 +0,0 @@
-/* D A T A S T R E A M U T I L S . H
- * BRL-CAD
- *
- * Copyright (c) 2011 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file DataStreamUtils.h
- *
- * Brief description
- *
- */
-
-#ifndef __DATASTREAMUTILS_H__
-#define __DATASTREAMUTILS_H__
-
-#include <stdint.h>
-#include <string>
-
-#include <iostream>
-
-#include "ByteArray.h"
-#include "DataStream.h"
-#include "GSUuid.h"
-
-class DataStreamUtils
-{
-public:
- static std::string* getString(DataStream* ds);
- static void putString(DataStream* ds, std::string str);
- static void putString(DataStream* ds, std::string *str);
- static GSUuid* getGSUuid(DataStream* ds);
- static void putGSUuid(DataStream* ds, GSUuid*);
-// static void printByteArray(ByteArray* ba);
-
-private:
- DataStreamUtils(){};
-
- /* Disable copy cstr and =operator */
- DataStreamUtils(DataStreamUtils const&){};
- DataStreamUtils& operator=(DataStreamUtils const&){};
-};
-
-#endif /* __DATASTREAMUTILS_H__ */
-
-/*
- * Local Variables: ***
- * mode: C++ ***
- * tab-width: 8 ***
- * c-basic-offset: 2 ***
- * indent-tabs-mode: t ***
- * End: ***
- * ex: shiftwidth=2 tabstop=8
-*/
Modified: geomcore/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
===================================================================
--- geomcore/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -23,7 +23,7 @@
*
*/
-#include "DataStreamUtils.h"
+#include "DataStream.h"
#include "GenericOneStringMsg.h"
#include <sstream>
@@ -41,7 +41,7 @@
GenericOneStringMsg::GenericOneStringMsg(DataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->strData = *DataStreamUtils::getString(ds);
+ this->strData = ds->getString()->c_str();
}
/* Destructor */
@@ -50,7 +50,7 @@
bool GenericOneStringMsg::_serialize(DataStream* ds)
{
- DataStreamUtils::putString(ds, this->strData);
+ ds->putString(this->strData);
return true;
}
Modified: geomcore/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
===================================================================
--- geomcore/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -29,7 +29,7 @@
#include "NetMsgTypes.h"
#include "GeometryManifestMsg.h"
-#include "DataStreamUtils.h"
+#include "DataStream.h"
/* Normal Constructor */
GeometryManifestMsg::GeometryManifestMsg(std::list<std::string>& items) :
@@ -55,7 +55,7 @@
numOfItems = ntohl(*ds->get(4));
for (uint32_t i = 0; i < numOfItems; ++i) {
- std::string* tString = DataStreamUtils::getString(ds);
+ std::string* tString = ds->getString();
std::string newStr;
newStr.append(*tString);
this->itemData->push_back(newStr);
@@ -74,7 +74,7 @@
ds->append((const char *)&mt, 4);
for (std::list<std::string>::iterator it = this->itemData->begin(); it != this->itemData->end(); it++)
- DataStreamUtils::putString(ds, *it);
+ ds->putString(*it);
return true;
}
Modified: geomcore/trunk/src/libNet/netMsg/NetMsg.cxx
===================================================================
--- geomcore/trunk/src/libNet/netMsg/NetMsg.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/libNet/netMsg/NetMsg.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -27,7 +27,6 @@
#include "NetMsg.h"
#include "Portal.h"
-#include "DataStreamUtils.h"
#include "GSUuid.h"
#include <sstream>
@@ -58,10 +57,10 @@
{
this->origin = origin;
this->msgType = ntohs(*(uint16_t*)ds->get(2));
- this->msgUUID = DataStreamUtils::getGSUuid(ds);
+ this->msgUUID = new GSUuid(ds->getString());
this->hasReUUID = *(unsigned char*)ds->get(1);
if (this->hasReUUID)
- this->reUUID = DataStreamUtils::getGSUuid(ds);
+ this->reUUID = new GSUuid(ds->getString());
}
/* Destructor */
@@ -88,11 +87,11 @@
mt = htons(this->msgType);
std::cout << "Erm, serialize? " << this->msgType << ":" << this->msgUUID << std::endl;
subDS.append((const char *)&mt, 2);
- DataStreamUtils::putGSUuid(&subDS, this->msgUUID);
+ subDS.putString(this->msgUUID->toString());
subDS.append((const char *)&this->hasReUUID, 1);
if (this->hasReUUID) {
- DataStreamUtils::putGSUuid(&subDS, this->reUUID);
+ subDS.putString(this->reUUID->toString());
}
/* Call subclass serialize */
Modified: geomcore/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
===================================================================
--- geomcore/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -25,7 +25,7 @@
#include "NetMsgTypes.h"
#include "NewSessionReqMsg.h"
-#include "DataStreamUtils.h"
+#include "DataStream.h"
#include <sstream>
/* Normal Constructor */
@@ -42,8 +42,8 @@
NewSessionReqMsg::NewSessionReqMsg(DataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->uname = *DataStreamUtils::getString(ds);
- this->passwd = *DataStreamUtils::getString(ds);
+ this->uname = ds->getString()->c_str();
+ this->passwd = ds->getString()->c_str();
}
/* Destructor */
@@ -52,8 +52,8 @@
bool NewSessionReqMsg::_serialize(DataStream* ds)
{
- DataStreamUtils::putString(ds, this->uname);
- DataStreamUtils::putString(ds, this->passwd);
+ ds->putString(this->uname);
+ ds->putString(this->passwd);
return true;
}
Modified: geomcore/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
===================================================================
--- geomcore/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -25,7 +25,7 @@
#include "NetMsgTypes.h"
#include "SessionInfoMsg.h"
-#include "DataStreamUtils.h"
+#include "DataStream.h"
#include <sstream>
/* Normal Constructor */
@@ -42,7 +42,7 @@
SessionInfoMsg::SessionInfoMsg(DataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->sessionID = DataStreamUtils::getGSUuid(ds);
+ this->sessionID = new GSUuid(ds->getString());
}
/* Destructor */
@@ -51,7 +51,7 @@
bool SessionInfoMsg::_serialize(DataStream* ds)
{
- DataStreamUtils::putGSUuid(ds, this->sessionID);
+ ds->putString(this->sessionID->toString());
return true;
}
Modified: geomcore/trunk/src/utility/CMakeLists.txt
===================================================================
--- geomcore/trunk/src/utility/CMakeLists.txt 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/utility/CMakeLists.txt 2011-02-25 18:32:21 UTC (rev 43461)
@@ -36,7 +36,6 @@
Config.cxx
ControlledThread.cxx
DataStream.cxx
- DataStreamUtils.cxx
GSException.cxx
GSThread.cxx
GSUuid.cxx
Modified: geomcore/trunk/src/utility/DataStream.cxx
===================================================================
--- geomcore/trunk/src/utility/DataStream.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/utility/DataStream.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <arpa/inet.h>
#include "DataStream.h"
@@ -38,7 +39,37 @@
void DataStream::advance(int i) { ind+=i; }
void DataStream::append(const char *data, int len) { bu_vlb_write(&vlb, (unsigned char *)data, len); }
+std::string* DataStream::getString()
+{
+ char *dsp = getptr();
+ uint32_t len;
+ std::string* out = new std::string();
+ len = ntohl(*(uint32_t *)dsp);
+
+ bu_log("Read String length of: %d\n", len);
+ out->append(dsp+sizeof(uint32_t), len);
+ advance(len+sizeof(uint32_t));
+
+ return out;
+}
+
+void DataStream::putString(std::string str)
+{
+ int l[1];
+
+ *l = htonl((uint32_t)str.length());
+ this->append((const char *)l, 4);
+ this->append(str.c_str(), *l);
+}
+
+void DataStream::putString(std::string *str)
+{
+ this->putString(*str);
+}
+
+
+
/*
* Local Variables:
* tab-width: 8
Deleted: geomcore/trunk/src/utility/DataStreamUtils.cxx
===================================================================
--- geomcore/trunk/src/utility/DataStreamUtils.cxx 2011-02-25 18:30:03 UTC (rev 43460)
+++ geomcore/trunk/src/utility/DataStreamUtils.cxx 2011-02-25 18:32:21 UTC (rev 43461)
@@ -1,98 +0,0 @@
-/* D A T A S T R E A M U T I L S . C X X
- * BRL-CAD
- *
- * Copyright (c) 2011 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file DataStreamUtils.cxx
- *
- * Brief description
- *
- */
-
-#include "GSUuid.h"
-#include "DataStreamUtils.h"
-
-#include <arpa/inet.h> /* ntohl */
-
-
-GSUuid *
-DataStreamUtils::getGSUuid(DataStream* ds)
-{
- return new GSUuid(DataStreamUtils::getString(ds));
-}
-
-void
-DataStreamUtils::putGSUuid(DataStream* ds, GSUuid *uuid)
-{
- DataStreamUtils::putString(ds, uuid->toString());
-}
-
-std::string* DataStreamUtils::getString(DataStream* ds)
-{
- char *dsp;
- uint32_t len;
- std::string* out = new std::string();
-
- dsp = ds->getptr();
- len = ntohl(*(uint32_t *)dsp);
-
- std::cout << "Read String length of: " << len << std::endl;
- out->append(dsp+sizeof(uint32_t), len);
- ds->advance(len+sizeof(uint32_t));
-
- return out;
-}
-
-void DataStreamUtils::putString(DataStream* ds, std::string str)
-{
- int l[1];
-
- *l = htonl((uint32_t)str.length());
- ds->append((const char *)l, 4);
- ds->append(str.c_str(), *l);
-}
-
-void DataStreamUtils::putString(DataStream* ds, std::string *str)
-{
- DataStreamUtils::putString(ds, *str);
-}
-
-/*
-void DataStreamUtils::printByteArray(ByteArray* ba)
-{
- uint32_t size = ba->size();
- char *b = ba->data();
- bu_log("\nByteArray.Size(): %d\n", size);
-
- for (uint32_t i = 0; i < size; ++i, b++) {
- bu_log("%d '%c' ", *b, *b);
- if ((i + 1) % 25 == 0)
- bu_log("\n");
- }
- bu_log("\n");
-}
-*/
-
-/*
- * Local Variables:
- * tab-width: 8
- * mode: C
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|