[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/Message.hh libCERTI/NetworkMessa...
From: |
certi-cvs |
Subject: |
[certi-cvs] certi libCERTI/Message.hh libCERTI/NetworkMessa... |
Date: |
Sat, 30 Jan 2010 15:24:44 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/01/30 15:24:44
Modified files:
libCERTI : Message.hh NetworkMessage.hh Message.cc
scripts : CERTI_Message.msg
Log message:
First set of pruning for making Message class
easy to generated using Message generator
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.57&r2=3.58
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.54&r2=3.55
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.65&r2=3.66
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CERTI_Message.msg?cvsroot=certi&r1=1.1&r2=1.2
Patches:
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.57
retrieving revision 3.58
diff -u -b -r3.57 -r3.58
--- libCERTI/Message.hh 24 Nov 2009 21:44:47 -0000 3.57
+++ libCERTI/Message.hh 30 Jan 2010 15:24:43 -0000 3.58
@@ -20,8 +20,6 @@
#ifndef CERTI_MESSAGE_HH
#define CERTI_MESSAGE_HH
-
-
#include "Exception.hh"
#include "SocketUN.hh"
#include "BasicMessage.hh"
@@ -35,49 +33,15 @@
/**
* The Message class is used to formalize messages that are going to be
- * exchanged between the RTI and the federate.
+ * exchanged between the RTI and the federate. In fact with current
+ * CERTI architecture those messages are exchanged between the federate
+ * process (though libRTI call) and the RTIA process.
+ * In turn RTIA exchange messages with RTIG process.
* @ingroup libCERTI
*/
class CERTI_EXPORT Message : public BasicMessage
{
public:
- struct MessageTimeStruct {
- FederationTime date ; // Date, Logical Time, Lookahead, etc.
- bool mode ; // IsRegulator or IsConstrained
- };
-
- struct MessageT_O_Struct {
- ObjectClassHandle handle ;
- UShort size ;
- TransportType transport ;
- OrderType order ;
- };
-
- struct MessageJ_R_Struct {
- FederateHandle federate ; // Join
- RTI::ResignAction action ; // Resign
- };
-
- struct MessageO_I_Struct {
- ObjectClassHandle handle ;
- UShort size ;
- FederationTime date ;
- };
-
- struct Message_DDM {
- SpaceHandle space ;
- DimensionHandle dimension ;
- RegionHandle region ;
- };
-
- // MessageHeaderUnion deprecated
- //union MessageHeaderUnion {
- // MessageTimeStruct time ;
- // MessageT_O_Struct T_O ;
- // MessageJ_R_Struct J_R ;
- // MessageO_I_Struct O_I ;
- // Message_DDM ddm ;
- //};
enum Type {
NOT_USED = 0,
@@ -242,24 +206,18 @@
LAST // should be the "last" (not used)
};
- // -- Structure de l'entete --
- struct MessageHeader {
- Type type ;
- TypeException exception ;
- UShort bodySize ;
- FederationTime date ;
- //MessageHeaderUnion VP ; // Variable Part deprecated
- };
-
public:
Message();
/**
* Serialize the message into a buffer
+ * @param[in] msgBuffer the serialization buffer
*/
virtual void serialize(MessageBuffer& msgBuffer);
+
/**
* DeSerialize the message from a buffer
+ * @param[in] msgBuffer the deserialization buffer
*/
virtual void deserialize(MessageBuffer& msgBuffer);
@@ -463,7 +421,6 @@
void writeFEDid(MessageBuffer &msgBuffer);
void writeFederationName(MessageBuffer &msgBuffer);
- MessageHeader header ;
std::string label ;
std::string name ;
std::string federateName ;
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.54
retrieving revision 3.55
diff -u -b -r3.54 -r3.55
--- libCERTI/NetworkMessage.hh 25 Nov 2009 22:05:19 -0000 3.54
+++ libCERTI/NetworkMessage.hh 30 Jan 2010 15:24:44 -0000 3.55
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.54 2009/11/25 22:05:19 erk Exp $
+// $Id: NetworkMessage.hh,v 3.55 2010/01/30 15:24:44 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -158,13 +158,19 @@
/**
* Serialize the message into a buffer
+ * @param[in] msgBuffer the serialization buffer
*/
virtual void serialize(MessageBuffer& msgBuffer);
+
/**
* DeSerialize the message from a buffer
+ * @param[in] msgBuffer the deserialization buffer
*/
virtual void deserialize(MessageBuffer& msgBuffer);
+ /**
+ * Send a message buffer to the socket
+ */
void send(Socket* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
void receive(Socket* socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
@@ -336,4 +342,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.54 2009/11/25 22:05:19 erk Exp $
+// $Id: NetworkMessage.hh,v 3.55 2010/01/30 15:24:44 erk Exp $
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.65
retrieving revision 3.66
diff -u -b -r3.65 -r3.66
--- libCERTI/Message.cc 24 Nov 2009 21:44:47 -0000 3.65
+++ libCERTI/Message.cc 30 Jan 2010 15:24:44 -0000 3.66
@@ -35,15 +35,12 @@
static PrettyDebug G("GENDOC",__FILE__) ;
-#define NONE -1
-
Message::Message()
{
fed_time.setZero();
exception = e_NO_EXCEPTION ;
exceptionReason[0] = '\0' ;
federateName[0] = '\0' ;
- //federationName = NULL ;is now a string then...
tag = "" ;
name[0] = '\0' ;
label[0] = '\0' ;
@@ -67,9 +64,8 @@
dimension = 0 ;
number = 0 ;
region = 0 ;
- //FEDid = NULL ;now string
valueArray.empty() ;
-}
+} /* end of Message default constructor */
// ----------------------------------------------------------------------------
/** Return a newly allocated ValueArray, exactly of size HandleArraySize.
Index: scripts/CERTI_Message.msg
===================================================================
RCS file: /sources/certi/certi/scripts/CERTI_Message.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- scripts/CERTI_Message.msg 19 Oct 2009 15:03:39 -0000 1.1
+++ scripts/CERTI_Message.msg 30 Jan 2010 15:24:44 -0000 1.2
@@ -33,6 +33,24 @@
language Java [import certi.Message]
}
+message M_Create_Federation_Execution : merge Message {
+
+}
+
+message M_Destroy_Federation_Execution : merge Message {
+
+}
+
+message M_Join_Federation_Execution : merge Message {
+
+}
+
+message M_Resign_Federation_Execution : merge Message {
+
+}
+
+
+
message M_Enable_Time_Regulation {
required double fedTime
required double lookahead
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/Message.hh libCERTI/NetworkMessa...,
certi-cvs <=