[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/RTIG_processing.cc RTIA/DeclarationM... [br_DEV_H
From: |
certi-cvs |
Subject: |
[certi-cvs] certi RTIG/RTIG_processing.cc RTIA/DeclarationM... [br_DEV_HETEROGENEOUS] |
Date: |
Thu, 10 Apr 2008 20:43:02 +0000 |
CVSROOT: /sources/certi
Module name: certi
Branch: br_DEV_HETEROGENEOUS
Changes by: Eric NOULARD <erk> 08/04/10 20:43:01
Modified files:
RTIG : RTIG_processing.cc
RTIA : DeclarationManagement.cc
libCERTI : NetworkMessage_RW.cc NM_Classes.hh
NM_Classes.cc
scripts : NW_MessageType.ods
Log message:
Some more fixes.
Not enough to make billard run through the end...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.56.2.5&r2=3.56.2.6
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.17.2.2&r2=3.17.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.45.2.6&r2=3.45.2.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.9&r2=1.1.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.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/NW_MessageType.ods?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&rev=1.1.2.6
Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.56.2.5
retrieving revision 3.56.2.6
diff -u -b -r3.56.2.5 -r3.56.2.6
--- RTIG/RTIG_processing.cc 10 Apr 2008 19:55:47 -0000 3.56.2.5
+++ RTIG/RTIG_processing.cc 10 Apr 2008 20:43:00 -0000 3.56.2.6
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIG_processing.cc,v 3.56.2.5 2008/04/10 19:55:47 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.6 2008/04/10 20:43:00 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -567,7 +567,6 @@
std::auto_ptr<NetworkMessage> rep(NM_Factory::create(req->getType()));
rep->federate = req->federate ;
rep->objectClass = req->objectClass ;
- rep->handleArraySize = 0 ;
rep->send(link); // send answer to RTIA
}
@@ -1325,4 +1324,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.56.2.5 2008/04/10 19:55:47 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.6 2008/04/10 20:43:00 erk Exp $
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.17.2.2
retrieving revision 3.17.2.3
diff -u -b -r3.17.2.2 -r3.17.2.3
--- RTIA/DeclarationManagement.cc 10 Apr 2008 14:57:47 -0000 3.17.2.2
+++ RTIA/DeclarationManagement.cc 10 Apr 2008 20:43:00 -0000 3.17.2.3
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: DeclarationManagement.cc,v 3.17.2.2 2008/04/10 14:57:47 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.17.2.3 2008/04/10 20:43:00 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -452,4 +452,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.17.2.2 2008/04/10 14:57:47 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.17.2.3 2008/04/10 20:43:00 erk Exp $
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45.2.6
retrieving revision 3.45.2.7
diff -u -b -r3.45.2.6 -r3.45.2.7
--- libCERTI/NetworkMessage_RW.cc 10 Apr 2008 14:57:49 -0000 3.45.2.6
+++ libCERTI/NetworkMessage_RW.cc 10 Apr 2008 20:43:01 -0000 3.45.2.7
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: NetworkMessage_RW.cc,v 3.45.2.6 2008/04/10 14:57:49 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.7 2008/04/10 20:43:01 erk Exp $
// ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@
(type==LAST)) {
throw RTIinternalError("Invalid network type (not a valid
type);");
}
- D.Out(pdDebug, "serialize <%s>", getName().c_str());
+ D.Out(pdDebug, "Serialize <%s>", getName().c_str());
/* type of message */
msgBuf.write_int32(type);
msgBuf.write_int32(exception);
@@ -72,7 +72,7 @@
/* We serialize the common Network message part
* ALL Network Messages will contain the following
*/
- D[pdDebug] << "deserialize <" << getName().c_str()<<">"<<endl;
+ 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());
@@ -109,7 +109,7 @@
serialize();
/* 2- update message buffer 'reserved bytes' header */
msgBuf.updateReservedBytes();
- D.Out(pdDebug,"[Header] Sending a buffer of <%u> bytes",msgBuf.size());
+ D.Out(pdDebug,"Sending an msg buffer of <%u> bytes",msgBuf.size());
//msgBuf.show(msgBuf(0),5);
/* 3- effectively send the raw message to socket */
socket->send(static_cast<unsigned char*>(msgBuf(0)), msgBuf.size());
@@ -125,7 +125,7 @@
*/
msgBuf.reset();
/* 1- Read 'reserved bytes' header from socket */
- D.Out(pdDebug,"reading %d bytes for header",msgBuf.reservedBytes);
+ D.Out(pdDebug,"Reading %d 'reserved' bytes",msgBuf.reservedBytes);
socket->receive(msgBuf(0), msgBuf.reservedBytes);
//msgBuf.show(msgBuf(0),5);
fflush(stdout);
@@ -144,4 +144,4 @@
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.45.2.6 2008/04/10 14:57:49 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.7 2008/04/10 20:43:01 erk Exp $
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.hh,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- libCERTI/NM_Classes.hh 10 Apr 2008 19:55:48 -0000 1.1.2.9
+++ libCERTI/NM_Classes.hh 10 Apr 2008 20:43:01 -0000 1.1.2.10
@@ -530,9 +530,12 @@
typedef NM_WithHandleArray Super;
NM_Publish_Object_Class();
virtual ~NM_Publish_Object_Class();
+ virtual void serialize();
+ virtual void deserialize();
/* specific Getter/Setter */
protected:
/* specific field */
+ //ObjectClassHandle objectClass;
private:
};
@@ -594,9 +597,12 @@
typedef NM_WithHandleArray Super;
NM_Subscribe_Object_Class();
virtual ~NM_Subscribe_Object_Class();
+ virtual void serialize();
+ virtual void deserialize();
/* specific Getter/Setter */
protected:
/* specific field */
+ //ObjectClassHandle objectClass;
private:
};
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- libCERTI/NM_Classes.cc 10 Apr 2008 19:55:48 -0000 1.1.2.9
+++ libCERTI/NM_Classes.cc 10 Apr 2008 20:43:01 -0000 1.1.2.10
@@ -770,6 +770,16 @@
}
NM_Publish_Object_Class::~NM_Publish_Object_Class() {
}
+void
+NM_Publish_Object_Class::serialize() {
+ Super::serialize();
+ msgBuf.write_int32(objectClass);
+}
+void
+NM_Publish_Object_Class::deserialize() {
+ Super::serialize();
+ objectClass = msgBuf.read_int32();
+}
/*<END>---------- Publish_Object_Class ------------<END>*/
/*<BEGIN>---------- Unpublish_Object_Class ------------<BEGIN>*/
@@ -834,6 +844,14 @@
}
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();
+}
/*<END>---------- Subscribe_Object_Class ------------<END>*/
/*<BEGIN>---------- Unsubscribe_Object_Class ------------<BEGIN>*/
Index: scripts/NW_MessageType.ods
===================================================================
RCS file: /sources/certi/certi/scripts/Attic/NW_MessageType.ods,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
Binary files /tmp/cvsJ4vn7W and /tmp/cvsHIMCZz differ
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/RTIG_processing.cc RTIA/DeclarationM... [br_DEV_HETEROGENEOUS],
certi-cvs <=