[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIA/Communications.cc RTIA/ObjectManagem...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIA/Communications.cc RTIA/ObjectManagem... |
|
Date: |
Sat, 20 Mar 2010 16:34:14 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/03/20 16:34:14
Modified files:
RTIA : Communications.cc ObjectManagement.cc
DeclarationManagement.cc RTIA_federate.cc
RTIA_network.cc TimeManagement.cc
libCERTI : M_Classes.cc ObjectClass.cc Message.hh
NM_Classes.cc ObjectClassAttribute.cc
NM_Classes.hh NetworkMessage.hh
ObjectClassBroadcastList.cc M_Classes.hh
RTIG : Federation.cc RTIG_processing.cc RTIG.cc
scripts : GenMsgCXX.py
libRTI : RTIambPrivateRefs.cc RTIambassador.cc
Log message:
getType --> getMessageType
which is more consistent
(and will help to merge network and non-network message)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.67&r2=3.68
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.106&r2=3.107
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.56&r2=3.57
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.cc?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.79&r2=3.80
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.62&r2=3.63
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.60&r2=3.61
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.hh?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.125&r2=3.126
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.96&r2=3.97
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.62&r2=3.63
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenMsgCXX.py?cvsroot=certi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.25&r2=3.26
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.115&r2=3.116
Patches:
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- RTIA/Communications.cc 27 Feb 2010 16:53:36 -0000 3.37
+++ RTIA/Communications.cc 20 Mar 2010 16:34:13 -0000 3.38
@@ -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: Communications.cc,v 3.37 2010/02/27 16:53:36 erk Exp $
+// $Id: Communications.cc,v 3.38 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -69,7 +69,7 @@
D.Out(pdProtocol, "TCP Message of Type %d has arrived.", type_msg);
- while ((msg->getType() != type_msg) ||
+ while ((msg->getMessageType() != type_msg) ||
((numeroFedere != 0) && (msg->federate != numeroFedere))) {
waitingList.push_back(msg);
msg = NM_Factory::receive(socketTCP);
@@ -77,7 +77,7 @@
}
assert(msg != NULL);
- assert(msg->getType() == type_msg);
+ assert(msg->getMessageType() == type_msg);
return msg;
} /* end of waitMessage */
@@ -166,7 +166,7 @@
// G.Out(pdGendoc,"enter Communications::requestFederateService for
message "
// "type %d",req->type);
assert(req != NULL);
- D.Out(pdRequest, "Sending Request to Federate, Name %s, Type %d.",
req->getMessageName(),req->getType());
+ D.Out(pdRequest, "Sending Request to Federate, Name %s, Type %d.",
req->getMessageName(),req->getMessageType());
req->send(socketUN, msgBufSend);
// G.Out(pdGendoc,"exit Communications::requestFederateService");
}
@@ -319,7 +319,7 @@
D.Out(pdProtocol, "Rechercher message de type %d .", type_msg);
- if ((*i)->getType() == type_msg) {
+ if ((*i)->getMessageType() == type_msg) {
// if numeroFedere != 0, verify that federateNumbers are similar
if (((*i)->federate == numeroFedere) || (numeroFedere == 0)) {
*msg = *i;
@@ -358,4 +358,4 @@
}} // namespace certi/rtia
-// $Id: Communications.cc,v 3.37 2010/02/27 16:53:36 erk Exp $
+// $Id: Communications.cc,v 3.38 2010/03/20 16:34:13 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.67
retrieving revision 3.68
diff -u -b -r3.67 -r3.68
--- RTIA/ObjectManagement.cc 19 Mar 2010 13:54:03 -0000 3.67
+++ RTIA/ObjectManagement.cc 20 Mar 2010 16:34:13 -0000 3.68
@@ -142,7 +142,7 @@
req.setLabel(theTag);
comm->sendMessage(&req);
- std::auto_ptr<NM_Update_Attribute_Values>
rep(static_cast<NM_Update_Attribute_Values*>(comm->waitMessage(req.getType(),
req.federate)));
+ std::auto_ptr<NM_Update_Attribute_Values>
rep(static_cast<NM_Update_Attribute_Values*>(comm->waitMessage(req.getMessageType(),
req.federate)));
e = rep->getException() ;
evtrHandle = rep->getEvent();
}
@@ -199,7 +199,7 @@
req.setLabel(theTag);
comm->sendMessage(&req);
- std::auto_ptr<NetworkMessage> rep(comm->waitMessage(req.getType(),
req.federate));
+ std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(req.getMessageType(), req.federate));
e = rep->getException() ;
G.Out(pdGendoc,"exit ObjectManagement::updateAttributeValues without
time");
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- RTIA/DeclarationManagement.cc 19 Mar 2010 13:54:03 -0000 3.32
+++ RTIA/DeclarationManagement.cc 20 Mar 2010 16:34:13 -0000 3.33
@@ -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: DeclarationManagement.cc,v 3.32 2010/03/19 13:54:03 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.33 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -405,7 +405,7 @@
std::auto_ptr<Message> rep(comm->receiveUN());
- if (rep->getType() != req.getType()) {
+ if (rep->getMessageType() != req.getMessageType()) {
D.Out(pdExcept, "Unknown response type when waiting for "
"START_REGISTRATION_FOR_OBJECT_CLASS.");
throw RTIinternalError("");
@@ -450,7 +450,7 @@
comm->sendUN(&req);
std::auto_ptr<Message> rep(comm->receiveUN());
- if (rep->getType() != req.getType()) {
+ if (rep->getMessageType() != req.getMessageType()) {
D.Out(pdExcept,
"Unknown response type, expecting TURN_INTERACTIONS_ON.");
throw RTIinternalError("");
@@ -471,7 +471,7 @@
comm->sendUN(&req);
std::auto_ptr<Message> rep(comm->receiveUN());
- if (rep->getType() != req.getType()) {
+ if (rep->getMessageType() != req.getMessageType()) {
D.Out(pdExcept,
"Unknown response type, expecting TURN_INTERACTIONS_OFF.");
throw RTIinternalError("");
@@ -482,4 +482,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.32 2010/03/19 13:54:03 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.33 2010/03/20 16:34:13 erk Exp $
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.106
retrieving revision 3.107
diff -u -b -r3.106 -r3.107
--- RTIA/RTIA_federate.cc 14 Mar 2010 15:35:53 -0000 3.106
+++ RTIA/RTIA_federate.cc 20 Mar 2010 16:34:13 -0000 3.107
@@ -100,15 +100,15 @@
void
RTIA::chooseFederateProcessing(Message *req, Message* rep, TypeException &e)
{
- G.Out(pdGendoc,"enter RTIA::chooseFederateProcessing for type =
%d",req->getType());
+ G.Out(pdGendoc,"enter RTIA::chooseFederateProcessing for type =
%d",req->getMessageType());
// Verify not in saving or restoring state.
// May throw SaveInProgress or RestoreInProgress
- saveAndRestoreStatus(req->getType());
+ saveAndRestoreStatus(req->getMessageType());
e = e_NO_EXCEPTION ;
- switch(req->getType()) {
+ switch(req->getMessageType()) {
case Message::CLOSE_CONNEXION:
D.Out(pdTrace,
@@ -238,7 +238,7 @@
case Message::FEDERATE_SAVE_NOT_COMPLETE: {
D.Out(pdTrace, "Receiving Message from Federate, type"
" FederateSave(Not)Complete.");
- bool result = req->getType() == Message::FEDERATE_SAVE_COMPLETE
;
+ bool result = req->getMessageType() ==
Message::FEDERATE_SAVE_COMPLETE ;
if (result) {
G.Out(pdGendoc,"chooseFederateProcessing
FEDERATE_SAVE_COMPLETE");
}
@@ -1244,10 +1244,10 @@
default:
D.Out(pdExcept,
- "Receiving Message from Federate, Unknown Type
%d.", req->getType());
+ "Receiving Message from Federate, Unknown Type
%d.", req->getMessageType());
throw RTIinternalError("");
}
- stat.federateService(req->getType());
+ stat.federateService(req->getMessageType());
G.Out(pdGendoc,"exit chooseFederateProcessing");
} /* end of RTIA::chooseFederateProcessing */
@@ -1316,7 +1316,7 @@
void
RTIA::initFederateProcessing(Message *req, Message* rep)
{
- if(req->getType() == Message::OPEN_CONNEXION) {
+ if(req->getMessageType() == Message::OPEN_CONNEXION) {
M_Open_Connexion *OCq, *OCr;
OCq = static_cast<M_Open_Connexion *>(req);
OCr = static_cast<M_Open_Connexion *>(rep);
@@ -1340,7 +1340,7 @@
rep->setException(e_RTIinternalError,
"RTIA protocol version mismatch; expecting
OPEN_CONNECTION first.");
}
- stat.federateService(req->getType());
+ stat.federateService(req->getMessageType());
}
void
@@ -1348,7 +1348,7 @@
{
/* use virtual constructor in order to build *
* appropriate answer message. */
- std::auto_ptr<Message> rep(M_Factory::create(req->getType()));
+ std::auto_ptr<Message> rep(M_Factory::create(req->getMessageType()));
G.Out(pdGendoc,"enter RTIA::processFederateRequest");
@@ -1377,7 +1377,7 @@
}
// FIXME should
// catch (Exception &e) {
- //
rep->setException(static_cast<TypeException>(e.getType()),e._reason);
+ //
rep->setException(static_cast<TypeException>(e.getMessageType()),e._reason);
catch (ArrayIndexOutOfBounds &e) {
D.Out(pdExcept, "Catched %s Exception.", e._name);
rep->setException(e_ArrayIndexOutOfBounds);
@@ -1709,9 +1709,9 @@
delete req;
- if (rep->getType() != Message::TICK_REQUEST &&
- rep->getType() != Message::TICK_REQUEST_NEXT &&
- rep->getType() != Message::TICK_REQUEST_STOP) {
+ if (rep->getMessageType() != Message::TICK_REQUEST &&
+ rep->getMessageType() != Message::TICK_REQUEST_NEXT &&
+ rep->getMessageType() != Message::TICK_REQUEST_STOP) {
// generic federate service acknowledgment
// the TICK_REQUEST confirmation is generated in
processOngoingTick()
comm->sendUN(rep.get());
Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- RTIA/RTIA_network.cc 19 Mar 2010 13:54:03 -0000 3.35
+++ RTIA/RTIA_network.cc 20 Mar 2010 16:34:13 -0000 3.36
@@ -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: RTIA_network.cc,v 3.35 2010/03/19 13:54:03 erk Exp $
+// $Id: RTIA_network.cc,v 3.36 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -43,7 +43,7 @@
void
RTIA::processNetworkMessage(NetworkMessage *msg)
{
-NetworkMessage::Type msgType = msg->getType();
+NetworkMessage::Type msgType = msg->getMessageType();
G.Out(pdGendoc,"enter RTIA::processNetworkMessage");
@@ -380,4 +380,4 @@
}} // namespace certi/rtia
-// $Id: RTIA_network.cc,v 3.35 2010/03/19 13:54:03 erk Exp $
+// $Id: RTIA_network.cc,v 3.36 2010/03/20 16:34:13 erk Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -b -r3.56 -r3.57
--- RTIA/TimeManagement.cc 19 Mar 2010 13:54:03 -0000 3.56
+++ RTIA/TimeManagement.cc 20 Mar 2010 16:34:13 -0000 3.57
@@ -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.cc,v 3.56 2010/03/19 13:54:03 erk Exp $
+// $Id: TimeManagement.cc,v 3.57 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -125,12 +125,12 @@
bool
TimeManagement::executeFederateService(NetworkMessage &msg)
{
- G.Out(pdGendoc,"enter TimeManagement::executeFederateService for type
%d",msg.getType());
- D.Out(pdRequest, "Execute federate service: Type %d.", msg.getType());
+ G.Out(pdGendoc,"enter TimeManagement::executeFederateService for type
%d",msg.getMessageType());
+ D.Out(pdRequest, "Execute federate service: Type %d.", msg.getMessageType());
_tick_state = TICK_NEXT; // indicate the callback was processed
- switch (msg.getType()) {
+ switch (msg.getMessageType()) {
case NetworkMessage::FEDERATION_SYNCHRONIZED:
try {
@@ -346,14 +346,14 @@
case NetworkMessage::FEDERATION_SAVED:
case NetworkMessage::FEDERATION_NOT_SAVED: {
- bool status = (msg.getType() == NetworkMessage::FEDERATION_SAVED) ?
true : false ;
+ bool status = (msg.getMessageType() ==
NetworkMessage::FEDERATION_SAVED) ? true : false ;
fm->federationSavedStatus(status);
}
break ;
case NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED:
case NetworkMessage::REQUEST_FEDERATION_RESTORE_FAILED: {
- bool status = (msg.getType() ==
NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED)
+ bool status = (msg.getMessageType() ==
NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED)
? true : false ;
fm->requestFederationRestoreStatus(status, msg.getLabel(),
msg.getTag());
}
@@ -369,7 +369,7 @@
case NetworkMessage::FEDERATION_RESTORED:
case NetworkMessage::FEDERATION_NOT_RESTORED: {
- bool status = (msg.getType() == NetworkMessage::FEDERATION_RESTORED)
? true : false ;
+ bool status = (msg.getMessageType() ==
NetworkMessage::FEDERATION_RESTORED) ? true : false ;
fm->federationRestoredStatus(status);
}
break ;
@@ -1010,4 +1010,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.56 2010/03/19 13:54:03 erk Exp $
+// $Id: TimeManagement.cc,v 3.57 2010/03/20 16:34:13 erk Exp $
Index: libCERTI/M_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.cc,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/M_Classes.cc 14 Mar 2010 15:35:54 -0000 3.7
+++ libCERTI/M_Classes.cc 20 Mar 2010 16:34:13 -0000 3.8
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sun, 14 at 16:30:18 by the CERTI message generator
+// Generated on 2010 March Sat, 20 at 17:24:56 by the CERTI message generator
#include <vector>
#include <string>
#include "M_Classes.hh"
@@ -894,8 +894,8 @@
//Specific serialization code
msgBuffer.write_uint32(objectClass);
msgBuffer.write_uint32(object);
- msgBuffer.write_bool(hasObjectName);
- if (hasObjectName) {
+ msgBuffer.write_bool(_hasObjectName);
+ if (_hasObjectName) {
msgBuffer.write_string(objectName);
}
}
@@ -906,8 +906,8 @@
//Specific deserialization code
objectClass = static_cast<ObjectClassHandle>(msgBuffer.read_uint32());
object = static_cast<ObjectHandle>(msgBuffer.read_uint32());
- hasObjectName = msgBuffer.read_bool();
- if (hasObjectName) {
+ _hasObjectName = msgBuffer.read_bool();
+ if (_hasObjectName) {
msgBuffer.read_string(objectName);
}
}
@@ -950,8 +950,8 @@
for (uint32_t i = 0; i < valuesSize; ++i) {
msgBuffer.write_string(values[i]);
}
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -972,8 +972,8 @@
for (uint32_t i = 0; i < valuesSize; ++i) {
msgBuffer.read_string(values[i]);
}
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1016,8 +1016,8 @@
msgBuffer.write_uint32(objectClass);
msgBuffer.write_uint32(object);
msgBuffer.write_string(objectName);
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1029,8 +1029,8 @@
objectClass = static_cast<ObjectClassHandle>(msgBuffer.read_uint32());
object = static_cast<ObjectHandle>(msgBuffer.read_uint32());
msgBuffer.read_string(objectName);
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1074,8 +1074,8 @@
for (uint32_t i = 0; i < valuesSize; ++i) {
msgBuffer.write_string(values[i]);
}
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1096,8 +1096,8 @@
for (uint32_t i = 0; i < valuesSize; ++i) {
msgBuffer.read_string(values[i]);
}
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1150,8 +1150,8 @@
msgBuffer.write_string(values[i]);
}
msgBuffer.write_uint32(region);
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1172,8 +1172,8 @@
msgBuffer.read_string(values[i]);
}
region = static_cast<RegionHandle>(msgBuffer.read_uint32());
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1226,8 +1226,8 @@
msgBuffer.write_string(values[i]);
}
msgBuffer.write_uint32(region);
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1248,8 +1248,8 @@
msgBuffer.read_string(values[i]);
}
region = static_cast<RegionHandle>(msgBuffer.read_uint32());
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1292,8 +1292,8 @@
msgBuffer.write_uint32(objectClass);
msgBuffer.write_uint32(object);
msgBuffer.write_string(objectName);
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1305,8 +1305,8 @@
objectClass = static_cast<ObjectClassHandle>(msgBuffer.read_uint32());
object = static_cast<ObjectHandle>(msgBuffer.read_uint32());
msgBuffer.read_string(objectName);
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -1370,8 +1370,8 @@
msgBuffer.write_uint32(objectClass);
msgBuffer.write_uint32(object);
msgBuffer.write_string(objectName);
- msgBuffer.write_bool(hasEventRetraction);
- if (hasEventRetraction) {
+ msgBuffer.write_bool(_hasEventRetraction);
+ if (_hasEventRetraction) {
eventRetraction.serialize(msgBuffer);
}
}
@@ -1383,8 +1383,8 @@
objectClass = static_cast<ObjectClassHandle>(msgBuffer.read_uint32());
object = static_cast<ObjectHandle>(msgBuffer.read_uint32());
msgBuffer.read_string(objectName);
- hasEventRetraction = msgBuffer.read_bool();
- if (hasEventRetraction) {
+ _hasEventRetraction = msgBuffer.read_bool();
+ if (_hasEventRetraction) {
eventRetraction.deserialize(msgBuffer);
}
}
@@ -3135,8 +3135,8 @@
//Specific serialization code
msgBuffer.write_uint32(objectClass);
msgBuffer.write_uint32(object);
- msgBuffer.write_bool(hasObjectInstanceName);
- if (hasObjectInstanceName) {
+ msgBuffer.write_bool(_hasObjectInstanceName);
+ if (_hasObjectInstanceName) {
msgBuffer.write_string(objectInstanceName);
}
uint32_t attributesSize = attributes.size();
@@ -3152,8 +3152,8 @@
//Specific deserialization code
objectClass = static_cast<ObjectClassHandle>(msgBuffer.read_uint32());
object = static_cast<ObjectHandle>(msgBuffer.read_uint32());
- hasObjectInstanceName = msgBuffer.read_bool();
- if (hasObjectInstanceName) {
+ _hasObjectInstanceName = msgBuffer.read_bool();
+ if (_hasObjectInstanceName) {
msgBuffer.read_string(objectInstanceName);
}
uint32_t attributesSize = msgBuffer.read_uint32();
@@ -4790,7 +4790,7 @@
// receive generic message
msgGen.receive(stream,msgBuffer);
// create specific message from type
- msg = M_Factory::create(msgGen.getType());
+ msg = M_Factory::create(msgGen.getMessageType());
msgBuffer.assumeSizeFromReservedBytes();
msg->deserialize(msgBuffer);
return msg;
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.79
retrieving revision 3.80
diff -u -b -r3.79 -r3.80
--- libCERTI/ObjectClass.cc 19 Mar 2010 13:54:03 -0000 3.79
+++ libCERTI/ObjectClass.cc 20 Mar 2010 16:34:13 -0000 3.80
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.79 2010/03/19 13:54:03 erk Exp $
+// $Id: ObjectClass.cc,v 3.80 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -110,8 +110,8 @@
G.Out(pdGendoc," ObjectClass::broadcastClassMessage
handle=%d",handle);
// 2. Update message attribute list by removing child's attributes.
- if ((ocbList->getMsg()->getType() ==
NetworkMessage::REFLECT_ATTRIBUTE_VALUES) ||
- (ocbList->getMsg()->getType() ==
NetworkMessage::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION)) {
+ if ((ocbList->getMsg()->getMessageType() ==
NetworkMessage::REFLECT_ATTRIBUTE_VALUES) ||
+ (ocbList->getMsg()->getMessageType() ==
NetworkMessage::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION)) {
for (uint32_t attr = 0; attr <
(ocbList->getMsgRAV()->getAttributesSize());) {
// If the attribute is not in that class, remove it from the
message.
@@ -125,7 +125,7 @@
}
// 3. Add class/attributes subscribers to the list.
- switch(ocbList->getMsg()->getType()) {
+ switch(ocbList->getMsg()->getMessageType()) {
case NetworkMessage::DISCOVER_OBJECT:
case NetworkMessage::REMOVE_OBJECT: {
// For each federate, add it to list if at least one attribute has
@@ -1713,4 +1713,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.79 2010/03/19 13:54:03 erk Exp $
+// $Id: ObjectClass.cc,v 3.80 2010/03/20 16:34:13 erk Exp $
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.62
retrieving revision 3.63
diff -u -b -r3.62 -r3.63
--- libCERTI/Message.hh 14 Mar 2010 15:35:54 -0000 3.62
+++ libCERTI/Message.hh 20 Mar 2010 16:34:13 -0000 3.63
@@ -211,10 +211,19 @@
/** Default Message creator */
Message();
- /** The name corresponding to message type */
+ /**
+ * Get the name of [the type of] the message.
+ * @return the message type name.
+ */
const char* getMessageName() const {return messageName;}
/**
+ * Get the message type.
+ * @return the type of the message
+ */
+ Type getMessageType() const { return type ; };
+
+ /**
* Serialize the message into a buffer
* @param[in] msgBuffer the serialization buffer
*/
@@ -242,8 +251,6 @@
*/
void receive(SocketUN* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
- Type getType() const { return type ; };
-
void setException(TypeException, const std::string& the_reason = "");
TypeException getExceptionType() const { return exception ; };
const char *getExceptionReason() const { return exceptionReason.c_str() ;
};
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- libCERTI/NM_Classes.cc 19 Mar 2010 13:54:03 -0000 3.22
+++ libCERTI/NM_Classes.cc 20 Mar 2010 16:34:13 -0000 3.23
@@ -1,4 +1,4 @@
-// Generated on 2010 March Fri, 19 at 13:57:08 by the CERTI message generator
+// Generated on 2010 March Sat, 20 at 17:24:14 by the CERTI message generator
#include <vector>
#include <string>
#include "NM_Classes.hh"
@@ -2912,7 +2912,7 @@
// receive generic message
msgGen.receive(stream,msgBuffer);
// create specific message from type
- msg = NM_Factory::create(msgGen.getType());
+ msg = NM_Factory::create(msgGen.getMessageType());
msgBuffer.assumeSizeFromReservedBytes();
msg->deserialize(msgBuffer);
return msg;
Index: libCERTI/ObjectClassAttribute.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- libCERTI/ObjectClassAttribute.cc 19 Mar 2010 13:54:03 -0000 3.37
+++ libCERTI/ObjectClassAttribute.cc 20 Mar 2010 16:34:13 -0000 3.38
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassAttribute.cc,v 3.37 2010/03/19 13:54:03 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.38 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include "ObjectClassAttribute.hh"
@@ -174,7 +174,7 @@
ObjectClassAttribute::updateBroadcastList(ObjectClassBroadcastList *ocblist,
const RTIRegion *region)
{
- switch(ocblist->getMsg()->getType()) {
+ switch(ocblist->getMsg()->getMessageType()) {
case NetworkMessage::REFLECT_ATTRIBUTE_VALUES: {
addFederatesIfOverlap(*ocblist, region, handle);
@@ -193,4 +193,4 @@
} // namespace
-// $Id: ObjectClassAttribute.cc,v 3.37 2010/03/19 13:54:03 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.38 2010/03/20 16:34:13 erk Exp $
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/NM_Classes.hh 19 Mar 2010 13:54:03 -0000 3.16
+++ libCERTI/NM_Classes.hh 20 Mar 2010 16:34:13 -0000 3.17
@@ -1,4 +1,4 @@
-// Generated on 2010 March Fri, 19 at 13:57:07 by the CERTI message generator
+// Generated on 2010 March Sat, 20 at 17:24:07 by the CERTI message generator
#ifndef NM_CLASSES_HH
#define NM_CLASSES_HH
// ****-**** Global System includes ****-****
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -b -r3.60 -r3.61
--- libCERTI/NetworkMessage.hh 19 Mar 2010 20:30:55 -0000 3.60
+++ libCERTI/NetworkMessage.hh 20 Mar 2010 16:34:13 -0000 3.61
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.60 2010/03/19 20:30:55 erk Exp $
+// $Id: NetworkMessage.hh,v 3.61 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -161,7 +161,7 @@
* Get the message type.
* @return the type of the message
*/
- const NetworkMessage::Message_T getType() const {return type;};
+ const NetworkMessage::Message_T getMessageType() const {return type;};
const TypeException getException() const {return exception;};
TypeException& getRefException() {return exception;};
@@ -248,4 +248,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.60 2010/03/19 20:30:55 erk Exp $
+// $Id: NetworkMessage.hh,v 3.61 2010/03/20 16:34:13 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- libCERTI/ObjectClassBroadcastList.cc 19 Mar 2010 13:54:02 -0000
3.29
+++ libCERTI/ObjectClassBroadcastList.cc 20 Mar 2010 16:34:13 -0000
3.30
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.29 2010/03/19 13:54:02 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.30 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
@@ -206,7 +206,7 @@
/* Initialize specific pointer
* FIXME : this is ugly and will be reworked
* */
- switch(msg->getType()) {
+ switch(msg->getMessageType()) {
case NetworkMessage::REMOVE_OBJECT:
msgRO = static_cast<NM_Remove_Object*>(msg);
break;
@@ -347,7 +347,7 @@
void ObjectClassBroadcastList::sendPendingMessage(SecurityServer *server)
{
G.Out(pdGendoc,"enter ObjectClassBroadcastList::sendPendingMessage");
- switch (msg->getType()) {
+ switch (msg->getMessageType()) {
case NetworkMessage::REFLECT_ATTRIBUTE_VALUES:
case NetworkMessage::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION:
@@ -474,7 +474,7 @@
/* Initialize specific pointer
* FIXME : this is ugly and will be reworked
* */
- switch(msg->getType()) {
+ switch(msg->getMessageType()) {
case NetworkMessage::REMOVE_OBJECT:
msgRO->setObjectClass(objectClass);
break;
@@ -501,4 +501,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.29 2010/03/19 13:54:02 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.30 2010/03/20 16:34:13 erk Exp $
Index: libCERTI/M_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.hh,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/M_Classes.hh 14 Mar 2010 15:35:54 -0000 3.7
+++ libCERTI/M_Classes.hh 20 Mar 2010 16:34:13 -0000 3.8
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sun, 14 at 16:30:18 by the CERTI message generator
+// Generated on 2010 March Sat, 20 at 17:25:05 by the CERTI message generator
#ifndef M_CLASSES_HH
#define M_CLASSES_HH
// ****-**** Global System includes ****-****
@@ -346,6 +346,7 @@
const FederateHandle& getFederateSet(uint32_t rank) const {return
federateSet[rank];}
FederateHandle& getFederateSet(uint32_t rank) {return
federateSet[rank];}
void setFederateSet(const FederateHandle& newFederateSet, uint32_t
rank) {federateSet[rank]=newFederateSet;}
+ void removeFederateSet(uint32_t rank)
{federateSet.erase(federateSet.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -574,6 +575,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -649,6 +651,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
const bool& getActive() const {return active;}
void setActive(const bool& newActive) {active=newActive;}
// the show method
@@ -793,16 +796,17 @@
void setObject(const ObjectHandle& newObject) {object=newObject;}
const std::string& getObjectName() const {return objectName;}
void setObjectName(const std::string& newObjectName) {
- hasObjectName=true;
+ _hasObjectName=true;
objectName=newObjectName;
}
+ bool hasObjectName() {return _hasObjectName;}
// the show method
virtual void show(std::ostream& out);
protected:
ObjectClassHandle objectClass;
ObjectHandle object;
std::string objectName;
- bool hasObjectName;
+ bool _hasObjectName;
private:
};
@@ -824,17 +828,20 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
uint32_t getValuesSize() const {return values.size();}
void setValuesSize(uint32_t num) {values.resize(num);}
const std::vector<AttributeValue_t>& getValues() const {return
values;}
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;}
+ void removeValues(uint32_t rank) {values.erase(values.begin() +
rank);}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -843,7 +850,7 @@
std::vector<AttributeHandle> attributes;
std::vector<AttributeValue_t> values;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -863,9 +870,10 @@
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -873,7 +881,7 @@
ObjectHandle object;
std::string objectName;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -895,17 +903,20 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
uint32_t getValuesSize() const {return values.size();}
void setValuesSize(uint32_t num) {values.resize(num);}
const std::vector<AttributeValue_t>& getValues() const {return
values;}
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;}
+ void removeValues(uint32_t rank) {values.erase(values.begin() +
rank);}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -914,7 +925,7 @@
std::vector<AttributeHandle> attributes;
std::vector<AttributeValue_t> values;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -934,19 +945,22 @@
const ParameterHandle& getParameters(uint32_t rank) const {return
parameters[rank];}
ParameterHandle& getParameters(uint32_t rank) {return
parameters[rank];}
void setParameters(const ParameterHandle& newParameters, uint32_t
rank) {parameters[rank]=newParameters;}
+ void removeParameters(uint32_t rank)
{parameters.erase(parameters.begin() + rank);}
uint32_t getValuesSize() const {return values.size();}
void setValuesSize(uint32_t num) {values.resize(num);}
const std::vector<ParameterValue_t>& getValues() const {return
values;}
const ParameterValue_t& getValues(uint32_t rank) const {return
values[rank];}
ParameterValue_t& getValues(uint32_t rank) {return values[rank];}
void setValues(const ParameterValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
+ void removeValues(uint32_t rank) {values.erase(values.begin() +
rank);}
const RegionHandle& getRegion() const {return region;}
void setRegion(const RegionHandle& newRegion) {region=newRegion;}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -955,7 +969,7 @@
std::vector<ParameterValue_t> values;
RegionHandle region;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -975,19 +989,22 @@
const ParameterHandle& getParameters(uint32_t rank) const {return
parameters[rank];}
ParameterHandle& getParameters(uint32_t rank) {return
parameters[rank];}
void setParameters(const ParameterHandle& newParameters, uint32_t
rank) {parameters[rank]=newParameters;}
+ void removeParameters(uint32_t rank)
{parameters.erase(parameters.begin() + rank);}
uint32_t getValuesSize() const {return values.size();}
void setValuesSize(uint32_t num) {values.resize(num);}
const std::vector<ParameterValue_t>& getValues() const {return
values;}
const ParameterValue_t& getValues(uint32_t rank) const {return
values[rank];}
ParameterValue_t& getValues(uint32_t rank) {return values[rank];}
void setValues(const ParameterValue_t& newValues, uint32_t rank)
{values[rank]=newValues;}
+ void removeValues(uint32_t rank) {values.erase(values.begin() +
rank);}
const RegionHandle& getRegion() const {return region;}
void setRegion(const RegionHandle& newRegion) {region=newRegion;}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -996,7 +1013,7 @@
std::vector<ParameterValue_t> values;
RegionHandle region;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -1016,9 +1033,10 @@
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1026,7 +1044,7 @@
ObjectHandle object;
std::string objectName;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -1063,9 +1081,10 @@
void setObjectName(const std::string& newObjectName)
{objectName=newObjectName;}
const EventRetraction& getEventRetraction() const {return
eventRetraction;}
void setEventRetraction(const EventRetraction& newEventRetraction) {
- hasEventRetraction=true;
+ _hasEventRetraction=true;
eventRetraction=newEventRetraction;
}
+ bool hasEventRetraction() {return _hasEventRetraction;}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1073,7 +1092,7 @@
ObjectHandle object;
std::string objectName;
EventRetraction eventRetraction;
- bool hasEventRetraction;
+ bool _hasEventRetraction;
private:
};
@@ -1097,6 +1116,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1146,6 +1166,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1170,6 +1191,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1194,6 +1216,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1218,6 +1241,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1242,6 +1266,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1266,6 +1291,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1290,6 +1316,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1323,6 +1350,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1347,6 +1375,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1371,6 +1400,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1395,6 +1425,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1419,6 +1450,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1443,6 +1475,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1562,6 +1595,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1586,6 +1620,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1610,6 +1645,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1634,6 +1670,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1658,6 +1695,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1682,6 +1720,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1706,6 +1745,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1730,6 +1770,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -1758,6 +1799,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -2036,6 +2078,7 @@
const Extent& getExtentSet(uint32_t rank) const {return
extentSet[rank];}
Extent& getExtentSet(uint32_t rank) {return extentSet[rank];}
void setExtentSet(const Extent& newExtentSet, uint32_t rank)
{extentSet[rank]=newExtentSet;}
+ void removeExtentSet(uint32_t rank)
{extentSet.erase(extentSet.begin() + rank);}
const RegionHandle& getRegion() const {return region;}
void setRegion(const RegionHandle& newRegion) {region=newRegion;}
// the show method
@@ -2063,6 +2106,7 @@
const Extent& getExtentSet(uint32_t rank) const {return
extentSet[rank];}
Extent& getExtentSet(uint32_t rank) {return extentSet[rank];}
void setExtentSet(const Extent& newExtentSet, uint32_t rank)
{extentSet[rank]=newExtentSet;}
+ void removeExtentSet(uint32_t rank)
{extentSet.erase(extentSet.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -2102,22 +2146,24 @@
void setObject(const ObjectHandle& newObject) {object=newObject;}
const std::string& getObjectInstanceName() const {return
objectInstanceName;}
void setObjectInstanceName(const std::string& newObjectInstanceName) {
- hasObjectInstanceName=true;
+ _hasObjectInstanceName=true;
objectInstanceName=newObjectInstanceName;
}
+ bool hasObjectInstanceName() {return _hasObjectInstanceName;}
uint32_t getAttributesSize() const {return attributes.size();}
void setAttributesSize(uint32_t num) {attributes.resize(num);}
const std::vector<AttributeHandle>& getAttributes() const {return
attributes;}
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
ObjectClassHandle objectClass;
ObjectHandle object;
std::string objectInstanceName;
- bool hasObjectInstanceName;
+ bool _hasObjectInstanceName;
std::vector<AttributeHandle> attributes;// repeated RegionHandle
regions
private:
};
@@ -2140,6 +2186,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -2190,6 +2237,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
@@ -2286,6 +2334,7 @@
const AttributeHandle& getAttributes(uint32_t rank) const {return
attributes[rank];}
AttributeHandle& getAttributes(uint32_t rank) {return
attributes[rank];}
void setAttributes(const AttributeHandle& newAttributes, uint32_t
rank) {attributes[rank]=newAttributes;}
+ void removeAttributes(uint32_t rank)
{attributes.erase(attributes.begin() + rank);}
// the show method
virtual void show(std::ostream& out);
protected:
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.125
retrieving revision 3.126
diff -u -b -r3.125 -r3.126
--- RTIG/Federation.cc 19 Mar 2010 13:54:03 -0000 3.125
+++ RTIG/Federation.cc 20 Mar 2010 16:34:13 -0000 3.126
@@ -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: Federation.cc,v 3.125 2010/03/19 13:54:03 erk Exp $
+// $Id: Federation.cc,v 3.126 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -474,7 +474,7 @@
nullMessage.setDate(v[i].second);
D.Out(pdTerm,
"Sending NULL message(type %d) from %d
to new federate.",
- nullMessage.getType(),
nullMessage.federate);
+ nullMessage.getMessageType(),
nullMessage.federate);
nullMessage.send(tcp_link,NM_msgBufSend);
}
@@ -490,7 +490,7 @@
ASPMessage.setLabel((*i).first);
ASPMessage.setTag((*i).second);
D.Out(pdTerm, "Sending synchronization message
%s (type %d)"
- " to the new Federate.",
(*i).first.c_str(), ASPMessage.getType());
+ " to the new Federate.",
(*i).first.c_str(), ASPMessage.getMessageType());
ASPMessage.send(tcp_link,NM_msgBufSend);
federate.addSynchronizationLabel((*i).first);
@@ -2575,5 +2575,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.125 2010/03/19 13:54:03 erk Exp $
+// $Id: Federation.cc,v 3.126 2010/03/20 16:34:13 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.96
retrieving revision 3.97
diff -u -b -r3.96 -r3.97
--- RTIG/RTIG_processing.cc 19 Mar 2010 20:30:55 -0000 3.96
+++ RTIG/RTIG_processing.cc 20 Mar 2010 16:34:13 -0000 3.97
@@ -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.96 2010/03/19 20:30:55 erk Exp $
+// $Id: RTIG_processing.cc,v 3.97 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -632,14 +632,14 @@
RTIG::processFederateSaveStatus(Socket *, NetworkMessage *req)
{
G.Out(pdGendoc,"enter RTIG::processFederateSaveStatus");
- if (req->getType() == NetworkMessage::FEDERATE_SAVE_COMPLETE)
+ if (req->getMessageType() == NetworkMessage::FEDERATE_SAVE_COMPLETE)
G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE COMPLETE SERVICE **");
else
G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE NOT COMPLETE SERVICE
**");
auditServer << "Federate " << req->federate << " save ended." ;
- bool status = req->getType() == NetworkMessage::FEDERATE_SAVE_COMPLETE ;
+ bool status = req->getMessageType() ==
NetworkMessage::FEDERATE_SAVE_COMPLETE ;
federations.federateSaveStatus(req->federation, req->federate, status);
G.Out(pdGendoc,"exit END ** FEDERATE SAVE (NOT) COMPLETE SERVICE
**");
@@ -668,7 +668,7 @@
G.Out(pdGendoc,"enter RTIG::processRequestFederateRestoreStatus");
auditServer << "Federate " << req->federate << " restore ended." ;
- bool status = req->getType() ==
NetworkMessage::FEDERATE_RESTORE_COMPLETE ;
+ bool status = req->getMessageType() ==
NetworkMessage::FEDERATE_RESTORE_COMPLETE ;
federations.federateRestoreStatus(req->federation, req->federate,
status);
@@ -681,7 +681,7 @@
void
RTIG::processPublishObjectClass(Socket *link, NM_Publish_Object_Class *req)
{
- bool pub = (req->getType() == NetworkMessage::PUBLISH_OBJECT_CLASS);
+ bool pub = (req->getMessageType() ==
NetworkMessage::PUBLISH_OBJECT_CLASS);
auditServer << "Publish Object Class = " << req->getObjectClass() << ",
# of att. = "
<< req->getAttributesSize() ;
@@ -720,7 +720,7 @@
G.Out(pdGendoc,"BEGIN ** SUBSCRIBE OBJECT CLASS SERVICE **");
std::vector <AttributeHandle> arrayVide ;
- bool sub = (req->getType() == NetworkMessage::SUBSCRIBE_OBJECT_CLASS);
+ bool sub = (req->getMessageType() ==
NetworkMessage::SUBSCRIBE_OBJECT_CLASS);
auditServer << "Subscribe Object Class = " << req->getObjectClass()
<< ", # of att. = " <<
req->getAttributesSize() ;
@@ -760,7 +760,7 @@
{
assert(link != NULL && req != NULL);
- bool pub = (req->getType() ==
NetworkMessage::PUBLISH_INTERACTION_CLASS);
+ bool pub = (req->getMessageType() ==
NetworkMessage::PUBLISH_INTERACTION_CLASS);
auditServer << "Publish Interaction Class = " <<
req->getInteractionClass() ;
federations.publishInteraction(req->federation,
@@ -785,7 +785,7 @@
void
RTIG::processSubscribeInteractionClass(Socket *link,
NM_Subscribe_Interaction_Class *req)
{
- bool sub = (req->getType() ==
NetworkMessage::SUBSCRIBE_INTERACTION_CLASS);
+ bool sub = (req->getMessageType() ==
NetworkMessage::SUBSCRIBE_INTERACTION_CLASS);
auditServer << "Subscribe Interaction Class = " <<
req->getInteractionClass() ;
federations.subscribeInteraction(req->federation,
@@ -1467,4 +1467,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.96 2010/03/19 20:30:55 erk Exp $
+// $Id: RTIG_processing.cc,v 3.97 2010/03/20 16:34:13 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.62
retrieving revision 3.63
diff -u -b -r3.62 -r3.63
--- RTIG/RTIG.cc 19 Mar 2010 13:54:03 -0000 3.62
+++ RTIG/RTIG.cc 20 Mar 2010 16:34:13 -0000 3.63
@@ -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.cc,v 3.62 2010/03/19 13:54:03 erk Exp $
+// $Id: RTIG.cc,v 3.63 2010/03/20 16:34:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -91,10 +91,10 @@
{
G.Out(pdGendoc,"enter RTIG::chooseProcessingMethod type
(%s)",msg->getMessageName());
// This may throw a security error.
- if ( msg->getType() != NetworkMessage::DESTROY_FEDERATION_EXECUTION)
+ if ( msg->getMessageType() != NetworkMessage::DESTROY_FEDERATION_EXECUTION)
socketServer.checkMessage(link->returnSocket(), msg);
- switch(msg->getType()) {
+ switch(msg->getMessageType()) {
case NetworkMessage::MESSAGE_NULL:
D.Out(pdDebug, "Message Null.");
auditServer.setLevel(0);
@@ -398,7 +398,7 @@
default:
// FIXME: Should treat other cases CHANGE_*_ORDER/TRANSPORT_TYPE
- D.Out(pdError, "processMessageRecu: unknown type %u.", msg->getType());
+ D.Out(pdError, "processMessageRecu: unknown type %u.",
msg->getMessageType());
throw RTIinternalError("Unknown Message Type");
}
G.Out(pdGendoc,"exit RTIG::chooseProcessingMethod");
@@ -568,10 +568,10 @@
msg = NM_Factory::receive(link);
// Server Answer(only if an exception is raised)
- std::auto_ptr<NetworkMessage> rep(NM_Factory::create(msg->getType()));
+ std::auto_ptr<NetworkMessage>
rep(NM_Factory::create(msg->getMessageType()));
rep->federate = msg->federate ;
- auditServer.startLine(msg->federation, msg->federate, msg->getType());
+ auditServer.startLine(msg->federation, msg->federate,
msg->getMessageType());
// This macro is used to copy any non null exception reason
// string into our buffer(used for Audit purpose).
@@ -1036,4 +1036,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.62 2010/03/19 13:54:03 erk Exp $
+// $Id: RTIG.cc,v 3.63 2010/03/20 16:34:13 erk Exp $
Index: scripts/GenMsgCXX.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenMsgCXX.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- scripts/GenMsgCXX.py 19 Mar 2010 12:59:37 -0000 1.11
+++ scripts/GenMsgCXX.py 20 Mar 2010 16:34:14 -0000 1.12
@@ -17,7 +17,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
## USA
##
-## $Id: GenMsgCXX.py,v 1.11 2010/03/19 12:59:37 erk Exp $
+## $Id: GenMsgCXX.py,v 1.12 2010/03/20 16:34:14 erk Exp $
## ----------------------------------------------------------------------------
"""
@@ -602,7 +602,7 @@
stream.write(self.getIndent()+self.commentLineBeginWith+" create
specific message from type \n")
stream.write(self.getIndent()+"msg = ");
-
stream.write(self.AST.factory.name+"::"+self.AST.factory.creator[1]+"(msgGen.getType());\n")
+
stream.write(self.AST.factory.name+"::"+self.AST.factory.creator[1]+"(msgGen.getMessageType());\n")
stream.write(self.getIndent()+"msgBuffer.assumeSizeFromReservedBytes();\n")
stream.write(self.getIndent()+"msg->deserialize(msgBuffer);\n")
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.25
retrieving revision 3.26
diff -u -b -r3.25 -r3.26
--- libRTI/RTIambPrivateRefs.cc 7 Mar 2010 18:23:39 -0000 3.25
+++ libRTI/RTIambPrivateRefs.cc 20 Mar 2010 16:34:14 -0000 3.26
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cc,v 3.25 2010/03/07 18:23:39 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.26 2010/03/20 16:34:14 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -125,7 +125,7 @@
D.Out(pdDebug, "RTIA reply received.");
- if (rep->getType() != req->getType()) {
+ if (rep->getMessageType() != req->getMessageType()) {
std::cout << "LibRTI: Assertion failed: rep->type != req->type"
<< std::endl ;
throw RTI::RTIinternalError("RTIambPrivateRefs::executeService:
"
"rep->type != req->type");
@@ -626,7 +626,7 @@
RTIambPrivateRefs::callFederateAmbassador(Message *msg)
throw (RTI::RTIinternalError)
{
- switch (msg->getType()) {
+ switch (msg->getMessageType()) {
case Message::SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED:
try {
@@ -976,4 +976,4 @@
}
}
-// $Id: RTIambPrivateRefs.cc,v 3.25 2010/03/07 18:23:39 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.26 2010/03/20 16:34:14 erk Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.115
retrieving revision 3.116
diff -u -b -r3.115 -r3.116
--- libRTI/RTIambassador.cc 14 Mar 2010 15:35:54 -0000 3.115
+++ libRTI/RTIambassador.cc 20 Mar 2010 16:34:14 -0000 3.116
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.115 2010/03/14 15:35:54 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.116 2010/03/20 16:34:14 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -430,7 +430,7 @@
}
// If the type is TICK_REQUEST, the __tick_kernel() has
terminated.
- if (vers_Fed->getType() == Message::TICK_REQUEST) {
+ if (vers_Fed->getMessageType() == Message::TICK_REQUEST) {
if (vers_Fed->getExceptionType() != e_NO_EXCEPTION) {
// tick() may only throw exceptions defined in
the HLA standard
// the RTIA is responsible for sending
'allowed' exceptions only
@@ -2988,4 +2988,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.115 2010/03/14 15:35:54 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.116 2010/03/20 16:34:14 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIA/Communications.cc RTIA/ObjectManagem...,
certi-cvs <=