[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi RTIA/DeclarationManagement.cc RTIG/RTIG_p...
|
From: |
certi-cvs |
|
Subject: |
certi RTIA/DeclarationManagement.cc RTIG/RTIG_p... |
|
Date: |
Thu, 21 Feb 2008 10:15:25 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 08/02/21 10:15:25
Modified files:
RTIA : DeclarationManagement.cc
RTIG : RTIG_processing.cc
libCERTI : Message_R.cc Message_W.cc
libRTI : RTIambassador.cc
Log message:
Preparing beginning of request class attribute value update
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.52&r2=3.53
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.68&r2=3.69
Patches:
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- RTIA/DeclarationManagement.cc 31 Oct 2007 10:30:24 -0000 3.16
+++ RTIA/DeclarationManagement.cc 21 Feb 2008 10:15:24 -0000 3.17
@@ -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.16 2007/10/31 10:30:24 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.17 2008/02/21 10:15:24 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -40,6 +40,7 @@
namespace rtia {
static pdCDebug D("RTIA_DM", "(RTIA DM) ");
+static PrettyDebug G("GENDOC",__FILE__) ;
// ----------------------------------------------------------------------------
//! DeclarationManagement
@@ -226,6 +227,7 @@
{
NetworkMessage req, rep ;
+ G.Out(pdGendoc,"enter
DeclarationManagement::subscribeObjectClassAttribute");
// Pas de partie locale pour les abonnements
// Partie RTIG
@@ -240,14 +242,17 @@
req.handleArray[i] = attribArray[i] ;
// Emission
+ G.Out(pdGendoc," =====> send S_O_C to RTIG");
comm->sendMessage(&req);
// Reception
comm->waitMessage(&rep,
NetworkMessage::SUBSCRIBE_OBJECT_CLASS,
req.federate);
+ G.Out(pdGendoc," =====> received S_O_C from
RTIG");
e = rep.exception ;
+ G.Out(pdGendoc,"exit
DeclarationManagement::subscribeObjectClassAttribute");
}
// ----------------------------------------------------------------------------
@@ -458,4 +463,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.16 2007/10/31 10:30:24 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.17 2008/02/21 10:15:24 rousse Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.52
retrieving revision 3.53
diff -u -b -r3.52 -r3.53
--- RTIG/RTIG_processing.cc 15 Feb 2008 14:16:19 -0000 3.52
+++ RTIG/RTIG_processing.cc 21 Feb 2008 10:15:24 -0000 3.53
@@ -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.52 2008/02/15 14:16:19 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.53 2008/02/21 10:15:24 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -599,6 +599,9 @@
void
RTIG::processSubscribeObjectClass(Socket *link, NetworkMessage *req)
{
+ G.Out(pdGendoc,"enter RTIG::processSubscribeObjectClass");
+ G.Out(pdGendoc,"BEGIN ** SUBSCRIBE OBJECT CLASS SERVICE **");
+
bool sub = (req->type == NetworkMessage::SUBSCRIBE_OBJECT_CLASS);
auditServer << "Class = " << req->objectClass
@@ -622,6 +625,9 @@
rep.handleArraySize = 0 ;
rep.write(link); // send answer to RTIA
+
+ G.Out(pdGendoc,"END ** SUBSCRIBE OBJECT CLASS SERVICE **");
+ G.Out(pdGendoc,"exit RTIG::processSubscribeObjectClass");
}
// ----------------------------------------------------------------------------
@@ -1350,4 +1356,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.52 2008/02/15 14:16:19 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.53 2008/02/21 10:15:24 rousse Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/Message_R.cc 12 Feb 2008 16:51:30 -0000 3.13
+++ libCERTI/Message_R.cc 21 Feb 2008 10:15:25 -0000 3.14
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.13 2008/02/12 16:51:30 rousse Exp $
+// $Id: Message_R.cc,v 3.14 2008/02/21 10:15:25 rousse Exp $
// ----------------------------------------------------------------------------
@@ -445,6 +445,14 @@
boolean = body.readLongInt();
break ;
+ // Body contains objectClass, handleArray
+ case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
+std::cout<<"readBody RCAVU"<<std::endl;
+ objectClass = body.readLongInt();
+ handleArraySize = body.readShortInt();
+ readHandleArray(body);
+ break;
+
// Body contains object,federationName,federate,handleArraySize,
// handleArray
case REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
@@ -563,6 +571,7 @@
case DISABLE_TIME_REGULATION:
case ENABLE_TIME_CONSTRAINED:
case DISABLE_TIME_CONSTRAINED:
+ case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
case TICK_REQUEST:
break ;
@@ -740,4 +749,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.13 2008/02/12 16:51:30 rousse Exp $
+// $Id: Message_R.cc,v 3.14 2008/02/21 10:15:25 rousse Exp $
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/Message_W.cc 12 Feb 2008 16:51:31 -0000 3.16
+++ libCERTI/Message_W.cc 21 Feb 2008 10:15:25 -0000 3.17
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.16 2008/02/12 16:51:31 rousse Exp $
+// $Id: Message_W.cc,v 3.17 2008/02/21 10:15:25 rousse Exp $
// ----------------------------------------------------------------------------
@@ -451,6 +451,12 @@
body.writeLongInt(boolean);
break ;
+ // Body contains objectClass, handleArray
+ case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
+ body.writeLongInt(objectClass);
+ writeHandleArray(body);
+ break;
+
// -- Default Handler --
default:
@@ -584,6 +590,7 @@
case DISABLE_TIME_REGULATION:
case ENABLE_TIME_CONSTRAINED:
case DISABLE_TIME_CONSTRAINED:
+ case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
case TICK_REQUEST:
header.bodySize = 1 ;
break ;
@@ -720,4 +727,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.16 2008/02/12 16:51:31 rousse Exp $
+// $Id: Message_W.cc,v 3.17 2008/02/21 10:15:25 rousse Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.68
retrieving revision 3.69
diff -u -b -r3.68 -r3.69
--- libRTI/RTIambassador.cc 18 Feb 2008 13:37:30 -0000 3.68
+++ libRTI/RTIambassador.cc 21 Feb 2008 10:15:25 -0000 3.69
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.68 2008/02/18 13:37:30 siron Exp $
+// $Id: RTIambassador.cc,v 3.69 2008/02/21 10:15:25 rousse Exp $
// ----------------------------------------------------------------------------
@@ -999,13 +999,14 @@
RTI::ObjectClassNotDefined)
{
Message req, rep ;
-
+ G.Out(pdGendoc,"enter RTIambassador::subscribeObjectClassAttributes");
req.type = Message::SUBSCRIBE_OBJECT_CLASS_ATTRIBUTES ;
req.setObjectClass(theClass);
req.setAHS(attributeList);
req.setBoolean(active);
privateRefs->executeService(&req, &rep);
+ G.Out(pdGendoc,"exit RTIambassador::subscribeObjectClassAttributes");
}
// ----------------------------------------------------------------------------
@@ -1095,7 +1096,17 @@
}
// ----------------------------------------------------------------------------
-// Update Attribute Values
+// Update Attribute Values with time
+/** Realization of the Create Federation Execution federation management
service
+ with time (HLA 1.3).
+ Provide current values to the federation for instance attributes owned by
+ the federate.
+ Un event retraction designator is returned.
+ @param theObject Object instance designator
+ @param theAttributes Set of attribute designator and value pairs
+ @param theTime Federation time
+ @param theTag User supplied tag
+*/
EventRetractionHandle
RTI::RTIambassador::
updateAttributeValues(ObjectHandle theObject,
@@ -1127,10 +1138,19 @@
}
// ----------------------------------------------------------------------------
+// Update Attribute Values without time
+/** Realization of the Create Federation Execution federation management
service
+ without time (HLA 1.3).
+ Provide current values to the federation for instance attributes owned by
+ the federate.
+ @param theObject Object instance designator
+ @param theAttributes Set of attribute designator and value pairs
+ @param theTag User supplied tag
+*/
void
RTI::RTIambassador::updateAttributeValues(ObjectHandle the_object,
- const AttributeHandleValuePairSet& attrs,
- const char *the_tag)
+ const AttributeHandleValuePairSet&
theAttributes,
+ const char *theTag)
throw (RTI::RTIinternalError, RTI::RestoreInProgress, RTI::SaveInProgress,
RTI::ConcurrentAccessAttempted, RTI::FederateNotExecutionMember,
RTI::AttributeNotOwned, RTI::AttributeNotDefined,
RTI::ObjectNotKnown)
@@ -1139,8 +1159,8 @@
req.type = Message::UPDATE_ATTRIBUTE_VALUES ;
req.setObject(the_object);
- req.setTag(the_tag);
- req.setAHVPS(attrs);
+ req.setTag(theTag);
+ req.setAHVPS(theAttributes);
req.setBoolean(false);
privateRefs->executeService(&req, &rep);
@@ -1343,14 +1363,15 @@
RTI::FederateNotExecutionMember, RTI::AttributeNotDefined,
RTI::ObjectNotKnown)
{
- throw UnimplementedService("");
Message req, rep ;
+ G.Out(pdGendoc,"enter RTIambassador::requestObjectAttributeValueUpdate");
req.type = Message::REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE ;
req.setObject(theObject);
req.setAHS(ahs);
privateRefs->executeService(&req, &rep);
+ G.Out(pdGendoc,"exit RTIambassador::requestObjectAttributeValueUpdate");
}
// ----------------------------------------------------------------------------
@@ -1362,14 +1383,16 @@
RTI::FederateNotExecutionMember, RTI::AttributeNotDefined,
RTI::ObjectClassNotDefined)
{
- throw UnimplementedService("");
+
Message req, rep ;
+ G.Out(pdGendoc,"enter RTIambassador::requestClassAttributeValueUpdate");
req.type = Message::REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE ;
req.setObjectClass(theClass);
req.setAHS(attrs);
privateRefs->executeService(&req, &rep);
+ G.Out(pdGendoc,"exit RTIambassador::requestClassAttributeValueUpdate");
}
// ----------------------------------------------------------------------------
@@ -2882,4 +2905,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.68 2008/02/18 13:37:30 siron Exp $
+// $Id: RTIambassador.cc,v 3.69 2008/02/21 10:15:25 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi RTIA/DeclarationManagement.cc RTIG/RTIG_p...,
certi-cvs <=