[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/NetworkMessage.hh libCERTI/NM_Cl... [br_DEV_H
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/NetworkMessage.hh libCERTI/NM_Cl... [br_DEV_HETEROGENEOUS] |
|
Date: |
Mon, 21 Apr 2008 11:29:10 +0000 |
CVSROOT: /sources/certi
Module name: certi
Branch: br_DEV_HETEROGENEOUS
Changes by: Eric NOULARD <erk> 08/04/21 11:29:10
Modified files:
libCERTI : NetworkMessage.hh NM_Classes.hh
NetworkMessage_RW.cc NM_Classes.cc
. : TODO
Log message:
Avoid serialize buffer copy
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.30.2.9&r2=3.30.2.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?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/NetworkMessage_RW.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.45.2.9&r2=3.45.2.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.12&r2=1.1.2.13
http://cvs.savannah.gnu.org/viewcvs/certi/TODO?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.1.6.1&r2=3.1.6.2
Patches:
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.30.2.9
retrieving revision 3.30.2.10
diff -u -b -r3.30.2.9 -r3.30.2.10
--- libCERTI/NetworkMessage.hh 20 Apr 2008 12:52:19 -0000 3.30.2.9
+++ libCERTI/NetworkMessage.hh 21 Apr 2008 11:29:09 -0000 3.30.2.10
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.30.2.9 2008/04/20 12:52:19 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.10 2008/04/21 11:29:09 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -146,8 +146,24 @@
const NetworkMessage::Message_T getType() const {return type;};
const TypeException getException() const {return exception;};
- virtual void serialize();
- virtual void deserialize();
+ /**
+ * Serialize the message into a buffer
+ */
+ virtual void serialize(MessageBuffer& msgBuffer);
+ /**
+ * DeSerialize the message from a buffer
+ */
+ 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);
@@ -356,4 +372,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.30.2.9 2008/04/20 12:52:19 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.10 2008/04/21 11:29:09 erk Exp $
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.hh,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.hh 20 Apr 2008 12:52:19 -0000 1.1.2.11
+++ libCERTI/NM_Classes.hh 21 Apr 2008 11:29:09 -0000 1.1.2.12
@@ -39,8 +39,8 @@
typedef NetworkMessage Super;
NM_WithHandleArray();
virtual ~NM_WithHandleArray();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
AttributeHandle getHandle(int i) {return handleArray[i];};
void setHandle(AttributeHandle h, int i) {handleArray[i]=h;};
@@ -54,8 +54,8 @@
typedef NM_WithHandleArray Super;
NM_DDM_Base();
virtual ~NM_DDM_Base();
- virtual void serialize() = 0;
- virtual void deserialize() = 0;
+ virtual void serialize(MessageBuffer& msgBuffer) = 0;
+ virtual void deserialize(MessageBuffer& msgBuffer) = 0;
/* specific Getter/Setter */
const SpaceHandle getSpace() const {return space;};
void setSpace(SpaceHandle space) {this->space=space;};
@@ -128,8 +128,8 @@
typedef NetworkMessage Super;
NM_Create_Federation_Execution();
virtual ~NM_Create_Federation_Execution();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -146,8 +146,8 @@
typedef NetworkMessage Super;
NM_Destroy_Federation_Execution();
virtual ~NM_Destroy_Federation_Execution();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -163,8 +163,8 @@
typedef NetworkMessage Super;
NM_Join_Federation_Execution();
virtual ~NM_Join_Federation_Execution();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -199,8 +199,8 @@
typedef NetworkMessage Super;
NM_Set_Time_Regulating();
virtual ~NM_Set_Time_Regulating();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -216,8 +216,8 @@
typedef NetworkMessage Super;
NM_Set_Time_Constrained();
virtual ~NM_Set_Time_Constrained();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -530,8 +530,8 @@
typedef NM_WithHandleArray Super;
NM_Publish_Object_Class();
virtual ~NM_Publish_Object_Class();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -547,8 +547,8 @@
typedef NetworkMessage Super;
NM_Unpublish_Object_Class();
virtual ~NM_Unpublish_Object_Class();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -564,8 +564,8 @@
typedef NetworkMessage Super;
NM_Publish_Interaction_Class();
virtual ~NM_Publish_Interaction_Class();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const InteractionClassHandle getInteractionClassHandle() const {return
interactionClass;};
void setInteractionClassHandle(InteractionClassHandle interactionClass)
{this->interactionClass=interactionClass;};
@@ -597,8 +597,8 @@
typedef NM_WithHandleArray Super;
NM_Subscribe_Object_Class();
virtual ~NM_Subscribe_Object_Class();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -684,8 +684,8 @@
typedef NetworkMessage Super;
NM_Register_Object();
virtual ~NM_Register_Object();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -715,8 +715,8 @@
typedef NetworkMessage Super;
NM_Update_Attribute_Values();
virtual ~NM_Update_Attribute_Values();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -747,8 +747,8 @@
typedef NetworkMessage Super;
NM_Send_Interaction();
virtual ~NM_Send_Interaction();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -808,8 +808,8 @@
typedef NetworkMessage Super;
NM_Change_Attribute_Transport_Type();
virtual ~NM_Change_Attribute_Transport_Type();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -824,8 +824,8 @@
typedef NetworkMessage Super;
NM_Change_Attribute_Order_Type();
virtual ~NM_Change_Attribute_Order_Type();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -840,8 +840,8 @@
typedef NetworkMessage Super;
NM_Change_Interaction_Transport_Type();
virtual ~NM_Change_Interaction_Transport_Type();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -856,8 +856,8 @@
typedef NetworkMessage Super;
NM_Change_Interaction_Order_Type();
virtual ~NM_Change_Interaction_Order_Type();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -872,8 +872,8 @@
typedef NetworkMessage Super;
NM_Request_Class_Attribute_Value_Update();
virtual ~NM_Request_Class_Attribute_Value_Update();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -888,8 +888,8 @@
typedef NM_WithHandleArray Super;
NM_Request_Object_Attribute_Value_Update();
virtual ~NM_Request_Object_Attribute_Value_Update();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const ObjectHandle getObject() const {return object;};
void setObject(ObjectHandle object) {this->object=object;};
@@ -906,8 +906,8 @@
typedef NetworkMessage Super;
NM_Is_Attribute_Owned_By_Federate();
virtual ~NM_Is_Attribute_Owned_By_Federate();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1148,8 +1148,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Create_Region();
virtual ~NM_DDM_Create_Region();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const SpaceHandle getSpace() const {return space;};
void setSpace(SpaceHandle space) {this->space=space;};
@@ -1171,8 +1171,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Modify_Region();
virtual ~NM_DDM_Modify_Region();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const int32_t getRegion() const {return region;};
void setRegion(SpaceHandle region) {this->region=region;};
@@ -1190,8 +1190,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Delete_Region();
virtual ~NM_DDM_Delete_Region();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const int32_t getRegion() const {return region;};
void setRegion(SpaceHandle region) {this->region=region;};
@@ -1209,8 +1209,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Associate_Region();
virtual ~NM_DDM_Associate_Region();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
const int32_t getRegion() const {return region;};
void setRegion(SpaceHandle region) {this->region=region;};
@@ -1231,8 +1231,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Register_Object();
virtual ~NM_DDM_Register_Object();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1247,8 +1247,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Unassociate_Region();
virtual ~NM_DDM_Unassociate_Region();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1263,8 +1263,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Subscribe_Attributes();
virtual ~NM_DDM_Subscribe_Attributes();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1279,8 +1279,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Unsubscribe_Attributes();
virtual ~NM_DDM_Unsubscribe_Attributes();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1295,8 +1295,8 @@
typedef NM_DDM_Base Super;
NM_DDM_Subscribe_Interaction();
virtual ~NM_DDM_Subscribe_Interaction();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
protected:
/* specific field */
@@ -1339,8 +1339,8 @@
typedef NetworkMessage Super;
NM_Get_FED_File();
virtual ~NM_Get_FED_File();
- virtual void serialize();
- virtual void deserialize();
+ virtual void serialize(MessageBuffer& msgBuffer);
+ virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
void setFEDid(std::string FEDid) {this->FEDid=FEDid;};
const std::string getFEDid() const {return FEDid;};
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45.2.9
retrieving revision 3.45.2.10
diff -u -b -r3.45.2.9 -r3.45.2.10
--- libCERTI/NetworkMessage_RW.cc 20 Apr 2008 12:52:19 -0000 3.45.2.9
+++ libCERTI/NetworkMessage_RW.cc 21 Apr 2008 11:29:10 -0000
3.45.2.10
@@ -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.9 2008/04/20 12:52:19 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.10 2008/04/21 11:29:10 erk Exp $
// ----------------------------------------------------------------------------
#include "NetworkMessage.hh"
#include "PrettyDebug.hh"
@@ -31,7 +31,7 @@
static PrettyDebug G("GENDOC",__FILE__ );
// ----------------------------------------------------------------------------
-void NetworkMessage::serialize() {
+void NetworkMessage::serialize(MessageBuffer& msgBuffer) {
G.Out(pdGendoc,"enter NetworkMessage::serialize");
/* We serialize the common Network messages part
* ALL Network Message will contain the following
@@ -41,59 +41,59 @@
}
D.Out(pdDebug, "Serialize <%s>", getName().c_str());
/* type of message */
- msgBuf.write_int32(type);
- msgBuf.write_int32(exception);
- msgBuf.write_int32(federate);
- msgBuf.write_int32(federation);
+ msgBuffer.write_int32(type);
+ msgBuffer.write_int32(exception);
+ msgBuffer.write_int32(federate);
+ msgBuffer.write_int32(federation);
/*
* "builtin" Optional part
* The subclass may chose in the constructor the variable part.
* isDated may be chosen on Message instance basis
* (same message may Dated or Not Dated)
*/
- msgBuf.write_bool(isDated);
+ msgBuffer.write_bool(isDated);
if (isDated) {
- msgBuf.write_double(date);
+ msgBuffer.write_double(date);
}
- msgBuf.write_bool(isLabelled);
+ msgBuffer.write_bool(isLabelled);
if (isLabelled) {
- msgBuf.write_string(label);
+ msgBuffer.write_string(label);
}
- msgBuf.write_bool(isTagged);
+ msgBuffer.write_bool(isTagged);
if (isTagged) {
- msgBuf.write_string(tag);
+ msgBuffer.write_string(tag);
}
G.Out(pdGendoc,"exit NetworkMessage::serialize");
} /* end of serialize */
-void NetworkMessage::deserialize() {
+void NetworkMessage::deserialize(MessageBuffer& msgBuffer) {
G.Out(pdGendoc,"enter NetworkMessage::deserialize");
/* We serialize the common Network message part
* ALL Network Messages will contain the following
*/
D[pdDebug] << "Deserialize <" << getName().c_str()<<">"<<endl;
/* deserialize common part */
- type =
static_cast<certi::NetworkMessage::Type>(msgBuf.read_int32());
- exception = static_cast<certi::TypeException>(msgBuf.read_int32());
- federate = msgBuf.read_int32();
- federation = msgBuf.read_int32();
+ type =
static_cast<certi::NetworkMessage::Type>(msgBuffer.read_int32());
+ exception = static_cast<certi::TypeException>(msgBuffer.read_int32());
+ federate = msgBuffer.read_int32();
+ federation = msgBuffer.read_int32();
/*
* "builtin" Optional part
* The subclass may chose in the constructor the variable part.
* isDated may be chosen on Message instance basis
* (same message may Dated or Not Dated)
*/
- isDated = msgBuf.read_bool();
+ isDated = msgBuffer.read_bool();
if (isDated) {
- date = msgBuf.read_double();
+ date = msgBuffer.read_double();
}
- isLabelled = msgBuf.read_bool();
+ isLabelled = msgBuffer.read_bool();
if (isLabelled) {
- label = msgBuf.read_string();
+ label = msgBuffer.read_string();
}
- isTagged = msgBuf.read_bool();
+ isTagged = msgBuffer.read_bool();
if (isTagged) {
- tag = msgBuf.read_string();
+ tag = msgBuffer.read_string();
}
G.Out(pdGendoc,"exit NetworkMessage::deserialize");
} /* end of deserialize */
@@ -107,7 +107,7 @@
* This is a polymorphic call
* which may specialized in a daughter class
*/
- serialize();
+ serialize(msgBuf);
/* 2- update message buffer 'reserved bytes' header */
msgBuf.updateReservedBytes();
D.Out(pdDebug,"Sending <%s> whose buffer has <%u>
bytes",getName().c_str(),msgBuf.size());
@@ -138,10 +138,10 @@
* This is a polymorphic call
* which may specialized in a daughter class
*/
- deserialize();
+ deserialize(msgBuf);
G.Out(pdGendoc,"exit NetworkMessage::receive");
} /* end of receive */
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.45.2.9 2008/04/20 12:52:19 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.10 2008/04/21 11:29:10 erk Exp $
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -b -r1.1.2.12 -r1.1.2.13
--- libCERTI/NM_Classes.cc 20 Apr 2008 12:52:19 -0000 1.1.2.12
+++ libCERTI/NM_Classes.cc 21 Apr 2008 11:29:10 -0000 1.1.2.13
@@ -291,7 +291,8 @@
return msg;
} /* end of NM_Factory::create */
- NetworkMessage* NM_Factory::receive(Socket* socket) throw (NetworkError,
RTIinternalError) {
+NetworkMessage*
+NM_Factory::receive(Socket* socket) throw (NetworkError, RTIinternalError) {
NetworkMessage msgGen;
NetworkMessage* msg;
@@ -299,8 +300,8 @@
msgGen.receive(socket);
/* create specific message from type */
msg = NM_Factory::create(msgGen.getType());
- msg->copyMsgBufFrom(msgGen);
- msg->deserialize();
+ /* msg->copyMsgBufFrom(msgGen); */
+ msg->deserialize(msgGen);
return msg;
} /* end of NM_Factory::receive */
@@ -314,35 +315,35 @@
NM_WithHandleArray::~NM_WithHandleArray() {
}
-void NM_WithHandleArray::serialize() {
+void NM_WithHandleArray::serialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_uint16(handleArraySize);
+ msgBuffer.write_uint16(handleArraySize);
/*
* Note that if handleArraySize is 0
* the loop is void which is done on purpose.
* (this is a feature not a bug :-)
*/
for (i = 0 ; i < handleArraySize ; ++i) {
- msgBuf.write_uint16(handleArray[i]);
+ msgBuffer.write_uint16(handleArray[i]);
}
} /* end of serialize */
-void NM_WithHandleArray::deserialize() {
+void NM_WithHandleArray::deserialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- handleArraySize = msgBuf.read_int16();
+ handleArraySize = msgBuffer.read_int16();
/*
* Note that if handleArraySize is 0
* the loop is void which is done on purpose.
* (this is a feature not a bug :-)
*/
for (i = 0 ; i < handleArraySize ; i ++) {
- handleArray[i] = msgBuf.read_int16();
+ handleArray[i] = msgBuffer.read_int16();
}
} /* end of deserialize */
@@ -401,19 +402,19 @@
}
NM_Create_Federation_Execution::~NM_Create_Federation_Execution() {
}
-void NM_Create_Federation_Execution::serialize() {
+void NM_Create_Federation_Execution::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_string(federationName);
- msgBuf.write_string(FEDid);
+ msgBuffer.write_string(federationName);
+ msgBuffer.write_string(FEDid);
} /* end of serialize */
-void NM_Create_Federation_Execution::deserialize() {
+void NM_Create_Federation_Execution::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- federationName = msgBuf.read_string();
- FEDid = msgBuf.read_string();
+ federationName = msgBuffer.read_string();
+ FEDid = msgBuffer.read_string();
} /* end of deserialize */
/*<END>---------- Create_Federation_Execution ------------<END>*/
@@ -426,17 +427,17 @@
}
NM_Destroy_Federation_Execution::~NM_Destroy_Federation_Execution() {
}
-void NM_Destroy_Federation_Execution::serialize() {
+void NM_Destroy_Federation_Execution::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_string(federationName);
+ msgBuffer.write_string(federationName);
} /* end of serialize */
-void NM_Destroy_Federation_Execution::deserialize() {
+void NM_Destroy_Federation_Execution::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- federationName = msgBuf.read_string();
+ federationName = msgBuffer.read_string();
} /* end of deserialize */
/*<END>---------- Destroy_Federation_Execution ------------<END>*/
@@ -448,27 +449,27 @@
}
NM_Join_Federation_Execution::~NM_Join_Federation_Execution() {
}
-void NM_Join_Federation_Execution::serialize() {
+void NM_Join_Federation_Execution::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(numberOfRegulators);
- msgBuf.write_uint32(multicastAddress);
- msgBuf.write_uint32(bestEffortAddress);
- msgBuf.write_uint32(bestEffortPeer);
- msgBuf.write_string(federationName);
- msgBuf.write_string(federateName);
-} /* end of serialize */
-void NM_Join_Federation_Execution::deserialize() {
- /* call mother class */
- Super::deserialize();
- /* specific code (if any) goes here */
- numberOfRegulators = msgBuf.read_int32();
- multicastAddress = msgBuf.read_uint32();
- bestEffortAddress = msgBuf.read_uint32();
- bestEffortPeer = msgBuf.read_uint32();
- federationName = msgBuf.read_string();
- federateName = msgBuf.read_string();
+ msgBuffer.write_int32(numberOfRegulators);
+ msgBuffer.write_uint32(multicastAddress);
+ msgBuffer.write_uint32(bestEffortAddress);
+ msgBuffer.write_uint32(bestEffortPeer);
+ msgBuffer.write_string(federationName);
+ msgBuffer.write_string(federateName);
+} /* end of serialize */
+void NM_Join_Federation_Execution::deserialize(MessageBuffer& msgBuffer) {
+ /* call mother class */
+ Super::deserialize(msgBuffer);
+ /* specific code (if any) goes here */
+ numberOfRegulators = msgBuffer.read_int32();
+ multicastAddress = msgBuffer.read_uint32();
+ bestEffortAddress = msgBuffer.read_uint32();
+ bestEffortPeer = msgBuffer.read_uint32();
+ federationName = msgBuffer.read_string();
+ federateName = msgBuffer.read_string();
} /* end of deserialize */
/*<END>---------- Join_Federation_Execution ------------<END>*/
@@ -491,17 +492,17 @@
}
NM_Set_Time_Regulating::~NM_Set_Time_Regulating() {
}
-void NM_Set_Time_Regulating::serialize() {
+void NM_Set_Time_Regulating::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_bool(regulator);
+ msgBuffer.write_bool(regulator);
} /* end of serialize */
-void NM_Set_Time_Regulating::deserialize() {
+void NM_Set_Time_Regulating::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- regulator = msgBuf.read_bool();
+ regulator = msgBuffer.read_bool();
} /* end of deserialize */
/*<END>---------- Set_Time_Regulating ------------<END>*/
@@ -514,17 +515,17 @@
}
NM_Set_Time_Constrained::~NM_Set_Time_Constrained() {
}
-void NM_Set_Time_Constrained::serialize() {
+void NM_Set_Time_Constrained::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_bool(constrained);
+ msgBuffer.write_bool(constrained);
} /* end of serialize */
-void NM_Set_Time_Constrained::deserialize() {
+void NM_Set_Time_Constrained::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- constrained = msgBuf.read_bool();
+ constrained = msgBuffer.read_bool();
} /* end of deserialize */
/*<END>---------- Set_Time_Constrained ------------<END>*/
@@ -770,14 +771,14 @@
NM_Publish_Object_Class::~NM_Publish_Object_Class() {
}
void
-NM_Publish_Object_Class::serialize() {
- Super::serialize();
- msgBuf.write_int32(objectClass);
+NM_Publish_Object_Class::serialize(MessageBuffer& msgBuffer) {
+ Super::serialize(msgBuffer);
+ msgBuffer.write_int32(objectClass);
}
void
-NM_Publish_Object_Class::deserialize() {
- Super::deserialize();
- objectClass = msgBuf.read_int32();
+NM_Publish_Object_Class::deserialize(MessageBuffer& msgBuffer) {
+ Super::deserialize(msgBuffer);
+ objectClass = msgBuffer.read_int32();
}
/*<END>---------- Publish_Object_Class ------------<END>*/
@@ -789,17 +790,17 @@
}
NM_Unpublish_Object_Class::~NM_Unpublish_Object_Class() {
}
-void NM_Unpublish_Object_Class::serialize() {
+void NM_Unpublish_Object_Class::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(objectClass);
+ msgBuffer.write_int32(objectClass);
} /* end of serialize */
-void NM_Unpublish_Object_Class::deserialize() {
+void NM_Unpublish_Object_Class::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- objectClass = msgBuf.read_int32();
+ objectClass = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- Unpublish_Object_Class ------------<END>*/
@@ -811,17 +812,17 @@
}
NM_Publish_Interaction_Class::~NM_Publish_Interaction_Class() {
}
-void NM_Publish_Interaction_Class::serialize() {
+void NM_Publish_Interaction_Class::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(interactionClass);
+ msgBuffer.write_int32(interactionClass);
} /* end of serialize */
-void NM_Publish_Interaction_Class::deserialize() {
+void NM_Publish_Interaction_Class::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- interactionClass = msgBuf.read_int32();
+ interactionClass = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- Publish_Interaction_Class ------------<END>*/
@@ -843,13 +844,13 @@
}
NM_Subscribe_Object_Class::~NM_Subscribe_Object_Class() {
}
-void NM_Subscribe_Object_Class::serialize() {
- Super::serialize();
- msgBuf.write_int32(objectClass);
-}
-void NM_Subscribe_Object_Class::deserialize() {
- Super::deserialize();
- objectClass=msgBuf.read_int32();
+void NM_Subscribe_Object_Class::serialize(MessageBuffer& msgBuffer) {
+ Super::serialize(msgBuffer);
+ msgBuffer.write_int32(objectClass);
+}
+void NM_Subscribe_Object_Class::deserialize(MessageBuffer& msgBuffer) {
+ Super::deserialize(msgBuffer);
+ objectClass=msgBuffer.read_int32();
}
/*<END>---------- Subscribe_Object_Class ------------<END>*/
@@ -912,19 +913,19 @@
}
NM_Register_Object::~NM_Register_Object() {
}
-void NM_Register_Object::serialize() {
+void NM_Register_Object::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(objectClass);
- msgBuf.write_int32(object);
+ msgBuffer.write_int32(objectClass);
+ msgBuffer.write_int32(object);
} /* end of serialize */
-void NM_Register_Object::deserialize() {
+void NM_Register_Object::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- objectClass = msgBuf.read_int32();
- object = msgBuf.read_int32();
+ objectClass = msgBuffer.read_int32();
+ object = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- Register_Object ------------<END>*/
@@ -949,27 +950,27 @@
}
NM_Update_Attribute_Values::~NM_Update_Attribute_Values() {
}
-void NM_Update_Attribute_Values::serialize() {
+void NM_Update_Attribute_Values::serialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(objectClass);
+ msgBuffer.write_int32(objectClass);
/* the value pre-encoded by the user (HLA 1.3) */
for (i = 0 ; i < handleArraySize ; i++) {
- msgBuf.write_int32(ValueArray[i].length) ;
- msgBuf.write_bytes(ValueArray[i].value, ValueArray[i].length);
+ msgBuffer.write_int32(ValueArray[i].length) ;
+ msgBuffer.write_bytes(ValueArray[i].value,
ValueArray[i].length);
}
} /* end of serialize */
-void NM_Update_Attribute_Values::deserialize() {
+void NM_Update_Attribute_Values::deserialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- objectClass = msgBuf.read_int32();
+ objectClass = msgBuffer.read_int32();
for (i = 0 ; i < handleArraySize ; i ++) {
- ValueArray[i].length = msgBuf.read_int32();
- msgBuf.read_bytes(ValueArray[i].value, ValueArray[i].length);
+ ValueArray[i].length = msgBuffer.read_int32();
+ msgBuffer.read_bytes(ValueArray[i].value,
ValueArray[i].length);
}
} /* end of deserialize */
/*<END>---------- Update_Attribute_Values ------------<END>*/
@@ -994,27 +995,27 @@
}
NM_Send_Interaction::~NM_Send_Interaction() {
}
-void NM_Send_Interaction::serialize() {
+void NM_Send_Interaction::serialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(interactionClass);
+ msgBuffer.write_int32(interactionClass);
/* the value pre-encoded by the user (HLA 1.3) */
for (i = 0 ; i < handleArraySize ; i++) {
- msgBuf.write_int32(ValueArray[i].length) ;
- msgBuf.write_bytes(ValueArray[i].value, ValueArray[i].length);
+ msgBuffer.write_int32(ValueArray[i].length) ;
+ msgBuffer.write_bytes(ValueArray[i].value,
ValueArray[i].length);
}
} /* end of serialize */
-void NM_Send_Interaction::deserialize() {
+void NM_Send_Interaction::deserialize(MessageBuffer& msgBuffer) {
int i;
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- interactionClass = msgBuf.read_int32();
+ interactionClass = msgBuffer.read_int32();
for (i = 0 ; i < handleArraySize ; i ++) {
- ValueArray[i].length = msgBuf.read_int32();
- msgBuf.read_bytes(ValueArray[i].value, ValueArray[i].length);
+ ValueArray[i].length = msgBuffer.read_int32();
+ msgBuffer.read_bytes(ValueArray[i].value, ValueArray[i].length);
}
} /* end of deserialize */
/*<END>---------- Send_Interaction ------------<END>*/
@@ -1060,14 +1061,14 @@
}
NM_Change_Attribute_Transport_Type::~NM_Change_Attribute_Transport_Type() {
}
-void NM_Change_Attribute_Transport_Type::serialize() {
+void NM_Change_Attribute_Transport_Type::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of serialize */
-void NM_Change_Attribute_Transport_Type::deserialize() {
+void NM_Change_Attribute_Transport_Type::deserialize(MessageBuffer& msgBuffer)
{
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of deserialize */
/*<END>---------- Change_Attribute_Transport_Type ------------<END>*/
@@ -1080,14 +1081,14 @@
}
NM_Change_Attribute_Order_Type::~NM_Change_Attribute_Order_Type() {
}
-void NM_Change_Attribute_Order_Type::serialize() {
+void NM_Change_Attribute_Order_Type::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of serialize */
-void NM_Change_Attribute_Order_Type::deserialize() {
+void NM_Change_Attribute_Order_Type::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of deserialize */
/*<END>---------- Change_Attribute_Order_Type ------------<END>*/
@@ -1100,14 +1101,14 @@
}
NM_Change_Interaction_Transport_Type::~NM_Change_Interaction_Transport_Type() {
}
-void NM_Change_Interaction_Transport_Type::serialize() {
+void NM_Change_Interaction_Transport_Type::serialize(MessageBuffer& msgBuffer)
{
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of serialize */
-void NM_Change_Interaction_Transport_Type::deserialize() {
+void NM_Change_Interaction_Transport_Type::deserialize(MessageBuffer&
msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of deserialize */
/*<END>---------- Change_Interaction_Transport_Type ------------<END>*/
@@ -1120,14 +1121,14 @@
}
NM_Change_Interaction_Order_Type::~NM_Change_Interaction_Order_Type() {
}
-void NM_Change_Interaction_Order_Type::serialize() {
+void NM_Change_Interaction_Order_Type::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of serialize */
-void NM_Change_Interaction_Order_Type::deserialize() {
+void NM_Change_Interaction_Order_Type::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of deserialize */
/*<END>---------- Change_Interaction_Order_Type ------------<END>*/
@@ -1140,14 +1141,14 @@
}
NM_Request_Class_Attribute_Value_Update::~NM_Request_Class_Attribute_Value_Update()
{
}
-void NM_Request_Class_Attribute_Value_Update::serialize() {
+void NM_Request_Class_Attribute_Value_Update::serialize(MessageBuffer&
msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of serialize */
-void NM_Request_Class_Attribute_Value_Update::deserialize() {
+void NM_Request_Class_Attribute_Value_Update::deserialize(MessageBuffer&
msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
} /* end of deserialize */
/*<END>---------- Request_Class_Attribute_Value_Update ------------<END>*/
@@ -1160,17 +1161,17 @@
}
NM_Request_Object_Attribute_Value_Update::~NM_Request_Object_Attribute_Value_Update()
{
}
-void NM_Request_Object_Attribute_Value_Update::serialize() {
+void NM_Request_Object_Attribute_Value_Update::serialize(MessageBuffer&
msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(object);
+ msgBuffer.write_int32(object);
} /* end of serialize */
-void NM_Request_Object_Attribute_Value_Update::deserialize() {
+void NM_Request_Object_Attribute_Value_Update::deserialize(MessageBuffer&
msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- object = msgBuf.read_int32();
+ object = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- Request_Object_Attribute_Value_Update ------------<END>*/
@@ -1183,19 +1184,19 @@
}
NM_Is_Attribute_Owned_By_Federate::~NM_Is_Attribute_Owned_By_Federate() {
}
-void NM_Is_Attribute_Owned_By_Federate::serialize() {
+void NM_Is_Attribute_Owned_By_Federate::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(object);
- msgBuf.write_int32(attribute);
+ msgBuffer.write_int32(object);
+ msgBuffer.write_int32(attribute);
} /* end of serialize */
-void NM_Is_Attribute_Owned_By_Federate::deserialize() {
+void NM_Is_Attribute_Owned_By_Federate::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- object = msgBuf.read_int32();
- attribute = msgBuf.read_int32();
+ object = msgBuffer.read_int32();
+ attribute = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- Is_Attribute_Owned_By_Federate ------------<END>*/
@@ -1368,21 +1369,21 @@
}
NM_DDM_Create_Region::~NM_DDM_Create_Region() {
}
-void NM_DDM_Create_Region::serialize() {
+void NM_DDM_Create_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(space);
- msgBuf.write_int32(nbExtents);
- msgBuf.write_int32(region);
+ msgBuffer.write_int32(space);
+ msgBuffer.write_int32(nbExtents);
+ msgBuffer.write_int32(region);
} /* end of serialize */
-void NM_DDM_Create_Region::deserialize() {
+void NM_DDM_Create_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- space = msgBuf.read_int32();
- nbExtents = msgBuf.read_int32();
- region = msgBuf.read_int32();
+ space = msgBuffer.read_int32();
+ nbExtents = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Create_Region ------------<END>*/
@@ -1394,18 +1395,18 @@
}
NM_DDM_Modify_Region::~NM_DDM_Modify_Region() {
}
-void NM_DDM_Modify_Region::serialize() {
+void NM_DDM_Modify_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(region);
+ msgBuffer.write_int32(region);
writeExtents();
} /* end of serialize */
-void NM_DDM_Modify_Region::deserialize() {
+void NM_DDM_Modify_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- region = msgBuf.read_int32();
+ region = msgBuffer.read_int32();
readExtents();
} /* end of deserialize */
/*<END>---------- DDM_Modify_Region ------------<END>*/
@@ -1418,17 +1419,17 @@
}
NM_DDM_Delete_Region::~NM_DDM_Delete_Region() {
}
-void NM_DDM_Delete_Region::serialize() {
+void NM_DDM_Delete_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(region);
+ msgBuffer.write_int32(region);
} /* end of serialize */
-void NM_DDM_Delete_Region::deserialize() {
+void NM_DDM_Delete_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- region = msgBuf.read_int32();
+ region = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Delete_Region ------------<END>*/
@@ -1440,23 +1441,23 @@
}
NM_DDM_Associate_Region::~NM_DDM_Associate_Region() {
}
-void NM_DDM_Associate_Region::serialize() {
+void NM_DDM_Associate_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::serialize(msgBuffer);
+ NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(object);
- msgBuf.write_int32(region);
- msgBuf.write_int32(boolean);
+ msgBuffer.write_int32(object);
+ msgBuffer.write_int32(region);
+ msgBuffer.write_int32(boolean);
} /* end of serialize */
-void NM_DDM_Associate_Region::deserialize() {
+void NM_DDM_Associate_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
+ NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
- object = msgBuf.read_int32();
- region = msgBuf.read_int32();
- boolean = msgBuf.read_int32();
+ object = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
+ boolean = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Associate_Region ------------<END>*/
@@ -1469,25 +1470,25 @@
}
NM_DDM_Register_Object::~NM_DDM_Register_Object() {
}
-void NM_DDM_Register_Object::serialize() {
+void NM_DDM_Register_Object::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::serialize(msgBuffer);
+ NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(object);
- msgBuf.write_int32(objectClass);
- msgBuf.write_int32(region);
- msgBuf.write_int32(boolean);
+ msgBuffer.write_int32(object);
+ msgBuffer.write_int32(objectClass);
+ msgBuffer.write_int32(region);
+ msgBuffer.write_int32(boolean);
} /* end of serialize */
-void NM_DDM_Register_Object::deserialize() {
+void NM_DDM_Register_Object::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
+ NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
- object = msgBuf.read_int32();
- objectClass = msgBuf.read_int32();
- region = msgBuf.read_int32();
- boolean = msgBuf.read_int32();
+ object = msgBuffer.read_int32();
+ objectClass = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
+ boolean = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Register_Object ------------<END>*/
@@ -1499,19 +1500,19 @@
}
NM_DDM_Unassociate_Region::~NM_DDM_Unassociate_Region() {
}
-void NM_DDM_Unassociate_Region::serialize() {
+void NM_DDM_Unassociate_Region::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(object);
- msgBuf.write_int32(region);
+ msgBuffer.write_int32(object);
+ msgBuffer.write_int32(region);
} /* end of serialize */
-void NM_DDM_Unassociate_Region::deserialize() {
+void NM_DDM_Unassociate_Region::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- object = msgBuf.read_int32();
- region = msgBuf.read_int32();
+ object = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Unassociate_Region ------------<END>*/
@@ -1523,23 +1524,23 @@
}
NM_DDM_Subscribe_Attributes::~NM_DDM_Subscribe_Attributes() {
}
-void NM_DDM_Subscribe_Attributes::serialize() {
+void NM_DDM_Subscribe_Attributes::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::serialize(msgBuffer);
+ NM_WithHandleArray::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(objectClass);
- msgBuf.write_int32(region);
- msgBuf.write_int32(boolean);
+ msgBuffer.write_int32(objectClass);
+ msgBuffer.write_int32(region);
+ msgBuffer.write_int32(boolean);
} /* end of serialize */
-void NM_DDM_Subscribe_Attributes::deserialize() {
+void NM_DDM_Subscribe_Attributes::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
- NM_WithHandleArray::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
+ NM_WithHandleArray::deserialize(msgBuffer);
/* specific code (if any) goes here */
- objectClass = msgBuf.read_int32();
- region = msgBuf.read_int32();
- boolean = msgBuf.read_int32();
+ objectClass = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
+ boolean = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Subscribe_Attributes ------------<END>*/
@@ -1551,19 +1552,19 @@
}
NM_DDM_Unsubscribe_Attributes::~NM_DDM_Unsubscribe_Attributes() {
}
-void NM_DDM_Unsubscribe_Attributes::serialize() {
+void NM_DDM_Unsubscribe_Attributes::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(objectClass);
- msgBuf.write_int32(region);
+ msgBuffer.write_int32(objectClass);
+ msgBuffer.write_int32(region);
} /* end of serialize */
-void NM_DDM_Unsubscribe_Attributes::deserialize() {
+void NM_DDM_Unsubscribe_Attributes::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- objectClass = msgBuf.read_int32();
- region = msgBuf.read_int32();
+ objectClass = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
} /* end of deserialize */
/*<END>---------- DDM_Unsubscribe_Attributes ------------<END>*/
@@ -1575,21 +1576,21 @@
}
NM_DDM_Subscribe_Interaction::~NM_DDM_Subscribe_Interaction() {
}
-void NM_DDM_Subscribe_Interaction::serialize() {
+void NM_DDM_Subscribe_Interaction::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::serialize();
+ NetworkMessage::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_int32(interactionClass);
- msgBuf.write_int32(region);
- msgBuf.write_bool(boolean);
+ msgBuffer.write_int32(interactionClass);
+ msgBuffer.write_int32(region);
+ msgBuffer.write_bool(boolean);
} /* end of serialize */
-void NM_DDM_Subscribe_Interaction::deserialize() {
+void NM_DDM_Subscribe_Interaction::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- NetworkMessage::deserialize();
+ NetworkMessage::deserialize(msgBuffer);
/* specific code (if any) goes here */
- interactionClass = msgBuf.read_int32();
- region = msgBuf.read_int32();
- boolean = msgBuf.read_bool();
+ interactionClass = msgBuffer.read_int32();
+ region = msgBuffer.read_int32();
+ boolean = msgBuffer.read_bool();
} /* end of deserialize */
/*<END>---------- DDM_Subscribe_Interaction ------------<END>*/
@@ -1621,24 +1622,24 @@
}
NM_Get_FED_File::~NM_Get_FED_File() {
}
-void NM_Get_FED_File::serialize() {
+void NM_Get_FED_File::serialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::serialize();
+ Super::serialize(msgBuffer);
/* specific code (if any) goes here */
- msgBuf.write_string(FEDid);
- msgBuf.write_int16(number);
+ msgBuffer.write_string(FEDid);
+ msgBuffer.write_int16(number);
if (number) {
- msgBuf.write_string(line);
+ msgBuffer.write_string(line);
}
} /* end of serialize */
-void NM_Get_FED_File::deserialize() {
+void NM_Get_FED_File::deserialize(MessageBuffer& msgBuffer) {
/* call mother class */
- Super::deserialize();
+ Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
- FEDid = msgBuf.read_string();
- number = msgBuf.read_int16();
+ FEDid = msgBuffer.read_string();
+ number = msgBuffer.read_int16();
if (number) {
- line = msgBuf.read_string();
+ line = msgBuffer.read_string();
}
} /* end of deserialize */
/*<END>---------- Get_FED_File ------------<END>*/
Index: TODO
===================================================================
RCS file: /sources/certi/certi/TODO,v
retrieving revision 3.1.6.1
retrieving revision 3.1.6.2
diff -u -b -r3.1.6.1 -r3.1.6.2
--- TODO 10 Apr 2008 19:58:50 -0000 3.1.6.1
+++ TODO 21 Apr 2008 11:29:10 -0000 3.1.6.2
@@ -1,7 +1,7 @@
Erk1) Replace serialize()/deserialize()
with serialize(MessageBuffer& msgBuf) ...
in order to minimize copy when possible
- (for example on virtual constructor)
+ (for example on virtual constructor) --> This part is DONE
We may even setup a msgBuf pool in order to
minimize realloc when creating NetworkMessage sub-classes instance
@@ -11,8 +11,6 @@
Erk3) Use proper constructor and getter/setter for NetworkMessage
and avoid public shared field between different kind of message
-Erk4) May implicity isLabelled/Tagged/Dated using Setter.
-
Erk5) Remove all kind of:
AnswerAssumption->exception = e_NO_EXCEPTION
- [certi-cvs] certi libCERTI/NetworkMessage.hh libCERTI/NM_Cl... [br_DEV_HETEROGENEOUS],
certi-cvs <=