[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/RTIG_processing.cc libCERTI/NetworkM...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/RTIG_processing.cc libCERTI/NetworkM... |
|
Date: |
Sat, 21 Nov 2009 21:00:57 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/11/21 21:00:57
Modified files:
RTIG : RTIG_processing.cc
libCERTI : NetworkMessage.hh NetworkMessage.cc
RTIA : TimeManagement.cc
Log message:
Check-in [performance improvement] patch from Mathias
patch #6991: Avoid now unneeded copying of attribute/parameter values
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.92&r2=3.93
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.51&r2=3.52
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.41&r2=3.42
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.52&r2=3.53
Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.92
retrieving revision 3.93
diff -u -b -r3.92 -r3.93
--- RTIG/RTIG_processing.cc 20 Nov 2009 19:43:40 -0000 3.92
+++ RTIG/RTIG_processing.cc 21 Nov 2009 21:00:55 -0000 3.93
@@ -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.92 2009/11/20 19:43:40 erk Exp $
+// $Id: RTIG_processing.cc,v 3.93 2009/11/21 21:00:55 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -716,7 +716,6 @@
G.Out(pdGendoc,"BEGIN ** SUBSCRIBE OBJECT CLASS SERVICE **");
std::vector <AttributeHandle> arrayVide ;
- arrayVide.empty() ;
bool sub = (req->getType() == NetworkMessage::SUBSCRIBE_OBJECT_CLASS);
auditServer << "Subscribe Object Class = " << req->objectClass
@@ -827,14 +826,10 @@
RTIG::processUpdateAttributeValues(Socket *link, NetworkMessage *req)
{
G.Out(pdGendoc,"enter RTIG::processUpdateAttributeValues");
- std::vector <AttributeValue_t> ValueArray ;
auditServer << "ObjID = " << req->object
<< ", Date = " << req->getDate().getTime();
- // Get Value Array
- ValueArray = req->getAttribValueArray();
-
// Forward the call
if ( req->isDated() )
{
@@ -843,7 +838,7 @@
req->federate,
req->object,
req->handleArray,
- ValueArray,
+ req->valueArray,
req->handleArraySize,
req->getDate(),
req->getLabel());
@@ -855,11 +850,10 @@
req->federate,
req->object,
req->handleArray,
- ValueArray,
+ req->valueArray,
req->handleArraySize,
req->getLabel());
}
- ValueArray.empty();
// Building answer (Network Message re)
NM_Update_Attribute_Values rep ;
@@ -880,23 +874,19 @@
void
RTIG::processSendInteraction(Socket *link, NetworkMessage *req)
{
- std::vector <ParameterValue_t> values ;
-
G.Out(pdGendoc,"BEGIN ** SEND INTERACTION SERVICE **");
G.Out(pdGendoc,"enter RTIG::processSendInteraction");
// Building Value Array
auditServer << "IntID = " << req->interactionClass
<< ", date = " << req->getDate().getTime();
- values = req->getParamValueArray();
-
if ( req->isDated() )
{
federations.updateParameter(req->federation,
req->federate,
req->interactionClass,
req->handleArray,
- values,
+ req->valueArray,
req->handleArraySize,
req->getDate(),
req->region,
@@ -908,12 +898,11 @@
req->federate,
req->interactionClass,
req->handleArray,
- values,
+ req->valueArray,
req->handleArraySize,
req->region,
req->getLabel());
}
- values.empty();
D.Out(pdDebug, "Interaction %d parameters update completed",
req->interactionClass);
@@ -1468,4 +1457,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.92 2009/11/20 19:43:40 erk Exp $
+// $Id: RTIG_processing.cc,v 3.93 2009/11/21 21:00:55 erk Exp $
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -b -r3.51 -r3.52
--- libCERTI/NetworkMessage.hh 19 Nov 2009 18:15:31 -0000 3.51
+++ libCERTI/NetworkMessage.hh 21 Nov 2009 21:00:56 -0000 3.52
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.51 2009/11/19 18:15:31 erk Exp $
+// $Id: NetworkMessage.hh,v 3.52 2009/11/21 21:00:56 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -183,14 +183,6 @@
// Value Array Management
- // Return a newly allocated ValueArray, exactly of size AttribArraySize.
- // containing the actual Attribute values. You must FREE this structure.
- std::vector <AttributeValue_t> getAttribValueArray();
-
- // Return a newly allocated ValueArray, exactly of size ParamArraySize,
- // containing the actual Parameter values. You must FREE this structure.
- std::vector <ParameterValue_t> getParamValueArray();
-
void setAHS(const std::vector <AttributeHandle> &, int);
void displayValueArray(char *);
@@ -343,4 +335,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.51 2009/11/19 18:15:31 erk Exp $
+// $Id: NetworkMessage.hh,v 3.52 2009/11/21 21:00:56 erk Exp $
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.41
retrieving revision 3.42
diff -u -b -r3.41 -r3.42
--- libCERTI/NetworkMessage.cc 19 Nov 2009 18:15:30 -0000 3.41
+++ libCERTI/NetworkMessage.cc 21 Nov 2009 21:00:56 -0000 3.42
@@ -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.cc,v 3.41 2009/11/19 18:15:30 erk Exp $
+// $Id: NetworkMessage.cc,v 3.42 2009/11/21 21:00:56 erk Exp $
// ----------------------------------------------------------------------------
@@ -68,34 +68,6 @@
}
// ----------------------------------------------------------------------------
-std::vector <AttributeValue_t>
-NetworkMessage::getAttribValueArray()
-{
- std::vector <std::string> NewValueArray ;
-
- NewValueArray.resize(handleArraySize) ;
-
- for (int i = 0 ; i <handleArraySize ; i++)
- NewValueArray[i] = valueArray[i] ;
-
- return NewValueArray ;
-}
-
-// ----------------------------------------------------------------------------
-std::vector <ParameterValue_t>
-NetworkMessage::getParamValueArray()
-{
- std::vector <std::string> NewValueArray ;
-
- NewValueArray.resize(handleArraySize) ;
-
- for (int i = 0 ; i < handleArraySize ; i++)
- NewValueArray[i] = valueArray[i] ;
-
- return NewValueArray ;
-}
-
-// ----------------------------------------------------------------------------
void
NetworkMessage::removeAttribute(UShort Rank)
{
@@ -158,4 +130,4 @@
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.41 2009/11/19 18:15:30 erk Exp $
+// $Id: NetworkMessage.cc,v 3.42 2009/11/21 21:00:56 erk Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.52
retrieving revision 3.53
diff -u -b -r3.52 -r3.53
--- RTIA/TimeManagement.cc 19 Nov 2009 18:15:30 -0000 3.52
+++ RTIA/TimeManagement.cc 21 Nov 2009 21:00:56 -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: TimeManagement.cc,v 3.52 2009/11/19 18:15:30 erk Exp $
+// $Id: TimeManagement.cc,v 3.53 2009/11/21 21:00:56 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -179,12 +179,10 @@
case NetworkMessage::REFLECT_ATTRIBUTE_VALUES:
{
- std::vector<AttributeValue_t> ValueArray = msg.getAttribValueArray();
-
if (msg.isDated())
om->reflectAttributeValues(msg.object,
msg.handleArray,
- ValueArray,
+ msg.valueArray,
msg.handleArraySize,
msg.getDate(),
msg.getLabel(),
@@ -193,11 +191,10 @@
else
om->reflectAttributeValues(msg.object,
msg.handleArray,
- ValueArray,
+ msg.valueArray,
msg.handleArraySize,
msg.getLabel(),
msg.getRefException());
- ValueArray.empty();
break ;
}
@@ -213,12 +210,10 @@
case NetworkMessage::RECEIVE_INTERACTION:
{
- std::vector<ParameterValue_t> ValueArray = msg.getParamValueArray();
-
if (msg.isDated())
om->receiveInteraction(msg.interactionClass,
msg.handleArray,
- ValueArray,
+ msg.valueArray,
msg.handleArraySize,
msg.getDate(),
msg.getLabel(),
@@ -227,11 +222,10 @@
else
om->receiveInteraction(msg.interactionClass,
msg.handleArray,
- ValueArray,
+ msg.valueArray,
msg.handleArraySize,
msg.getLabel(),
msg.getRefException());
- ValueArray.empty();
break ;
}
@@ -1001,4 +995,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.52 2009/11/19 18:15:30 erk Exp $
+// $Id: TimeManagement.cc,v 3.53 2009/11/21 21:00:56 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/RTIG_processing.cc libCERTI/NetworkM...,
certi-cvs <=