[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/RTIG.cc RTIA/RTIA_network.cc RTIA/Ob...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/RTIG.cc RTIA/RTIA_network.cc RTIA/Ob... |
|
Date: |
Fri, 25 Mar 2011 20:53:54 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 11/03/25 20:53:54
Modified files:
RTIG : RTIG.cc
RTIA : RTIA_network.cc ObjectManagement.cc
DataDistribution.hh DataDistribution.cc
ObjectManagement.hh RTIA_federate.cc
Log message:
fix bug #32904 : ReserveObjectInsranceName method call results in RTIA
crash
Merge in patch from Eugene and move reserveObjectName method from DDM
to OM where it should have been put.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.67&r2=3.68
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.41&r2=3.42
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.74&r2=3.75
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DataDistribution.hh?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DataDistribution.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.hh?cvsroot=certi&r1=3.38&r2=3.39
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.115&r2=3.116
Patches:
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.67
retrieving revision 3.68
diff -u -b -r3.67 -r3.68
--- RTIG/RTIG.cc 2 Oct 2010 13:20:39 -0000 3.67
+++ RTIG/RTIG.cc 25 Mar 2011 20:53:53 -0000 3.68
@@ -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.cc,v 3.67 2010/10/02 13:20:39 erk Exp $
+// $Id: RTIG.cc,v 3.68 2011/03/25 20:53:53 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -282,6 +282,12 @@
static_cast<NM_Set_Attribute_Scope_Advisory_Switch*>(msg));
break;
+ case NetworkMessage::RESERVE_OBJECT_INSTANCE_NAME:
+ Debug(D, pdTrace) << "reserveObjectInstanceName" << endl ;
+ auditServer.setLevel(6);
+ processReserveObjectInstanceName(link,
static_cast<NM_Reserve_Object_Instance_Name*>(msg));
+ break;
+
case NetworkMessage::REGISTER_OBJECT:
D.Out(pdTrace, "registerObject.");
auditServer.setLevel(6);
@@ -1048,4 +1054,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.67 2010/10/02 13:20:39 erk Exp $
+// $Id: RTIG.cc,v 3.68 2011/03/25 20:53:53 erk Exp $
Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.41
retrieving revision 3.42
diff -u -b -r3.41 -r3.42
--- RTIA/RTIA_network.cc 11 Jan 2011 12:29:40 -0000 3.41
+++ RTIA/RTIA_network.cc 25 Mar 2011 20:53:54 -0000 3.42
@@ -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: RTIA_network.cc,v 3.41 2011/01/11 12:29:40 erk Exp $
+// $Id: RTIA_network.cc,v 3.42 2011/03/25 20:53:54 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -388,6 +388,16 @@
" type StartRegForObjClass.");
queues->insertLastCommand(msg);
break;
+ case NetworkMessage::RESERVE_OBJECT_INSTANCE_NAME_SUCCEEDED:
+ D.Out(pdTrace, "Receiving Message from RTIG, "
+ " type reserveObjectInstanceNameSucceeded.");
+ queues->insertLastCommand(msg);
+ break;
+ case NetworkMessage::RESERVE_OBJECT_INSTANCE_NAME_FAILED:
+ D.Out(pdTrace, "Receiving Message from RTIG, "
+ " type reserveObjectInstanceNameFaild.");
+ queues->insertLastCommand(msg);
+ break;
default:
{
@@ -404,4 +414,4 @@
}} // namespace certi/rtia
-// $Id: RTIA_network.cc,v 3.41 2011/01/11 12:29:40 erk Exp $
+// $Id: RTIA_network.cc,v 3.42 2011/03/25 20:53:54 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.74
retrieving revision 3.75
diff -u -b -r3.74 -r3.75
--- RTIA/ObjectManagement.cc 15 Nov 2010 13:15:47 -0000 3.74
+++ RTIA/ObjectManagement.cc 25 Mar 2011 20:53:54 -0000 3.75
@@ -65,6 +65,29 @@
ObjectManagement::~ObjectManagement() { }
+// ----------------------------------------------------------------------------
+void
+ObjectManagement::reserveObjectName(const std::string &newObjName,
TypeException &e)
+{
+ NM_Reserve_Object_Instance_Name req;
+
+ // Empty strings not allowed
+ if (newObjName.size() <= 0 ||
+ // According to spec, the HLA prefix is reserved for RTI-internal
objects.
+ newObjName.compare(0, 3, "HLA") == 0 )
+ {
+ e = e_IllegalName;
+ } else {
+ req.setFederation(fm->_numero_federation);
+ req.setFederate(fm->federate);
+
+ req.setObjectName(newObjName);
+
+ comm->sendMessage(&req);
+ }
+ // JvY TODO: Finish handling on other side (and return path)
+}
+
// ----------------------------------------------------------------------------
//! registerObject
Index: RTIA/DataDistribution.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/DataDistribution.hh,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIA/DataDistribution.hh 31 May 2010 09:33:26 -0000 3.21
+++ RTIA/DataDistribution.hh 25 Mar 2011 20:53:54 -0000 3.22
@@ -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: DataDistribution.hh,v 3.21 2010/05/31 09:33:26 erk Exp $
+// $Id: DataDistribution.hh,v 3.22 2011/03/25 20:53:54 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_DATA_DISTRIBUTION
@@ -66,8 +66,6 @@
uint32_t, TypeException &)
throw (RegionNotKnown);
- void reserveObjectName(const std::string &, TypeException &);
-
ObjectHandle registerObject(ObjectClassHandle, const std::string&,
const std::vector <AttributeHandle> &, uint32_t,
const std::vector<RegionHandle>,
@@ -101,4 +99,4 @@
#endif // _CERTI_DATA_DISTRIBUTION
-// $Id: DataDistribution.hh,v 3.21 2010/05/31 09:33:26 erk Exp $
+// $Id: DataDistribution.hh,v 3.22 2011/03/25 20:53:54 erk Exp $
Index: RTIA/DataDistribution.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DataDistribution.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- RTIA/DataDistribution.cc 9 Aug 2010 07:05:47 -0000 3.37
+++ RTIA/DataDistribution.cc 25 Mar 2011 20:53:54 -0000 3.38
@@ -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: DataDistribution.cc,v 3.37 2010/08/09 07:05:47 erk Exp $
+// $Id: DataDistribution.cc,v 3.38 2011/03/25 20:53:54 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -247,29 +247,6 @@
} /* end of associateRegion */
-// ----------------------------------------------------------------------------
-void
-DataDistribution::reserveObjectName(const std::string &newObjName,
TypeException &e)
-{
- NM_Reserve_Object_Instance_Name req;
-
- // Empty strings not allowed
- if (newObjName.size() <= 0 ||
- // According to spec, the HLA prefix is reserved for
RTI-internal objects.
- newObjName.compare(0, 3, "HLA") == 0 )
- {
- e = e_IllegalName;
- } else {
- req.setFederation(fm->_numero_federation);
- req.setFederate(fm->federate);
-
- req.setObjectName(newObjName);
-
- comm->sendMessage(&req);
- }
- // JvY TODO: Finish handling on other side (and return path)
-}
-
ObjectHandle
DataDistribution::registerObject(ObjectClassHandle class_handle,
@@ -445,4 +422,4 @@
}} // namespace certi::rtia
-// $Id: DataDistribution.cc,v 3.37 2010/08/09 07:05:47 erk Exp $
+// $Id: DataDistribution.cc,v 3.38 2011/03/25 20:53:54 erk Exp $
Index: RTIA/ObjectManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.hh,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -b -r3.38 -r3.39
--- RTIA/ObjectManagement.hh 15 Nov 2010 13:15:46 -0000 3.38
+++ RTIA/ObjectManagement.hh 25 Mar 2011 20:53:54 -0000 3.39
@@ -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.38 2010/11/15 13:15:46 erk Exp $
+// $Id: ObjectManagement.hh,v 3.39 2011/03/25 20:53:54 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIA_OM
@@ -42,6 +42,8 @@
~ObjectManagement();
// Object Management services
+ void reserveObjectName(const std::string &, TypeException &);
+
ObjectHandle registerObject(ObjectClassHandle theClassHandle,
const std::string& theObjectName,
FederationTime date,
@@ -313,4 +315,4 @@
#endif // _CERTI_RTIA_OM
-// $Id: ObjectManagement.hh,v 3.38 2010/11/15 13:15:46 erk Exp $
+// $Id: ObjectManagement.hh,v 3.39 2011/03/25 20:53:54 erk Exp $
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.115
retrieving revision 3.116
diff -u -b -r3.115 -r3.116
--- RTIA/RTIA_federate.cc 22 Nov 2010 14:56:53 -0000 3.115
+++ RTIA/RTIA_federate.cc 25 Mar 2011 20:53:54 -0000 3.116
@@ -393,11 +393,7 @@
ROINr = static_cast<M_Reserve_Object_Instance_Name *>(rep);
ROINr->setObjectName(ROINq->getObjectName());
-
- ddm->reserveObjectName(ROINq->getObjectName(), e);
-
-
-
+ om->reserveObjectName(ROINq->getObjectName(), e);
break;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/RTIG.cc RTIA/RTIA_network.cc RTIA/Ob...,
certi-cvs <=