[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi test/Billard/dtest_billard.py libCERTI/Ob...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi test/Billard/dtest_billard.py libCERTI/Ob... |
|
Date: |
Fri, 30 May 2008 14:01:06 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 08/05/30 14:01:06
Modified files:
test/Billard : dtest_billard.py
libCERTI : ObjectClass.hh NetworkMessage.hh
InteractionBroadcastList.cc
InteractionBroadcastList.hh ObjectSet.cc
ObjectClass.cc ObjectClassBroadcastList.cc
NetworkMessage_RW.cc
ObjectClassBroadcastList.hh ObjectSet.hh
NM_Classes.hh NM_Classes.cc
RTIG : Federation.hh RTIG_processing.cc Federation.cc
RTIG.cc RTIG.hh
RTIA : Communications.cc Communications.hh
Log message:
Minimize MessageBuffer allocation used for NetworkMessage.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/dtest_billard.py?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.hh?cvsroot=certi&r1=3.33&r2=3.34
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionBroadcastList.cc?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionBroadcastList.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.cc?cvsroot=certi&r1=3.20&r2=3.21
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.45&r2=3.46
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.20&r2=3.21
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.49&r2=3.50
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.46&r2=3.47
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.71&r2=3.72
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.87&r2=3.88
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.44&r2=3.45
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.hh?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.hh?cvsroot=certi&r1=3.13&r2=3.14
Patches:
Index: test/Billard/dtest_billard.py
===================================================================
RCS file: /sources/certi/certi/test/Billard/dtest_billard.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/Billard/dtest_billard.py 5 May 2008 08:11:26 -0000 1.4
+++ test/Billard/dtest_billard.py 30 May 2008 14:01:04 -0000 1.5
@@ -169,7 +169,7 @@
myDTestMaster.register(rtig)
myDTestMaster.register(firstBillard)
myDTestMaster.register(billard2)
- #myDTestMaster.register(billard3)
+ myDTestMaster.register(billard3)
#myDTestMaster.register(billard4)
myDTestMaster.startTestSequence()
myDTestMaster.waitTestSequenceEnd()
Index: libCERTI/ObjectClass.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.hh,v
retrieving revision 3.33
retrieving revision 3.34
diff -u -b -r3.33 -r3.34
--- libCERTI/ObjectClass.hh 29 May 2008 12:20:38 -0000 3.33
+++ libCERTI/ObjectClass.hh 30 May 2008 14:01:04 -0000 3.34
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.hh,v 3.33 2008/05/29 12:20:38 rousse Exp $
+// $Id: ObjectClass.hh,v 3.34 2008/05/30 14:01:04 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_OBJECT_CLASS_HH
@@ -254,10 +254,12 @@
ObjectClassHandle superClass;
// The set of sub classes of this object class
ObjectClassSet* subClasses;
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
};
} // namespace certi
#endif // _CERTI_OBJECT_CLASS_HH
-// $Id: ObjectClass.hh,v 3.33 2008/05/29 12:20:38 rousse Exp $
+// $Id: ObjectClass.hh,v 3.34 2008/05/30 14:01:04 erk Exp $
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- libCERTI/NetworkMessage.hh 23 May 2008 12:37:21 -0000 3.35
+++ libCERTI/NetworkMessage.hh 30 May 2008 14:01:04 -0000 3.36
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.35 2008/05/23 12:37:21 erk Exp $
+// $Id: NetworkMessage.hh,v 3.36 2008/05/30 14:01:04 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -157,18 +157,8 @@
*/
virtual void deserialize(MessageBuffer& msgBuffer);
- /**
- * Deserialize a message using the message buffer
- * from another message.
- * This is used to avoid copy in a virtual constructor
- * for network Message.
- */
- void deserialize(NetworkMessage& anotherMsg)
- {anotherMsg.msgBuf.assumeSizeFromReservedBytes();
- deserialize(anotherMsg.msgBuf);};
-
- void send(Socket* socket) throw (NetworkError, NetworkSignal);
- void receive(Socket* socket) throw (NetworkError, NetworkSignal);
+ void send(Socket* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
+ void receive(Socket* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
// Parameter and Attribute Management
// Remove the Parameter of rank 'Rank' in the ParamArray and its value
in
@@ -363,4 +353,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.35 2008/05/23 12:37:21 erk Exp $
+// $Id: NetworkMessage.hh,v 3.36 2008/05/30 14:01:04 erk Exp $
Index: libCERTI/InteractionBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionBroadcastList.cc,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/InteractionBroadcastList.cc 26 Apr 2008 14:59:40 -0000
3.12
+++ libCERTI/InteractionBroadcastList.cc 30 May 2008 14:01:05 -0000
3.13
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionBroadcastList.cc,v 3.12 2008/04/26 14:59:40 erk Exp $
+// $Id: InteractionBroadcastList.cc,v 3.13 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
@@ -153,7 +153,7 @@
G.Out(pdGendoc,"sendPendingMessage===>write");
- message->send(socket);
+ message->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -177,4 +177,4 @@
} // namespace certi
-// $Id: InteractionBroadcastList.cc,v 3.12 2008/04/26 14:59:40 erk Exp $
+// $Id: InteractionBroadcastList.cc,v 3.13 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/InteractionBroadcastList.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionBroadcastList.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/InteractionBroadcastList.hh 26 Apr 2008 14:59:40 -0000
3.8
+++ libCERTI/InteractionBroadcastList.hh 30 May 2008 14:01:05 -0000
3.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionBroadcastList.hh,v 3.8 2008/04/26 14:59:40 erk Exp $
+// $Id: InteractionBroadcastList.hh,v 3.9 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_INTERACTION_BROADCAST_LIST_HH
@@ -63,7 +63,8 @@
private:
InteractionBroadcastLine *getLineWithFederate(FederateHandle theFederate);
-
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
std::list<InteractionBroadcastLine *> lines ;
};
@@ -71,4 +72,4 @@
#endif // CERTI_INTERACTION_BROADCAST_LIST_HH
-// $Id: InteractionBroadcastList.hh,v 3.8 2008/04/26 14:59:40 erk Exp $
+// $Id: InteractionBroadcastList.hh,v 3.9 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/ObjectSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.cc,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -b -r3.20 -r3.21
--- libCERTI/ObjectSet.cc 29 May 2008 12:20:39 -0000 3.20
+++ libCERTI/ObjectSet.cc 30 May 2008 14:01:05 -0000 3.21
@@ -425,7 +425,7 @@
#else
socket = server->getSocketLink(the_federate);
#endif
- msg->send(socket);
+ msg->send(socket,const_cast<MessageBuffer&>(NM_msgBufSend));
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -458,4 +458,4 @@
}
} // namespace certi
-// $Id: ObjectSet.cc,v 3.20 2008/05/29 12:20:39 rousse Exp $
+// $Id: ObjectSet.cc,v 3.21 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -b -r3.45 -r3.46
--- libCERTI/ObjectClass.cc 29 May 2008 12:20:38 -0000 3.45
+++ libCERTI/ObjectClass.cc 30 May 2008 14:01:05 -0000 3.46
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.45 2008/05/29 12:20:38 rousse Exp $
+// $Id: ObjectClass.cc,v 3.46 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -206,7 +206,7 @@
#else
socket = server->getSocketLink(theFederate);
#endif
- msg->send(socket);
+ msg->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -809,7 +809,7 @@
Socket *socket = NULL ;
try {
socket = server->getSocketLink(federate);
- message.send(socket);
+ message.send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -1810,4 +1810,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.45 2008/05/29 12:20:38 rousse Exp $
+// $Id: ObjectClass.cc,v 3.46 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -b -r3.20 -r3.21
--- libCERTI/ObjectClassBroadcastList.cc 23 May 2008 12:37:21 -0000
3.20
+++ libCERTI/ObjectClassBroadcastList.cc 30 May 2008 14:01:05 -0000
3.21
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.20 2008/05/23 12:37:21 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.21 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
@@ -255,7 +255,7 @@
"Broadcasting message to Federate %d.", (*i)->Federate);
try {
socket = server->getSocketLink((*i)->Federate);
- message->send(socket);
+ message->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -361,7 +361,7 @@
socket = server->getSocketLink((*i)->Federate);
#endif
G.Out(pdGendoc,"
sendPendingRAVMessage=====> write");
- currentMessage->send(socket);
+ currentMessage->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D.Out(pdExcept,
@@ -396,4 +396,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.20 2008/05/23 12:37:21 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.21 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -b -r3.49 -r3.50
--- libCERTI/NetworkMessage_RW.cc 9 May 2008 20:21:39 -0000 3.49
+++ libCERTI/NetworkMessage_RW.cc 30 May 2008 14:01:05 -0000 3.50
@@ -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.49 2008/05/09 20:21:39 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.50 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#include "NetworkMessage.hh"
#include "PrettyDebug.hh"
@@ -101,49 +101,49 @@
} /* end of deserialize */
void
-NetworkMessage::send(Socket *socket) throw (NetworkError, NetworkSignal) {
+NetworkMessage::send(Socket *socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal){
G.Out(pdGendoc,"enter NetworkMessage::send");
/* 0- reset send buffer */
- msgBuf.reset();
+ msgBuffer.reset();
/* 1- serialize the message
* This is a polymorphic call
* which may specialized in a daughter class
*/
- serialize(msgBuf);
+ serialize(msgBuffer);
/* 2- update message buffer 'reserved bytes' header */
- msgBuf.updateReservedBytes();
+ msgBuffer.updateReservedBytes();
D.Out(pdDebug,"Sending <%s> whose buffer has <%u>
bytes",getName().c_str(),msgBuf.size());
- //msgBuf.show(msgBuf(0),5);
+ //msgBuffer.show(msgBuf(0),5);
/* 3- effectively send the raw message to socket */
- socket->send(static_cast<unsigned char*>(msgBuf(0)), msgBuf.size());
+ socket->send(static_cast<unsigned char*>(msgBuffer(0)),
msgBuffer.size());
G.Out(pdGendoc,"exit NetworkMessage::send");
} /* end of send */
void
-NetworkMessage::receive(Socket* socket) throw (NetworkError, NetworkSignal) {
+NetworkMessage::receive(Socket* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal) {
G.Out(pdGendoc,"enter NetworkMessage::receive");
/* 0- Reset receive buffer */
/* FIXME this reset may not be necessary since we do
* raw-receive + assume-size
*/
- msgBuf.reset();
+ msgBuffer.reset();
/* 1- Read 'reserved bytes' header from socket */
- //D.Out(pdDebug,"Reading %d 'reserved' bytes",msgBuf.reservedBytes);
- socket->receive(msgBuf(0), msgBuf.reservedBytes);
- //msgBuf.show(msgBuf(0),5);fflush(stdout);
+ //D.Out(pdDebug,"Reading %d 'reserved' bytes",msgBuffer.reservedBytes);
+ socket->receive(msgBuffer(0), msgBuffer.reservedBytes);
+ //msgBuffer.show(msgBuf(0),5);fflush(stdout);
/* 2- update (assume) complete message size from reserved bytes */
- msgBuf.assumeSizeFromReservedBytes();
- D.Out(pdDebug,"Got a MsgBuf of size %d bytes (including %d
reserved)",msgBuf.size(),msgBuf.reservedBytes);
+ msgBuffer.assumeSizeFromReservedBytes();
+ D.Out(pdDebug,"Got a MsgBuf of size %d bytes (including %d
reserved)",msgBuffer.size(),msgBuffer.reservedBytes);
/* 3- receive the rest of the message */
-
socket->receive(msgBuf(msgBuf.reservedBytes),msgBuf.size()-msgBuf.reservedBytes);
+
socket->receive(msgBuffer(msgBuffer.reservedBytes),msgBuffer.size()-msgBuffer.reservedBytes);
/* 4- deserialize the message
* This is a polymorphic call
* which may specialized in a daughter class
*/
- deserialize(msgBuf);
+ deserialize(msgBuffer);
G.Out(pdGendoc,"exit NetworkMessage::receive");
} /* end of receive */
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.49 2008/05/09 20:21:39 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.50 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/ObjectClassBroadcastList.hh 5 Apr 2005 20:07:08 -0000
3.8
+++ libCERTI/ObjectClassBroadcastList.hh 30 May 2008 14:01:05 -0000
3.9
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.hh,v 3.8 2005/04/05 20:07:08 breholee Exp $
+// $Id: ObjectClassBroadcastList.hh,v 3.9 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_OBJECT_CLASS_BROADCAST_LIST_HH
@@ -76,10 +76,12 @@
AttributeHandle maxHandle ;
std::list<ObjectBroadcastLine *> lines ;
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
};
} // namespace certi
#endif // CERTI_OBJECT_CLASS_BROADCAST_LIST_HH
-// $Id: ObjectClassBroadcastList.hh,v 3.8 2005/04/05 20:07:08 breholee Exp $
+// $Id: ObjectClassBroadcastList.hh,v 3.9 2008/05/30 14:01:05 erk Exp $
Index: libCERTI/ObjectSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/ObjectSet.hh 29 May 2008 12:20:39 -0000 3.11
+++ libCERTI/ObjectSet.hh 30 May 2008 14:01:05 -0000 3.12
@@ -27,6 +27,7 @@
// Project
class Object;
#include "SecurityServer.hh"
+#include "MessageBuffer.hh"
#include "certi.hh"
// Standard
@@ -172,6 +173,8 @@
typedef Name2ObjectMap_t::const_iterator namedO_const_iterator;
Handle2ObjectMap_t OFromHandle;
Name2ObjectMap_t OFromName;
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
};
} // namespace certi
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libCERTI/NM_Classes.hh 23 May 2008 12:37:22 -0000 3.4
+++ libCERTI/NM_Classes.hh 30 May 2008 14:01:05 -0000 3.5
@@ -32,6 +32,7 @@
public:
static NetworkMessage* create(NetworkMessage::Message_T type) throw
(RTIinternalError);
static NetworkMessage* receive(Socket* socket) throw
(NetworkError,RTIinternalError);
+private:
};
class CERTI_EXPORT NM_WithHandleArray : public NetworkMessage {
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/NM_Classes.cc 23 May 2008 12:37:22 -0000 3.7
+++ libCERTI/NM_Classes.cc 30 May 2008 14:01:05 -0000 3.8
@@ -299,15 +299,17 @@
NetworkMessage*
NM_Factory::receive(Socket* socket) throw (NetworkError, RTIinternalError) {
+ // FIXME this is not thread-safe.
+ static MessageBuffer msgBuffer;
NetworkMessage msgGen;
NetworkMessage* msg;
/* receive generic message */
- msgGen.receive(socket);
+ msgGen.receive(socket,msgBuffer);
/* create specific message from type */
msg = NM_Factory::create(msgGen.getType());
- /* msg->copyMsgBufFrom(msgGen); */
- msg->deserialize(msgGen);
+ msgBuffer.assumeSizeFromReservedBytes();
+ msg->deserialize(msgBuffer);
return msg;
} /* end of NM_Factory::receive */
Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.46
retrieving revision 3.47
diff -u -b -r3.46 -r3.47
--- RTIG/Federation.hh 29 Apr 2008 08:57:48 -0000 3.46
+++ RTIG/Federation.hh 30 May 2008 14:01:05 -0000 3.47
@@ -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.hh,v 3.46 2008/04/29 08:57:48 erk Exp $
+// $Id: Federation.hh,v 3.47 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATION_HH
@@ -588,10 +588,12 @@
#ifdef HAVE_XML
xmlDocPtr doc ; // FIXME: should not be an attribute
#endif // HAVE_XML
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
};
}} // namespace certi/rtig
#endif // _CERTI_RTIG_FEDERATION_HH
-// $Id: Federation.hh,v 3.46 2008/04/29 08:57:48 erk Exp $
+// $Id: Federation.hh,v 3.47 2008/05/30 14:01:05 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.71
retrieving revision 3.72
diff -u -b -r3.71 -r3.72
--- RTIG/RTIG_processing.cc 29 May 2008 12:20:35 -0000 3.71
+++ RTIG/RTIG_processing.cc 30 May 2008 14:01:05 -0000 3.72
@@ -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.71 2008/05/29 12:20:35 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.72 2008/05/30 14:01:05 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -113,7 +113,7 @@
G.Out(pdGendoc,"processCreateFederation===>write answer to RTIA");
- rep.send(link); // Send answer to RTIA
+ rep.send(link,NM_msgBufSend); // Send answer to RTIA
D.Out(pdInit, "Federation \"%s\" created with Handle %d.",
federation.c_str(), rep.federation);
@@ -168,7 +168,7 @@
repFED.exception = e_FederateAlreadyExecutionMember ;
repFED.exceptionReason="Federate with same name has yet joined the
federation";
G.Out(pdGendoc,"processJoinFederation==>Answer to RTIA GFF ERROR
%s",repFED.exceptionReason.c_str());
- repFED.send(link);
+ repFED.send(link,NM_msgBufSend);
G.Out(pdGendoc,"exit RTIG::processJoinFederation on Error");
G.Out(pdGendoc,"END ** JOIN FEDERATION (BAD) SERVICE **");
@@ -180,7 +180,7 @@
G.Out(pdGendoc,"processJoinFederation==>Answer to RTIA JFE ERROR
%s",rep.exceptionReason.c_str());
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
return ;
}
@@ -237,14 +237,14 @@
repFED.getType(),repFED.FEDid.c_str());
G.Out(pdGendoc,"processJoinFederation====>Begin FED file transfer");
- repFED.send(link);
+ repFED.send(link,NM_msgBufSend);
if ( e == e_NO_EXCEPTION )
{
// Wait for OK from RTIA
NM_Get_FED_File msg ;
D.Out(pdTrace,"wait NetworkMessage of Type %d",msg.getType());
- msg.receive(link);
+ msg.receive(link,NM_msgBufReceive);
assert ( msg.number == 0 );
// RTIA has opened working file then RTIG has to transfer file contents
// line by line
@@ -265,10 +265,10 @@
// line transfered
repFED.setFEDLine(fileLine);
// Send answer
- repFED.send(link);
+ repFED.send(link,NM_msgBufSend);
// Wait for OK from RTIA
- msg.receive(link);
+ msg.receive(link,NM_msgBufReceive);
assert ( msg.number == num_line );
}
@@ -283,7 +283,7 @@
G.Out(pdGendoc,"processJoinFederation====>End FED file transfer");
- repFED.send(link);
+ repFED.send(link,NM_msgBufSend);
}
// END of FED file processing
@@ -298,7 +298,7 @@
// Send answer
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
G.Out(pdGendoc,"exit RTIG::processJoinFederation");
G.Out(pdGendoc,"END ** JOIN FEDERATION SERVICE **");
@@ -325,7 +325,7 @@
// Send answer to RTIA
reponse.federate = federe ;
reponse.federation = federation ;
- reponse.send(link);
+ reponse.send(link,NM_msgBufSend);
G.Out(pdGendoc,"exit RTIG::processResignFederation");
G.Out(pdGendoc,"END ** RESIGN FEDERATION SERVICE **");
@@ -384,7 +384,7 @@
}
G.Out(pdGendoc,"processDestroyFederation===>write DFE to RTIA");
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
G.Out(pdGendoc,"END ** DESTROY FEDERATION SERVICE **");
G.Out(pdGendoc,"exit RTIG::processDestroyFederation");
@@ -413,7 +413,7 @@
G.Out(pdGendoc," processSetTimeRegulating====> write TRE to
RTIA");
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
D.Out(pdTerm, "Federate %u of Federation %u sets TimeRegulation ON.",
msg->federate, msg->federation);
@@ -453,7 +453,7 @@
G.Out(pdGendoc," processSetTimeConstrained====> write TCE to
RTIA");
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
D.Out(pdTerm, "Federate %u of Federation %u is now constrained.",
msg->federate, msg->federation);
@@ -523,7 +523,7 @@
G.Out(pdGendoc," processRegisterSynchronization====> write SPRS to
RTIA");
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
// boolean true means a federates set exists
if ( req->doesSetExist() )
@@ -669,7 +669,7 @@
rep->federate = req->federate ;
rep->objectClass = req->objectClass ;
- rep->send(link); // send answer to RTIA
+ rep->send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -700,7 +700,7 @@
rep->objectClass = req->objectClass ;
rep->handleArraySize = 0 ;
- rep->send(link); // send answer to RTIA
+ rep->send(link,NM_msgBufSend); // send answer to RTIA
G.Out(pdGendoc,"END ** SUBSCRIBE OBJECT CLASS SERVICE **");
G.Out(pdGendoc,"exit RTIG::processSubscribeObjectClass");
@@ -729,7 +729,7 @@
rep->federate = req->federate ;
rep->interactionClass = req->interactionClass ;
- rep->send(link); // send answer to RTIA
+ rep->send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -754,7 +754,7 @@
rep->federate = req->federate ;
rep->interactionClass = req->interactionClass ;
- rep->send(link); // send answer to RTIA
+ rep->send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -781,7 +781,7 @@
// rep.object is set by the call of registerObject
rep->setLabel(req->getLabel());
- rep->send(link); // Send answer to RTIA
+ rep->send(link,NM_msgBufSend); // Send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -834,7 +834,7 @@
rep.setLabel(req->getLabel());
rep.setTag(req->getTag());
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
G.Out(pdGendoc,"exit RTIG::processUpdateAttributeValues");
}
@@ -889,7 +889,7 @@
rep.setLabel(req->getLabel());
rep.setTag(req->getTag());
G.Out(pdGendoc,"processSendInteraction===>write");
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
G.Out(pdGendoc,"exit RTIG::processSendInteraction");
G.Out(pdGendoc,"END ** SEND INTERACTION SERVICE **");
@@ -926,7 +926,7 @@
rep.federate = req->federate ;
rep.object = req->object ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
G.Out(pdGendoc,"exit RTIG::processDeleteObject");
G.Out(pdGendoc,"END ** DELETE OBJECT INSTANCE **");
@@ -954,7 +954,7 @@
rep.federate = req->federate ;
rep.object = req->object ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -983,7 +983,7 @@
rep.federate = req->federate ;
rep.object = req->object ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1009,7 +1009,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1036,7 +1036,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1063,7 +1063,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1090,7 +1090,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1116,7 +1116,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1148,7 +1148,7 @@
rep.federate = req->federate ;
rep.object = req->object ;
- rep.send(link); // Send answer to RTIA
+ rep.send(link,NM_msgBufSend); // Send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1174,7 +1174,7 @@
rep.object = req->object ;
rep.handleArraySize = 0 ;
- rep.send(link); // send answer to RTIA
+ rep.send(link,NM_msgBufSend); // send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1196,7 +1196,7 @@
<< endl ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1213,7 +1213,7 @@
NM_DDM_Modify_Region rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1232,7 +1232,7 @@
NM_DDM_Delete_Region rep ;
rep.federate = req->federate ;
rep.region = req->region ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1252,7 +1252,7 @@
NM_DDM_Associate_Region rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1271,7 +1271,7 @@
NM_DDM_Unassociate_Region rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1292,7 +1292,7 @@
rep.federate = req->federate ;
rep.objectClass = req->objectClass ;
rep.handleArraySize = 0 ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1310,7 +1310,7 @@
NM_DDM_Unsubscribe_Attributes rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1329,7 +1329,7 @@
NM_DDM_Subscribe_Interaction rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1348,7 +1348,7 @@
NM_DDM_Unsubscribe_Interaction rep ;
rep.federate = req->federate ;
- rep.send(link);
+ rep.send(link,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -1378,7 +1378,7 @@
req->getLabel().c_str(), req->federate, rep->object);
rep->federate = req->federate ;
- rep->send(link); // Send answer to RTIA
+ rep->send(link,NM_msgBufSend); // Send answer to RTIA
}
// ----------------------------------------------------------------------------
@@ -1422,11 +1422,11 @@
answer.federate = request->federate ;
answer.object = request->object ;
- answer.send(link); // Send answer to RTIA
+ answer.send(link,NM_msgBufSend); // Send answer to RTIA
G.Out(pdGendoc,"exit RTIG::processRequestObjectAttributeValueUpdate");
G.Out(pdGendoc,"END ** REQUEST OBJECT ATTRIBUTE VALUE UPDATE **");
}
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.71 2008/05/29 12:20:35 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.72 2008/05/30 14:01:05 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.87
retrieving revision 3.88
diff -u -b -r3.87 -r3.88
--- RTIG/Federation.cc 29 May 2008 12:20:34 -0000 3.87
+++ RTIG/Federation.cc 30 May 2008 14:01:06 -0000 3.88
@@ -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.87 2008/05/29 12:20:34 rousse Exp $
+// $Id: Federation.cc,v 3.88 2008/05/30 14:01:06 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -445,7 +445,7 @@
"Sending NULL message(type %d) from %d to new federate.",
nullMessage.getType(), nullMessage.federate);
- nullMessage.send(tcp_link);
+ nullMessage.send(tcp_link,NM_msgBufSend);
}
// If federation is synchronizing, put federate in same state.
@@ -461,7 +461,7 @@
D.Out(pdTerm, "Sending synchronization message %s (type %d)"
" to the new Federate.", (*i).first,
ASPMessage.getType());
- ASPMessage.send(tcp_link);
+ ASPMessage.send(tcp_link,NM_msgBufSend);
federates.back().addSynchronizationLabel((*i).first);
}
}
@@ -547,7 +547,7 @@
#else
socket = server->getSocketLink(i->getHandle());
#endif
- msg->send(socket);
+ msg->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
D[pdExcept] << "Reference to a killed Federate while "
@@ -595,7 +595,7 @@
#else
socket = server->getSocketLink(i->getHandle());
#endif
- msg->send(socket);
+ msg->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e)
{
@@ -1132,7 +1132,7 @@
else
G.Out(pdGendoc," =====> send message R_F_R_F to RTIA");
- msg->send(socket);
+ msg->send(socket,NM_msgBufSend);
delete msg ;
// Reading file failed: not restoring !
@@ -1170,7 +1170,7 @@
// send message.
socket = server->getSocketLink(msg->federate);
G.Out(pdGendoc," =====> send message I_F_R to federate
%d",msg->federate);
- msg->send(socket);
+ msg->send(socket,NM_msgBufSend);
}
delete msg;
G.Out(pdGendoc,"exit Federation::requestFederationRestore");
@@ -2266,7 +2266,7 @@
mess.handleArray[i] = theAttributeList[i] ;
}
- mess.send(server->getSocketLink(theOwnerHandle));
+ mess.send(server->getSocketLink(theOwnerHandle),NM_msgBufSend);
G.Out(pdGendoc," requestObjectOwner ===> write PAVU to RTIA %d"
,theOwnerHandle);
@@ -2277,5 +2277,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.87 2008/05/29 12:20:34 rousse Exp $
+// $Id: Federation.cc,v 3.88 2008/05/30 14:01:06 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- RTIG/RTIG.cc 29 May 2008 12:20:35 -0000 3.44
+++ RTIG/RTIG.cc 30 May 2008 14:01:06 -0000 3.45
@@ -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.44 2008/05/29 12:20:35 rousse Exp $
+// $Id: RTIG.cc,v 3.45 2008/05/30 14:01:06 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -966,7 +966,7 @@
/* FIXME ***/
if (rep->exception != e_NO_EXCEPTION) {
G.Out(pdGendoc," processIncomingMessage ===> write on
exception to RTIA");
- rep->send(link);
+ rep->send(link,NM_msgBufSend);
D.Out(pdExcept,
"RTIG catched exception %d and sent it back to federate %d.",
rep->exception, rep->federate);
@@ -990,4 +990,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.44 2008/05/29 12:20:35 rousse Exp $
+// $Id: RTIG.cc,v 3.45 2008/05/30 14:01:06 erk Exp $
Index: RTIG/RTIG.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.hh,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- RTIG/RTIG.hh 22 May 2008 12:20:21 -0000 3.27
+++ RTIG/RTIG.hh 30 May 2008 14:01:06 -0000 3.28
@@ -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.27 2008/05/22 12:20:21 erk Exp $
+// $Id: RTIG.hh,v 3.28 2008/05/30 14:01:06 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIG_HH
@@ -126,10 +126,14 @@
SocketServer socketServer ;
AuditFile auditServer ;
FederationsList federations ;
+ /* The message buffer used to send Network messages */
+ MessageBuffer NM_msgBufSend;
+ /* The message buffer used to receive Network messages */
+ MessageBuffer NM_msgBufReceive;
};
}} // namespaces
#endif // CERTI_RTIG_HH
-// $Id: RTIG.hh,v 3.27 2008/05/22 12:20:21 erk Exp $
+// $Id: RTIG.hh,v 3.28 2008/05/30 14:01:06 erk Exp $
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- RTIA/Communications.cc 29 May 2008 12:20:32 -0000 3.27
+++ RTIA/Communications.cc 30 May 2008 14:01:06 -0000 3.28
@@ -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.27 2008/05/29 12:20:32 rousse Exp $
+// $Id: Communications.cc,v 3.28 2008/05/30 14:01:06 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -132,7 +132,7 @@
G.Out(pdGendoc,"enter Communications::~Communications");
NM_Close_Connexion closeMsg ;
- closeMsg.send((SecureTCPSocket *) this);
+ closeMsg.send((SecureTCPSocket *) this, NM_msgBufSend);
SecureTCPSocket::close();
G.Out(pdGendoc,"exit Communications::~Communications");
@@ -320,7 +320,7 @@
void
Communications::sendMessage(NetworkMessage *Msg)
{
- Msg->send((SecureTCPSocket *) this);
+ Msg->send((SecureTCPSocket *) this,NM_msgBufSend);
}
// ----------------------------------------------------------------------------
@@ -339,4 +339,4 @@
}} // namespace certi/rtia
-// $Id: Communications.cc,v 3.27 2008/05/29 12:20:32 rousse Exp $
+// $Id: Communications.cc,v 3.28 2008/05/30 14:01:06 erk Exp $
Index: RTIA/Communications.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.hh,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- RTIA/Communications.hh 29 May 2008 12:20:32 -0000 3.13
+++ RTIA/Communications.hh 30 May 2008 14:01:06 -0000 3.14
@@ -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.hh,v 3.13 2008/05/29 12:20:32 rousse Exp $
+// $Id: Communications.hh,v 3.14 2008/05/30 14:01:06 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_COMMUNICATIONS_HH
@@ -67,6 +67,8 @@
*/
NetworkMessage* waitMessage(NetworkMessage::Type type_msg,
FederateHandle numeroFedere);
+
+ MessageBuffer NM_msgBufSend,NM_msgBufReceive;
MessageBuffer msgBufSend, msgBufReceive ;
private:
@@ -86,4 +88,4 @@
#endif // _CERTI_COMMUNICATIONS_HH
-// $Id: Communications.hh,v 3.13 2008/05/29 12:20:32 rousse Exp $
+// $Id: Communications.hh,v 3.14 2008/05/30 14:01:06 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi test/Billard/dtest_billard.py libCERTI/Ob...,
certi-cvs <=