[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/Message_W.cc libCERTI/NM_Classes... [br_DEV_H
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/Message_W.cc libCERTI/NM_Classes... [br_DEV_HETEROGENEOUS] |
|
Date: |
Tue, 22 Apr 2008 08:41:09 +0000 |
CVSROOT: /sources/certi
Module name: certi
Branch: br_DEV_HETEROGENEOUS
Changes by: Eric NOULARD <erk> 08/04/22 08:41:09
Modified files:
libCERTI : Message_W.cc NM_Classes.hh BasicMessage.hh
BasicMessage.cc NM_Classes.cc ObjectClassSet.cc
Message_R.cc
RTIG : RTIG_processing.cc
. : TODO
RTIA : ObjectManagement.cc
Log message:
Heteregenous CERTI seems to work fine with CERTI Billard
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.20.2.1&r2=3.20.2.2
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.12&r2=1.1.2.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.7.2.2&r2=3.7.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.9.2.2&r2=3.9.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.13&r2=1.1.2.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassSet.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.31&r2=3.31.2.1
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.17.2.1&r2=3.17.2.2
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.56.2.8&r2=3.56.2.9
http://cvs.savannah.gnu.org/viewcvs/certi/TODO?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.1.6.2&r2=3.1.6.3
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.35.2.4&r2=3.35.2.5
Patches:
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.20.2.1
retrieving revision 3.20.2.2
diff -u -b -r3.20.2.1 -r3.20.2.2
--- libCERTI/Message_W.cc 18 Mar 2008 15:55:55 -0000 3.20.2.1
+++ libCERTI/Message_W.cc 22 Apr 2008 08:41:07 -0000 3.20.2.2
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.20.2.1 2008/03/18 15:55:55 erk Exp $
+// $Id: Message_W.cc,v 3.20.2.2 2008/04/22 08:41:07 erk Exp $
// ----------------------------------------------------------------------------
@@ -217,7 +217,7 @@
body.writeString(tag);
body.writeShortInt(handleArraySize);
writeHandleArray(body);
- writeRegions();
+ writeRegions(body);
break ;
// Body contains objectClass,region,boolean,handleArraySize,
@@ -419,7 +419,7 @@
// Body contains region,extents
case DDM_MODIFY_REGION:
body.writeLongInt(region);
- writeExtents();
+ writeExtents(body);
break ;
// Body contains region
@@ -737,4 +737,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.20.2.1 2008/03/18 15:55:55 erk Exp $
+// $Id: Message_W.cc,v 3.20.2.2 2008/04/22 08:41:07 erk Exp $
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.hh,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -b -r1.1.2.12 -r1.1.2.13
--- libCERTI/NM_Classes.hh 21 Apr 2008 11:29:09 -0000 1.1.2.12
+++ libCERTI/NM_Classes.hh 22 Apr 2008 08:41:07 -0000 1.1.2.13
@@ -712,7 +712,7 @@
/*<BEGIN>---------- Update_Attribute_Values ------------<BEGIN>*/
class CERTI_EXPORT NM_Update_Attribute_Values : public NM_WithHandleArray {
public:
- typedef NetworkMessage Super;
+ typedef NM_WithHandleArray Super;
NM_Update_Attribute_Values();
virtual ~NM_Update_Attribute_Values();
virtual void serialize(MessageBuffer& msgBuffer);
@@ -720,8 +720,8 @@
/* specific Getter/Setter */
protected:
/* specific field */
- ObjectClassHandle objectClass;
- ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS];
+// ObjectClassHandle objectClass;
+// ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS];
private:
};
@@ -730,7 +730,7 @@
/*<BEGIN>---------- Reflect_Attribute_Values ------------<BEGIN>*/
class CERTI_EXPORT NM_Reflect_Attribute_Values : public
NM_Update_Attribute_Values {
public:
- typedef NetworkMessage Super;
+ typedef NM_Update_Attribute_Values Super;
NM_Reflect_Attribute_Values();
virtual ~NM_Reflect_Attribute_Values();
/* specific Getter/Setter */
@@ -744,7 +744,7 @@
/*<BEGIN>---------- Send_Interaction ------------<BEGIN>*/
class CERTI_EXPORT NM_Send_Interaction : public NM_WithHandleArray {
public:
- typedef NetworkMessage Super;
+ typedef NM_WithHandleArray Super;
NM_Send_Interaction();
virtual ~NM_Send_Interaction();
virtual void serialize(MessageBuffer& msgBuffer);
@@ -762,7 +762,7 @@
/*<BEGIN>---------- Receive_Interaction ------------<BEGIN>*/
class CERTI_EXPORT NM_Receive_Interaction : public NM_Send_Interaction {
public:
- typedef NetworkMessage Super;
+ typedef NM_Send_Interaction Super;
NM_Receive_Interaction();
virtual ~NM_Receive_Interaction();
/* specific Getter/Setter */
Index: libCERTI/BasicMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.hh,v
retrieving revision 3.7.2.2
retrieving revision 3.7.2.3
diff -u -b -r3.7.2.2 -r3.7.2.3
--- libCERTI/BasicMessage.hh 9 Apr 2008 14:16:31 -0000 3.7.2.2
+++ libCERTI/BasicMessage.hh 22 Apr 2008 08:41:07 -0000 3.7.2.3
@@ -19,13 +19,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.hh,v 3.7.2.2 2008/04/09 14:16:31 erk Exp $
+// $Id: BasicMessage.hh,v 3.7.2.3 2008/04/22 08:41:07 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_BASIC_MESSAGE
#define LIBCERTI_BASIC_MESSAGE
#include "Extent.hh"
+#include "MessageBody.hh"
#include "MessageBuffer.hh"
#include "BaseRegion.hh"
#include <vector>
@@ -47,14 +48,16 @@
void setRegions(const BaseRegion **, int);
void setRegions(const std::vector<RegionHandle> &);
const std::vector<RegionHandle> &getRegions() const ;
- void copyMsgBufFrom(BasicMessage& msg);
protected:
- void readExtents();
- void writeExtents() ;
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
- void readRegions();
- void writeRegions();
+ void readExtents(const MessageBody &);
+ void writeExtents(MessageBody &) const ;
+
+ void readRegions(const MessageBody &body);
+ void writeRegions(MessageBody &body);
std::vector<Extent> extents ;
std::vector<RegionHandle> regions ;
@@ -71,4 +74,4 @@
#endif // LIBCERTI_BASIC_MESSAGE
-// $Id: BasicMessage.hh,v 3.7.2.2 2008/04/09 14:16:31 erk Exp $
+// $Id: BasicMessage.hh,v 3.7.2.3 2008/04/22 08:41:07 erk Exp $
Index: libCERTI/BasicMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.cc,v
retrieving revision 3.9.2.2
retrieving revision 3.9.2.3
diff -u -b -r3.9.2.2 -r3.9.2.3
--- libCERTI/BasicMessage.cc 9 Apr 2008 14:16:32 -0000 3.9.2.2
+++ libCERTI/BasicMessage.cc 22 Apr 2008 08:41:07 -0000 3.9.2.3
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.cc,v 3.9.2.2 2008/04/09 14:16:32 erk Exp $
+// $Id: BasicMessage.cc,v 3.9.2.3 2008/04/22 08:41:07 erk Exp $
// ----------------------------------------------------------------------------
@@ -28,129 +28,197 @@
#include <cassert>
-using std::vector;
-using std::endl;
+using std::vector ;
+using std::endl ;
-static pdCDebug D("BM","BasicMessage:");
+static pdCDebug D("MESSAGE", __FILE__);
namespace certi {
// ----------------------------------------------------------------------------
/** Set extents
*/
-void BasicMessage::setExtents(const std::vector<Extent> &e) {
- extents = e;
+void
+BasicMessage::setExtents(const std::vector<Extent> &e)
+{
+ extents = e ;
assert(extents.size() == e.size());
}
// ----------------------------------------------------------------------------
/** Get extents
*/
-const vector<Extent> & BasicMessage::getExtents() const {
- return extents;
+const vector<Extent> &
+BasicMessage::getExtents() const
+{
+ return extents ;
}
-// ----------------------------------------------------------------------------
-/** Write the 'extent' Message attribute into the body. Format : number of
- extents. If not zero, number of dimensions. The list of extents. Extent
- format: list of ranges. Range format: lower bound, upper bound.
- */
-void BasicMessage::writeExtents() {
- D[pdDebug] << "Write " << extents.size() << " extent(s)" << endl;
-
- msgBuf.write_int32(static_cast<int32_t>(extents.size()));
+void
+BasicMessage::serialize(MessageBuffer& msgBuffer) {
+ /* Write Extent */
+ D[pdDebug] << "Serialize " << extents.size() << " extent(s)" << endl;
+ msgBuffer.write_int32(static_cast<int32_t>(extents.size()));
if (extents.size() > 0) {
int n = extents[0].size();
- msgBuf.write_int32(static_cast<int32_t>(n));
+ msgBuffer.write_int32(static_cast<int32_t>(n));
D[pdDebug] << "Extent with " << n << " range(s)" << endl;
-
for (unsigned int i = 0; i < extents.size(); ++i) {
const Extent &e = extents[i];
for (int h = 1; h <= n; ++h) {
-
msgBuf.write_int32(static_cast<int32_t>(e.getRangeLowerBound(h)));
-
msgBuf.write_int32(static_cast<int32_t>(e.getRangeUpperBound(h)));
+
msgBuffer.write_int32(static_cast<int32_t>(e.getRangeLowerBound(h)));
+
msgBuffer.write_int32(static_cast<int32_t>(e.getRangeUpperBound(h)));
}
}
}
-}
+ /* Write Region */
+ int32_t n = regions.size();
+ msgBuffer.write_int32(n);
+ for (int i = 0; i < n; ++i) {
+ msgBuffer.write_int32(regions[i]);
+ }
+} /* end of serialize */
-// ----------------------------------------------------------------------------
-/** Set the 'extent' attribute with the values found in a message body.
- \param body Message body to look into
- \sa BasicMessage::writeExtents, Extent
- */
-void BasicMessage::readExtents() {
+void
+BasicMessage::deserialize(MessageBuffer& msgBuffer) {
+ /* Deserialize Extents */
int32_t nb_extents;
int32_t temp;
- msgBuf.read_int32(&nb_extents);
- D[pdDebug] << "Read " << nb_extents << " extent(s)" << endl;
+ msgBuffer.read_int32(&nb_extents);
+ D[pdDebug] << "Deserialize " << nb_extents << " extent(s)" << endl;
extents.clear();
if (nb_extents > 0) {
extents.reserve(nb_extents);
int32_t nb_dimensions;
- msgBuf.read_int32(&nb_dimensions);
+ msgBuffer.read_int32(&nb_dimensions);
D[pdDebug] << "Extent with " << nb_dimensions << " range(s)" <<
endl;
for (long i = 0; i < nb_extents; ++i) {
Extent e(nb_dimensions);
for (long h = 1; h <= nb_dimensions; ++h) {
- msgBuf.read_int32(&temp);
+ msgBuffer.read_int32(&temp);
e.setRangeLowerBound(h, temp);
- msgBuf.read_int32(&temp);
+ msgBuffer.read_int32(&temp);
e.setRangeUpperBound(h, temp);
}
extents.push_back(e);
}
}
+ /* Deserialize Regions */
+ int32_t n;
+ msgBuffer.read_int32(&n);
+ regions.clear();
+ regions.reserve(n);
+ for (int i = 0; i < n; ++i) {
+ msgBuffer.read_int32(&temp);
+ regions.push_back(temp);
+ }
+
+} /* end of serialize */
+
+// ----------------------------------------------------------------------------
+/** Write the 'extent' Message attribute into the body. Format : number of
+ extents. If not zero, number of dimensions. The list of extents. Extent
+ format: list of ranges. Range format: lower bound, upper bound.
+ */
+void
+BasicMessage::writeExtents(MessageBody &body) const
+{
+ D[pdDebug] << "Write " << extents.size() << " extent(s)" << endl ;
+
+ body.writeLongInt(extents.size());
+ if (extents.size() > 0) {
+ int n = extents[0].size();
+ body.writeLongInt(n);
+ D[pdDebug] << "Extent with " << n << " range(s)" << endl ;
+
+ for (unsigned int i = 0 ; i < extents.size(); ++i) {
+ const Extent &e = extents[i] ;
+
+ for (int h = 1 ; h <= n ; ++h) {
+ body.writeLongInt(e.getRangeLowerBound(h));
+ body.writeLongInt(e.getRangeUpperBound(h));
+ }
+ }
+ }
}
// ----------------------------------------------------------------------------
-void BasicMessage::writeRegions() {
- int32_t n = regions.size();
- msgBuf.write_int32(n);
- for (int i = 0; i < n; ++i) {
- msgBuf.write_int32(regions[i]);
+/** Set the 'extent' attribute with the values found in a message body.
+ \param body Message body to look into
+ \sa BasicMessage::writeExtents, Extent
+ */
+void
+BasicMessage::readExtents(const MessageBody &body)
+{
+ long nb_extents = body.readLongInt();
+ D[pdDebug] << "Read " << nb_extents << " extent(s)" << endl ;
+
+ extents.clear();
+ if (nb_extents > 0) {
+ extents.reserve(nb_extents);
+ long nb_dimensions = body.readLongInt();
+ D[pdDebug] << "Extent with " << nb_dimensions << " range(s)" << endl ;
+ for (long i = 0 ; i < nb_extents ; ++i) {
+ Extent e(nb_dimensions);
+ for (long h = 1 ; h <= nb_dimensions ; ++h) {
+ e.setRangeLowerBound(h, body.readLongInt());
+ e.setRangeUpperBound(h, body.readLongInt());
+ }
+ extents.push_back(e);
+ }
}
}
// ----------------------------------------------------------------------------
-void BasicMessage::readRegions() {
- int32_t n;
- int32_t temp;
- msgBuf.read_int32(&n);
+void
+BasicMessage::writeRegions(MessageBody &body)
+{
+ long n = regions.size();
+ body.writeLongInt(n);
+ for (int i = 0 ; i < n ; ++i) {
+ body.writeLongInt(regions[i]);
+ }
+}
+
+// ----------------------------------------------------------------------------
+void
+BasicMessage::readRegions(const MessageBody &body)
+{
+ long n = body.readLongInt();
regions.clear();
regions.reserve(n);
for (int i = 0; i < n; ++i) {
- msgBuf.read_int32(&temp);
- regions.push_back(temp);
+ regions.push_back(body.readLongInt());
}
}
// ----------------------------------------------------------------------------
-void BasicMessage::setRegions(const BaseRegion *reg[], int size) {
+void
+BasicMessage::setRegions(const BaseRegion *reg[], int size)
+{
regions.resize(size);
- for (int i = 0; i < size; ++i) {
+ for (int i = 0 ; i < size ; ++i) {
regions[i] = reg[i]->getHandle();
}
}
-void BasicMessage::setRegions(const std::vector<RegionHandle> &src) {
- regions = src;
+void
+BasicMessage::setRegions(const std::vector<RegionHandle> &src)
+{
+ regions = src ;
}
// ----------------------------------------------------------------------------
-const std::vector<RegionHandle> & BasicMessage::getRegions() const {
- return regions;
+const std::vector<RegionHandle> &
+BasicMessage::getRegions() const
+{
+ return regions ;
}
-void BasicMessage::copyMsgBufFrom(BasicMessage& msg) {
- this->msgBuf.resize(msg.msgBuf.size());
- memcpy(this->msgBuf(0),msg.msgBuf(0),msg.msgBuf.size());
- msgBuf.assumeSizeFromReservedBytes();
-}
} // namespace certi
-// $Id: BasicMessage.cc,v 3.9.2.2 2008/04/09 14:16:32 erk Exp $
+// $Id: BasicMessage.cc,v 3.9.2.3 2008/04/22 08:41:07 erk Exp $
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- libCERTI/NM_Classes.cc 21 Apr 2008 11:29:10 -0000 1.1.2.13
+++ libCERTI/NM_Classes.cc 22 Apr 2008 08:41:08 -0000 1.1.2.14
@@ -954,8 +954,9 @@
int i;
/* call mother class */
Super::serialize(msgBuffer);
+ /* handleArraySize was done by superclass */
/* specific code (if any) goes here */
- msgBuffer.write_int32(objectClass);
+ msgBuffer.write_int32(object);
/* the value pre-encoded by the user (HLA 1.3) */
for (i = 0 ; i < handleArraySize ; i++) {
msgBuffer.write_int32(ValueArray[i].length) ;
@@ -966,8 +967,9 @@
int i;
/* call mother class */
Super::deserialize(msgBuffer);
+ /* handleArraySize was done by superclass */
/* specific code (if any) goes here */
- objectClass = msgBuffer.read_int32();
+ object = msgBuffer.read_int32();
for (i = 0 ; i < handleArraySize ; i ++) {
ValueArray[i].length = msgBuffer.read_int32();
msgBuffer.read_bytes(ValueArray[i].value,
ValueArray[i].length);
@@ -1000,6 +1002,7 @@
/* call mother class */
Super::serialize(msgBuffer);
/* specific code (if any) goes here */
+ msgBuffer.write_int32(region);
msgBuffer.write_int32(interactionClass);
/* the value pre-encoded by the user (HLA 1.3) */
for (i = 0 ; i < handleArraySize ; i++) {
@@ -1012,6 +1015,7 @@
/* call mother class */
Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
+ region = msgBuffer.read_int32();
interactionClass = msgBuffer.read_int32();
for (i = 0 ; i < handleArraySize ; i ++) {
ValueArray[i].length = msgBuffer.read_int32();
@@ -1399,15 +1403,13 @@
/* call mother class */
NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuffer.write_int32(region);
- writeExtents();
+ BasicMessage::serialize(msgBuffer);
} /* end of serialize */
void NM_DDM_Modify_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- region = msgBuffer.read_int32();
- readExtents();
+ BasicMessage::deserialize(msgBuffer);
} /* end of deserialize */
/*<END>---------- DDM_Modify_Region ------------<END>*/
@@ -1423,13 +1425,13 @@
/* call mother class */
NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuffer.write_int32(region);
+ BasicMessage::serialize(msgBuffer);
} /* end of serialize */
void NM_DDM_Delete_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- region = msgBuffer.read_int32();
+ BasicMessage::deserialize(msgBuffer);
} /* end of deserialize */
/*<END>---------- DDM_Delete_Region ------------<END>*/
@@ -1443,7 +1445,6 @@
}
void NM_DDM_Associate_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize(msgBuffer);
NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
msgBuffer.write_int32(object);
@@ -1452,7 +1453,6 @@
} /* end of serialize */
void NM_DDM_Associate_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize(msgBuffer);
NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
object = msgBuffer.read_int32();
@@ -1472,7 +1472,6 @@
}
void NM_DDM_Register_Object::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize(msgBuffer);
NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
msgBuffer.write_int32(object);
@@ -1482,7 +1481,6 @@
} /* end of serialize */
void NM_DDM_Register_Object::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize(msgBuffer);
NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
object = msgBuffer.read_int32();
@@ -1526,7 +1524,6 @@
}
void NM_DDM_Subscribe_Attributes::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize(msgBuffer);
NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
msgBuffer.write_int32(objectClass);
@@ -1535,7 +1532,6 @@
} /* end of serialize */
void NM_DDM_Subscribe_Attributes::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize(msgBuffer);
NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
objectClass = msgBuffer.read_int32();
Index: libCERTI/ObjectClassSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassSet.cc,v
retrieving revision 3.31
retrieving revision 3.31.2.1
diff -u -b -r3.31 -r3.31.2.1
--- libCERTI/ObjectClassSet.cc 5 Dec 2007 12:29:40 -0000 3.31
+++ libCERTI/ObjectClassSet.cc 22 Apr 2008 08:41:08 -0000 3.31.2.1
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassSet.cc,v 3.31 2007/12/05 12:29:40 approx Exp $
+// $Id: ObjectClassSet.cc,v 3.31.2.1 2008/04/22 08:41:08 erk Exp $
// ----------------------------------------------------------------------------
// Project
@@ -825,4 +825,4 @@
} // namespace certi
-// $Id: ObjectClassSet.cc,v 3.31 2007/12/05 12:29:40 approx Exp $
+// $Id: ObjectClassSet.cc,v 3.31.2.1 2008/04/22 08:41:08 erk Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.17.2.1
retrieving revision 3.17.2.2
diff -u -b -r3.17.2.1 -r3.17.2.2
--- libCERTI/Message_R.cc 18 Mar 2008 15:55:56 -0000 3.17.2.1
+++ libCERTI/Message_R.cc 22 Apr 2008 08:41:08 -0000 3.17.2.2
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.17.2.1 2008/03/18 15:55:56 erk Exp $
+// $Id: Message_R.cc,v 3.17.2.2 2008/04/22 08:41:08 erk Exp $
// ----------------------------------------------------------------------------
@@ -205,7 +205,7 @@
readTag(body);
handleArraySize = body.readShortInt();
readHandleArray(body);
- readRegions();
+ readRegions(body);
break ;
// Body contains objectClass,region,boolean,handleArraySize,
@@ -406,7 +406,7 @@
// Body contains region,extents
case DDM_MODIFY_REGION:
region = body.readLongInt();
- readExtents();
+ readExtents(body);
break ;
// Body contains region
@@ -756,4 +756,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.17.2.1 2008/03/18 15:55:56 erk Exp $
+// $Id: Message_R.cc,v 3.17.2.2 2008/04/22 08:41:08 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.56.2.8
retrieving revision 3.56.2.9
diff -u -b -r3.56.2.8 -r3.56.2.9
--- RTIG/RTIG_processing.cc 20 Apr 2008 12:52:21 -0000 3.56.2.8
+++ RTIG/RTIG_processing.cc 22 Apr 2008 08:41:08 -0000 3.56.2.9
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIG_processing.cc,v 3.56.2.8 2008/04/20 12:52:21 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.9 2008/04/22 08:41:08 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -1326,4 +1326,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.56.2.8 2008/04/20 12:52:21 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.9 2008/04/22 08:41:08 erk Exp $
Index: TODO
===================================================================
RCS file: /sources/certi/certi/TODO,v
retrieving revision 3.1.6.2
retrieving revision 3.1.6.3
diff -u -b -r3.1.6.2 -r3.1.6.3
--- TODO 21 Apr 2008 11:29:10 -0000 3.1.6.2
+++ TODO 22 Apr 2008 08:41:08 -0000 3.1.6.3
@@ -19,6 +19,8 @@
Erk7) Clean-up PrettyDebug mess
+Erk8) Suppress copy in ValueArray = req->getAttribValueArray();
+
Warning: this is an old file, many file/class names have changed, some
problems are probably solved or handled differently.
-------------------------------------------------------------------------------
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.35.2.4
retrieving revision 3.35.2.5
diff -u -b -r3.35.2.4 -r3.35.2.5
--- RTIA/ObjectManagement.cc 20 Apr 2008 12:52:20 -0000 3.35.2.4
+++ RTIA/ObjectManagement.cc 22 Apr 2008 08:41:09 -0000 3.35.2.5
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.cc,v 3.35.2.4 2008/04/20 12:52:20 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.5 2008/04/22 08:41:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -118,7 +118,7 @@
req.federation = fm->_numero_federation ;
req.federate = fm->federate ;
req.object = theObjectHandle ;
- // set Datefor UAV with time
+ // set Date for UAV with time
req.setDate(theTime);
req.handleArraySize = attribArraySize ;
@@ -131,7 +131,7 @@
req.setLabel(theTag);
comm->sendMessage(&req);
- std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UPDATE_ATTRIBUTE_VALUES, req.federate));
+ std::auto_ptr<NetworkMessage> rep(comm->waitMessage(req.getType(),
req.federate));
e = rep->exception ;
@@ -163,8 +163,7 @@
req.federation = fm->_numero_federation ;
req.federate = fm->federate ;
req.object = theObjectHandle ;
- // false for UAV without time
- req.setBoolean(false);
+ // Do no set Date if without time
req.handleArraySize = attribArraySize ;
@@ -176,7 +175,7 @@
req.setLabel(theTag);
comm->sendMessage(&req);
- std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UPDATE_ATTRIBUTE_VALUES, req.federate));
+ std::auto_ptr<NetworkMessage> rep(comm->waitMessage(req.getType(),
req.federate));
e = rep->exception ;
@@ -771,4 +770,4 @@
}} // namespace certi/rtia
-// $Id: ObjectManagement.cc,v 3.35.2.4 2008/04/20 12:52:20 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.5 2008/04/22 08:41:09 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/Message_W.cc libCERTI/NM_Classes... [br_DEV_HETEROGENEOUS],
certi-cvs <=