[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/Interaction.cc libCERTI/NetworkM... [br_DEV_H
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/Interaction.cc libCERTI/NetworkM... [br_DEV_HETEROGENEOUS] |
|
Date: |
Thu, 10 Apr 2008 15:12:28 +0000 |
CVSROOT: /sources/certi
Module name: certi
Branch: br_DEV_HETEROGENEOUS
Changes by: Eric NOULARD <erk> 08/04/10 15:12:27
Modified files:
libCERTI : Interaction.cc NetworkMessage.hh ObjectClass.cc
ObjectClassBroadcastList.cc
RTIG : RTIG_processing.cc
RTIA : OwnershipManagement.cc ObjectManagement.cc
DataDistribution.cc TimeManagement.cc
Log message:
Now date, label and tag are protected and accessed through getter/setter
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.35.2.3&r2=3.35.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.30.2.7&r2=3.30.2.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.41.2.3&r2=3.41.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.18.2.3&r2=3.18.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.56.2.3&r2=3.56.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/OwnershipManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.12.2.2&r2=3.12.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.35.2.2&r2=3.35.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DataDistribution.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.23.2.2&r2=3.23.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.29.2.2&r2=3.29.2.3
Patches:
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.35.2.3
retrieving revision 3.35.2.4
diff -u -b -r3.35.2.3 -r3.35.2.4
--- libCERTI/Interaction.cc 10 Apr 2008 14:57:50 -0000 3.35.2.3
+++ libCERTI/Interaction.cc 10 Apr 2008 15:12:25 -0000 3.35.2.4
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.35.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: Interaction.cc,v 3.35.2.4 2008/04/10 15:12:25 erk Exp $
// ----------------------------------------------------------------------------
@@ -415,7 +415,7 @@
answer->interactionClass = handle ; // Interaction Class Handle
answer->setDate(time);
- answer->label = the_tag;
+ answer->setLabel(the_tag);
answer->handleArraySize = list_size ;
for (int i = 0 ; i < list_size ; i++) {
@@ -473,7 +473,7 @@
answer->interactionClass = handle ; // Interaction Class Handle
answer->setBoolean(false) ; // without time
- answer->label = the_tag;
+ answer->setLabel(the_tag);
answer->handleArraySize = list_size ;
for (int i = 0 ; i < list_size ; i++) {
@@ -551,4 +551,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.35.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: Interaction.cc,v 3.35.2.4 2008/04/10 15:12:25 erk Exp $
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.30.2.7
retrieving revision 3.30.2.8
diff -u -b -r3.30.2.7 -r3.30.2.8
--- libCERTI/NetworkMessage.hh 10 Apr 2008 14:57:49 -0000 3.30.2.7
+++ libCERTI/NetworkMessage.hh 10 Apr 2008 15:12:25 -0000 3.30.2.8
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.30.2.7 2008/04/10 14:57:49 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.8 2008/04/10 15:12:25 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -232,7 +232,7 @@
* Indicate if the message is Labelled or not
*/
bool isLabelled;
- std::string label;
+
void setLabel(const std::string label) {isLabelled = true; this->label
= label;};
void setLabel(const char *new_label) {isLabelled = true; label =
std::string(new_label); }
const std::string getLabel() const {return this->label;};
@@ -241,7 +241,6 @@
* Indicate if the message is Tagged or not
*/
bool isTagged;
- std::string tag;
void setTag(const std::string tag) {isTagged = true; this->tag = tag;};
void setTag(const char *new_tag) {isTagged = true; tag =
std::string(new_tag); }
const std::string getTag() const {return this->tag;};
@@ -310,6 +309,19 @@
*/
FederationTime date ;
+ /**
+ * The label of message if it is labelled.
+ * date field cannot be accessed directly but only using
+ * getter/setter.
+ */
+ std::string label;
+ /**
+ * The tag of message if it is tagged.
+ * date field cannot be accessed directly but only using
+ * getter/setter.
+ */
+ std::string tag;
+
// ValueArray is now a ValueLengthPair
ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS] ;
@@ -324,4 +336,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.30.2.7 2008/04/10 14:57:49 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.8 2008/04/10 15:12:25 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.41.2.3
retrieving revision 3.41.2.4
diff -u -b -r3.41.2.3 -r3.41.2.4
--- libCERTI/ObjectClass.cc 10 Apr 2008 14:57:50 -0000 3.41.2.3
+++ libCERTI/ObjectClass.cc 10 Apr 2008 15:12:26 -0000 3.41.2.4
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.41.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: ObjectClass.cc,v 3.41.2.4 2008/04/10 15:12:26 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -236,9 +236,8 @@
std::auto_ptr<NetworkMessage> answer(NM_Factory::create(type));
answer->federation = server->federation();
answer->federate = theFederate ;
- answer->exception = e_NO_EXCEPTION ;
answer->object = theObjectHandle ;
- answer->label = theTag;
+ answer->setLabel(theTag);
int index = 0 ;
for (int j = i ; j < nbAttributes ; j++) {
@@ -790,7 +789,7 @@
NM_Discover_Object message ;
D.Out(pdInit,
"Sending DiscoverObj to Federate %d for Object %u in class %u
",
- federate, (*o)->getHandle(), handle, message.label.c_str());
+ federate, (*o)->getHandle(), handle,
message.getLabel().c_str());
message.federation = server->federation();
message.federate = federate ;
@@ -1102,7 +1101,7 @@
AnswerDivestiture.federation = server->federation();
AnswerDivestiture.federate = theFederateHandle ;
AnswerDivestiture.object = theObjectHandle ;
- AnswerDivestiture.label = std::string("");
+ AnswerDivestiture.setLabel(std::string(""));
AnswerDivestiture.handleArraySize = compteur_divestiture ;
sendToFederate(&AnswerDivestiture, theFederateHandle);
@@ -1113,7 +1112,7 @@
AnswerAssumption->federate = theFederateHandle ;
AnswerAssumption->exception = e_NO_EXCEPTION ;
AnswerAssumption->object = theObjectHandle ;
- AnswerAssumption->label = theTag;
+ AnswerAssumption->setLabel(theTag);
AnswerAssumption->handleArraySize = compteur_assumption ;
List = new ObjectClassBroadcastList(AnswerAssumption,
@@ -1366,7 +1365,7 @@
AnswerAssumption->federate = theFederateHandle ;
AnswerAssumption->exception = e_NO_EXCEPTION ;
AnswerAssumption->object = theObjectHandle ;
- AnswerAssumption->label = std::string("");
+ AnswerAssumption->setLabel(std::string(""));
AnswerAssumption->handleArraySize = compteur_assumption ;
List = new ObjectClassBroadcastList(AnswerAssumption,
@@ -1803,4 +1802,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.41.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: ObjectClass.cc,v 3.41.2.4 2008/04/10 15:12:26 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.18.2.3
retrieving revision 3.18.2.4
diff -u -b -r3.18.2.3 -r3.18.2.4
--- libCERTI/ObjectClassBroadcastList.cc 10 Apr 2008 14:57:50 -0000
3.18.2.3
+++ libCERTI/ObjectClassBroadcastList.cc 10 Apr 2008 15:12:26 -0000
3.18.2.4
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.18.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.18.2.4 2008/04/10 15:12:26 erk Exp $
// ----------------------------------------------------------------------------
@@ -73,7 +73,7 @@
reducedMessage->boolean = message->boolean ; // FIXME Useful ?
reducedMessage->objectClass = message->objectClass ;
- reducedMessage->label = message->label;
+ reducedMessage->setLabel(message->getLabel());
// Copy attributes that are in the bsWaiting state in Line.
UShort currentSize ;
@@ -391,4 +391,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.18.2.3 2008/04/10 14:57:50 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.18.2.4 2008/04/10 15:12:26 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.56.2.3
retrieving revision 3.56.2.4
diff -u -b -r3.56.2.3 -r3.56.2.4
--- RTIG/RTIG_processing.cc 10 Apr 2008 14:57:49 -0000 3.56.2.3
+++ RTIG/RTIG_processing.cc 10 Apr 2008 15:12:26 -0000 3.56.2.4
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIG_processing.cc,v 3.56.2.3 2008/04/10 14:57:49 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.4 2008/04/10 15:12:26 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -397,31 +397,31 @@
G.Out(pdGendoc,"BEGIN ** REGISTER FEDERATION SYNCHRONIZATION POINT Service
**");
G.Out(pdGendoc,"enter RTIG::processRegisterSynchronization");
- auditServer << "Label \"" << req->label.c_str() << "\" registered. Tag is
\""
- << req->tag.c_str() << "\"" ;
+ auditServer << "Label \"" << req->getLabel().c_str() << "\" registered.
Tag is \""
+ << req->getTag().c_str() << "\"" ;
// boolean true means a federates set exists
if ( req->boolean )
federations.manageSynchronization(req->federation,
req->federate,
true,
- req->label.c_str(),
- req->tag.c_str(),
+ req->getLabel().c_str(),
+ req->getTag().c_str(),
req->handleArraySize,
req->handleArray);
else
federations.manageSynchronization(req->federation,
req->federate,
true,
- req->label.c_str(),
- req->tag.c_str());
+ req->getLabel().c_str(),
+ req->getTag().c_str());
D.Out(pdTerm, "Federation %u is now synchronizing.", req->federation);
// send synchronizationPointRegistrationSucceeded() to federate.
NM_Synchronization_Point_Registration_Succeeded rep ;
rep.federate = req->federate ;
rep.federation = req->federation ;
- rep.setLabel(req->label.c_str());
+ rep.setLabel(req->getLabel().c_str());
G.Out(pdGendoc," processRegisterSynchronization====> write SPRS to
RTIA");
@@ -431,15 +431,15 @@
if ( req->boolean )
federations.broadcastSynchronization(req->federation,
req->federate,
- req->label.c_str(),
- req->tag.c_str(),
+ req->getLabel().c_str(),
+ req->getTag().c_str(),
req->handleArraySize,
req->handleArray);
else
federations.broadcastSynchronization(req->federation,
req->federate,
- req->label.c_str(),
- req->tag.c_str());
+ req->getLabel().c_str(),
+ req->getTag().c_str());
G.Out(pdGendoc,"exit RTIG::processRegisterSynchronization");
G.Out(pdGendoc,"END ** REGISTER FEDERATION SYNCHRONIZATION POINT Service
**");
@@ -451,12 +451,12 @@
void
RTIG::processSynchronizationAchieved(Socket *, NetworkMessage *req)
{
- auditServer << "Label \"" << req->label.c_str() << "\" ended." ;
+ auditServer << "Label \"" << req->getLabel().c_str() << "\" ended." ;
federations.manageSynchronization(req->federation,
req->federate,
false,
- req->label.c_str(),
+ req->getLabel().c_str(),
"");
D.Out(pdTerm, "Federate %u has synchronized.", req->federate);
}
@@ -473,11 +473,11 @@
if ( req->boolean )
// With time
federations.requestFederationSave(req->federation, req->federate,
- req->label.c_str(), req->getDate());
+ req->getLabel().c_str(),
req->getDate());
else
// Without time
federations.requestFederationSave(req->federation, req->federate,
- req->label.c_str());
+ req->getLabel().c_str());
G.Out(pdGendoc,"exit RTIG::processRequestFederationSave");
G.Out(pdGendoc,"END ** REQUEST FEDERATION SAVE SERVICE **");
@@ -526,7 +526,7 @@
auditServer << "Federate " << req->federate << " request restore." ;
federations.requestFederationRestore(req->federation, req->federate,
- req->label.c_str());
+ req->getLabel().c_str());
G.Out(pdGendoc,"exit RTIG::processRequestFederationRestore");
G.Out(pdGendoc,"END ** REQUEST FEDERATION RESTORE SERVICE **");
}
@@ -671,15 +671,15 @@
rep->object = federations.registerObject(req->federation,
req->federate,
req->objectClass,
-
const_cast<char*>(req->label.c_str()));
+
const_cast<char*>(req->getLabel().c_str()));
auditServer << ", Handle = " << rep->object ;
D.Out(pdRegister,
"Object \"%s\" of Federate %u has been registered under ID %u.",
- req->label.c_str(), req->federate, rep->object);
+ req->getLabel().c_str(), req->federate, rep->object);
rep->federate = req->federate ;
- rep->setLabel(req->label);
+ rep->setLabel(req->getLabel());
// rep.object is set by the call of registerObject
rep->send(link); // Send answer to RTIA
@@ -709,7 +709,7 @@
ValueArray,
req->handleArraySize,
req->getDate(),
- req->label.c_str());
+ req->getLabel().c_str());
}
else
{
@@ -720,7 +720,7 @@
req->handleArray,
ValueArray,
req->handleArraySize,
- req->label.c_str());
+ req->getLabel().c_str());
}
free(ValueArray);
@@ -731,8 +731,8 @@
rep.setDate(req->getDate());
rep.handleArraySize = 0 ;
// Don't forget label and tag
- rep.label=req->label ;
- rep.tag=req->tag;
+ rep.setLabel(req->getLabel());
+ rep.setTag(req->getTag());
rep.send(link); // send answer to RTIA
}
@@ -762,7 +762,7 @@
req->handleArraySize,
req->getDate(),
req->region,
- req->label.c_str());
+ req->getLabel().c_str());
}
else
{
@@ -773,7 +773,7 @@
values,
req->handleArraySize,
req->region,
- req->label.c_str());
+ req->getLabel().c_str());
}
free(values);
@@ -785,8 +785,8 @@
rep.interactionClass = req->interactionClass ;
rep.handleArraySize = 0 ;
// Don't forget label and tag
- rep.label=req->label;
- rep.tag=req->tag;
+ rep.setLabel(req->getLabel());
+ rep.setTag(req->getTag());
G.Out(pdGendoc,"processSendInteraction===>write");
rep.send(link); // send answer to RTIA
@@ -809,13 +809,13 @@
req->federate,
req->object,
req->getDate(),
- const_cast<char*>(req->label.c_str()));
+ const_cast<char*>(req->getLabel().c_str()));
}
else {
federations.destroyObject(req->federation,
req->federate,
req->object,
- const_cast<char*>(req->label.c_str()));
+ const_cast<char*>(req->getLabel().c_str()));
}
D.Out(pdRegister, "Object # %u of Federation %u has been deleted.",
@@ -872,9 +872,9 @@
req->federate,
req->object,
req->handleArray[0]))
- rep.label = "RTI_TRUE";
+ rep.setLabel("RTI_TRUE");
else
- rep.label = "RTI_FALSE";
+ rep.setLabel("RTI_FALSE");
D.Out(pdDebug, "Owner of Attribute %u of Object %u .",
req->handleArray[0], req->object);
@@ -897,7 +897,7 @@
req->object,
req->handleArray,
req->handleArraySize,
- req->label.c_str());
+ req->getLabel().c_str());
D.Out(pdDebug, "Federate %u of Federation %u negotiate "
"divestiture of object %u.",
@@ -978,7 +978,7 @@
req->object,
req->handleArray,
req->handleArraySize,
- req->label.c_str());
+ req->getLabel().c_str());
D.Out(pdDebug,
"Federate %u of Federation %u ownership acquisition of object %u.",
@@ -1267,14 +1267,14 @@
rep->object = federations.registerObjectWithRegion(req->federation,
req->federate,
req->objectClass,
-
const_cast<char*>(req->label.c_str()),
+
const_cast<char*>(req->getLabel().c_str()),
req->region,
req->handleArraySize,
req->handleArray);
D.Out(pdRegister,
"Object \"%s\" of Federate %u has been registered under ID %u.",
- req->label.c_str(), req->federate, rep->object);
+ req->getLabel().c_str(), req->federate, rep->object);
rep->federate = req->federate ;
rep->send(link); // Send answer to RTIA
@@ -1328,4 +1328,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.56.2.3 2008/04/10 14:57:49 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.4 2008/04/10 15:12:26 erk Exp $
Index: RTIA/OwnershipManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/OwnershipManagement.cc,v
retrieving revision 3.12.2.2
retrieving revision 3.12.2.3
diff -u -b -r3.12.2.2 -r3.12.2.3
--- RTIA/OwnershipManagement.cc 10 Apr 2008 14:57:48 -0000 3.12.2.2
+++ RTIA/OwnershipManagement.cc 10 Apr 2008 15:12:26 -0000 3.12.2.3
@@ -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: OwnershipManagement.cc,v 3.12.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.12.2.3 2008/04/10 15:12:26 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -88,7 +88,7 @@
e = rep->exception ;
if (e == e_NO_EXCEPTION)
- return(rep->label.c_str());
+ return(rep->getLabel().c_str());
else
return("\0");
}
@@ -143,7 +143,7 @@
for (int i = 0 ; i < attribArraySize ; i++)
req.handleArray[i] = attribArray[i] ;
- req.label = theTag;
+ req.setLabel(theTag);
D.Out(pdDebug, "NEGOTIATED_DIVESTITURE Federate %u ", fm->federate);
@@ -265,7 +265,7 @@
for (int i = 0 ; i < attribArraySize ; i++)
req.handleArray[i] = attribArray[i] ;
- req.label = theTag;
+ req.setLabel(theTag);
D.Out(pdDebug, "OWNERSHIP_ACQUISITION Federate %u ", fm->federate);
@@ -504,4 +504,4 @@
}} // namespace certi/rtia
-// $Id: OwnershipManagement.cc,v 3.12.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.12.2.3 2008/04/10 15:12:26 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.35.2.2
retrieving revision 3.35.2.3
diff -u -b -r3.35.2.2 -r3.35.2.3
--- RTIA/ObjectManagement.cc 10 Apr 2008 14:57:48 -0000 3.35.2.2
+++ RTIA/ObjectManagement.cc 10 Apr 2008 15:12:27 -0000 3.35.2.3
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.cc,v 3.35.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.3 2008/04/10 15:12:27 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -73,7 +73,7 @@
req.federate = fm->federate ;
req.federation = fm->_numero_federation ;
req.objectClass = the_class ;
- req.label = theObjectName;
+ req.setLabel(theObjectName);
comm->sendMessage(&req);
@@ -83,7 +83,7 @@
if (e == e_NO_EXCEPTION) {
rootObject->registerObjectInstance(fm->federate, the_class,
rep->object,
- rep->label.c_str());
+ rep->getLabel().c_str());
return rep->object ;
}
else
@@ -127,7 +127,7 @@
req.setValue(i, valueArray[i].value, valueArray[i].length);
}
- req.label= theTag;
+ req.setLabel(theTag);
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UPDATE_ATTRIBUTE_VALUES, req.federate));
@@ -172,7 +172,7 @@
req.setValue(i, valueArray[i].value, valueArray[i].length);
}
- req.label = theTag;
+ req.setLabel(theTag);
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UPDATE_ATTRIBUTE_VALUES, req.federate));
@@ -293,7 +293,7 @@
req.setValue(i, valueArray[i].value, valueArray[i].length);
}
- req.label = theTag;
+ req.setLabel(theTag);
// Send network message and then wait for answer.
comm->sendMessage(&req);
@@ -338,7 +338,7 @@
req.setValue(i, valueArray[i].value, valueArray[i].length);
}
- req.label = theTag;
+ req.setLabel(theTag);
// Send network message and then wait for answer.
comm->sendMessage(&req);
@@ -407,7 +407,7 @@
req.federation = fm->_numero_federation ;
req.federate = fm->federate ;
- req.label = theTag;
+ req.setLabel(theTag);
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DELETE_OBJECT, req.federate));
@@ -433,7 +433,7 @@
req.federation = fm->_numero_federation ;
req.federate = fm->federate ;
- req.label =theTag;
+ req.setLabel(theTag);
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DELETE_OBJECT, req.federate));
@@ -770,4 +770,4 @@
}} // namespace certi/rtia
-// $Id: ObjectManagement.cc,v 3.35.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.3 2008/04/10 15:12:27 erk Exp $
Index: RTIA/DataDistribution.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DataDistribution.cc,v
retrieving revision 3.23.2.2
retrieving revision 3.23.2.3
diff -u -b -r3.23.2.2 -r3.23.2.3
--- RTIA/DataDistribution.cc 10 Apr 2008 14:57:48 -0000 3.23.2.2
+++ RTIA/DataDistribution.cc 10 Apr 2008 15:12:27 -0000 3.23.2.3
@@ -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: DataDistribution.cc,v 3.23.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: DataDistribution.cc,v 3.23.2.3 2008/04/10 15:12:27 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -273,7 +273,7 @@
if (e == e_NO_EXCEPTION) {
rootObject->registerObjectInstance(fm->federate, class_handle,
rep->object,
- rep->label.c_str());
+ rep->getLabel().c_str());
for (int i = 0 ; i < nb ; ++i) {
D[pdDebug] << "Register attribute [" << i << "] Attr: " << attrs[i]
<< " Region: " << regions[i] << std::endl ;
@@ -412,4 +412,4 @@
}} // namespace certi::rtia
-// $Id: DataDistribution.cc,v 3.23.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: DataDistribution.cc,v 3.23.2.3 2008/04/10 15:12:27 erk Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.29.2.2
retrieving revision 3.29.2.3
diff -u -b -r3.29.2.2 -r3.29.2.3
--- RTIA/TimeManagement.cc 10 Apr 2008 14:57:48 -0000 3.29.2.2
+++ RTIA/TimeManagement.cc 10 Apr 2008 15:12:27 -0000 3.29.2.3
@@ -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.29.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: TimeManagement.cc,v 3.29.2.3 2008/04/10 15:12:27 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -129,7 +129,7 @@
case NetworkMessage::FEDERATION_SYNCHRONIZED:
try {
- fm->federationSynchronized(msg.label.c_str());
+ fm->federationSynchronized(msg.getLabel().c_str());
}
catch (RTIinternalError &e) {
cout << "RTIA:RTIinternalError in federationSynchronized." << endl
;
@@ -139,7 +139,7 @@
case NetworkMessage::SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED:
try {
- fm->synchronizationPointRegistrationSucceeded(msg.label.c_str());
+
fm->synchronizationPointRegistrationSucceeded(msg.getLabel().c_str());
}
catch (RTIinternalError &e) {
cout << "RTIA:RTIinternalError in synchronizationPointRegistration"
@@ -150,7 +150,7 @@
case NetworkMessage::ANNOUNCE_SYNCHRONIZATION_POINT:
try {
- fm->announceSynchronizationPoint(msg.label.c_str(),
msg.tag.c_str());
+ fm->announceSynchronizationPoint(msg.getLabel().c_str(),
msg.getTag().c_str());
}
catch (RTIinternalError &e) {
cout << "RTIA:RTIinternalError in announceSynchronizationPoint."
<< endl ;
@@ -162,7 +162,7 @@
try {
om->discoverObject(msg.object,
msg.objectClass,
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.getDate(),
msg.eventRetraction,
msg.exception);
@@ -184,7 +184,7 @@
ValueArray,
msg.handleArraySize,
msg.getDate(),
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.eventRetraction,
msg.exception);
else
@@ -192,7 +192,7 @@
msg.handleArray,
ValueArray,
msg.handleArraySize,
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.exception);
free(ValueArray);
break ;
@@ -218,7 +218,7 @@
ValueArray,
msg.handleArraySize,
msg.getDate(),
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.eventRetraction,
msg.exception);
else
@@ -226,7 +226,7 @@
msg.handleArray,
ValueArray,
msg.handleArraySize,
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.exception);
free(ValueArray);
@@ -238,14 +238,14 @@
om->removeObject(msg.object,
msg.federate,
msg.getDate(),
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.eventRetraction,
msg.exception);
}
else {
om->removeObject(msg.object,
msg.federate,
- msg.label.c_str(),
+ msg.getLabel().c_str(),
msg.exception);
}
break ;
@@ -272,7 +272,7 @@
msg.handleArray,
msg.handleArraySize,
msg.federate,
-
const_cast<char*>(msg.label.c_str()),
+
const_cast<char*>(msg.getLabel().c_str()),
msg.exception);
break ;
@@ -303,7 +303,7 @@
owm->requestAttributeOwnershipRelease(msg.object,
msg.handleArray,
msg.handleArraySize,
-
const_cast<char*>(msg.label.c_str()),
+
const_cast<char*>(msg.getLabel().c_str()),
msg.exception);
break ;
@@ -315,7 +315,7 @@
break ;
case NetworkMessage::INITIATE_FEDERATE_SAVE:
- fm->initiateFederateSave(msg.label.c_str());
+ fm->initiateFederateSave(msg.getLabel().c_str());
break ;
case NetworkMessage::FEDERATION_SAVED:
@@ -329,7 +329,7 @@
case NetworkMessage::REQUEST_FEDERATION_RESTORE_FAILED: {
bool status = (msg.getType() ==
NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED)
? true : false ;
- fm->requestFederationRestoreStatus(status, msg.label.c_str(),
msg.tag.c_str());
+ fm->requestFederationRestoreStatus(status, msg.getLabel().c_str(),
msg.getTag().c_str());
}
break ;
@@ -338,7 +338,7 @@
break ;
case NetworkMessage::INITIATE_FEDERATE_RESTORE:
- fm->initiateFederateRestore(msg.label.c_str(), msg.federate);
+ fm->initiateFederateRestore(msg.getLabel().c_str(), msg.federate);
break ;
case NetworkMessage::FEDERATION_RESTORED:
@@ -796,4 +796,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.29.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: TimeManagement.cc,v 3.29.2.3 2008/04/10 15:12:27 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/Interaction.cc libCERTI/NetworkM... [br_DEV_HETEROGENEOUS],
certi-cvs <=