[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe... [br_DEV_H
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe... [br_DEV_HETEROGENEOUS] |
|
Date: |
Sun, 20 Apr 2008 12:52:22 +0000 |
CVSROOT: /sources/certi
Module name: certi
Branch: br_DEV_HETEROGENEOUS
Changes by: Eric NOULARD <erk> 08/04/20 12:52:22
Modified files:
libCERTI : NM_Classes.cc NM_Classes.hh NetworkMessage.cc
NetworkMessage.hh NetworkMessage_RW.cc
ObjectClass.cc ObjectClass.hh
ObjectClassBroadcastList.cc
RTIA : FederationManagement.cc ObjectManagement.cc
RTIA_network.cc TimeManagement.cc main.cc
RTIG : Federation.cc RTIG.cc RTIG.hh
RTIG_processing.cc
Log message:
Heterogeneous update
Single Billard is OK.
Still have trouble with DISCOVER_OBJECT
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.28.2.6&r2=3.28.2.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.30.2.8&r2=3.30.2.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.45.2.8&r2=3.45.2.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.41.2.4&r2=3.41.2.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.31&r2=3.31.2.1
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.18.2.4&r2=3.18.2.5
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.50.2.3&r2=3.50.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.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/RTIA/RTIA_network.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.22.2.2&r2=3.22.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.29.2.3&r2=3.29.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/main.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.18&r2=3.18.2.1
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.80.2.3&r2=3.80.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.36.2.5&r2=3.36.2.6
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.23&r2=3.23.2.1
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.56.2.7&r2=3.56.2.8
Patches:
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- libCERTI/NM_Classes.cc 11 Apr 2008 14:08:19 -0000 1.1.2.11
+++ libCERTI/NM_Classes.cc 20 Apr 2008 12:52:19 -0000 1.1.2.12
@@ -291,7 +291,7 @@
return msg;
} /* end of NM_Factory::create */
-NetworkMessage* NM_Factory::receive(Socket* socket) throw (RTIinternalError) {
+ NetworkMessage* NM_Factory::receive(Socket* socket) throw (NetworkError,
RTIinternalError) {
NetworkMessage msgGen;
NetworkMessage* msg;
@@ -386,7 +386,7 @@
this->name = "MESSAGE_NULL";
this->type = NetworkMessage::MESSAGE_NULL;
/* specific field init */
- ////isDated =true;
+ //isDated =true;
}
NM_Message_Null::~NM_Message_Null() {
}
@@ -397,7 +397,7 @@
this->name = "CREATE_FEDERATION_EXECUTION";
this->type = NetworkMessage::CREATE_FEDERATION_EXECUTION;
/* specific field init */
- ////isDated =true;
+ //isDated =true;
}
NM_Create_Federation_Execution::~NM_Create_Federation_Execution() {
}
@@ -422,7 +422,7 @@
this->name = "DESTROY_FEDERATION_EXECUTION";
this->type = NetworkMessage::DESTROY_FEDERATION_EXECUTION;
/* specific field init */
- ////isDated =true;
+ //isDated =true;
}
NM_Destroy_Federation_Execution::~NM_Destroy_Federation_Execution() {
}
@@ -436,7 +436,6 @@
/* call mother class */
Super::deserialize();
/* specific code (if any) goes here */
- date = msgBuf.read_double();
federationName = msgBuf.read_string();
} /* end of deserialize */
/*<END>---------- Destroy_Federation_Execution ------------<END>*/
@@ -488,7 +487,7 @@
this->name = "SET_TIME_REGULATING";
this->type = NetworkMessage::SET_TIME_REGULATING;
/* specific field init */
- ////isDated =true;
+ //isDated =true;
}
NM_Set_Time_Regulating::~NM_Set_Time_Regulating() {
}
@@ -496,13 +495,13 @@
/* call mother class */
Super::serialize();
/* specific code (if any) goes here */
- msgBuf.write_bool(regulating);
+ msgBuf.write_bool(regulator);
} /* end of serialize */
void NM_Set_Time_Regulating::deserialize() {
/* call mother class */
Super::deserialize();
/* specific code (if any) goes here */
- regulating = msgBuf.read_bool();
+ regulator = msgBuf.read_bool();
} /* end of deserialize */
/*<END>---------- Set_Time_Regulating ------------<END>*/
@@ -511,7 +510,7 @@
this->name = "SET_TIME_CONSTRAINED";
this->type = NetworkMessage::SET_TIME_CONSTRAINED;
/* specific field init */
- ////isDated =true;
+ //isDated =true;
}
NM_Set_Time_Constrained::~NM_Set_Time_Constrained() {
}
@@ -535,8 +534,8 @@
this->type = NetworkMessage::REGISTER_FEDERATION_SYNCHRONIZATION_POINT;
/* specific field init */
//isDated =true;
- isLabelled = true;
- isTagged = true;
+ //isLabelled = true;
+ //isTagged = true;
}
NM_Register_Federation_Synchronization_Point::~NM_Register_Federation_Synchronization_Point()
{
}
@@ -548,7 +547,7 @@
this->type =
NetworkMessage::SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Synchronization_Point_Registration_Succeeded::~NM_Synchronization_Point_Registration_Succeeded()
{
}
@@ -560,8 +559,8 @@
this->type = NetworkMessage::ANNOUNCE_SYNCHRONIZATION_POINT;
/* specific field init */
//isDated =true;
- isLabelled = true;
- isTagged = true;
+ //isLabelled = true;
+ //isTagged = true;
}
NM_Announce_Synchronization_Point::~NM_Announce_Synchronization_Point() {
}
@@ -573,7 +572,7 @@
this->type = NetworkMessage::SYNCHRONIZATION_POINT_ACHIEVED;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Synchronization_Point_Achieved::~NM_Synchronization_Point_Achieved() {
}
@@ -585,7 +584,7 @@
this->type = NetworkMessage::FEDERATION_SYNCHRONIZED;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Federation_Synchronized::~NM_Federation_Synchronized() {
}
@@ -596,7 +595,7 @@
this->name = "REQUEST_FEDERATION_SAVE";
this->type = NetworkMessage::REQUEST_FEDERATION_SAVE;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Request_Federation_Save::~NM_Request_Federation_Save() {
}
@@ -638,7 +637,7 @@
this->type = NetworkMessage::INITIATE_FEDERATE_SAVE;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Initiate_Federate_Save::~NM_Initiate_Federate_Save() {
}
@@ -670,7 +669,7 @@
this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Request_Federation_Restore::~NM_Request_Federation_Restore() {
}
@@ -702,7 +701,7 @@
this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Request_Federation_Restore_Succeeded::~NM_Request_Federation_Restore_Succeeded()
{
}
@@ -714,8 +713,8 @@
this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE_FAILED;
/* specific field init */
//isDated =true;
- isLabelled = true;
- isTagged = true;
+ //isLabelled = true;
+ //isTagged = true;
}
NM_Request_Federation_Restore_Failed::~NM_Request_Federation_Restore_Failed() {
}
@@ -726,7 +725,7 @@
this->name = "FEDERATION_RESTORE_BEGUN";
this->type = NetworkMessage::FEDERATION_RESTORE_BEGUN;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Federation_Restore_Begun::~NM_Federation_Restore_Begun() {
}
@@ -909,7 +908,7 @@
this->name = "REGISTER_OBJECT";
this->type = NetworkMessage::REGISTER_OBJECT;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Register_Object::~NM_Register_Object() {
}
@@ -917,12 +916,14 @@
/* call mother class */
Super::serialize();
/* specific code (if any) goes here */
+ msgBuf.write_int32(objectClass);
msgBuf.write_int32(object);
} /* end of serialize */
void NM_Register_Object::deserialize() {
/* call mother class */
Super::deserialize();
/* specific code (if any) goes here */
+ objectClass = msgBuf.read_int32();
object = msgBuf.read_int32();
} /* end of deserialize */
/*<END>---------- Register_Object ------------<END>*/
@@ -932,7 +933,7 @@
this->name = "DISCOVER_OBJECT";
this->type = NetworkMessage::DISCOVER_OBJECT;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Discover_Object::~NM_Discover_Object() {
}
@@ -944,7 +945,7 @@
this->type = NetworkMessage::UPDATE_ATTRIBUTE_VALUES;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Update_Attribute_Values::~NM_Update_Attribute_Values() {
}
@@ -989,7 +990,7 @@
this->type = NetworkMessage::SEND_INTERACTION;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Send_Interaction::~NM_Send_Interaction() {
}
@@ -1034,7 +1035,7 @@
this->type = NetworkMessage::DELETE_OBJECT;
/* specific field init */
//isDated =true;
- isLabelled = true;
+ //isLabelled = true;
}
NM_Delete_Object::~NM_Delete_Object() {
}
@@ -1178,7 +1179,7 @@
this->name = "IS_ATTRIBUTE_OWNED_BY_FEDERATE";
this->type = NetworkMessage::IS_ATTRIBUTE_OWNED_BY_FEDERATE;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Is_Attribute_Owned_By_Federate::~NM_Is_Attribute_Owned_By_Federate() {
}
@@ -1233,7 +1234,7 @@
this->name = "NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE";
this->type = NetworkMessage::NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE;
/* specific field init */
- isLabelled = true;
+ //isLabelled = true;
}
NM_Negotiated_Attribute_Ownership_Divestiture::~NM_Negotiated_Attribute_Ownership_Divestiture()
{
}
@@ -1464,7 +1465,7 @@
this->name = "DDM_REGISTER_OBJECT";
this->type = NetworkMessage::DDM_REGISTER_OBJECT;
/* specific field init */
- isTagged = true;
+ //isTagged = true;
}
NM_DDM_Register_Object::~NM_DDM_Register_Object() {
}
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.hh,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- libCERTI/NM_Classes.hh 10 Apr 2008 20:43:01 -0000 1.1.2.10
+++ libCERTI/NM_Classes.hh 20 Apr 2008 12:52:19 -0000 1.1.2.11
@@ -31,7 +31,7 @@
class NM_Factory {
public:
static NetworkMessage* create(NetworkMessage::Message_T type) throw
(RTIinternalError);
- static NetworkMessage* receive(Socket* socket) throw (RTIinternalError);
+ static NetworkMessage* receive(Socket* socket) throw
(NetworkError,RTIinternalError);
};
class CERTI_EXPORT NM_WithHandleArray : public NetworkMessage {
@@ -204,7 +204,7 @@
/* specific Getter/Setter */
protected:
/* specific field */
- bool regulating;
+ //bool regulating;
private:
};
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.28.2.6
retrieving revision 3.28.2.7
diff -u -b -r3.28.2.6 -r3.28.2.7
--- libCERTI/NetworkMessage.cc 10 Apr 2008 14:57:50 -0000 3.28.2.6
+++ libCERTI/NetworkMessage.cc 20 Apr 2008 12:52:19 -0000 3.28.2.7
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: NetworkMessage.cc,v 3.28.2.6 2008/04/10 14:57:50 erk Exp $
+// $Id: NetworkMessage.cc,v 3.28.2.7 2008/04/20 12:52:19 erk Exp $
// ----------------------------------------------------------------------------
@@ -41,36 +41,34 @@
isLabelled(false),
isTagged(false)
{
- name = "NetworkMessage (generic)";
- exceptionReason[0] = '\0' ;
+ name = std::string("NetworkMessage (generic)");
+ exceptionReason = std::string("") ;
number = 0 ;
federation = 0 ;
federate = 0 ;
federationName = std::string("") ;
- federateName[0] = '\0' ;
+ federateName = std::string("") ;
- label[0] = '\0' ;
+ label = std::string("") ;
FEDid = std::string("") ;
bestEffortPeer = -1 ;
bestEffortAddress = 0 ;
- date = 0.0 ;
+ date = 0.0;
object = 0 ;
objectClass = 0 ;
interactionClass = 0 ;
handleArraySize = 0 ;
-
- for ( int i=0 ; i<MAX_ATTRIBUTES_PER_CLASS ; i++ )
- {
+ for (int i=0 ; i<MAX_ATTRIBUTES_PER_CLASS ; ++i) {
ValueArray[i].length = 0 ;
ValueArray[i].value[0] = '\0' ;
}
-}
+} /* end of NetworkMessage() */
NetworkMessage::~NetworkMessage() {
@@ -231,4 +229,4 @@
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.28.2.6 2008/04/10 14:57:50 erk Exp $
+// $Id: NetworkMessage.cc,v 3.28.2.7 2008/04/20 12:52:19 erk Exp $
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.30.2.8
retrieving revision 3.30.2.9
diff -u -b -r3.30.2.8 -r3.30.2.9
--- libCERTI/NetworkMessage.hh 10 Apr 2008 15:12:25 -0000 3.30.2.8
+++ libCERTI/NetworkMessage.hh 20 Apr 2008 12:52:19 -0000 3.30.2.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.30.2.8 2008/04/10 15:12:25 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.9 2008/04/20 12:52:19 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -202,10 +202,17 @@
int bestEffortPeer ;
unsigned long bestEffortAddress ;
- bool regulator ;
- bool constrained ;
+ void setRegulator(bool newState) {this->regulator=newState;};
+ bool isRegulator() {return regulator;};
+
+
+ int numberOfRegulators ;
+
+ void setConstrained(bool newState) {this->constrained=newState;};
+ bool isConstrained() {return constrained;};
- /* NM_DDM_Basr class fields */
+
+ /* NM_DDM_Base class fields */
SpaceHandle space;
int32_t nbExtents;
int32_t region;
@@ -225,7 +232,6 @@
void setDate(FederationTime date) {isDated=true; this->date = date;};
const FederationTime getDate() const {return this->date;};
- int numberOfRegulators ;
unsigned long multicastAddress ;
/**
@@ -322,6 +328,20 @@
*/
std::string tag;
+ /**
+ * Toggle which indicates if federate
+ * wants to become regulator or leave
+ * its regulator state
+ */
+ bool regulator ;
+
+ /**
+ * Toggle which indicates if federate
+ * wants to become constrained or leave
+ * its constrained state
+ */
+ bool constrained ;
+
// ValueArray is now a ValueLengthPair
ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS] ;
@@ -336,4 +356,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.30.2.8 2008/04/10 15:12:25 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.9 2008/04/20 12:52:19 erk Exp $
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45.2.8
retrieving revision 3.45.2.9
diff -u -b -r3.45.2.8 -r3.45.2.9
--- libCERTI/NetworkMessage_RW.cc 11 Apr 2008 14:08:18 -0000 3.45.2.8
+++ libCERTI/NetworkMessage_RW.cc 20 Apr 2008 12:52:19 -0000 3.45.2.9
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: NetworkMessage_RW.cc,v 3.45.2.8 2008/04/11 14:08:18 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.9 2008/04/20 12:52:19 erk Exp $
// ----------------------------------------------------------------------------
#include "NetworkMessage.hh"
#include "PrettyDebug.hh"
@@ -55,9 +55,11 @@
if (isDated) {
msgBuf.write_double(date);
}
+ msgBuf.write_bool(isLabelled);
if (isLabelled) {
msgBuf.write_string(label);
}
+ msgBuf.write_bool(isTagged);
if (isTagged) {
msgBuf.write_string(tag);
}
@@ -85,9 +87,11 @@
if (isDated) {
date = msgBuf.read_double();
}
+ isLabelled = msgBuf.read_bool();
if (isLabelled) {
label = msgBuf.read_string();
}
+ isTagged = msgBuf.read_bool();
if (isTagged) {
tag = msgBuf.read_string();
}
@@ -140,4 +144,4 @@
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.45.2.8 2008/04/11 14:08:18 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.9 2008/04/20 12:52:19 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.41.2.4
retrieving revision 3.41.2.5
diff -u -b -r3.41.2.4 -r3.41.2.5
--- libCERTI/ObjectClass.cc 10 Apr 2008 15:12:26 -0000 3.41.2.4
+++ libCERTI/ObjectClass.cc 20 Apr 2008 12:52:19 -0000 3.41.2.5
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.41.2.4 2008/04/10 15:12:26 erk Exp $
+// $Id: ObjectClass.cc,v 3.41.2.5 2008/04/20 12:52:19 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -742,13 +742,15 @@
"Object %u registered in class %u, now broadcasting...",
the_object->getHandle(), handle);
- NetworkMessage *answer =
NM_Factory::create(NetworkMessage::DISCOVER_OBJECT);
+ NM_Discover_Object *answer = new NM_Discover_Object();
answer->federation = server->federation();
answer->federate = the_federate ;
answer->exception = e_NO_EXCEPTION ;
answer->objectClass = handle ; // Class Handle
answer->object = the_object->getHandle();
answer->setLabel(the_object->getName().c_str());
+ // BUG FIXME strange!!
+ //answer->setDate(0.0);
ocbList = new ObjectClassBroadcastList(answer, 0);
broadcastClassMessage(ocbList);
@@ -784,9 +786,9 @@
// Else, send message for each object
list<Object *>::const_iterator o ;
- for (o = objectSet.begin(); o != objectSet.end(); o++) {
+ for (o = objectSet.begin(); o != objectSet.end(); ++o) {
if ((*o)->getOwner() != federate) {
- NM_Discover_Object message ;
+ NM_Discover_Object message;
D.Out(pdInit,
"Sending DiscoverObj to Federate %d for Object %u in class %u
",
federate, (*o)->getHandle(), handle,
message.getLabel().c_str());
@@ -797,6 +799,8 @@
message.objectClass = super_handle ;
message.object = (*o)->getHandle();
message.setLabel((*o)->getName().c_str());
+ //BUG FIXME strange!!
+ //message.setDate(0.0);
Socket *socket = NULL ;
try {
@@ -1802,4 +1806,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.41.2.4 2008/04/10 15:12:26 erk Exp $
+// $Id: ObjectClass.cc,v 3.41.2.5 2008/04/20 12:52:19 erk Exp $
Index: libCERTI/ObjectClass.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.hh,v
retrieving revision 3.31
retrieving revision 3.31.2.1
diff -u -b -r3.31 -r3.31.2.1
--- libCERTI/ObjectClass.hh 5 Dec 2007 12:29:40 -0000 3.31
+++ libCERTI/ObjectClass.hh 20 Apr 2008 12:52:20 -0000 3.31.2.1
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.hh,v 3.31 2007/12/05 12:29:40 approx Exp $
+// $Id: ObjectClass.hh,v 3.31.2.1 2008/04/20 12:52:20 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_OBJECT_CLASS_HH
@@ -197,7 +197,7 @@
RTIinternalError);
void broadcastClassMessage(ObjectClassBroadcastList *ocb_list,
- const Object * = 0);
+ const Object * = NULL);
ObjectClassBroadcastList *
updateAttributeValues(FederateHandle, Object *, AttributeHandle *,
@@ -260,4 +260,4 @@
#endif // _CERTI_OBJECT_CLASS_HH
-// $Id: ObjectClass.hh,v 3.31 2007/12/05 12:29:40 approx Exp $
+// $Id: ObjectClass.hh,v 3.31.2.1 2008/04/20 12:52:20 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.18.2.4
retrieving revision 3.18.2.5
diff -u -b -r3.18.2.4 -r3.18.2.5
--- libCERTI/ObjectClassBroadcastList.cc 10 Apr 2008 15:12:26 -0000
3.18.2.4
+++ libCERTI/ObjectClassBroadcastList.cc 20 Apr 2008 12:52:20 -0000
3.18.2.5
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.18.2.4 2008/04/10 15:12:26 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.18.2.5 2008/04/20 12:52:20 erk Exp $
// ----------------------------------------------------------------------------
@@ -241,7 +241,7 @@
// Pour chaque ligne de la liste
list<ObjectBroadcastLine *>::iterator i ;
- for (i = lines.begin(); i != lines.end(); i++) {
+ for (i = lines.begin(); i != lines.end(); ++i) {
// Si le federe attend un message(attribute 0 en attente)
if ((*i)->state[0] == ObjectBroadcastLine::waiting) {
@@ -391,4 +391,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.18.2.4 2008/04/10 15:12:26 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.18.2.5 2008/04/20 12:52:20 erk Exp $
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.50.2.3
retrieving revision 3.50.2.4
diff -u -b -r3.50.2.3 -r3.50.2.4
--- RTIA/FederationManagement.cc 10 Apr 2008 19:55:48 -0000 3.50.2.3
+++ RTIA/FederationManagement.cc 20 Apr 2008 12:52:20 -0000 3.50.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: FederationManagement.cc,v 3.50.2.3 2008/04/10 19:55:48 erk Exp $
+// $Id: FederationManagement.cc,v 3.50.2.4 2008/04/20 12:52:20 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -230,7 +230,7 @@
_nom_federation = NULL ;
_numero_federation = 0 ;
_est_createur_federation = false ;
- _fin_execution = true ;
+ //FIXME _fin_execution = true ;
// Now, remove temporary file (if not yet done)
if ( _FEDid != NULL )
{
@@ -457,8 +457,8 @@
}
// BUG: Voir DestroyFederation ou ~GF.
- if (!_est_createur_federation)
- _fin_execution = true ;
+ //if (!_est_createur_federation)
+ // FIXME _fin_execution = true ;
}
}
@@ -990,4 +990,4 @@
}} // namespace certi/rtia
-// $Id: FederationManagement.cc,v 3.50.2.3 2008/04/10 19:55:48 erk Exp $
+// $Id: FederationManagement.cc,v 3.50.2.4 2008/04/20 12:52:20 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.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
--- RTIA/ObjectManagement.cc 10 Apr 2008 15:12:27 -0000 3.35.2.3
+++ RTIA/ObjectManagement.cc 20 Apr 2008 12:52:20 -0000 3.35.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: ObjectManagement.cc,v 3.35.2.3 2008/04/10 15:12:27 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.4 2008/04/20 12:52:20 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -86,8 +86,9 @@
rep->getLabel().c_str());
return rep->object ;
}
- else
- return 0 ;
+ else {
+ return 0;
+ }
}
// ----------------------------------------------------------------------------
@@ -770,4 +771,4 @@
}} // namespace certi/rtia
-// $Id: ObjectManagement.cc,v 3.35.2.3 2008/04/10 15:12:27 erk Exp $
+// $Id: ObjectManagement.cc,v 3.35.2.4 2008/04/20 12:52:20 erk Exp $
Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.22.2.2
retrieving revision 3.22.2.3
diff -u -b -r3.22.2.2 -r3.22.2.3
--- RTIA/RTIA_network.cc 10 Apr 2008 14:57:48 -0000 3.22.2.2
+++ RTIA/RTIA_network.cc 20 Apr 2008 12:52:20 -0000 3.22.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: RTIA_network.cc,v 3.22.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: RTIA_network.cc,v 3.22.2.3 2008/04/20 12:52:20 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -64,7 +64,7 @@
D.Out(pdTrace,
"Receving Message from RTIG, type
NetworkMessage::SET_TIME_REGULATING.");
- if (msg->regulator)
+ if (msg->isRegulator())
tm->insert(msg->federate, msg->getDate());
else
tm->remove(msg->federate);
@@ -95,8 +95,8 @@
D.Out(pdTrace, "Receving Message from RTIG, "
"type NetworkMessage::DISCOVER_OBJECT.");
queues->insertFifoMessage(msg);
- break ;
}
+ break;
case NetworkMessage::REFLECT_ATTRIBUTE_VALUES:
{
@@ -337,10 +337,11 @@
stat.rtiService(msgType);
/* now we can delete the message which has been processed */
- delete msg;
+ // BIG BUG the following line may "double delete" messages??
+ // delete msg;
G.Out(pdGendoc,"exit RTIA::processNetworkMessage");
}
}} // namespace certi/rtia
-// $Id: RTIA_network.cc,v 3.22.2.2 2008/04/10 14:57:48 erk Exp $
+// $Id: RTIA_network.cc,v 3.22.2.3 2008/04/20 12:52:20 erk Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.29.2.3
retrieving revision 3.29.2.4
diff -u -b -r3.29.2.3 -r3.29.2.4
--- RTIA/TimeManagement.cc 10 Apr 2008 15:12:27 -0000 3.29.2.3
+++ RTIA/TimeManagement.cc 20 Apr 2008 12:52:21 -0000 3.29.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: TimeManagement.cc,v 3.29.2.3 2008/04/10 15:12:27 erk Exp $
+// $Id: TimeManagement.cc,v 3.29.2.4 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -120,7 +120,7 @@
TimeManagement::executeFederateService(NetworkMessage &msg)
{
G.Out(pdGendoc,"enter TimeManagement::executeFederateService");
- D.Out(pdRequest, "Execute federate service: Type %d.", msg.getType());
+ D.Out(pdRequest, "Execute federate service: Type %d (%s).",
msg.getType(),msg.getName().c_str());
_ongoing_tick = false ; // end of the blocking tick, a message is delivered
_tick_request_ack = false ; // the callback message serves as the ack
@@ -178,7 +178,7 @@
{
ValueLengthPair *ValueArray = msg.getAttribValueArray();
- if (msg.getBoolean())
+ if (msg.isDated)
om->reflectAttributeValues(msg.object,
msg.handleArray,
ValueArray,
@@ -212,7 +212,7 @@
{
ParameterLengthPair *ValueArray = msg.getParamValueArray();
- if (msg.getBoolean())
+ if (msg.isDated)
om->receiveInteraction(msg.interactionClass,
msg.handleArray,
ValueArray,
@@ -234,7 +234,7 @@
}
case NetworkMessage::REMOVE_OBJECT:
- if (msg.getBoolean()) {
+ if (msg.isDated) {
om->removeObject(msg.object,
msg.federate,
msg.getDate(),
@@ -349,8 +349,10 @@
break ;
default:
+ std::stringstream errorMsg;
D.Out(pdExcept, "Unknown message type in executeFederateService.");
- throw RTIinternalError("Unknown message in executeFederateService.");
+ errorMsg << "Unknown message <" << msg.getName() << " in
executeFederateService.";
+ throw RTIinternalError(errorMsg.str().c_str());
}
G.Out(pdGendoc,"exit TimeManagement::executeFederateService");
return true ;
@@ -568,7 +570,7 @@
msg.federation = fm->_numero_federation ;
msg.federate = fm->federate ;
- msg.constrained = etat ;
+ msg.setConstrained(etat);
comm->sendMessage(&msg);
@@ -607,7 +609,7 @@
msg.federation = fm->_numero_federation ;
msg.federate = fm->federate ;
- msg.regulator = etat ;
+ msg.setRegulator(etat);
msg.setDate(_heure_courante + _lookahead_courant);
comm->sendMessage(&msg);
@@ -796,4 +798,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.29.2.3 2008/04/10 15:12:27 erk Exp $
+// $Id: TimeManagement.cc,v 3.29.2.4 2008/04/20 12:52:21 erk Exp $
Index: RTIA/main.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/main.cc,v
retrieving revision 3.18
retrieving revision 3.18.2.1
diff -u -b -r3.18 -r3.18.2.1
--- RTIA/main.cc 12 Mar 2008 15:00:46 -0000 3.18
+++ RTIA/main.cc 20 Apr 2008 12:52:21 -0000 3.18.2.1
@@ -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: main.cc,v 3.18 2008/03/12 15:00:46 rousse Exp $
+// $Id: main.cc,v 3.18.2.1 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -58,8 +58,10 @@
}
catch (Exception &e) {
cerr << "RTIA:: RTIA has thrown " << e._name << "
exception." << endl;
+ cerr.flush();
if (e._reason) {
cerr << "RTIA:: Reason: " << e._reason << endl;
+ cerr.flush();
rtia.displayStatistics();
}
@@ -90,4 +92,4 @@
throw MemoryExhausted("RTIA has exhausted memory error");
}
-// EOF $Id: main.cc,v 3.18 2008/03/12 15:00:46 rousse Exp $
+// EOF $Id: main.cc,v 3.18.2.1 2008/04/20 12:52:21 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.80.2.3
retrieving revision 3.80.2.4
diff -u -b -r3.80.2.3 -r3.80.2.4
--- RTIG/Federation.cc 10 Apr 2008 14:57:49 -0000 3.80.2.3
+++ RTIG/Federation.cc 20 Apr 2008 12:52:21 -0000 3.80.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: Federation.cc,v 3.80.2.3 2008/04/10 14:57:49 erk Exp $
+// $Id: Federation.cc,v 3.80.2.4 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -532,7 +532,7 @@
msg.exception = e_NO_EXCEPTION ;
msg.federation = handle ;
msg.federate = federate_handle ;
- msg.regulator = true ;
+ msg.setRegulator(true);
msg.setDate(time);
this->broadcastAnyMessage(&msg, 0);
@@ -1482,7 +1482,7 @@
NM_Set_Time_Regulating msg ;
msg.federation = handle ;
msg.federate = federate_handle ;
- msg.regulator = false ;
+ msg.setRegulator(false);
broadcastAnyMessage(&msg, 0);
}
@@ -2281,5 +2281,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.80.2.3 2008/04/10 14:57:49 erk Exp $
+// $Id: Federation.cc,v 3.80.2.4 2008/04/20 12:52:21 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.36.2.5
retrieving revision 3.36.2.6
diff -u -b -r3.36.2.5 -r3.36.2.6
--- RTIG/RTIG.cc 11 Apr 2008 14:08:19 -0000 3.36.2.5
+++ RTIG/RTIG.cc 20 Apr 2008 12:52:21 -0000 3.36.2.6
@@ -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.36.2.5 2008/04/11 14:08:19 erk Exp $
+// $Id: RTIG.cc,v 3.36.2.6 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -503,7 +503,7 @@
on the link. This message only holds the exception.
*/
Socket*
-RTIG::processIncomingMessage(Socket *link)
+RTIG::processIncomingMessage(Socket *link) throw (NetworkError)
{
NetworkMessage* msg ;
@@ -986,4 +986,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.36.2.5 2008/04/11 14:08:19 erk Exp $
+// $Id: RTIG.cc,v 3.36.2.6 2008/04/20 12:52:21 erk Exp $
Index: RTIG/RTIG.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.hh,v
retrieving revision 3.23
retrieving revision 3.23.2.1
diff -u -b -r3.23 -r3.23.2.1
--- RTIG/RTIG.hh 27 Feb 2008 16:38:27 -0000 3.23
+++ RTIG/RTIG.hh 20 Apr 2008 12:52:21 -0000 3.23.2.1
@@ -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.hh,v 3.23 2008/02/27 16:38:27 rousse Exp $
+// $Id: RTIG.hh,v 3.23.2.1 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIG_HH
@@ -60,7 +60,7 @@
private:
// Both methods return the socket, because it may have been closed
// & deleted.
- Socket* processIncomingMessage(Socket*);
+ Socket* processIncomingMessage(Socket*) throw (NetworkError) ;
Socket* chooseProcessingMethod(Socket*, NetworkMessage *);
void openConnection();
@@ -131,4 +131,4 @@
#endif // CERTI_RTIG_HH
-// $Id: RTIG.hh,v 3.23 2008/02/27 16:38:27 rousse Exp $
+// $Id: RTIG.hh,v 3.23.2.1 2008/04/20 12:52:21 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.56.2.7
retrieving revision 3.56.2.8
diff -u -b -r3.56.2.7 -r3.56.2.8
--- RTIG/RTIG_processing.cc 11 Apr 2008 14:08:19 -0000 3.56.2.7
+++ RTIG/RTIG_processing.cc 20 Apr 2008 12:52:21 -0000 3.56.2.8
@@ -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.7 2008/04/11 14:08:19 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.8 2008/04/20 12:52:21 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -328,7 +328,7 @@
void
RTIG::processSetTimeRegulating(NetworkMessage *msg)
{
- if (msg->regulator) {
+ if (msg->isRegulator()) {
auditServer << "ON at time " << msg->getDate();
federations.createRegulator(msg->federation,
@@ -352,7 +352,7 @@
void
RTIG::processSetTimeConstrained(NetworkMessage *msg)
{
- if (msg->constrained) {
+ if (msg->isConstrained()) {
auditServer << "ON at time " << msg->getDate();
federations.addConstrained(msg->federation,
@@ -675,8 +675,10 @@
req->getLabel().c_str(), req->federate, rep->object);
rep->federate = req->federate ;
- rep->setLabel(req->getLabel());
+ rep->federation = req->federation;
+ rep->objectClass = req->objectClass;
// rep.object is set by the call of registerObject
+ rep->setLabel(req->getLabel());
rep->send(link); // Send answer to RTIA
}
@@ -695,7 +697,7 @@
ValueArray = req->getAttribValueArray();
// Forward the call
- if ( req->getBoolean() )
+ if ( req->isDated )
{
// UAV with time
federations.updateAttribute(req->federation,
@@ -748,7 +750,7 @@
<< ", date = " << req->getDate() ;
values = req->getParamValueArray();
- if ( req->getBoolean() )
+ if ( req->isDated )
{
federations.updateParameter(req->federation,
req->federate,
@@ -800,7 +802,7 @@
G.Out(pdGendoc,"enter RTIG::processDeleteObject");
auditServer << "ObjID = %u" << req->object ;
- if ( req->getBoolean() ) {
+ if ( req->isDated ) {
federations.destroyObject(req->federation,
req->federate,
req->object,
@@ -1324,4 +1326,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.56.2.7 2008/04/11 14:08:19 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.8 2008/04/20 12:52:21 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe... [br_DEV_HETEROGENEOUS],
certi-cvs <=