[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libRTI/RTItypesImp.cc libRTI/RTItypes.cc ...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libRTI/RTItypesImp.cc libRTI/RTItypes.cc ... |
|
Date: |
Sun, 07 Mar 2010 18:23:40 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/03/07 18:23:40
Modified files:
libRTI : RTItypesImp.cc RTItypes.cc RTItypesImp.hh
RTIambPrivateRefs.cc RTIambassador.cc
libCERTI : Message.cc MessageBuffer.cc SocketTCP.cc
PrettyDebEx.cc M_Classes.hh M_Classes.cc
SocketUN.cc Extent.cc SocketHTTPProxy.cc
SocketMC.cc Message.hh SemaphoreSysV.cc
SocketUDP.cc NetworkMessage.hh
RTIA : FederationManagement.cc FederationManagement.hh
TimeManagement.hh ObjectManagement.cc
RTIA_federate.cc
include : certi.hh RTIambServices.hh
Log message:
RTI.hh
MUST NOT be included in certi.hh
this may created unwanted libCERTI-->libRTI dependency.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTItypesImp.cc?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTItypes.cc?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTItypesImp.hh?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.113&r2=3.114
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.67&r2=3.68
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/MessageBuffer.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebEx.cc?cvsroot=certi&r1=4.8&r2=4.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.hh?cvsroot=certi&r1=3.3&r2=3.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.cc?cvsroot=certi&r1=3.3&r2=3.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.cc?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.cc?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketHTTPProxy.cc?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.60&r2=3.61
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SemaphoreSysV.cc?cvsroot=certi&r1=3.1&r2=3.2
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.56&r2=3.57
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.80&r2=3.81
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.hh?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.hh?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.104&r2=3.105
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.43&r2=3.44
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTIambServices.hh?cvsroot=certi&r1=3.5&r2=3.6
Patches:
Index: libRTI/RTItypesImp.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTItypesImp.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libRTI/RTItypesImp.cc 12 Jun 2009 08:59:28 -0000 3.5
+++ libRTI/RTItypesImp.cc 7 Mar 2010 18:23:39 -0000 3.6
@@ -16,13 +16,10 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTItypesImp.cc,v 3.5 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTItypesImp.cc,v 3.6 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
-#include "certi.hh"
-
#include "RTItypesImp.hh"
-#include "GAV.hh"
#include "PrettyDebug.hh"
#include <algorithm>
@@ -35,7 +32,7 @@
// ----------------------------------------------------------------------------
-AttributeHandleValuePairSetImp::AttributeHandleValuePairSetImp(ULong size)
+AttributeHandleValuePairSetImp::AttributeHandleValuePairSetImp(RTI::ULong size)
{
_order = RECEIVE;
_transport = RELIABLE;
@@ -54,12 +51,12 @@
{
}
-ULong AttributeHandleValuePairSetImp::size() const
+RTI::RTI::ULong AttributeHandleValuePairSetImp::size() const
{
return _set.size();
}
-Handle AttributeHandleValuePairSetImp::getHandle(ULong i) const
+RTI::Handle AttributeHandleValuePairSetImp::getHandle(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -68,7 +65,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-ULong AttributeHandleValuePairSetImp::getValueLength(ULong i) const
+RTI::ULong AttributeHandleValuePairSetImp::getValueLength(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -77,7 +74,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void AttributeHandleValuePairSetImp::getValue(ULong i, char *buff, ULong &len)
const
+void AttributeHandleValuePairSetImp::getValue(RTI::ULong i, char *buff,
RTI::ULong &len) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size()) {
@@ -89,7 +86,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-char *AttributeHandleValuePairSetImp::getValuePointer(ULong i, ULong &len)
const
+char *AttributeHandleValuePairSetImp::getValuePointer(RTI::ULong i, RTI::ULong
&len) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size()) {
@@ -101,31 +98,31 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-TransportType AttributeHandleValuePairSetImp::getTransportType(ULong) const
+RTI::TransportType
AttributeHandleValuePairSetImp::getTransportType(RTI::ULong) const
throw (RTI::InvalidHandleValuePairSetContext)
{
return _transport;
}
-OrderType AttributeHandleValuePairSetImp::getOrderType(ULong) const
+RTI::OrderType AttributeHandleValuePairSetImp::getOrderType(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds, RTI::InvalidHandleValuePairSetContext)
{
return _order;
}
-RTI::Region *AttributeHandleValuePairSetImp::getRegion(ULong) const
+RTI::Region *AttributeHandleValuePairSetImp::getRegion(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds, RTI::InvalidHandleValuePairSetContext)
{
throw RTI::RTIinternalError("unimplemented function getRegion()");
}
-void AttributeHandleValuePairSetImp::add(Handle h, const char *str, ULong len)
+void AttributeHandleValuePairSetImp::add(RTI::Handle h, const char *str,
RTI::ULong len)
throw (RTI::ValueLengthExceeded, RTI::ValueCountExceeded)
{
_set.push_back(AttributeHandleValuePair_t(h, std::string(str, len)));
}
-void AttributeHandleValuePairSetImp::remove(Handle h)
+void AttributeHandleValuePairSetImp::remove(RTI::Handle h)
throw (RTI::ArrayIndexOutOfBounds)
{
for (std::vector<AttributeHandleValuePair_t>::iterator pos = _set.begin();
@@ -139,7 +136,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void AttributeHandleValuePairSetImp::moveFrom(const
AttributeHandleValuePairSet &, ULong &)
+void AttributeHandleValuePairSetImp::moveFrom(const
AttributeHandleValuePairSet &, RTI::ULong &)
throw (RTI::ValueCountExceeded, RTI::ArrayIndexOutOfBounds)
{
throw RTI::RTIinternalError("unimplemented function moveFrom()");
@@ -150,19 +147,19 @@
_set.clear();
}
-ULong AttributeHandleValuePairSetImp::start() const
+RTI::ULong AttributeHandleValuePairSetImp::start() const
{
// not implemented
return 0 ;
}
-ULong AttributeHandleValuePairSetImp::valid(ULong i) const
+RTI::ULong AttributeHandleValuePairSetImp::valid(RTI::ULong i) const
{
// not implemented
return 0 ;
}
-ULong AttributeHandleValuePairSetImp::next(ULong i) const
+RTI::ULong AttributeHandleValuePairSetImp::next(RTI::ULong i) const
{
// not implemented
return 0 ;
@@ -175,26 +172,32 @@
}
// ----------------------------------------------------------------------------
-AttributeHandleSetImp::AttributeHandleSetImp(ULong size)
+AttributeHandleSetImp::AttributeHandleSetImp(RTI::ULong size)
{
_set.reserve(size);
}
-AttributeHandleSetImp::AttributeHandleSetImp(const
std::vector<AttributeHandle> &val)
+AttributeHandleSetImp::AttributeHandleSetImp(const
std::vector<RTI::AttributeHandle> &val)
: _set(val)
{
}
+AttributeHandleSetImp::AttributeHandleSetImp(const
std::vector<certi::AttributeHandle> &val)
+{
+ _set.reserve(val.size());
+ std::copy(val.begin(), val.end(), _set.begin());
+}
+
AttributeHandleSetImp::~AttributeHandleSetImp()
{
}
-ULong AttributeHandleSetImp::size() const
+RTI::ULong AttributeHandleSetImp::size() const
{
return _set.size();
}
-AttributeHandle AttributeHandleSetImp::getHandle(ULong i) const
+RTI::AttributeHandle AttributeHandleSetImp::getHandle(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -203,16 +206,16 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void AttributeHandleSetImp::add(AttributeHandle h)
+void AttributeHandleSetImp::add(RTI::AttributeHandle h)
throw (RTI::ArrayIndexOutOfBounds, RTI::AttributeNotDefined)
{
_set.push_back(h);
}
-void AttributeHandleSetImp::remove(AttributeHandle h)
+void AttributeHandleSetImp::remove(RTI::AttributeHandle h)
throw (RTI::AttributeNotDefined)
{
- std::vector<AttributeHandle>::iterator pos = std::find(_set.begin(),
_set.end(), h);
+ std::vector<RTI::AttributeHandle>::iterator pos = std::find(_set.begin(),
_set.end(), h);
if (pos != _set.end())
_set.erase(pos);
else
@@ -229,19 +232,19 @@
return RTI::Boolean(_set.empty());
}
-RTI::Boolean AttributeHandleSetImp::isMember(AttributeHandle h) const
+RTI::Boolean AttributeHandleSetImp::isMember(RTI::AttributeHandle h) const
{
return RTI::Boolean(std::find(_set.begin(), _set.end(), h) != _set.end());
}
-const std::vector<AttributeHandle>&
+const std::vector<RTI::AttributeHandle>&
AttributeHandleSetImp::getAttributeHandles() const
{
return _set;
}
// ----------------------------------------------------------------------------
-FederateHandleSetImp::FederateHandleSetImp(ULong size)
+FederateHandleSetImp::FederateHandleSetImp(RTI::ULong size)
{
_set.reserve(size);
}
@@ -250,12 +253,12 @@
{
}
-ULong FederateHandleSetImp::size() const
+RTI::ULong FederateHandleSetImp::size() const
{
return _set.size();
}
-FederateHandle FederateHandleSetImp::getHandle(ULong i) const
+RTI::FederateHandle FederateHandleSetImp::getHandle(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -264,16 +267,16 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void FederateHandleSetImp::add(FederateHandle h)
+void FederateHandleSetImp::add(RTI::FederateHandle h)
throw (RTI::ValueCountExceeded)
{
_set.push_back(h);
}
-void FederateHandleSetImp::remove(FederateHandle h)
+void FederateHandleSetImp::remove(RTI::FederateHandle h)
throw (RTI::ArrayIndexOutOfBounds)
{
- std::vector<FederateHandle>::iterator pos = std::find(_set.begin(),
_set.end(), h);
+ std::vector<RTI::FederateHandle>::iterator pos = std::find(_set.begin(),
_set.end(), h);
if (pos != _set.end())
_set.erase(pos);
else
@@ -285,13 +288,13 @@
_set.clear();
}
-RTI::Boolean FederateHandleSetImp::isMember(FederateHandle h) const
+RTI::Boolean FederateHandleSetImp::isMember(RTI::FederateHandle h) const
{
return RTI::Boolean(std::find(_set.begin(), _set.end(), h) != _set.end());
}
// ----------------------------------------------------------------------------
-ParameterHandleValuePairSetImp::ParameterHandleValuePairSetImp(ULong size)
+ParameterHandleValuePairSetImp::ParameterHandleValuePairSetImp(RTI::ULong size)
{
_order = RECEIVE;
_transport = RELIABLE;
@@ -310,12 +313,12 @@
{
}
-ULong ParameterHandleValuePairSetImp::size() const
+RTI::ULong ParameterHandleValuePairSetImp::size() const
{
return _set.size();
}
-Handle ParameterHandleValuePairSetImp::getHandle(ULong i) const
+RTI::Handle ParameterHandleValuePairSetImp::getHandle(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -324,7 +327,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-ULong ParameterHandleValuePairSetImp::getValueLength(ULong i) const
+RTI::ULong ParameterHandleValuePairSetImp::getValueLength(RTI::ULong i) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size())
@@ -333,7 +336,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void ParameterHandleValuePairSetImp::getValue(ULong i, char *buff, ULong &len)
const
+void ParameterHandleValuePairSetImp::getValue(RTI::ULong i, char *buff,
RTI::ULong &len) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size()) {
@@ -345,7 +348,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-char *ParameterHandleValuePairSetImp::getValuePointer(ULong i, ULong &len)
const
+char *ParameterHandleValuePairSetImp::getValuePointer(RTI::ULong i, RTI::ULong
&len) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (i < size()) {
@@ -357,13 +360,13 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-TransportType ParameterHandleValuePairSetImp::getTransportType() const
+RTI::TransportType ParameterHandleValuePairSetImp::getTransportType() const
throw (RTI::InvalidHandleValuePairSetContext)
{
return _transport;
}
-OrderType ParameterHandleValuePairSetImp::getOrderType() const
+RTI::OrderType ParameterHandleValuePairSetImp::getOrderType() const
throw (RTI::InvalidHandleValuePairSetContext)
{
return _order;
@@ -375,13 +378,13 @@
throw RTI::RTIinternalError("unimplemented function getRegion()");
}
-void ParameterHandleValuePairSetImp::add(Handle h, const char *str, ULong len)
+void ParameterHandleValuePairSetImp::add(RTI::Handle h, const char *str,
RTI::ULong len)
throw (RTI::ValueLengthExceeded, RTI::ValueCountExceeded)
{
_set.push_back(ParameterHandleValuePair_t(h, std::string(str, len)));
}
-void ParameterHandleValuePairSetImp::remove(Handle h)
+void ParameterHandleValuePairSetImp::remove(RTI::Handle h)
throw (RTI::ArrayIndexOutOfBounds)
{
for (std::vector<ParameterHandleValuePair_t>::iterator pos = _set.begin();
@@ -395,7 +398,7 @@
throw RTI::ArrayIndexOutOfBounds("");
}
-void ParameterHandleValuePairSetImp::moveFrom(const
ParameterHandleValuePairSet &, ULong &)
+void ParameterHandleValuePairSetImp::moveFrom(const
ParameterHandleValuePairSet &, RTI::ULong &)
throw (RTI::ValueCountExceeded, RTI::ArrayIndexOutOfBounds)
{
throw RTI::RTIinternalError("unimplemented function moveFrom()");
@@ -406,19 +409,19 @@
return _set.clear();
}
-ULong ParameterHandleValuePairSetImp::start() const
+RTI::ULong ParameterHandleValuePairSetImp::start() const
{
// not implemented
return 0;
}
-ULong ParameterHandleValuePairSetImp::valid(ULong i) const
+RTI::ULong ParameterHandleValuePairSetImp::valid(RTI::ULong i) const
{
// not implemented
return 0;
}
-ULong ParameterHandleValuePairSetImp::next(ULong i) const
+RTI::ULong ParameterHandleValuePairSetImp::next(RTI::ULong i) const
{
// not implemented
return 0;
@@ -432,7 +435,7 @@
// ----------------------------------------------------------------------------
RTI::AttributeHandleValuePairSet *
-RTI::AttributeSetFactory::create(ULong size)
+RTI::AttributeSetFactory::create(RTI::ULong size)
throw (MemoryExhausted, ValueCountExceeded, HandleValuePairMaximumExceeded)
{
return new AttributeHandleValuePairSetImp(size);
@@ -440,7 +443,7 @@
// ----------------------------------------------------------------------------
RTI::AttributeHandleSet *
-RTI::AttributeHandleSetFactory::create(ULong size)
+RTI::AttributeHandleSetFactory::create(RTI::ULong size)
throw (MemoryExhausted, ValueCountExceeded)
{
return new AttributeHandleSetImp(size);
@@ -448,7 +451,7 @@
// ----------------------------------------------------------------------------
RTI::FederateHandleSet *
-RTI::FederateHandleSetFactory::create(ULong size)
+RTI::FederateHandleSetFactory::create(RTI::ULong size)
throw (MemoryExhausted, ValueCountExceeded)
{
return new FederateHandleSetImp(size);
@@ -456,14 +459,14 @@
// ----------------------------------------------------------------------------
RTI::ParameterHandleValuePairSet *
-RTI::ParameterSetFactory::create(ULong size)
+RTI::ParameterSetFactory::create(RTI::ULong size)
throw (MemoryExhausted, ValueCountExceeded, HandleValuePairMaximumExceeded)
{
return new ParameterHandleValuePairSetImp(size);
}
// ----------------------------------------------------------------------------
-RegionImp::RegionImp(RegionHandle h, SpaceHandle s, const std::vector<Extent>
&ext)
+RegionImp::RegionImp(RegionHandle h, RTI::SpaceHandle s, const
std::vector<Extent> &ext)
: handle(h), space(s), extents(ext), effectiveExtents(ext)
{
}
@@ -472,7 +475,7 @@
{
}
-ULong RegionImp::getRangeLowerBound(ExtentIndex index, DimensionHandle
dimension) const
+RTI::ULong RegionImp::getRangeLowerBound(RTI::ExtentIndex index,
RTI::DimensionHandle dimension) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < extents.size())
@@ -481,7 +484,7 @@
throw RTI::ArrayIndexOutOfBounds("Extent index above limit");
}
-ULong RegionImp::getRangeUpperBound(ExtentIndex index, DimensionHandle
dimension) const
+RTI::ULong RegionImp::getRangeUpperBound(RTI::ExtentIndex index,
RTI::DimensionHandle dimension) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < extents.size())
@@ -490,7 +493,7 @@
throw RTI::ArrayIndexOutOfBounds("Extent index above limit");
}
-void RegionImp::setRangeLowerBound(ExtentIndex index, DimensionHandle
dimension, ULong val)
+void RegionImp::setRangeLowerBound(RTI::ExtentIndex index,
RTI::DimensionHandle dimension, RTI::ULong val)
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < extents.size())
@@ -499,7 +502,7 @@
throw RTI::ArrayIndexOutOfBounds("Extent index above limit");
}
-void RegionImp::setRangeUpperBound(ExtentIndex index, DimensionHandle
dimension, ULong val)
+void RegionImp::setRangeUpperBound(RTI::ExtentIndex index,
RTI::DimensionHandle dimension, RTI::ULong val)
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < extents.size())
@@ -508,19 +511,19 @@
throw RTI::ArrayIndexOutOfBounds("Extent index above limit");
}
-SpaceHandle RegionImp::getSpaceHandle() const
+RTI::SpaceHandle RegionImp::getSpaceHandle() const
throw ()
{
return space;
}
-ULong RegionImp::getNumberOfExtents() const
+RTI::ULong RegionImp::getNumberOfExtents() const
throw ()
{
return extents.size();
}
-ULong RegionImp::getRangeLowerBoundNotificationLimit(ExtentIndex index,
DimensionHandle dimension) const
+RTI::ULong RegionImp::getRangeLowerBoundNotificationLimit(RTI::ExtentIndex
index, RTI::DimensionHandle dimension) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < effectiveExtents.size())
@@ -529,7 +532,7 @@
throw RTI::ArrayIndexOutOfBounds("Extent index above limit");
}
-ULong RegionImp::getRangeUpperBoundNotificationLimit(ExtentIndex index,
DimensionHandle dimension) const
+RTI::ULong RegionImp::getRangeUpperBoundNotificationLimit(RTI::ExtentIndex
index, RTI::DimensionHandle dimension) const
throw (RTI::ArrayIndexOutOfBounds)
{
if (index < effectiveExtents.size())
@@ -562,4 +565,4 @@
effectiveExtents = extents;
}
-// $Id: RTItypesImp.cc,v 3.5 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTItypesImp.cc,v 3.6 2010/03/07 18:23:39 erk Exp $
Index: libRTI/RTItypes.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTItypes.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libRTI/RTItypes.cc 21 Oct 2009 20:04:46 -0000 1.5
+++ libRTI/RTItypes.cc 7 Mar 2010 18:23:39 -0000 1.6
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTItypes.cc,v 1.5 2009/10/21 20:04:46 erk Exp $
+// $Id: RTItypes.cc,v 1.6 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include "Exception.hh"
@@ -25,6 +25,7 @@
#include <sstream>
#include <cstdlib>
#include <cstring>
+#include "RTI.hh"
// static members for HLA Exceptions
const char *RTI::ArrayIndexOutOfBounds::_ex = "ArrayIndexOutOfBounds" ;
@@ -263,4 +264,4 @@
return os<<(*ex);
}
-// $Id: RTItypes.cc,v 1.5 2009/10/21 20:04:46 erk Exp $
+// $Id: RTItypes.cc,v 1.6 2010/03/07 18:23:39 erk Exp $
Index: libRTI/RTItypesImp.hh
===================================================================
RCS file: /sources/certi/certi/libRTI/RTItypesImp.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libRTI/RTItypesImp.hh 7 Jun 2009 15:08:46 -0000 3.4
+++ libRTI/RTItypesImp.hh 7 Mar 2010 18:23:39 -0000 3.5
@@ -19,14 +19,15 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTItypesImp.hh,v 3.4 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTItypesImp.hh,v 3.5 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _RTI_TYPESIMP_HH
#define _RTI_TYPESIMP_HH
-#include "certi.hh"
#include "Extent.hh"
+#include "RTI.hh"
+#include "certi.hh"
namespace certi {
@@ -63,48 +64,48 @@
class RTI_EXPORT AttributeHandleValuePairSetImp : public
RTI::AttributeHandleValuePairSet
{
public:
- AttributeHandleValuePairSetImp(ULong);
+ AttributeHandleValuePairSetImp(RTI::ULong);
AttributeHandleValuePairSetImp(const
std::vector<AttributeHandleValuePair_t> &);
virtual ~AttributeHandleValuePairSetImp();
- virtual ULong size() const;
+ virtual RTI::ULong size() const;
- virtual Handle getHandle(ULong) const
+ virtual RTI::Handle getHandle(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual ULong getValueLength(ULong) const
+ virtual RTI::ULong getValueLength(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual void getValue(ULong, char *, ULong &) const
+ virtual void getValue(RTI::ULong, char *, RTI::ULong &) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual char *getValuePointer(ULong, ULong &) const
+ virtual char *getValuePointer(RTI::ULong, RTI::ULong &) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual TransportType getTransportType(ULong) const
+ virtual RTI::TransportType getTransportType(RTI::ULong) const
throw (RTI::InvalidHandleValuePairSetContext);
- virtual OrderType getOrderType(ULong) const
+ virtual RTI::OrderType getOrderType(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds,
RTI::InvalidHandleValuePairSetContext);
- virtual RTI::Region *getRegion(ULong) const
+ virtual RTI::Region *getRegion(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds,
RTI::InvalidHandleValuePairSetContext);
- virtual void add(Handle, const char *, ULong)
+ virtual void add(RTI::Handle, const char *,RTI:: ULong)
throw (RTI::ValueLengthExceeded, RTI::ValueCountExceeded);
- virtual void remove(Handle h)
+ virtual void remove(RTI::Handle h)
throw (RTI::ArrayIndexOutOfBounds);
- virtual void moveFrom(const AttributeHandleValuePairSet &, ULong &)
+ virtual void moveFrom(const AttributeHandleValuePairSet &, RTI::ULong &)
throw (RTI::ValueCountExceeded, RTI::ArrayIndexOutOfBounds);
virtual void empty();
- virtual ULong start() const;
- virtual ULong valid(ULong i) const;
- virtual ULong next(ULong i) const;
+ virtual RTI::ULong start() const;
+ virtual RTI::ULong valid(RTI::ULong i) const;
+ virtual RTI::ULong next(RTI::ULong i) const;
const std::vector<AttributeHandleValuePair_t>&
getAttributeHandleValuePairs() const;
@@ -117,142 +118,143 @@
class RTI_EXPORT AttributeHandleSetImp : public RTI::AttributeHandleSet
{
public:
- AttributeHandleSetImp(ULong);
- AttributeHandleSetImp(const std::vector<AttributeHandle> &);
+ AttributeHandleSetImp(RTI::ULong);
+ AttributeHandleSetImp(const std::vector<RTI::AttributeHandle> &val);
+ AttributeHandleSetImp(const std::vector<certi::AttributeHandle> &val);
virtual ~AttributeHandleSetImp();
- virtual ULong size() const;
+ virtual RTI::ULong size() const;
- virtual AttributeHandle getHandle(ULong) const
+ virtual RTI::AttributeHandle getHandle(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual void add(AttributeHandle)
+ virtual void add(RTI::AttributeHandle)
throw (RTI::ArrayIndexOutOfBounds, RTI::AttributeNotDefined);
- virtual void remove(AttributeHandle)
+ virtual void remove(RTI::AttributeHandle)
throw (RTI::AttributeNotDefined);
virtual void empty();
virtual RTI::Boolean isEmpty() const;
- virtual RTI::Boolean isMember(AttributeHandle h) const;
+ virtual RTI::Boolean isMember(RTI::AttributeHandle h) const;
- const std::vector<AttributeHandle>& getAttributeHandles() const;
+ const std::vector<RTI::AttributeHandle>& getAttributeHandles() const;
protected:
- std::vector<AttributeHandle> _set;
+ std::vector<RTI::AttributeHandle> _set;
};
class RTI_EXPORT FederateHandleSetImp : public RTI::FederateHandleSet
{
public:
- FederateHandleSetImp(ULong);
+ FederateHandleSetImp(RTI::ULong);
virtual ~FederateHandleSetImp();
- virtual ULong size() const;
+ virtual RTI::ULong size() const;
- virtual FederateHandle getHandle(ULong) const
+ virtual RTI::FederateHandle getHandle(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual void add(FederateHandle)
+ virtual void add(RTI::FederateHandle)
throw (RTI::ValueCountExceeded);
- virtual void remove(FederateHandle)
+ virtual void remove(RTI::FederateHandle)
throw (RTI::ArrayIndexOutOfBounds);
virtual void empty();
- virtual RTI::Boolean isMember(FederateHandle) const;
+ virtual RTI::Boolean isMember(RTI::FederateHandle) const;
protected:
- std::vector<FederateHandle> _set;
+ std::vector<RTI::FederateHandle> _set;
};
-typedef std::pair<ParameterHandle, ParameterValue_t>
ParameterHandleValuePair_t;
+typedef std::pair<RTI::ParameterHandle, ParameterValue_t>
ParameterHandleValuePair_t;
class RTI_EXPORT ParameterHandleValuePairSetImp : public
RTI::ParameterHandleValuePairSet
{
public:
- ParameterHandleValuePairSetImp(ULong);
+ ParameterHandleValuePairSetImp(RTI::ULong);
ParameterHandleValuePairSetImp(const
std::vector<ParameterHandleValuePair_t> &);
virtual ~ParameterHandleValuePairSetImp();
- virtual ULong size() const;
+ virtual RTI::ULong size() const;
- virtual Handle getHandle(ULong) const
+ virtual RTI::Handle getHandle(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual ULong getValueLength(ULong) const
+ virtual RTI::ULong getValueLength(RTI::ULong) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual void getValue(ULong, char *, ULong &) const
+ virtual void getValue(RTI::ULong, char *, RTI::ULong &) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual char *getValuePointer(ULong, ULong &) const
+ virtual char *getValuePointer(RTI::ULong, RTI::ULong &) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual TransportType getTransportType() const
+ virtual RTI::TransportType getTransportType() const
throw (RTI::InvalidHandleValuePairSetContext);
- virtual OrderType getOrderType() const
+ virtual RTI::OrderType getOrderType() const
throw (RTI::InvalidHandleValuePairSetContext);
virtual RTI::Region *getRegion() const
throw (RTI::InvalidHandleValuePairSetContext);
- virtual void add(Handle, const char *, ULong)
+ virtual void add(RTI::Handle, const char *, RTI::ULong)
throw (RTI::ValueLengthExceeded, RTI::ValueCountExceeded);
- virtual void remove(Handle)
+ virtual void remove(RTI::Handle)
throw (RTI::ArrayIndexOutOfBounds);
- virtual void moveFrom(const ParameterHandleValuePairSet &, ULong &)
+ virtual void moveFrom(const ParameterHandleValuePairSet &, RTI::ULong &)
throw (RTI::ValueCountExceeded, RTI::ArrayIndexOutOfBounds);
virtual void empty();
- virtual ULong start() const;
- virtual ULong valid(ULong i) const;
- virtual ULong next(ULong i) const;
+ virtual RTI::ULong start() const;
+ virtual RTI::ULong valid(RTI::ULong i) const;
+ virtual RTI::ULong next(RTI::ULong i) const;
const std::vector<ParameterHandleValuePair_t>&
getParameterHandleValuePairs() const;
protected:
std::vector<ParameterHandleValuePair_t> _set;
- OrderType _order ;
- TransportType _transport ;
+ RTI::OrderType _order ;
+ RTI::TransportType _transport ;
};
class RTI_EXPORT RegionImp : public RTI::Region
{
public:
- RegionImp(RegionHandle, SpaceHandle, const std::vector<Extent> &);
+ RegionImp(RegionHandle, RTI::SpaceHandle, const std::vector<Extent>&);
virtual ~RegionImp();
- virtual ULong getRangeLowerBound(ExtentIndex, DimensionHandle) const
+ virtual RTI::ULong getRangeLowerBound(RTI::ExtentIndex,
RTI::DimensionHandle) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual ULong getRangeUpperBound(ExtentIndex, DimensionHandle) const
+ virtual RTI::ULong getRangeUpperBound(RTI::ExtentIndex,
RTI::DimensionHandle) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeLowerBound(RTI::ExtentIndex, RTI::DimensionHandle,
RTI::ULong)
throw (RTI::ArrayIndexOutOfBounds);
- virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeUpperBound(RTI::ExtentIndex, RTI::DimensionHandle,
RTI::ULong)
throw (RTI::ArrayIndexOutOfBounds);
- virtual SpaceHandle getSpaceHandle() const
+ virtual RTI::SpaceHandle getSpaceHandle() const
throw ();
- virtual ULong getNumberOfExtents() const
+ virtual RTI::ULong getNumberOfExtents() const
throw ();
- virtual ULong getRangeLowerBoundNotificationLimit(ExtentIndex,
DimensionHandle) const
+ virtual RTI::ULong getRangeLowerBoundNotificationLimit(RTI::ExtentIndex,
RTI::DimensionHandle) const
throw (RTI::ArrayIndexOutOfBounds);
- virtual ULong getRangeUpperBoundNotificationLimit(ExtentIndex,
DimensionHandle) const
+ virtual RTI::ULong getRangeUpperBoundNotificationLimit(RTI::ExtentIndex,
RTI::DimensionHandle) const
throw (RTI::ArrayIndexOutOfBounds);
RegionHandle getHandle() const;
@@ -263,7 +265,7 @@
private:
RegionHandle handle;
- SpaceHandle space;
+ RTI::SpaceHandle space;
std::vector<Extent> extents;
// extents used in last notifyAboutRegionModification
std::vector<Extent> effectiveExtents;
@@ -273,4 +275,4 @@
#endif // _RTI_TYPESIMP_HH
-// $Id: RTItypesImp.hh,v 3.4 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTItypesImp.hh,v 3.5 2010/03/07 18:23:39 erk Exp $
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- libRTI/RTIambPrivateRefs.cc 27 Feb 2010 16:53:36 -0000 3.24
+++ libRTI/RTIambPrivateRefs.cc 7 Mar 2010 18:23:39 -0000 3.25
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cc,v 3.24 2010/02/27 16:53:36 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.25 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -51,12 +51,12 @@
}
template<typename T>
-std::vector<std::pair<ParameterHandle, ParameterValue_t> >
+std::vector<std::pair<RTI::ParameterHandle, ParameterValue_t> >
getPHVPSFromRequest(T* request)
{
uint32_t size = request->getParametersSize();
- std::vector<std::pair<ParameterHandle, ParameterValue_t> > result;
+ std::vector<std::pair<RTI::ParameterHandle, ParameterValue_t> > result;
result.resize(size);
for (uint32_t i = 0 ; i < size ; ++i) {
@@ -173,7 +173,7 @@
//! Process exception from received message.
/*! When a message is received from RTIA, it can contains an exception.
This exception is processed by this module and a new exception is thrown.
-*/
+ */
void
RTIambPrivateRefs::processException(Message *msg)
{
@@ -624,7 +624,7 @@
void
RTIambPrivateRefs::callFederateAmbassador(Message *msg)
- throw (RTI::RTIinternalError)
+throw (RTI::RTIinternalError)
{
switch (msg->getType()) {
@@ -755,11 +755,14 @@
new AttributeHandleValuePairSetImp(getAHVPSFromRequest(RAV));
if (msg->isDated()) {
+ RTI::EventRetractionHandle event;
+ event.theSerialNumber =
RAV->getEventRetraction().getSN();
+ event.sendingFederate =
RAV->getEventRetraction().getSendingFederate();
fed_amb->reflectAttributeValues(RAV->getObject(),
*attributes,
RTIfedTime(msg->getDate().getTime()),
(msg->getTag()).c_str(),
- RAV->getEventRetraction());
+ event);
}
else {
fed_amb->reflectAttributeValues(RAV->getObject(),
@@ -778,12 +781,15 @@
new ParameterHandleValuePairSetImp(getPHVPSFromRequest(RI));
if (msg->isDated()) {
+ RTI::EventRetractionHandle event;
+ event.theSerialNumber =
RI->getEventRetraction().getSN();
+ event.sendingFederate =
RI->getEventRetraction().getSendingFederate();
fed_amb->receiveInteraction(
RI->getInteractionClass(),
*parameters,
RTIfedTime(msg->getDate().getTime()),
(msg->getTag()).c_str(),
- RI->getEventRetraction());
+ event);
}
else {
fed_amb->receiveInteraction(
@@ -799,12 +805,15 @@
case Message::REMOVE_OBJECT_INSTANCE:
try {
M_Remove_Object_Instance* ROI =
static_cast<M_Remove_Object_Instance *>(msg);
+ RTI::EventRetractionHandle event;
+ event.theSerialNumber =
ROI->getEventRetraction().getSN();
+ event.sendingFederate =
ROI->getEventRetraction().getSendingFederate();
if (msg->isDated()) {
fed_amb->removeObjectInstance(
ROI->getObject(),
RTIfedTime(msg->getDate().getTime()),
(msg->getTag()).c_str(),
- ROI->getEventRetraction());
+ event);
}
else {
fed_amb->removeObjectInstance(
@@ -967,4 +976,4 @@
}
}
-// $Id: RTIambPrivateRefs.cc,v 3.24 2010/02/27 16:53:36 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.25 2010/03/07 18:23:39 erk Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.113
retrieving revision 3.114
diff -u -b -r3.113 -r3.114
--- libRTI/RTIambassador.cc 1 Mar 2010 16:44:27 -0000 3.113
+++ libRTI/RTIambassador.cc 7 Mar 2010 18:23:39 -0000 3.114
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.113 2010/03/01 16:44:27 erk Exp $
+// $Id: RTIambassador.cc,v 3.114 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -59,11 +59,11 @@
using namespace certi ;
-std::vector<RTI::Handle>
+std::vector<certi::RegionHandle>
build_region_handles(RTI::Region **regions, int nb)
throw (RTI::RegionNotKnown)
{
- std::vector<RTI::Handle> vect(nb);
+ std::vector<certi::RegionHandle> vect(nb);
for (int i = 0 ; i < nb ; ++i) {
RTI::Region *region = regions[i] ;
try {
@@ -110,7 +110,7 @@
template<typename T>
void
-assignAHVToRequest(const std::vector<AttributeHandle>& AHV, T request) {
+assignAHVToRequest(const std::vector<RTI::AttributeHandle>& AHV, T request) {
request.setAttributesSize(AHV.size());
for (uint32_t i=0;i<AHV.size();++i) {
request.setAttributes(AHV[i],i);
@@ -119,7 +119,7 @@
template<typename T>
void
-assignAHVPSToRequest(const std::vector<std::pair<AttributeHandle,
AttributeValue_t> >& AHVPSv, T request) {
+assignAHVPSToRequest(const std::vector<std::pair<RTI::AttributeHandle,
AttributeValue_t> >& AHVPSv, T request) {
uint32_t size = AHVPSv.size();
request.setAttributesSize(size);
@@ -134,7 +134,7 @@
template<typename T>
void
-assignPHVPSToRequest(const std::vector<std::pair<ParameterHandle,
ParameterValue_t> > &PHVPSv, T request) {
+assignPHVPSToRequest(const std::vector<std::pair<RTI::ParameterHandle,
ParameterValue_t> > &PHVPSv, T request) {
uint32_t size = PHVPSv.size();
request.setParametersSize(size);
@@ -559,7 +559,7 @@
// ----------------------------------------------------------------------------
//! Join Federation Execution.
-FederateHandle
+RTI::FederateHandle
RTI::RTIambassador::joinFederationExecution(const char *yourName,
const char *executionName,
FederateAmbassadorPtr fedamb)
@@ -601,7 +601,7 @@
G.Out(pdGendoc,"enter RTIambassador::resignFederationExecution");
- req.setResignAction(theAction);
+ req.setResignAction(static_cast<certi::ResignAction>(theAction));
G.Out(pdGendoc," ====>executeService
RESIGN_FEDERATION_EXECUTION");
privateRefs->executeService(&req, &rep);
@@ -992,7 +992,7 @@
// ----------------------------------------------------------------------------
// Register Object
-ObjectHandle
+RTI::ObjectHandle
RTI::RTIambassador::registerObjectInstance(ObjectClassHandle theClass,
const char *theObjectName)
throw (RTI::RTIinternalError, RTI::RestoreInProgress,
@@ -1010,7 +1010,7 @@
}
// ----------------------------------------------------------------------------
-ObjectHandle
+RTI::ObjectHandle
RTI::RTIambassador::registerObjectInstance(ObjectClassHandle theClass)
throw (RTI::RTIinternalError, RTI::RestoreInProgress, RTI::SaveInProgress,
RTI::ConcurrentAccessAttempted, RTI::FederateNotExecutionMember,
@@ -1053,6 +1053,7 @@
{
G.Out(pdGendoc,"enter RTIambassador::updateAttributeValues with time");
M_Update_Attribute_Values req, rep ;
+ RTI::EventRetractionHandle_s eventRetraction;
const std::vector<AttributeHandleValuePair_t>& AHVPS =
certi_cast<AttributeHandleValuePairSetImp>()(theAttributes).getAttributeHandleValuePairs();
req.setObject(theObject);
req.setDate(certi_cast<RTIfedTime>()(theTime).getTime());
@@ -1069,7 +1070,9 @@
privateRefs->executeService(&req, &rep);
G.Out(pdGendoc,"return RTIambassador::updateAttributeValues with
time");
- return rep.getEventRetraction();
+ eventRetraction.sendingFederate =
rep.getEventRetraction().getSendingFederate();
+ eventRetraction.theSerialNumber = rep.getEventRetraction().getSN();
+ return eventRetraction;
}
// ----------------------------------------------------------------------------
@@ -1135,7 +1138,7 @@
RTI::RTIinternalError)
{
M_Send_Interaction req, rep ;
-
+ RTI::EventRetractionHandle eventRetraction;
req.setInteractionClass(theInteraction);
req.setDate(certi_cast<RTIfedTime>()(theTime).getTime());
if (theTag == NULL) {
@@ -1147,7 +1150,10 @@
privateRefs->executeService(&req, &rep);
- return rep.getEventRetraction();
+ eventRetraction.sendingFederate =
rep.getEventRetraction().getSendingFederate();
+ eventRetraction.theSerialNumber = rep.getEventRetraction().getSN();
+ return eventRetraction;
+
}
// ----------------------------------------------------------------------------
@@ -1203,6 +1209,7 @@
RTI::RTIinternalError)
{
M_Delete_Object_Instance req, rep ;
+ RTI::EventRetractionHandle eventRetraction;
req.setObject(theObject);
req.setDate(certi_cast<RTIfedTime>()(theTime).getTime());
@@ -1213,7 +1220,10 @@
req.setTag(theTag);
privateRefs->executeService(&req, &rep);
- return rep.getEventRetraction();
+ eventRetraction.sendingFederate =
rep.getEventRetraction().getSendingFederate();
+ eventRetraction.theSerialNumber =
rep.getEventRetraction().getSN();
+ return eventRetraction;
+
}
// ----------------------------------------------------------------------------
@@ -1448,6 +1458,7 @@
RTI::RTIinternalError)
{
M_Attribute_Ownership_Release_Response req, rep ;
+ AttributeHandleSetImp* retval;
req.setObject(theObject);
assignAHVToRequest(certi_cast<AttributeHandleSetImp>()(attrs).getAttributeHandles(),req);
@@ -1455,7 +1466,11 @@
privateRefs->executeService(&req, &rep);
if (rep.getExceptionType() == e_NO_EXCEPTION) {
- return new AttributeHandleSetImp(rep.getAttributes());
+ retval = new AttributeHandleSetImp(rep.getAttributesSize());
+ for (uint32_t i=0;i<rep.getAttributesSize();++i) {
+ retval->add(rep.getAttributes()[i]);
+ }
+ return retval;
}
return NULL ;
@@ -1863,8 +1878,11 @@
{
throw RTI::RTIinternalError("Unimplemented Service retract");
M_Retract req, rep ;
+ EventRetraction event;
- req.setEventRetraction(handle);
+ event.setSN(handle.theSerialNumber);
+ event.setSendingFederate(handle.sendingFederate);
+ req.setEventRetraction(event);
privateRefs->executeService(&req, &rep);
}
@@ -2004,7 +2022,7 @@
// ----------------------------------------------------------------------------
// Register Object Instance With Region
-ObjectHandle
+RTI::ObjectHandle
RTI::RTIambassador::registerObjectInstanceWithRegion(ObjectClassHandle
object_class,
const char *tag,
AttributeHandle attrs[],
@@ -2043,10 +2061,10 @@
}
// ----------------------------------------------------------------------------
-ObjectHandle
+RTI::ObjectHandle
RTI::RTIambassador::registerObjectInstanceWithRegion(ObjectClassHandle
object_class,
- AttributeHandle attrs[],
- Region *regions[],
+ RTI::AttributeHandle attrs[],
+ RTI::Region *regions[],
ULong nb)
throw (RTI::ObjectClassNotDefined,
RTI::ObjectClassNotPublished,
@@ -2277,7 +2295,7 @@
RTI::RTIinternalError)
{
M_Send_Interaction req, rep ;
-
+ EventRetractionHandle event;
req.setInteractionClass(interaction);
assignPHVPSToRequest(certi_cast<ParameterHandleValuePairSetImp>()(par).getParameterHandleValuePairs(),req);
req.setDate(certi_cast<RTIfedTime>()(time).getTime());
@@ -2289,8 +2307,9 @@
req.setRegion(get_handle(region));
privateRefs->executeService(&req, &rep);
-
- return rep.getEventRetraction();
+ event.theSerialNumber = rep.getEventRetraction().getSN();
+ event.sendingFederate = rep.getEventRetraction().getSendingFederate();
+ return event;
}
// ----------------------------------------------------------------------------
@@ -2346,7 +2365,7 @@
/** Get object class handle
\param theName Name of the object class
*/
-ObjectClassHandle
+RTI::ObjectClassHandle
RTI::RTIambassador::getObjectClassHandle(const char *theName)
throw (RTI::NameNotFound,
RTI::FederateNotExecutionMember,
@@ -2390,7 +2409,7 @@
\param theName Name of the attribute
\param whichClass Handle of the attribute's class
*/
-AttributeHandle
+RTI::AttributeHandle
RTI::RTIambassador::getAttributeHandle(const char *theName,
ObjectClassHandle whichClass)
throw (RTI::ObjectClassNotDefined,
@@ -2434,7 +2453,7 @@
// ----------------------------------------------------------------------------
// Get Interaction Class Handle
-InteractionClassHandle
+RTI::InteractionClassHandle
RTI::RTIambassador::getInteractionClassHandle(const char *theName)
throw (RTI::NameNotFound,
RTI::FederateNotExecutionMember,
@@ -2470,7 +2489,7 @@
// ----------------------------------------------------------------------------
// Get Parameter Handle
-ParameterHandle
+RTI::ParameterHandle
RTI::RTIambassador::getParameterHandle(const char *theName,
InteractionClassHandle whichClass)
throw (RTI::InteractionClassNotDefined,
@@ -2513,7 +2532,7 @@
// ----------------------------------------------------------------------------
// Get Object Instance Handle
-ObjectHandle
+RTI::ObjectHandle
RTI::RTIambassador::getObjectInstanceHandle(const char *theName)
throw (RTI::RTIinternalError, RTI::ConcurrentAccessAttempted,
RTI::FederateNotExecutionMember, RTI::ObjectNotKnown)
@@ -2547,7 +2566,7 @@
/** Get routing space handle
\param rs_name Name of the routing space
*/
-SpaceHandle
+RTI::SpaceHandle
RTI::RTIambassador::getRoutingSpaceHandle(const char *rs_name)
throw (RTI::NameNotFound,
RTI::FederateNotExecutionMember,
@@ -2585,7 +2604,7 @@
\param dimension Name of the dimension
\param space The dimension's routing SpaceHandle
*/
-DimensionHandle
+RTI::DimensionHandle
RTI::RTIambassador::getDimensionHandle(const char *dimension,
SpaceHandle space)
throw (RTI::SpaceNotDefined,
@@ -2630,7 +2649,7 @@
\param object_class The attribute's class handle
\return The associated routing space handle
*/
-SpaceHandle
+RTI::SpaceHandle
RTI::RTIambassador::getAttributeRoutingSpaceHandle(AttributeHandle attribute,
ObjectClassHandle object_class)
throw (RTI::ObjectClassNotDefined,
@@ -2649,7 +2668,7 @@
// ----------------------------------------------------------------------------
// Get Object Class
-ObjectClassHandle
+RTI::ObjectClassHandle
RTI::RTIambassador::getObjectClass(ObjectHandle theObject)
throw (RTI::RTIinternalError, RTI::ConcurrentAccessAttempted,
RTI::FederateNotExecutionMember, RTI::ObjectNotKnown)
@@ -2666,7 +2685,7 @@
\param inter The interaction handle
\return The associated routing space
*/
-SpaceHandle
+RTI::SpaceHandle
RTI::RTIambassador::getInteractionRoutingSpaceHandle(InteractionClassHandle
inter)
throw (RTI::InteractionClassNotDefined,
RTI::FederateNotExecutionMember,
@@ -2962,4 +2981,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.113 2010/03/01 16:44:27 erk Exp $
+// $Id: RTIambassador.cc,v 3.114 2010/03/07 18:23:39 erk Exp $
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.67
retrieving revision 3.68
diff -u -b -r3.67 -r3.68
--- libCERTI/Message.cc 27 Feb 2010 16:53:35 -0000 3.67
+++ libCERTI/Message.cc 7 Mar 2010 18:23:39 -0000 3.68
@@ -39,7 +39,7 @@
exceptionReason = "" ;
messageName = "Message (generic)";
type = NOT_USED ;
- resignAction = RTI::NO_ACTION ;
+ resignAction = certi::NO_ACTION ;
space = 0 ;
dimension = 0 ;
} /* end of Message default constructor */
Index: libCERTI/MessageBuffer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/MessageBuffer.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/MessageBuffer.cc 24 Nov 2009 19:11:37 -0000 3.17
+++ libCERTI/MessageBuffer.cc 7 Mar 2010 18:23:39 -0000 3.18
@@ -26,6 +26,7 @@
#include <sstream>
#include <iomanip>
#include <cstring>
+#include <cstdio>
namespace certi {
Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- libCERTI/SocketTCP.cc 24 Nov 2009 21:44:47 -0000 3.31
+++ libCERTI/SocketTCP.cc 7 Mar 2010 18:23:39 -0000 3.32
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SocketTCP.cc,v 3.31 2009/11/24 21:44:47 erk Exp $
+// $Id: SocketTCP.cc,v 3.32 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include "SocketTCP.hh"
@@ -28,6 +28,7 @@
#include <cerrno>
#include <cstdlib>
#include <cstring>
+#include <cstdio>
using std::cout ;
using std::endl ;
@@ -586,4 +587,4 @@
} // namespace
-// $Id: SocketTCP.cc,v 3.31 2009/11/24 21:44:47 erk Exp $
+// $Id: SocketTCP.cc,v 3.32 2010/03/07 18:23:39 erk Exp $
Index: libCERTI/PrettyDebEx.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebEx.cc,v
retrieving revision 4.8
retrieving revision 4.9
diff -u -b -r4.8 -r4.9
--- libCERTI/PrettyDebEx.cc 18 Nov 2009 18:50:49 -0000 4.8
+++ libCERTI/PrettyDebEx.cc 7 Mar 2010 18:23:39 -0000 4.9
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: PrettyDebEx.cc,v 4.8 2009/11/18 18:50:49 erk Exp $
+// $Id: PrettyDebEx.cc,v 4.9 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
@@ -27,10 +27,12 @@
#include "Message.hh"
#include "NetworkMessage.hh"
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdlib>
+#include <cstdarg>
#include <iostream>
#include <cstring>
+#include <cstdio>
+
#ifdef _WIN32
#include <time.h>
#else
@@ -317,4 +319,4 @@
}
#endif // NDEBUG
-// $Id: PrettyDebEx.cc,v 4.8 2009/11/18 18:50:49 erk Exp $
+// $Id: PrettyDebEx.cc,v 4.9 2010/03/07 18:23:39 erk Exp $
Index: libCERTI/M_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.hh,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -b -r3.3 -r3.4
--- libCERTI/M_Classes.hh 27 Feb 2010 16:53:35 -0000 3.3
+++ libCERTI/M_Classes.hh 7 Mar 2010 18:23:39 -0000 3.4
@@ -1,4 +1,4 @@
-// Generated on 2010 February Sat, 27 at 15:30:42 by the CERTI message
generator
+// Generated on 2010 March Sat, 06 at 18:06:18 by the CERTI message generator
#ifndef M_CLASSES_HH
#define M_CLASSES_HH
// ****-**** Global System includes ****-****
@@ -11,8 +11,6 @@
// of a Message
#include "Message.hh"
-#include "RTItypes.hh"
-
#include "certi.hh"
#include "Extent.hh"
@@ -47,10 +45,6 @@
// - by included headers (see above)
// - with typedef (see below [if any])
- typedef RTI::ResignAction ResignAction;
-
- typedef RTI::EventRetractionHandle EventRetractionHandle;
-
typedef SocketUN* StreamType;
typedef Message::Type M_Type;
@@ -202,6 +196,25 @@
M_TICK_REQUEST_STOP,
LAST
} CERTI_Message_MessageType_t; //end of enum CERTI_Message_MessageType
+
+ class CERTI_EXPORT EventRetraction {
+ public:
+ EventRetraction();
+ ~EventRetraction();
+ void serialize(MessageBuffer& msgBuffer);
+ void deserialize(MessageBuffer& msgBuffer);
+ // specific Getter(s)/Setter(s)
+ const FederateHandle& getSendingFederate() const {return
sendingFederate;}
+ void setSendingFederate(const FederateHandle& newSendingFederate)
{sendingFederate=newSendingFederate;}
+ const uint64_t& getSN() const {return SN;}
+ void setSN(const uint64_t& newSN) {SN=newSN;}
+ // the show method
+ void show(std::ostream& out);
+ protected:
+ FederateHandle sendingFederate;
+ uint64_t SN;
+ private:
+ };
// Closing connexion message
class CERTI_EXPORT M_Close_Connexion : public Message {
public:
@@ -787,8 +800,8 @@
const AttributeValue_t& getValues(uint32_t rank) const {return
values[rank];}
AttributeValue_t& getValues(uint32_t rank) {return values[rank];}
void setValues(const AttributeValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -798,8 +811,8 @@
ObjectClassHandle objectClass;
ObjectHandle object;
std::vector<AttributeHandle> attributes;
- std::vector<AttributeValue_t> values;// FIXME check this one
- EventRetractionHandle eventRetraction;
+ std::vector<AttributeValue_t> values;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -818,8 +831,8 @@
void setObject(const ObjectHandle& newObject) {object=newObject;}
const std::string& getObjectName() const {return objectName;}
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -829,7 +842,7 @@
ObjectClassHandle objectClass;
ObjectHandle object;
std::string objectName;
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -858,8 +871,8 @@
const AttributeValue_t& getValues(uint32_t rank) const {return
values[rank];}
AttributeValue_t& getValues(uint32_t rank) {return values[rank];}
void setValues(const AttributeValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -869,8 +882,8 @@
ObjectClassHandle objectClass;
ObjectHandle object;
std::vector<AttributeHandle> attributes;
- std::vector<AttributeValue_t> values;// FIXME check this one
- EventRetractionHandle eventRetraction;
+ std::vector<AttributeValue_t> values;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -899,8 +912,8 @@
void setValues(const ParameterValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
const RegionHandle& getRegion() const {return region;}
void setRegion(const RegionHandle& newRegion) {region=newRegion;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -911,7 +924,7 @@
std::vector<ParameterHandle> parameters;
std::vector<ParameterValue_t> values;
RegionHandle region;
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -940,8 +953,8 @@
void setValues(const ParameterValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
const RegionHandle& getRegion() const {return region;}
void setRegion(const RegionHandle& newRegion) {region=newRegion;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -952,7 +965,7 @@
std::vector<ParameterHandle> parameters;
std::vector<ParameterValue_t> values;
RegionHandle region;
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -971,8 +984,8 @@
void setObject(const ObjectHandle& newObject) {object=newObject;}
const std::string& getObjectName() const {return objectName;}
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -982,7 +995,7 @@
ObjectClassHandle objectClass;
ObjectHandle object;
std::string objectName;
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -1018,8 +1031,8 @@
void setObject(const ObjectHandle& newObject) {object=newObject;}
const std::string& getObjectName() const {return objectName;}
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction) {
hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
@@ -1029,7 +1042,7 @@
ObjectClassHandle objectClass;
ObjectHandle object;
std::string objectName;
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
bool hasEventRetraction;
private:
};
@@ -1895,12 +1908,12 @@
virtual void serialize(MessageBuffer& msgBuffer);
virtual void deserialize(MessageBuffer& msgBuffer);
// specific Getter(s)/Setter(s)
- const EventRetractionHandle& getEventRetraction() const {return
eventRetraction;}
- void setEventRetraction(const EventRetractionHandle&
newEventRetraction) {eventRetraction=newEventRetraction;}
+ const EventRetraction& getEventRetraction() const {return
eventRetraction;}
+ void setEventRetraction(const EventRetraction& newEventRetraction)
{eventRetraction=newEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
- EventRetractionHandle eventRetraction;
+ EventRetraction eventRetraction;
private:
};
Index: libCERTI/M_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.cc,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -b -r3.3 -r3.4
--- libCERTI/M_Classes.cc 27 Feb 2010 16:53:35 -0000 3.3
+++ libCERTI/M_Classes.cc 7 Mar 2010 18:23:39 -0000 3.4
@@ -1,4 +1,4 @@
-// Generated on 2010 February Sat, 27 at 15:30:45 by the CERTI message
generator
+// Generated on 2010 March Sat, 06 at 18:06:19 by the CERTI message generator
#include <vector>
#include <string>
#include "M_Classes.hh"
@@ -27,6 +27,32 @@
// The messages related classes will be placed in the certi package
namespace certi {
+ EventRetraction::EventRetraction() {
+ sendingFederate=0;
+ SN=0;
+ }
+
+ EventRetraction::~EventRetraction() {
+ }
+
+ void EventRetraction::serialize(MessageBuffer& msgBuffer) {
+ //Specific serialization code
+ msgBuffer.write_uint32(sendingFederate);
+ msgBuffer.write_uint64(SN);
+ }
+
+ void EventRetraction::deserialize(MessageBuffer& msgBuffer) {
+ //Specific deserialization code
+ sendingFederate = static_cast<FederateHandle>(msgBuffer.read_uint32());
+ SN = msgBuffer.read_uint64();
+ }
+
+ void EventRetraction::show(std::ostream& out) {
+ out << "[EventRetraction -Begin]" << std::endl; //Specific show code
+ out << " sendingFederate = " << sendingFederate << " " <<
std::endl;
+ out << " SN = " << SN << " " << std::endl;
+ out << "[EventRetraction -End]" << std::endl; }
+
M_Close_Connexion::M_Close_Connexion() {
this->messageName = "M_Close_Connexion";
this->type = Message::CLOSE_CONNEXION;
@@ -892,8 +918,7 @@
}
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -915,8 +940,7 @@
}
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -936,7 +960,7 @@
out << values[i] << " " ;
}
out << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Update_Attribute_Values -End]" << std::endl; }
M_Discover_Object_Instance::M_Discover_Object_Instance() {
@@ -960,8 +984,7 @@
msgBuffer.write_string(objectName);
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -974,8 +997,7 @@
msgBuffer.read_string(objectName);
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -986,7 +1008,7 @@
out << " objectClass = " << objectClass << " " << std::endl;
out << " object = " << object << " " << std::endl;
out << " objectName = " << objectName << " " << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Discover_Object_Instance -End]" << std::endl; }
M_Reflect_Attribute_Values::M_Reflect_Attribute_Values() {
@@ -1020,8 +1042,7 @@
}
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -1043,8 +1064,7 @@
}
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -1064,7 +1084,7 @@
out << values[i] << " " ;
}
out << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Reflect_Attribute_Values -End]" << std::endl; }
M_Send_Interaction::M_Send_Interaction() {
@@ -1098,8 +1118,7 @@
msgBuffer.write_uint32(region);
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -1121,8 +1140,7 @@
region = static_cast<RegionHandle>(msgBuffer.read_uint32());
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -1142,7 +1160,7 @@
}
out << std::endl;
out << " region = " << region << " " << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Send_Interaction -End]" << std::endl; }
M_Receive_Interaction::M_Receive_Interaction() {
@@ -1176,8 +1194,7 @@
msgBuffer.write_uint32(region);
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -1199,8 +1216,7 @@
region = static_cast<RegionHandle>(msgBuffer.read_uint32());
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -1220,7 +1236,7 @@
}
out << std::endl;
out << " region = " << region << " " << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Receive_Interaction -End]" << std::endl; }
M_Delete_Object_Instance::M_Delete_Object_Instance() {
@@ -1244,8 +1260,7 @@
msgBuffer.write_string(objectName);
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -1258,8 +1273,7 @@
msgBuffer.read_string(objectName);
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -1270,7 +1284,7 @@
out << " objectClass = " << objectClass << " " << std::endl;
out << " object = " << object << " " << std::endl;
out << " objectName = " << objectName << " " << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Delete_Object_Instance -End]" << std::endl; }
M_Local_Delete_Object_Instance::M_Local_Delete_Object_Instance() {
@@ -1324,8 +1338,7 @@
msgBuffer.write_string(objectName);
msgBuffer.write_bool(hasEventRetraction);
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
}
@@ -1338,8 +1351,7 @@
msgBuffer.read_string(objectName);
hasEventRetraction = msgBuffer.read_bool();
if (hasEventRetraction) {
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of
type <EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
}
@@ -1350,7 +1362,7 @@
out << " objectClass = " << objectClass << " " << std::endl;
out << " object = " << object << " " << std::endl;
out << " objectName = " << objectName << " " << std::endl;
- out << "(opt) eventRetraction =" << " //FIXME FIXME don't know how
to serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << "(opt) eventRetraction =" << "FIXME inherited " <<
std::endl;
out << "[M_Remove_Object_Instance -End]" << std::endl; }
M_Change_Attribute_Transportation_Type::M_Change_Attribute_Transportation_Type()
{
@@ -2888,23 +2900,21 @@
//Call mother class
Super::serialize(msgBuffer);
//Specific serialization code
- // FIXME FIXME FIXME
- // don't know how to serialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.serialize(msgBuffer);
}
void M_Retract::deserialize(MessageBuffer& msgBuffer) {
//Call mother class
Super::deserialize(msgBuffer);
//Specific deserialization code
- // FIXME FIXME FIXME
- // don't know how to deserialize native field <eventRetraction> of type
<EventRetractionHandle>
+ eventRetraction.deserialize(msgBuffer);
}
void M_Retract::show(std::ostream& out) {
out << "[M_Retract -Begin]" << std::endl; //Call mother class
Super::show(out);
//Specific show code
- out << " eventRetraction = " << " //FIXME FIXME don't know how to
serialize native field <eventRetraction> of type <EventRetractionHandle>"
<< std::endl;
+ out << " eventRetraction = " << "FIXME inherited " << std::endl;
out << "[M_Retract -End]" << std::endl; }
M_Request_Retraction::M_Request_Retraction() {
Index: libCERTI/SocketUN.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.cc,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- libCERTI/SocketUN.cc 24 Nov 2009 21:44:47 -0000 3.34
+++ libCERTI/SocketUN.cc 7 Mar 2010 18:23:39 -0000 3.35
@@ -17,19 +17,18 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
-
#include "certi.hh"
#include "SocketUN.hh"
-
#include "SocketTCP.hh"
#include <cstring>
#include <cerrno>
+#include <cstdio>
+#include <cassert>
+
#include <sstream>
#include <string>
-
#include <iostream>
-#include <assert.h>
using std::string ;
using std::cout ;
Index: libCERTI/Extent.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.cc,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/Extent.cc 27 Feb 2010 16:53:36 -0000 3.12
+++ libCERTI/Extent.cc 7 Mar 2010 18:23:39 -0000 3.13
@@ -19,13 +19,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.cc,v 3.12 2010/02/27 16:53:36 erk Exp $
+// $Id: Extent.cc,v 3.13 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include "Extent.hh"
#include "Dimension.hh"
#include "PrettyDebug.hh"
+#include <iostream>
using std::vector ;
@@ -107,4 +108,4 @@
} // namespace certi
-// $Id: Extent.cc,v 3.12 2010/02/27 16:53:36 erk Exp $
+// $Id: Extent.cc,v 3.13 2010/03/07 18:23:39 erk Exp $
Index: libCERTI/SocketHTTPProxy.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketHTTPProxy.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/SocketHTTPProxy.cc 20 May 2009 08:17:16 -0000 3.5
+++ libCERTI/SocketHTTPProxy.cc 7 Mar 2010 18:23:39 -0000 3.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SocketHTTPProxy.cc,v 3.5 2009/05/20 08:17:16 gotthardp Exp $
+// $Id: SocketHTTPProxy.cc,v 3.6 2010/03/07 18:23:39 erk Exp $
// ----------------------------------------------------------------------------
#include "SocketHTTPProxy.hh"
@@ -26,6 +26,7 @@
#include <cstdlib>
#include <cstring>
#include <cerrno>
+#include <cstdio>
namespace certi {
@@ -252,4 +253,4 @@
} // namespace
-// $Id: SocketHTTPProxy.cc,v 3.5 2009/05/20 08:17:16 gotthardp Exp $
+// $Id: SocketHTTPProxy.cc,v 3.6 2010/03/07 18:23:39 erk Exp $
Index: libCERTI/SocketMC.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/SocketMC.cc 24 Nov 2009 21:44:47 -0000 3.19
+++ libCERTI/SocketMC.cc 7 Mar 2010 18:23:39 -0000 3.20
@@ -17,8 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
-
-
#include "SocketMC.hh"
#include "config.h"
@@ -32,6 +30,7 @@
#include <cstdlib>
#include <cstring>
#include <cerrno>
+#include <cstdio>
namespace certi {
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -b -r3.60 -r3.61
--- libCERTI/Message.hh 27 Feb 2010 16:53:36 -0000 3.60
+++ libCERTI/Message.hh 7 Mar 2010 18:23:39 -0000 3.61
@@ -252,7 +252,7 @@
TypeException exception ;
std::string exceptionReason;
- RTI::ResignAction resignAction ;
+ ResignAction resignAction ;
EventRetractionHandle eventRetraction ;
SpaceHandle space ;
DimensionHandle dimension ;
Index: libCERTI/SemaphoreSysV.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SemaphoreSysV.cc,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -b -r3.1 -r3.2
--- libCERTI/SemaphoreSysV.cc 16 Jan 2010 20:17:14 -0000 3.1
+++ libCERTI/SemaphoreSysV.cc 7 Mar 2010 18:23:39 -0000 3.2
@@ -1,6 +1,7 @@
#include "SemaphoreSysV.hh"
#include "sha1.h"
#include <cstring>
+#include <cstdio>
key_t SemaphoreSysV::ntokUser(const char* name, int32_t user_specific_value) {
Index: libCERTI/SocketUDP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- libCERTI/SocketUDP.cc 24 Nov 2009 21:44:47 -0000 3.27
+++ libCERTI/SocketUDP.cc 7 Mar 2010 18:23:40 -0000 3.28
@@ -17,13 +17,12 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
-
-
#include "certi.hh"
#include "SocketUDP.hh"
#include "PrettyDebug.hh"
#include <cstdlib>
#include <cstring>
+#include <cstdio>
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 4096
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -b -r3.56 -r3.57
--- libCERTI/NetworkMessage.hh 30 Jan 2010 18:41:37 -0000 3.56
+++ libCERTI/NetworkMessage.hh 7 Mar 2010 18:23:40 -0000 3.57
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.56 2010/01/30 18:41:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.57 2010/03/07 18:23:40 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -211,14 +211,13 @@
void sizeValueArray(int size) ;
- ObjectHandlecount idCount ;
ObjectHandle firstId ;
ObjectHandle lastId ;
EventRetractionHandle eventRetraction ;
/* NM_WithHandleArray class specific fields */
- UShort handleArraySize ;
+ uint16_t handleArraySize ;
std::vector <AttributeHandle> handleArray ;
std::vector <AttributeValue_t> valueArray ;
@@ -282,4 +281,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.56 2010/01/30 18:41:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.57 2010/03/07 18:23:40 erk Exp $
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.80
retrieving revision 3.81
diff -u -b -r3.80 -r3.81
--- RTIA/FederationManagement.cc 27 Feb 2010 16:53:36 -0000 3.80
+++ RTIA/FederationManagement.cc 7 Mar 2010 18:23:40 -0000 3.81
@@ -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: FederationManagement.cc,v 3.80 2010/02/27 16:53:36 erk Exp $
+// $Id: FederationManagement.cc,v 3.81 2010/03/07 18:23:40 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -292,7 +292,7 @@
// -------------------------------
void
-FederationManagement::resignFederationExecution(RTI::ResignAction,
+FederationManagement::resignFederationExecution(ResignAction,
TypeException &e)
{
NM_Resign_Federation_Execution msg;
@@ -341,7 +341,7 @@
if (_est_membre_federation) {
TypeException e ;
- resignFederationExecution(RTI::DELETE_OBJECTS, e);
+ resignFederationExecution(DELETE_OBJECTS, e);
}
G.Out(pdGendoc,"exit
FederationManagement::resignFederationExecutionForTermination");
Index: RTIA/FederationManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.hh,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- RTIA/FederationManagement.hh 27 Feb 2010 16:53:36 -0000 3.29
+++ RTIA/FederationManagement.hh 7 Mar 2010 18:23:40 -0000 3.30
@@ -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: FederationManagement.hh,v 3.29 2010/02/27 16:53:36 erk Exp $
+// $Id: FederationManagement.hh,v 3.30 2010/03/07 18:23:40 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIA_FEDERATION_MANAGEMENT
@@ -63,7 +63,7 @@
RootObject* rootObject,
TypeException &e);
- void resignFederationExecution(RTI::ResignAction action,
+ void resignFederationExecution(ResignAction action,
TypeException &e);
void resignFederationExecutionForTermination();
@@ -130,4 +130,4 @@
#endif // _CERTI_RTIA_FEDERATION_MANAGEMENT
-// $Id: FederationManagement.hh,v 3.29 2010/02/27 16:53:36 erk Exp $
+// $Id: FederationManagement.hh,v 3.30 2010/03/07 18:23:40 erk Exp $
Index: RTIA/TimeManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.hh,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- RTIA/TimeManagement.hh 24 Nov 2009 21:44:48 -0000 3.22
+++ RTIA/TimeManagement.hh 7 Mar 2010 18:23:40 -0000 3.23
@@ -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: TimeManagement.hh,v 3.22 2009/11/24 21:44:48 erk Exp $
+// $Id: TimeManagement.hh,v 3.23 2010/03/07 18:23:40 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIA_TIME_MANAGEMENT_HH
@@ -109,8 +109,8 @@
} _tick_state;
bool _tick_multiple; // process multiple callbacks
bool _tick_result; // tick() return value
- RTI::TickTime _tick_timeout;
- RTI::TickTime _tick_max_tick;
+ TickTime _tick_timeout;
+ TickTime _tick_max_tick;
uint64_t _tick_clock_start;
bool _asynchronous_delivery ;
@@ -154,4 +154,4 @@
#endif // CERTI_RTIA_TIME_MANAGEMENT_HH
-// $Id: TimeManagement.hh,v 3.22 2009/11/24 21:44:48 erk Exp $
+// $Id: TimeManagement.hh,v 3.23 2010/03/07 18:23:40 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- RTIA/ObjectManagement.cc 27 Feb 2010 16:53:36 -0000 3.64
+++ RTIA/ObjectManagement.cc 7 Mar 2010 18:23:40 -0000 3.65
@@ -219,11 +219,13 @@
TypeException &)
{
M_Discover_Object_Instance req;
+ EventRetraction event;
req.setObject(the_object);
req.setObjectClass(the_class);
req.setDate(the_time);
- req.setEventRetraction(the_event);
+ event.setSN(the_event);
+ req.setEventRetraction(event);
req.setObjectName(the_name);
comm->requestFederateService(&req);
@@ -260,11 +262,13 @@
TypeException &)
{
M_Reflect_Attribute_Values req;
+ EventRetraction event;
G.Out(pdGendoc,"enter ObjectManagement::reflectAttributeValues with time");
req.setObject(the_object);
req.setDate(the_time);
- req.setEventRetraction(the_event);
+ event.setSN(the_event);
+ req.setEventRetraction(event);
req.setTag(the_tag);
req.setValuesSize(the_size);
@@ -420,10 +424,12 @@
TypeException &)
{
M_Receive_Interaction req;
+ EventRetraction event;
req.setInteractionClass(the_interaction);
req.setDate(the_time);
- req.setEventRetraction(the_event);
+ event.setSN(the_event);
+ req.setEventRetraction(event);
req.setTag(the_tag);
req.setParametersSize(the_size);
req.setValuesSize(the_size);
@@ -521,9 +527,11 @@
{
M_Remove_Object_Instance req;
+ EventRetraction event;
req.setObject(the_object);
- req.setEventRetraction(the_event);
+ event.setSN(the_event);
+ req.setEventRetraction(event);
req.setTag(the_tag);
req.setDate(theTime);
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.104
retrieving revision 3.105
diff -u -b -r3.104 -r3.105
--- RTIA/RTIA_federate.cc 1 Mar 2010 16:44:29 -0000 3.104
+++ RTIA/RTIA_federate.cc 7 Mar 2010 18:23:40 -0000 3.105
@@ -369,6 +369,7 @@
case Message::UPDATE_ATTRIBUTE_VALUES: {
M_Update_Attribute_Values *UAVq,*UAVr;
+ EventRetraction event;
UAVq = static_cast<M_Update_Attribute_Values *>(req);
UAVr = static_cast<M_Update_Attribute_Values *>(rep);
try {
@@ -376,14 +377,15 @@
{
D.Out(pdTrace,"Receiving Message from Federate,
type "
"UpdateAttribValues with
TIMESTAMP.");
- UAVr->setEventRetraction(
-
om->updateAttributeValues(UAVq->getObject(),
+
event.setSN(om->updateAttributeValues(UAVq->getObject(),
UAVq->getAttributes(),
UAVq->getValues(),
UAVq->getAttributesSize(),
UAVq->getDate(),
UAVq->getTag(),
e));
+ //FIXME event.setSendingFederate()
+ UAVr->setEventRetraction(event);
// answer should contains the date too
UAVr->setDate(UAVq->getDate());
}
@@ -406,6 +408,7 @@
case Message::SEND_INTERACTION: {
M_Send_Interaction *SIr, *SIq;
+ EventRetraction event;
SIq = static_cast<M_Send_Interaction *>(req);
SIr = static_cast<M_Send_Interaction *>(rep);
G.Out(pdGendoc,"S_I into RTIA::chooseFederateProcessing") ;
@@ -413,8 +416,7 @@
if (SIq->isDated() ) {
D.Out(pdTrace,
"Receiving Message from Federate, type
SendInteraction with TIMESTAMP.");
- SIr->setEventRetraction(
-
om->sendInteraction(SIq->getInteractionClass(),
+
event.setSN(om->sendInteraction(SIq->getInteractionClass(),
SIq->getParameters(),
SIq->getValues(),
SIq->getParametersSize(),
@@ -422,6 +424,7 @@
SIq->getTag(),
SIq->getRegion(),
e));
+ SIr->setEventRetraction(event);
}
else {
D.Out(pdTrace,
@@ -439,6 +442,7 @@
case Message::DELETE_OBJECT_INSTANCE: {
M_Delete_Object_Instance *DOIr, *DOIq;
+ EventRetraction event;
DOIq = static_cast<M_Delete_Object_Instance *>(req);
DOIr = static_cast<M_Delete_Object_Instance *>(rep);
G.Out(pdGendoc,"D_O_I into RTIA::chooseFederateProcessing") ;
@@ -448,12 +452,13 @@
D.Out(pdTrace,
"Receiving Message from
Federate, type DeleteObjectInstance with \
TIMESTAMP.");
- DOIr->setEventRetraction(
- om->deleteObject(
+ event.setSN(om->deleteObject(
DOIq->getObject(),
DOIq->getDate(),
DOIq->getTag(),
e));
+ // FIXME event.setSendingFederate();
+ DOIr->setEventRetraction(event);
}
else {
D.Out(pdTrace,
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.43
retrieving revision 3.44
diff -u -b -r3.43 -r3.44
--- include/certi.hh 28 Feb 2010 18:54:44 -0000 3.43
+++ include/certi.hh 7 Mar 2010 18:23:40 -0000 3.44
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: certi.hh,v 3.43 2010/02/28 18:54:44 erk Exp $
+// $Id: certi.hh,v 3.44 2010/03/07 18:23:40 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_HH_INCLUDED
@@ -107,7 +107,8 @@
#define CERTI_ENCODE_DOUBLE_TO_UINT64BE(val) (CERTI_UINT64_TO_BE
(*(uint64_t*)(val)))
#define CERTI_DECODE_DOUBLE_FROM_UINT64BE(val) (CERTI_UINT64_FROM_BE
(*(uint64_t*)(val)))
-#include "RTI.hh"
+//#include "RTI.hh"
+#include <string>
/**
* @defgroup libCERTI The CERTI library.
@@ -120,29 +121,36 @@
namespace certi {
-typedef unsigned short UShort;
-typedef unsigned long ULong;
-typedef long Long;
-typedef ULong Handle;
+typedef uint16_t UShort;
+typedef uint32_t ULong;
+
+typedef uint32_t Handle;
typedef Handle ObjectClassHandle;
typedef Handle InteractionClassHandle;
-typedef ULong ExtentIndex;
+typedef uint32_t ExtentIndex;
typedef Handle AttributeHandle;
typedef Handle ParameterHandle;
typedef Handle ObjectHandle;
typedef Handle DimensionHandle;
typedef Handle FederateHandle;
typedef Handle OrderType;
-typedef Long SpaceHandle;
+typedef Handle SpaceHandle;
typedef Handle TransportType;
+typedef Handle EventRetractionHandle;
-typedef RTI::EventRetractionHandle EventRetractionHandle;
+typedef double TickTime;
-typedef UShort ObjectHandlecount ;
typedef std::string ObjectName_t ;
typedef std::string AttributeValue_t;
typedef std::string ParameterValue_t;
+enum ResignAction {
+ RELEASE_ATTRIBUTES = 1,
+ DELETE_OBJECTS,
+ DELETE_OBJECTS_AND_RELEASE_ATTRIBUTES,
+ NO_ACTION
+};
+
enum ObjectRemovalReason {
OUT_OF_REGION = 1,
OBJECT_DELETED,
@@ -264,4 +272,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.43 2010/02/28 18:54:44 erk Exp $
+// $Id: certi.hh,v 3.44 2010/03/07 18:23:40 erk Exp $
Index: include/RTIambServices.hh
===================================================================
RCS file: /sources/certi/certi/include/RTIambServices.hh,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- include/RTIambServices.hh 1 Mar 2010 16:44:29 -0000 3.5
+++ include/RTIambServices.hh 7 Mar 2010 18:23:40 -0000 3.6
@@ -1,5 +1,5 @@
// HLA 1.3 Header "RTIambServices.hh"
-// $Id: RTIambServices.hh,v 3.5 2010/03/01 16:44:29 erk Exp $
+// $Id: RTIambServices.hh,v 3.6 2010/03/07 18:23:40 erk Exp $
typedef FederateAmbassador *FederateAmbassadorPtr ;
@@ -324,13 +324,13 @@
throw (RegionNotKnown, RegionInUse, FederateNotExecutionMember,
ConcurrentAccessAttempted,
SaveInProgress, RestoreInProgress, RTIinternalError);
-ObjectHandle registerObjectInstanceWithRegion(ObjectClassHandle, const char *,
AttributeHandle [],
+RTI::ObjectHandle registerObjectInstanceWithRegion(ObjectClassHandle, const
char *, AttributeHandle [],
Region *theRegions[], ULong)
throw (ObjectClassNotDefined, ObjectClassNotPublished,
AttributeNotDefined, AttributeNotPublished,
RegionNotKnown, InvalidRegionContext, ObjectAlreadyRegistered,
FederateNotExecutionMember,
ConcurrentAccessAttempted, SaveInProgress, RestoreInProgress,
RTIinternalError);
-ObjectHandle registerObjectInstanceWithRegion(ObjectClassHandle,
AttributeHandle [], Region *regions[], ULong)
+RTI::ObjectHandle registerObjectInstanceWithRegion(ObjectClassHandle,
AttributeHandle [], Region *regions[], ULong)
throw (ObjectClassNotDefined, ObjectClassNotPublished,
AttributeNotDefined, AttributeNotPublished,
RegionNotKnown, InvalidRegionContext, FederateNotExecutionMember,
ConcurrentAccessAttempted,
SaveInProgress, RestoreInProgress, RTIinternalError);
@@ -422,7 +422,7 @@
char *getRoutingSpaceName(SpaceHandle)
throw (SpaceNotDefined, FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
-DimensionHandle getDimensionHandle(const char *, SpaceHandle)
+RTI::DimensionHandle getDimensionHandle(const char *, SpaceHandle)
throw (SpaceNotDefined, NameNotFound, FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
@@ -430,14 +430,14 @@
throw (SpaceNotDefined, DimensionNotDefined, FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
-SpaceHandle getAttributeRoutingSpaceHandle(AttributeHandle, ObjectClassHandle)
+RTI::SpaceHandle getAttributeRoutingSpaceHandle(AttributeHandle,
ObjectClassHandle)
throw (ObjectClassNotDefined, AttributeNotDefined,
FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
-ObjectClassHandle getObjectClass(ObjectHandle)
+RTI::ObjectClassHandle getObjectClass(ObjectHandle)
throw (ObjectNotKnown, FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
-SpaceHandle getInteractionRoutingSpaceHandle(InteractionClassHandle)
+RTI::SpaceHandle getInteractionRoutingSpaceHandle(InteractionClassHandle)
throw (InteractionClassNotDefined, FederateNotExecutionMember,
ConcurrentAccessAttempted, RTIinternalError);
TransportationHandle getTransportationHandle(const char *)
@@ -508,4 +508,4 @@
Region *getRegion(RegionToken)
throw (FederateNotExecutionMember, ConcurrentAccessAttempted,
RegionNotKnown, RTIinternalError);
-// $Id: RTIambServices.hh,v 3.5 2010/03/01 16:44:29 erk Exp $
+// $Id: RTIambServices.hh,v 3.6 2010/03/07 18:23:40 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libRTI/RTItypesImp.cc libRTI/RTItypes.cc ...,
certi-cvs <=