[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libRTI/RTIambassador.cc RTIG/RTIG_process...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libRTI/RTIambassador.cc RTIG/RTIG_process... |
|
Date: |
Mon, 01 Mar 2010 16:44:29 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/03/01 16:44:29
Modified files:
libRTI : RTIambassador.cc
RTIG : RTIG_processing.cc Federation.cc
RTIA : RTIA_federate.cc
include : RTIambServices.hh
Log message:
Minor refactoring
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.112&r2=3.113
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.93&r2=3.94
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.121&r2=3.122
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.103&r2=3.104
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTIambServices.hh?cvsroot=certi&r1=3.4&r2=3.5
Patches:
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.112
retrieving revision 3.113
diff -u -b -r3.112 -r3.113
--- libRTI/RTIambassador.cc 27 Feb 2010 16:53:36 -0000 3.112
+++ libRTI/RTIambassador.cc 1 Mar 2010 16:44:27 -0000 3.113
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.112 2010/02/27 16:53:36 erk Exp $
+// $Id: RTIambassador.cc,v 3.113 2010/03/01 16:44:27 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -610,13 +610,6 @@
}
-// ----------------------------------------------------------------------------
-//! Register Federation Synchronization Point without set of federates
-// (all federates in the federation execution are informed)
-/**
- @param label Synchronization point label
- @param the_tag User-supplied tag
- */
void
RTI::RTIambassador::registerFederationSynchronizationPoint(const char *label,
const char *the_tag)
@@ -624,8 +617,7 @@
RTI::ConcurrentAccessAttempted,
RTI::SaveInProgress,
RTI::RestoreInProgress,
- RTI::RTIinternalError)
- {
+ RTI::RTIinternalError) {
M_Register_Federation_Synchronization_Point req, rep ;
G.Out(pdGendoc,"enter
RTIambassador::registerFederationSynchronizationPoint for all federates");
@@ -643,23 +635,14 @@
G.Out(pdGendoc,"exit
RTIambassador::registerFederationSynchronizationPoint for all federates");
- }
+} /* end of RTI::RTIambassador::registerFederationSynchronizationPoint */
-// ----------------------------------------------------------------------------
-//! Register Federation Synchronization Point with set of federates
(UNIMPLEMENTED)
-// (only federates in the set are informed)
-/**
- @param label Synchronization point label
- @param theTag User-supplied tag
- @param set_of_fed set of federate designators
- */
void
RTI::RTIambassador::registerFederationSynchronizationPoint(const char *label,
const char *theTag,
const FederateHandleSet &set_of_fed)
throw (RTI::RTIinternalError, RTI::RestoreInProgress, RTI::SaveInProgress,
- RTI::ConcurrentAccessAttempted, RTI::FederateNotExecutionMember)
- {
+ RTI::ConcurrentAccessAttempted,
RTI::FederateNotExecutionMember) {
M_Register_Federation_Synchronization_Point req, rep ;
@@ -685,7 +668,7 @@
G.Out(pdGendoc,"exit
RTIambassador::registerFederationSynchronizationPoint for some federates");
- }
+} /* end of RTI::RTIambassador::registerFederationSynchronizationPoint */
// ----------------------------------------------------------------------------
//! Synchronization Point Achieved
@@ -2979,4 +2962,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.112 2010/02/27 16:53:36 erk Exp $
+// $Id: RTIambassador.cc,v 3.113 2010/03/01 16:44:27 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.93
retrieving revision 3.94
diff -u -b -r3.93 -r3.94
--- RTIG/RTIG_processing.cc 21 Nov 2009 21:00:55 -0000 3.93
+++ RTIG/RTIG_processing.cc 1 Mar 2010 16:44:27 -0000 3.94
@@ -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.93 2009/11/21 21:00:55 erk Exp $
+// $Id: RTIG_processing.cc,v 3.94 2010/03/01 16:44:27 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -534,7 +534,7 @@
<< req->getTag() << "\"" ;
// boolean true means a federates set exists
- if ( req->doesSetExist() )
+ if ( req->doesSetExist() ) {
federations.manageSynchronization(req->federation,
req->federate,
true,
@@ -542,12 +542,14 @@
req->getTag(),
req->handleArraySize,
req->handleArray);
- else
+ }
+ else {
federations.manageSynchronization(req->federation,
req->federate,
true,
req->getLabel(),
req->getTag());
+ }
D.Out(pdTerm, "Federation %u is now synchronizing.", req->federation);
// send synchronizationPointRegistrationSucceeded() to federate.
@@ -1457,4 +1459,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.93 2009/11/21 21:00:55 erk Exp $
+// $Id: RTIG_processing.cc,v 3.94 2010/03/01 16:44:27 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.121
retrieving revision 3.122
diff -u -b -r3.121 -r3.122
--- RTIG/Federation.cc 25 Nov 2009 22:05:19 -0000 3.121
+++ RTIG/Federation.cc 1 Mar 2010 16:44:28 -0000 3.122
@@ -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: Federation.cc,v 3.121 2009/11/25 22:05:19 erk Exp $
+// $Id: Federation.cc,v 3.122 2010/03/01 16:44:28 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -1020,9 +1020,7 @@
<< label << endl ;
G.Out(pdGendoc,"exit Federation::registerSynchronization for all
federates");
-
-
-}
+} /* end of Federation::registerSynchronization */
// ----------------------------------------------------------------------------
//! Add a new synchronization point (with federates set) to federation.
@@ -1070,7 +1068,6 @@
G.Out(pdGendoc,"exit Federation::registerSynchronization for federate
set");
-
}
// ----------------------------------------------------------------------------
@@ -2585,5 +2582,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.121 2009/11/25 22:05:19 erk Exp $
+// $Id: Federation.cc,v 3.122 2010/03/01 16:44:28 erk Exp $
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.103
retrieving revision 3.104
diff -u -b -r3.103 -r3.104
--- RTIA/RTIA_federate.cc 27 Feb 2010 16:53:36 -0000 3.103
+++ RTIA/RTIA_federate.cc 1 Mar 2010 16:44:29 -0000 3.104
@@ -192,10 +192,13 @@
RFSPq = static_cast<M_Register_Federation_Synchronization_Point
*>(req);
D.Out(pdTrace, "Receiving Message from Federate, type
RegisterFederationSynchronizationPoint.");
- // boolean true means with federates set
+ // Check whether if the with federates set size is strictly
positive,
+ // which means with federate set.
if ( RFSPq->getFederateSetSize()>0 ) {
- fm->registerSynchronization(req->getLabel(),
req->getTag(),
- static_cast<unsigned
short>(RFSPq->getFederateSetSize()), RFSPq->getFederateSet(), e);
+ fm->registerSynchronization(req->getLabel(),
+
req->getTag(),
+
static_cast<unsigned short>(RFSPq->getFederateSetSize()),
+
RFSPq->getFederateSet(), e);
}
else {
fm->registerSynchronization(req->getLabel(),
req->getTag(), e);
Index: include/RTIambServices.hh
===================================================================
RCS file: /sources/certi/certi/include/RTIambServices.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- include/RTIambServices.hh 23 Apr 2008 07:36:01 -0000 3.4
+++ include/RTIambServices.hh 1 Mar 2010 16:44:29 -0000 3.5
@@ -1,5 +1,5 @@
// HLA 1.3 Header "RTIambServices.hh"
-// $Id: RTIambServices.hh,v 3.4 2008/04/23 07:36:01 siron Exp $
+// $Id: RTIambServices.hh,v 3.5 2010/03/01 16:44:29 erk Exp $
typedef FederateAmbassador *FederateAmbassadorPtr ;
@@ -22,11 +22,26 @@
throw (FederateOwnsAttributes, FederateNotExecutionMember,
InvalidResignAction,
ConcurrentAccessAttempted, RTIinternalError);
+/**
+ * Register Federation Synchronization Point.
+ * All federates who have joined the federation are informed.
+ *
+ * @param[in] label Synchronization point label
+ * @param[in] tag User-supplied tag
+ */
void registerFederationSynchronizationPoint(const char *, const char *)
throw (FederateNotExecutionMember, ConcurrentAccessAttempted,
SaveInProgress, RestoreInProgress, RTIinternalError);
-void registerFederationSynchronizationPoint(const char *, const char *, const
FederateHandleSet &)
+/**
+ * Register Federation Synchronization Point with set of federates.
+ * Only federates in the set are informed.
+ *
+ * @param[in] label Synchronization point label
+ * @param[in] tag User-supplied tag
+ * @param[in] federates set of federate designators
+ */
+void registerFederationSynchronizationPoint(const char *label, const char
*tag, const FederateHandleSet &federates)
throw (FederateNotExecutionMember, ConcurrentAccessAttempted,
SaveInProgress,
RestoreInProgress, RTIinternalError);
@@ -493,4 +508,4 @@
Region *getRegion(RegionToken)
throw (FederateNotExecutionMember, ConcurrentAccessAttempted,
RegionNotKnown, RTIinternalError);
-// $Id: RTIambServices.hh,v 3.4 2008/04/23 07:36:01 siron Exp $
+// $Id: RTIambServices.hh,v 3.5 2010/03/01 16:44:29 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libRTI/RTIambassador.cc RTIG/RTIG_process...,
certi-cvs <=