[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi ChangeLog RTIA/Communications.cc RTIA/Obj...
|
From: |
certi-cvs |
|
Subject: |
certi ChangeLog RTIA/Communications.cc RTIA/Obj... |
|
Date: |
Mon, 05 Nov 2007 14:30:05 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 07/11/05 14:30:05
Modified files:
. : ChangeLog
RTIA : Communications.cc ObjectManagement.cc
ObjectManagement.hh TimeManagement.cc
libCERTI : Message_R.cc Message_W.cc
libRTI : RTIambassador.cc
Log message:
Bug #21515 correction
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/ChangeLog?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.hh?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.54&r2=3.55
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/certi/certi/ChangeLog,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- ChangeLog 26 Oct 2007 14:36:29 -0000 3.29
+++ ChangeLog 5 Nov 2007 14:30:03 -0000 3.30
@@ -1,3 +1,76 @@
+2007-11-02 13:52 erk
+
+ * scripts/FindCERTI.cmake: FindCERTI now honors the QUIET arguments
+ of FIND_PACKAGE.
+
+2007-10-31 11:30 erk
+
+ * libCERTI/ObjectClassAttribute.cc, libCERTI/Dimension.hh,
+ libCERTI/InteractionSet.hh, libCERTI/Named.cc,
+ libCERTI/ObjectClassSet.cc, libCERTI/RTIRegion.hh,
+ libCERTI/RootObject.cc, libCERTI/fed.cc, libCERTI/Interaction.cc,
+ libCERTI/Object.cc, libCERTI/ObjectClass.cc,
+ libCERTI/ObjectSet.cc, libCERTI/ObjectSet.hh,
+ libCERTI/PrettyDebug.cc, libCERTI/XmlParser.cc,
+ libCERTI/Interaction.hh, libCERTI/ObjectClass.hh,
+ libCERTI/ObjectClassAttribute.hh, libCERTI/RoutingSpace.hh,
+ libCERTI/SocketUN.hh, libCERTI/Subscribable.hh,
+ RTIA/RTIA_federate.cc, RTIA/RTIA_network.cc,
+ libCERTI/InteractionSet.cc, libCERTI/Object.hh,
+ libCERTI/ObjectClassSet.hh, libCERTI/RootObject.hh,
+ libCERTI/Subscribable.cc, libCERTI/fed.hh,
+ RTIA/DataDistribution.cc, RTIA/DeclarationManagement.cc,
+ RTIA/ObjectManagement.cc, RTIG/Federation.cc,
+ libRTI/RTIambPrivateRefs.cc, libRTI/RTIambPrivateRefs.hh: This
+ set of patches should fix thse following bugs: bug #20935 :
+ Qualified name not handled bug #21067 :
+ ObjectClassSet::getObjectClassHandle doesn't handle class
+ hierarchies This is not the ultimate solution since the patch
+ does not resolve name clash problem. I will continue to improve
+ the behaviour in order to reach what is required by HLA 1.3 and
+ 1516.
+
+2007-10-31 10:42 rousse
+
+ * RTIA/FederationManagement.cc, RTIA/FederationManagement.hh,
+ libCERTI/Message_R.cc, libCERTI/Message_W.cc:
+ synchronizationPointRegistrationFailed added
+
+2007-10-30 16:24 rousse
+
+ * libCERTI/: Message.hh, Message_R.cc, Message_W.cc: Message_R and
+ _W.cc restructuration
+
+2007-10-30 15:15 rousse
+
+ * libCERTI/: Message_R.cc, Message_W.cc: Little things...
+
+2007-10-30 14:11 rousse
+
+ * libCERTI/Message_W.cc: Message_W.cc restructuration (continued)
+
+2007-10-30 10:25 rousse
+
+ * libCERTI/: Message_R.cc, Message_W.cc: Message_R and W.cc
+ restructuration (continued)
+
+2007-10-29 09:09 erk
+
+ * myCERTI_env.csh.in, myCERTI_env.sh.in: Now csh and sh should be
+ 'equivalent' I did suppress the NBITs thing which was only usable
+ on Linux
+
+2007-10-29 00:27 erk
+
+ * myCERTI_env.csh.in, myCERTI_env.sh.in: First pass update of the
+ Bourne Shell scripts from C-Shell one (correct some typo in
+ C-shell too)
+
+2007-10-26 16:36 rousse
+
+ * ChangeLog, libCERTI/Message_R.cc, libCERTI/Message_W.cc: Little
+ thing.
+
2007-10-26 15:00 rousse
* libCERTI/: CMakeLists.txt, Makefile.am, Message.hh, Message_R.cc,
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- RTIA/Communications.cc 28 Sep 2007 14:07:53 -0000 3.17
+++ RTIA/Communications.cc 5 Nov 2007 14:30:03 -0000 3.18
@@ -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.17 2007/09/28 14:07:53 rousse Exp $
+// $Id: Communications.cc,v 3.18 2007/11/05 14:30:03 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -152,15 +152,15 @@
void
Communications::requestFederateService(Message *req, Message *rep)
{
- G.Out(pdGendoc,"enter Communications::requestFederateService for message "
- "type %d",req->type);
+ // G.Out(pdGendoc,"enter Communications::requestFederateService for
message "
+ // "type %d",req->type);
assert(req != NULL);
D.Out(pdRequest, "Sending Request to Federate, Type %d.", req->type);
sendUN(req);
receiveUN(rep);
D.Out(pdAnswer, "Received Answer from Federate.");
assert(req->type == rep->type);
- G.Out(pdGendoc,"exit Communications::requestFederateService");
+ // G.Out(pdGendoc,"exit Communications::requestFederateService");
}
// ----------------------------------------------------------------------------
@@ -342,4 +342,4 @@
}} // namespace certi/rtia
-// $Id: Communications.cc,v 3.17 2007/09/28 14:07:53 rousse Exp $
+// $Id: Communications.cc,v 3.18 2007/11/05 14:30:03 rousse Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- RTIA/ObjectManagement.cc 31 Oct 2007 10:30:24 -0000 3.27
+++ RTIA/ObjectManagement.cc 5 Nov 2007 14:30:04 -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: ObjectManagement.cc,v 3.27 2007/10/31 10:30:24 erk Exp $
+// $Id: ObjectManagement.cc,v 3.28 2007/11/05 14:30:04 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -327,7 +327,7 @@
}
// ----------------------------------------------------------------------------
-//! receiveInteraction
+//! receiveInteraction with time
void
ObjectManagement::receiveInteraction(InteractionClassHandle the_interaction,
ParameterHandle *the_parameters,
@@ -346,7 +346,28 @@
req.setEventRetraction(the_event);
req.setTag(the_tag);
req.setParameters(the_parameters, the_values, the_size);
+ req.setBoolean(true);
+ // BUG: On fait quoi de la reponse ?
+ comm->requestFederateService(&req, &rep);
+}
+
+// ----------------------------------------------------------------------------
+//! receiveInteraction without time
+void
+ObjectManagement::receiveInteraction(InteractionClassHandle the_interaction,
+ ParameterHandle *the_parameters,
+ ParameterLengthPair *the_values,
+ UShort the_size,
+ const char *the_tag,
+ TypeException &)
+{
+ Message req, rep ;
+ req.type = Message::RECEIVE_INTERACTION ;
+ req.setInteractionClass(the_interaction);
+ req.setTag(the_tag);
+ req.setParameters(the_parameters, the_values, the_size);
+ req.setBoolean(false);
// BUG: On fait quoi de la reponse ?
comm->requestFederateService(&req, &rep);
}
@@ -687,4 +708,4 @@
}} // namespace certi/rtia
-// $Id: ObjectManagement.cc,v 3.27 2007/10/31 10:30:24 erk Exp $
+// $Id: ObjectManagement.cc,v 3.28 2007/11/05 14:30:04 rousse Exp $
Index: RTIA/ObjectManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.hh,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- RTIA/ObjectManagement.hh 23 Jul 2007 14:13:23 -0000 3.14
+++ RTIA/ObjectManagement.hh 5 Nov 2007 14:30:04 -0000 3.15
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.hh,v 3.14 2007/07/23 14:13:23 rousse Exp $
+// $Id: ObjectManagement.hh,v 3.15 2007/11/05 14:30:04 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIA_OM
@@ -110,6 +110,13 @@
EventRetractionHandle theHandle,
TypeException &e);
+ void receiveInteraction(InteractionClassHandle theInteraction,
+ ParameterHandle *paramArray,
+ ParameterLengthPair *valueArray,
+ UShort paramArraySize,
+ const char *theTag,
+ TypeException &e);
+
EventRetractionHandle deleteObject(ObjectHandle theObjectHandle,
const char *theTag,
TypeException &e);
@@ -199,4 +206,4 @@
#endif // _CERTI_RTIA_OM
-// $Id: ObjectManagement.hh,v 3.14 2007/07/23 14:13:23 rousse Exp $
+// $Id: ObjectManagement.hh,v 3.15 2007/11/05 14:30:04 rousse Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- RTIA/TimeManagement.cc 25 Oct 2007 08:07:16 -0000 3.18
+++ RTIA/TimeManagement.cc 5 Nov 2007 14:30:04 -0000 3.19
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: TimeManagement.cc,v 3.18 2007/10/25 08:07:16 rousse Exp $
+// $Id: TimeManagement.cc,v 3.19 2007/11/05 14:30:04 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -192,6 +192,7 @@
{
ParameterLengthPair *ValueArray = msg.getParamValueArray();
+ if (msg.getBoolean())
om->receiveInteraction(msg.interactionClass,
msg.handleArray,
ValueArray,
@@ -200,6 +201,13 @@
msg.label,
msg.eventRetraction,
msg.exception);
+ else
+ om->receiveInteraction(msg.interactionClass,
+ msg.handleArray,
+ ValueArray,
+ msg.handleArraySize,
+ msg.label,
+ msg.exception);
free(ValueArray);
break ;
@@ -728,4 +736,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.18 2007/10/25 08:07:16 rousse Exp $
+// $Id: TimeManagement.cc,v 3.19 2007/11/05 14:30:04 rousse Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/Message_R.cc 31 Oct 2007 09:42:27 -0000 3.6
+++ libCERTI/Message_R.cc 5 Nov 2007 14:30:04 -0000 3.7
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.6 2007/10/31 09:42:27 rousse Exp $
+// $Id: Message_R.cc,v 3.7 2007/11/05 14:30:04 rousse Exp $
// ----------------------------------------------------------------------------
@@ -256,6 +256,7 @@
break ;
// Body contains federate,Federationname,FederateName
+ // Note : federate relevant on RTIA answer only
case JOIN_FEDERATION_EXECUTION:
federate = body.readShortInt();
readFederationName(body);
@@ -701,4 +702,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.6 2007/10/31 09:42:27 rousse Exp $
+// $Id: Message_R.cc,v 3.7 2007/11/05 14:30:04 rousse Exp $
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/Message_W.cc 31 Oct 2007 09:42:27 -0000 3.7
+++ libCERTI/Message_W.cc 5 Nov 2007 14:30:04 -0000 3.8
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.7 2007/10/31 09:42:27 rousse Exp $
+// $Id: Message_W.cc,v 3.8 2007/11/05 14:30:04 rousse Exp $
// ----------------------------------------------------------------------------
@@ -264,6 +264,7 @@
break ;
// Body contains federate,federationName,federateName
+ // Note : federate relevant on RTIA answer only
case JOIN_FEDERATION_EXECUTION:
body.writeShortInt(federate);
body.writeString(federationName);
@@ -686,4 +687,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.7 2007/10/31 09:42:27 rousse Exp $
+// $Id: Message_W.cc,v 3.8 2007/11/05 14:30:04 rousse Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.54
retrieving revision 3.55
diff -u -b -r3.54 -r3.55
--- libRTI/RTIambassador.cc 25 Oct 2007 08:07:16 -0000 3.54
+++ libRTI/RTIambassador.cc 5 Nov 2007 14:30:05 -0000 3.55
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.54 2007/10/25 08:07:16 rousse Exp $
+// $Id: RTIambassador.cc,v 3.55 2007/11/05 14:30:05 rousse Exp $
// ----------------------------------------------------------------------------
@@ -357,14 +357,21 @@
delete attributes ;
} break ;
- case Message::RECEIVE_INTERACTION: {
+ case Message::RECEIVE_INTERACTION:
+ {
ParameterHandleValuePairSet *parameters =
vers_Fed.getPHVPS();
-
-
privateRefs->fed_amb->receiveInteraction(vers_Fed.getInteractionClass(),
+ if (vers_Fed.getBoolean())
+ privateRefs->fed_amb->receiveInteraction(
+ vers_Fed.getInteractionClass(),
*parameters,
vers_Fed.getFedTime(),
vers_Fed.getTag(),
vers_Fed.getEventRetraction());
+ else
+ privateRefs->fed_amb->receiveInteraction(
+ vers_Fed.getInteractionClass(),
+ *parameters,
+ vers_Fed.getTag());
delete parameters ;
} break ;
@@ -562,6 +569,8 @@
req.type = Message::DESTROY_FEDERATION_EXECUTION ;
req.setFederationName(executionName);
+ G.Out(pdGendoc," ====>executeService DESTROY_FEDERATION_EXECUTION");
+
privateRefs->executeService(&req, &rep);
G.Out(pdGendoc,"exit RTIambassador::destroyFederationExecution");
@@ -2848,4 +2857,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.54 2007/10/25 08:07:16 rousse Exp $
+// $Id: RTIambassador.cc,v 3.55 2007/11/05 14:30:05 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi ChangeLog RTIA/Communications.cc RTIA/Obj...,
certi-cvs <=