[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c... |
|
Date: |
Wed, 21 Oct 2009 20:04:47 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/10/21 20:04:47
Modified files:
RTIG : FederationsList.cc Federation.cc
RTIG_processing.cc main.cc RTIG.cc
libCERTI : PrettyDebug.hh SecurityServer.cc Interaction.cc
ObjectClassSet.cc ObjectClass.cc XmlParser.cc
ObjectClassAttribute.cc Exception.cc Extent.cc
BasicMessage.cc Subscribable.cc Message_R.cc
NetworkMessage_RW.cc
libRTI : RTItypes.cc RTIambPrivateRefs.cc
RTIambassador.cc
test/Billard : Billard.cc main.cc BillardDDM.cc
RTIA : RTIA_federate.cc DataDistribution.cc
Removed files:
libCERTI : DebugOStream.hh
Log message:
Merge in
patch #6954: Logging system improovements, cleanup
0003-Replace-PrettyDebug-operator-usage-erk1.patch
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.cc?cvsroot=certi&r1=3.63&r2=3.64
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.113&r2=3.114
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.88&r2=3.89
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/main.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.58&r2=3.59
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebug.hh?cvsroot=certi&r1=4.7&r2=4.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityServer.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.53&r2=3.54
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassSet.cc?cvsroot=certi&r1=3.46&r2=3.47
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.67&r2=3.68
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/XmlParser.cc?cvsroot=certi&r1=3.30&r2=3.31
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.cc?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.cc?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Subscribable.cc?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.53&r2=3.54
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/DebugOStream.hh?cvsroot=certi&r1=4.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTItypes.cc?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.20&r2=3.21
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.108&r2=3.109
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.41&r2=3.42
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/main.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/BillardDDM.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.99&r2=3.100
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DataDistribution.cc?cvsroot=certi&r1=3.29&r2=3.30
Patches:
Index: RTIG/FederationsList.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.cc,v
retrieving revision 3.63
retrieving revision 3.64
diff -u -b -r3.63 -r3.64
--- RTIG/FederationsList.cc 7 Dec 2008 20:16:11 -0000 3.63
+++ RTIG/FederationsList.cc 21 Oct 2009 20:04:45 -0000 3.64
@@ -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: FederationsList.cc,v 3.63 2008/12/07 20:16:11 gotthardp Exp $
+// $Id: FederationsList.cc,v 3.64 2009/10/21 20:04:45 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -26,7 +26,6 @@
using std::list ;
using std::endl ;
-using std::cout ;
namespace certi {
namespace rtig {
@@ -1417,7 +1416,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Create " << nb_extents << "-extent Region "
+ Debug(D, pdDebug) << "Create " << nb_extents << "-extent Region "
<< "in space " << space << endl ;
return f->createRegion(federate, space, nb_extents);
@@ -1437,7 +1436,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Modify region #" << region << endl ;
+ Debug(D, pdDebug) << "Modify region #" << region << endl ;
f->modifyRegion(federate, region, extents);
}
@@ -1455,7 +1454,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Delete region " << region << endl ;
+ Debug(D, pdDebug) << "Delete region " << region << endl ;
f->deleteRegion(federate, region);
}
@@ -1471,8 +1470,8 @@
throw (RegionInUse, FederateNotExecutionMember, SaveInProgress,
RestoreInProgress, RTIinternalError)
{
- D[pdDebug] << "Associate region " << region << " for updates." << endl ;
- D[pdDebug] << "F�:" << federation << ", F:" << federate << endl ;
+ Debug(D, pdDebug) << "Associate region " << region << " for updates." <<
endl ;
+ Debug(D, pdDebug) << "F�:" << federation << ", F:" << federate << endl ;
Federation *f = 0 ;
@@ -1499,7 +1498,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Unassociate region for updates " << region << endl ;
+ Debug(D, pdDebug) << "Unassociate region for updates " << region << endl ;
f->unassociateRegion(federate, object, region);
}
@@ -1521,7 +1520,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << " Subscribe attributes with region " << region << endl ;
+ Debug(D, pdDebug) << " Subscribe attributes with region " << region <<
endl ;
f->subscribeAttributesWR(federate, object_class, region, nb, attributes);
}
@@ -1541,7 +1540,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Unsubscribe attributes with region " << region << endl ;
+ Debug(D, pdDebug) << "Unsubscribe attributes with region " << region <<
endl ;
f->unsubscribeAttributesWR(federate, object_class, region);
}
@@ -1561,7 +1560,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Subscribe interaction with region " << region << endl ;
+ Debug(D, pdDebug) << "Subscribe interaction with region " << region <<
endl ;
f->subscribeInteractionWR(federate, ic, region);
}
@@ -1581,7 +1580,7 @@
checkHandle(federation);
checkHandle(federate);
- D[pdDebug] << "Unsubscribe interaction with region " << region << endl ;
+ Debug(D, pdDebug) << "Unsubscribe interaction with region " << region <<
endl ;
f->unsubscribeInteractionWR(federate, ic, region);
}
@@ -1750,5 +1749,5 @@
}} // certi::rtig
-// EOF $Id: FederationsList.cc,v 3.63 2008/12/07 20:16:11 gotthardp Exp $
+// EOF $Id: FederationsList.cc,v 3.64 2009/10/21 20:04:45 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.113
retrieving revision 3.114
diff -u -b -r3.113 -r3.114
--- RTIG/Federation.cc 16 Oct 2009 21:48:28 -0000 3.113
+++ RTIG/Federation.cc 21 Oct 2009 20:04:45 -0000 3.114
@@ -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.113 2009/10/16 21:48:28 erk Exp $
+// $Id: Federation.cc,v 3.114 2009/10/21 20:04:45 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -772,7 +772,7 @@
msg->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
- D[pdExcept] << "Reference to a killed Federate while "
+ Debug(D, pdExcept) << "Reference to a killed Federate while "
<< "broadcasting." << endl ;
}
catch (NetworkError &e) {
@@ -821,7 +821,7 @@
}
catch (RTIinternalError &e)
{
- D[pdExcept] << "Reference to a killed Federate
while "
+ Debug(D, pdExcept) << "Reference to a killed
Federate while "
<< "broadcasting." << endl ;
}
catch (NetworkError &e)
@@ -1029,7 +1029,7 @@
j->addSynchronizationLabel(label);
}
- D[pdTerm] << "Federation " << handle << " is now synchronizing for label "
+ Debug(D, pdTerm) << "Federation " << handle << " is now synchronizing for
label "
<< label << endl ;
G.Out(pdGendoc,"exit Federation::registerSynchronization for all
federates");
@@ -1083,7 +1083,7 @@
}
}
- D[pdTerm] << "Federation " << handle << " is now synchronizing for label "
+ Debug(D, pdTerm) << "Federation " << handle << " is now synchronizing for
label "
<< label << endl ;
G.Out(pdGendoc,"exit Federation::registerSynchronization for federate
set");
@@ -1522,7 +1522,7 @@
// Remove references to this federate in root object
root->killFederate(federate);
- D[pdTrace] << "Federate " << federate << " removed from the Root Object "
+ Debug(D, pdTrace) << "Federate " << federate << " removed from the Root
Object "
<< endl ;
// delete from federations list
@@ -2420,7 +2420,7 @@
// Register object
ObjectHandle object = objectHandles.provide();
- D[pdDebug] << "Register object with region : Object " << object
+ Debug(D, pdDebug) << "Register object with region : Object " << object
<< ", class " << class_handle << ", region " << region_handle
<< std::endl ;
string strname = "" ; // create a name if necessary
@@ -2429,7 +2429,7 @@
root->registerObjectInstance(federate, class_handle, object,
strname.c_str());
- D[pdDebug] << "- object \"" << strname.c_str()
+ Debug(D, pdDebug) << "- object \"" << strname
<< "\" registered" << std::endl ;
// Associate region
@@ -2440,7 +2440,7 @@
root->getObjectAttribute(object, attributes[i])->associate(region);
}
- D[pdDebug] << "- " << nb << " attribute(s) associated with region "
+ Debug(D, pdDebug) << "- " << nb << " attribute(s) associated with region "
<< region_handle << std::endl ;
G.Out(pdGendoc,"exit Federation::registerObjectWithRegion");
return object ;
@@ -2606,5 +2606,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.113 2009/10/16 21:48:28 erk Exp $
+// $Id: Federation.cc,v 3.114 2009/10/21 20:04:45 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.88
retrieving revision 3.89
diff -u -b -r3.88 -r3.89
--- RTIG/RTIG_processing.cc 21 Oct 2009 18:56:29 -0000 3.88
+++ RTIG/RTIG_processing.cc 21 Oct 2009 20:04:45 -0000 3.89
@@ -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.88 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIG_processing.cc,v 3.89 2009/10/21 20:04:45 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -1316,7 +1316,7 @@
req->space,
req->nbExtents);
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " creates region " << rep.region
<< endl ;
@@ -1329,7 +1329,7 @@
void
RTIG::processModifyRegion(Socket *link, NetworkMessage *req)
{
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " modifies region " << req->region
<< endl ;
@@ -1348,7 +1348,7 @@
{
// TODO: audit...
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " deletes region " << req->region
<< endl ;
@@ -1367,7 +1367,7 @@
{
// TODO: audit...
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " associates region " << req->region
<< " to some attributes of object " << req->object << endl ;
@@ -1390,7 +1390,7 @@
federations.unassociateRegion(req->federation, req->federate,
req->object, req->region);
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " associates region " << req->region
<< " from object " << req->object << endl ;
@@ -1405,7 +1405,7 @@
RTIG::processSubscribeAttributesWR(Socket *link, NetworkMessage *req)
{
// TODO: audit...
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " subscribes with region " << req->region
<< " to some attributes of class " << req->objectClass << endl ;
@@ -1426,7 +1426,7 @@
RTIG::processUnsubscribeAttributesWR(Socket *link, NetworkMessage *req)
{
// TODO: audit...
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " unsubscribes with region " <<
req->region
<< " from object class " << req->objectClass << endl ;
@@ -1448,7 +1448,7 @@
federations.subscribeInteractionWR(req->federation, req->federate,
req->interactionClass, req->region);
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " subscribes with region " << req->region
<< " to interaction class " << req->interactionClass << endl ;
@@ -1467,7 +1467,7 @@
federations.unsubscribeInteractionWR(req->federation, req->federate,
req->interactionClass, req->region);
- D[pdDebug] << "Federate " << req->federate << " of Federation "
+ Debug(D, pdDebug) << "Federate " << req->federate << " of Federation "
<< req->federation << " unsubscribes with region " <<
req->region
<< " from interaction class " << req->interactionClass << endl ;
@@ -1554,4 +1554,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.88 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIG_processing.cc,v 3.89 2009/10/21 20:04:45 erk Exp $
Index: RTIG/main.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/main.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIG/main.cc 10 Nov 2008 13:19:01 -0000 3.21
+++ RTIG/main.cc 21 Oct 2009 20:04:46 -0000 3.22
@@ -30,6 +30,7 @@
#include <new>
#include <csignal>
+#include <iostream>
using namespace certi ;
using namespace certi::rtig ;
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.58
retrieving revision 3.59
diff -u -b -r3.58 -r3.59
--- RTIG/RTIG.cc 21 Oct 2009 18:56:29 -0000 3.58
+++ RTIG/RTIG.cc 21 Oct 2009 20:04:46 -0000 3.59
@@ -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.58 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIG.cc,v 3.59 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -194,7 +194,7 @@
break ;
case NetworkMessage::REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
- D[pdTrace] << "requestAttributeValueUpdate" << endl ;
+ Debug(D, pdTrace) << "requestAttributeValueUpdate" << endl ;
auditServer.setLevel(6);
processRequestObjectAttributeValueUpdate(link, msg);
break ;
@@ -336,61 +336,61 @@
break ;
case NetworkMessage::DDM_CREATE_REGION:
- D[pdTrace] << "createRegion" << endl ;
+ Debug(D, pdTrace) << "createRegion" << endl ;
auditServer.setLevel(6);
processCreateRegion(link, msg);
break ;
case NetworkMessage::DDM_MODIFY_REGION:
- D[pdTrace] << "modifyRegion" << endl ;
+ Debug(D, pdTrace) << "modifyRegion" << endl ;
auditServer.setLevel(6);
processModifyRegion(link, msg);
break ;
case NetworkMessage::DDM_DELETE_REGION:
- D[pdTrace] << "deleteRegion" << endl ;
+ Debug(D, pdTrace) << "deleteRegion" << endl ;
auditServer.setLevel(6);
processDeleteRegion(link, msg);
break ;
case NetworkMessage::DDM_REGISTER_OBJECT:
- D[pdTrace] << "registerObjectWithRegion" << endl ;
+ Debug(D, pdTrace) << "registerObjectWithRegion" << endl ;
auditServer.setLevel(6);
processRegisterObjectWithRegion(link, msg);
break ;
case NetworkMessage::DDM_ASSOCIATE_REGION:
- D[pdTrace] << "associateRegionForUpdates" << endl ;
+ Debug(D, pdTrace) << "associateRegionForUpdates" << endl ;
auditServer.setLevel(6);
processAssociateRegion(link, msg);
break ;
case NetworkMessage::DDM_UNASSOCIATE_REGION:
- D[pdTrace] << "unassociateRegionForUpdates" << endl ;
+ Debug(D, pdTrace) << "unassociateRegionForUpdates" << endl ;
auditServer.setLevel(6);
processUnassociateRegion(link, msg);
break ;
case NetworkMessage::DDM_SUBSCRIBE_ATTRIBUTES:
- D[pdTrace] << "subscribeObjectClassAttributes (DDM)" << endl ;
+ Debug(D, pdTrace) << "subscribeObjectClassAttributes (DDM)" << endl ;
auditServer.setLevel(6);
processSubscribeAttributesWR(link, msg);
break ;
case NetworkMessage::DDM_UNSUBSCRIBE_ATTRIBUTES:
- D[pdTrace] << "unsubscribeObjectClassAttributes (DDM)" << endl ;
+ Debug(D, pdTrace) << "unsubscribeObjectClassAttributes (DDM)" << endl ;
auditServer.setLevel(6);
processUnsubscribeAttributesWR(link, msg);
break ;
case NetworkMessage::DDM_SUBSCRIBE_INTERACTION:
- D[pdTrace] << "subscribeInteraction (DDM)" << endl ;
+ Debug(D, pdTrace) << "subscribeInteraction (DDM)" << endl ;
auditServer.setLevel(6);
processSubscribeInteractionWR(link, msg);
break ;
case NetworkMessage::DDM_UNSUBSCRIBE_INTERACTION:
- D[pdTrace] << "unsubscribeInteraction (DDM)" << endl ;
+ Debug(D, pdTrace) << "unsubscribeInteraction (DDM)" << endl ;
auditServer.setLevel(6);
processUnsubscribeInteractionWR(link, msg);
break ;
@@ -1035,4 +1035,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.58 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIG.cc,v 3.59 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/PrettyDebug.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebug.hh,v
retrieving revision 4.7
retrieving revision 4.8
diff -u -b -r4.7 -r4.8
--- libCERTI/PrettyDebug.hh 21 Oct 2009 19:51:12 -0000 4.7
+++ libCERTI/PrettyDebug.hh 21 Oct 2009 20:04:46 -0000 4.8
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: PrettyDebug.hh,v 4.7 2009/10/21 19:51:12 erk Exp $
+// $Id: PrettyDebug.hh,v 4.8 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#ifndef PRETTYDEBUG_HH
@@ -30,7 +30,6 @@
#endif
#include "certi.hh"
-#include "DebugOStream.hh"
#include <iosfwd>
#include <string>
@@ -71,7 +70,7 @@
//
// Debug(D, pdDebug) << "This is a usual std::ostream shich could be used
like that\n";
//
-// Note that this is about the least runtim overhead you can have with dynamic
debug messages
+// Note that this is about the least runtime overhead you can have with
dynamic debug messages
// as the only thing that happens exactly once is the check against the null
pointer in
// the stream return. That is even optimized into fast inline path and a more
expensive part
// in case we really need the some output.
@@ -110,15 +109,9 @@
#ifdef NDEBUG
void Out(pdDebugLevel level, const char *format, ...) {}
-
- DebugOStream operator[](pdDebugLevel level)
- { return DebugOStream(0); }
#else
void Out(pdDebugLevel level, const char *format, ...);
void Mes(pdDebugLevel level, const char type, const short testMess, const
char *context);
-
- DebugOStream operator[](pdDebugLevel level)
- { return DebugOStream(getStreamPrintHeader(level)); }
#endif
private:
@@ -133,9 +126,6 @@
static std::string _federateName;
};
-// Alias
-typedef PrettyDebug PrettyDebug ; ///< \deprecated PrettyDebug replaced by
PrettyDebug
-
#endif // PRETTYDEBUG_HH
-// $Id: PrettyDebug.hh,v 4.7 2009/10/21 19:51:12 erk Exp $
+// $Id: PrettyDebug.hh,v 4.8 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/SecurityServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityServer.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/SecurityServer.cc 21 Oct 2009 18:56:28 -0000 3.16
+++ libCERTI/SecurityServer.cc 21 Oct 2009 20:04:46 -0000 3.17
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SecurityServer.cc,v 3.16 2009/10/21 18:56:28 erk Exp $
+// $Id: SecurityServer.cc,v 3.17 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -145,12 +145,12 @@
SecurityServer::getLevelIDWithName(const char *theName)
{
if (empty()) {
- D[pdDebug] << "Empty list: added default (public) level" << endl ;
+ Debug(D, pdDebug) << "Empty list: added default (public) level" << endl
;
insertPublicLevel();
}
if ((theName == NULL) || (strlen(theName) > MAX_SECURITYLEVELNAME)) {
- D[pdDebug] << "Security Level Name null or too long." << endl ;
+ Debug(D, pdDebug) << "Security Level Name null or too long." << endl ;
throw RTIinternalError("Security Level Name null or too long.");
}
@@ -161,7 +161,7 @@
}
// Level not Found
- D[pdDebug] << "Level " << theName << " not found. Adding it to the list."
+ Debug(D, pdDebug) << "Level " << theName << " not found. Adding it to the
list."
<< endl ;
LastLevelID ++ ;
SecurityLevel *StoredLevel = new SecurityLevel(theName, LastLevelID);
@@ -196,4 +196,4 @@
}
-// $Id: SecurityServer.cc,v 3.16 2009/10/21 18:56:28 erk Exp $
+// $Id: SecurityServer.cc,v 3.17 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -b -r3.53 -r3.54
--- libCERTI/Interaction.cc 21 Oct 2009 18:56:28 -0000 3.53
+++ libCERTI/Interaction.cc 21 Oct 2009 20:04:46 -0000 3.54
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.53 2009/10/21 18:56:28 erk Exp $
+// $Id: Interaction.cc,v 3.54 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -102,9 +102,9 @@
parameterSet.push_front(the_parameter);
- D[pdRegister] << "Interaction " << handle << "[" << name.c_str()
+ Debug(D, pdRegister) << "Interaction " << handle << "[" << name
<< "] has a new parameter "
- << the_parameter->getHandle() << "[" <<
the_parameter->getName().c_str() << "]"
+ << the_parameter->getHandle() << "[" << the_parameter->getName() << "]"
<< std::flush;
return the_parameter->getHandle();
@@ -547,4 +547,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.53 2009/10/21 18:56:28 erk Exp $
+// $Id: Interaction.cc,v 3.54 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/ObjectClassSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassSet.cc,v
retrieving revision 3.46
retrieving revision 3.47
diff -u -b -r3.46 -r3.47
--- libCERTI/ObjectClassSet.cc 12 Oct 2009 07:09:32 -0000 3.46
+++ libCERTI/ObjectClassSet.cc 21 Oct 2009 20:04:46 -0000 3.47
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassSet.cc,v 3.46 2009/10/12 07:09:32 erk Exp $
+// $Id: ObjectClassSet.cc,v 3.47 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
// Project
@@ -381,7 +381,7 @@
delete ocbList ;
}
- D[pdRegister] << "Instance " << the_object << " has been registered."
+ Debug(D, pdRegister) << "Instance " << the_object << " has been
registered."
<< endl ;
}
@@ -692,4 +692,4 @@
} // namespace certi
-// $Id: ObjectClassSet.cc,v 3.46 2009/10/12 07:09:32 erk Exp $
+// $Id: ObjectClassSet.cc,v 3.47 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.67
retrieving revision 3.68
diff -u -b -r3.67 -r3.68
--- libCERTI/ObjectClass.cc 21 Oct 2009 18:56:28 -0000 3.67
+++ libCERTI/ObjectClass.cc 21 Oct 2009 20:04:46 -0000 3.68
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.67 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClass.cc,v 3.68 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -168,7 +168,7 @@
if (trouve) {
ObjectAttribute *attr =
source->getAttribute((*a)->getHandle());
const RTIRegion *update_region = attr->getRegion();
- D[pdTrace] << "RAV: attr " << (*a)->getHandle()
+ Debug(D, pdTrace) << "RAV: attr " << (*a)->getHandle()
<< " / region " << (update_region ?
update_region->getHandle() : 0)
<< std::endl ;
(*a)->updateBroadcastList(ocbList, update_region);
@@ -551,7 +551,7 @@
<< objectSet.size() << "> objects of ObjectClass "
<< handle;
- D[pdError] << msg.str().c_str() << std::endl ;
+ Debug(D, pdError) << msg.str() << std::endl ;
throw ObjectNotKnown(msg.str());
}
@@ -738,7 +738,7 @@
}
objectSet.push_front(the_object);
- D[pdTrace] << "Added object " << the_object->getHandle() << "/"
+ Debug(D, pdTrace) << "Added object " << the_object->getHandle() << "/"
<< objectSet.size() << " to class " << handle << std::endl ;
// Prepare and Broadcast message for this class
@@ -866,7 +866,7 @@
// FIXME what does this means?
unsubscribe(fed, region);
- D[pdTrace] << "ObjectClass::subscribe" << " : fed " << fed << ", class
" << handle
+ Debug(D, pdTrace) << "ObjectClass::subscribe" << " : fed " << fed << ",
class " << handle
<< ", " << nb_attributes << " attributes, region "
<< (region ? region->getHandle() : 0) << std::endl ;
@@ -1743,7 +1743,7 @@
void
ObjectClass::unsubscribe(FederateHandle fed, const RTIRegion *region)
{
- D[pdTrace] << "ObjectClass::unsubscribe" << ": fed " << fed << ", region "
+ Debug(D, pdTrace) << "ObjectClass::unsubscribe" << ": fed " << fed << ",
region "
<< (region ? region->getHandle() : 0) << std::endl ;
list<ObjectClassAttribute *>::iterator i ;
@@ -1796,7 +1796,7 @@
ObjectClassHandle subscription)
throw (ObjectClassNotDefined)
{
- D[pdInit] << "Recursive Discovering on class " << handle
+ Debug(D, pdInit) << "Recursive Discovering on class " << handle
<< " for Federate " << federate << "." << std::endl ;
bool go_deeper = sendDiscoverMessages(federate, subscription);
@@ -1834,4 +1834,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.67 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClass.cc,v 3.68 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/XmlParser.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/XmlParser.cc,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -b -r3.30 -r3.31
--- libCERTI/XmlParser.cc 21 Oct 2009 18:56:28 -0000 3.30
+++ libCERTI/XmlParser.cc 21 Oct 2009 20:04:46 -0000 3.31
@@ -148,7 +148,7 @@
xmlFreeDoc(doc);
- D[pdTrace] << "XmlParser: finished parsing" << endl ;
+ Debug(D, pdTrace) << "XmlParser: finished parsing" << endl ;
return root ;
}
@@ -156,7 +156,7 @@
void
XmlParser::parseClass(ObjectClass* parent)
{
- D[pdTrace] << "New Object Class" << endl ;
+ Debug(D, pdTrace) << "New Object Class" << endl ;
xmlNodePtr prev = cur ;
/* note how objectHandle counter is incremented */
@@ -226,7 +226,7 @@
void
XmlParser::parseInteraction(Interaction* parent)
{
- D[pdTrace] << "New Interaction Class" << endl;
+ Debug(D, pdTrace) << "New Interaction Class" << endl;
std::string name;
TransportType transport;
OrderType order;
@@ -300,7 +300,7 @@
void
XmlParser::parseRoutingSpace()
{
- D[pdTrace] << "New Routing Space" << endl ;
+ Debug(D, pdTrace) << "New Routing Space" << endl ;
DimensionHandle freeDimensionHandle = 1 ;
xmlNodePtr prev = cur ;
Index: libCERTI/ObjectClassAttribute.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.cc,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- libCERTI/ObjectClassAttribute.cc 21 Oct 2009 18:56:28 -0000 3.32
+++ libCERTI/ObjectClassAttribute.cc 21 Oct 2009 20:04:46 -0000 3.33
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassAttribute.cc,v 3.32 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.33 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "ObjectClassAttribute.hh"
@@ -133,12 +133,12 @@
{
if (!isPublishing(fed)) {
checkFederateAccess(fed, "Publish");
- D[pdInit] << "Attribute " << handle << ": Added Federate " << fed
+ Debug(D, pdInit) << "Attribute " << handle << ": Added Federate " <<
fed
<< " to publishers list." << endl ;
publishers.insert(fed);
}
else
- D[pdError] << "Attribute " << handle
+ Debug(D, pdError) << "Attribute " << handle
<< ": Inconsistent publish request from Federate "
<< fed << endl ;
}
@@ -150,13 +150,13 @@
throw (RTIinternalError, SecurityError)
{
if (isPublishing(fed)) {
- D[pdTerm] << "Attribute " << handle << ": Removed Federate " << fed
+ Debug(D, pdTerm) << "Attribute " << handle << ": Removed Federate " <<
fed
<< " from publishers list." << endl ;
deletePublisher(fed);
}
else
- D[pdError] << "Attribute " << handle
+ Debug(D, pdError) << "Attribute " << handle
<< ": Inconsistent publish request from Federate "
<< fed << endl ;
}
@@ -219,4 +219,4 @@
} // namespace
-// $Id: ObjectClassAttribute.cc,v 3.32 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.33 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/Exception.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/Exception.cc 7 Dec 2008 20:16:12 -0000 3.17
+++ libCERTI/Exception.cc 21 Oct 2009 20:04:46 -0000 3.18
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.cc,v 3.17 2008/12/07 20:16:12 gotthardp Exp $
+// $Id: Exception.cc,v 3.18 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "Exception.hh"
@@ -155,7 +155,7 @@
msg << std::endl;
msg << std::flush;
- PD_Exception[pdExcept] << msg.str().c_str();
+ Debug(PD_Exception, pdExcept) << msg.str();
return msg.str();
}
-// $Id: Exception.cc,v 3.17 2008/12/07 20:16:12 gotthardp Exp $
+// $Id: Exception.cc,v 3.18 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/Extent.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.cc,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/Extent.cc 6 Jul 2007 09:25:18 -0000 3.10
+++ libCERTI/Extent.cc 21 Oct 2009 20:04:46 -0000 3.11
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.cc,v 3.10 2007/07/06 09:25:18 erk Exp $
+// $Id: Extent.cc,v 3.11 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -115,7 +115,7 @@
Extent::overlaps(const Extent &e) const
{
for (unsigned int i = 1 ; i <= size(); ++i) {
- D[pdTrace] << e.getRangeLowerBound(i) << " < " << getRangeUpperBound(i)
+ Debug(D, pdTrace) << e.getRangeLowerBound(i) << " < " <<
getRangeUpperBound(i)
<< " or " << e.getRangeUpperBound(i) << " < "
<< getRangeLowerBound(i) << " ?" << std::endl ;
if (e.getRangeLowerBound(i) > getRangeUpperBound(i) ||
@@ -127,4 +127,4 @@
} // namespace certi
-// $Id: Extent.cc,v 3.10 2007/07/06 09:25:18 erk Exp $
+// $Id: Extent.cc,v 3.11 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/BasicMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/BasicMessage.cc 21 Oct 2009 18:56:28 -0000 3.13
+++ libCERTI/BasicMessage.cc 21 Oct 2009 20:04:46 -0000 3.14
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.cc,v 3.13 2009/10/21 18:56:28 erk Exp $
+// $Id: BasicMessage.cc,v 3.14 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -61,12 +61,12 @@
void
BasicMessage::serialize(MessageBuffer& msgBuffer) {
/* Write Extent */
- D[pdDebug] << "Serialize " << extents.size() << " extent(s)" << endl;
+ Debug(D, pdDebug) << "Serialize " << extents.size() << " extent(s)" <<
endl;
msgBuffer.write_int32(static_cast<int32_t>(extents.size()));
if (extents.size() > 0) {
int n = extents[0].size();
msgBuffer.write_int32(static_cast<int32_t>(n));
- D[pdDebug] << "Extent with " << n << " range(s)" << endl;
+ Debug(D, pdDebug) << "Extent with " << n << " range(s)" << endl;
for (unsigned int i = 0; i < extents.size(); ++i) {
const Extent &e = extents[i];
@@ -90,14 +90,14 @@
int32_t nb_extents;
int32_t temp;
msgBuffer.read_int32(&nb_extents);
- D[pdDebug] << "Deserialize " << nb_extents << " extent(s)" << endl;
+ Debug(D, pdDebug) << "Deserialize " << nb_extents << " extent(s)" <<
endl;
extents.clear();
if (nb_extents > 0) {
extents.reserve(nb_extents);
int32_t nb_dimensions;
msgBuffer.read_int32(&nb_dimensions);
- D[pdDebug] << "Extent with " << nb_dimensions << " range(s)" <<
endl;
+ Debug(D, pdDebug) << "Extent with " << nb_dimensions << "
range(s)" << endl;
for (long i = 0; i < nb_extents; ++i) {
Extent e(nb_dimensions);
@@ -130,13 +130,13 @@
void
BasicMessage::writeExtents(MessageBuffer& msgBuffer) const
{
- D[pdDebug] << "Write " << extents.size() << " extent(s)" << endl ;
+ Debug(D, pdDebug) << "Write " << extents.size() << " extent(s)" << endl ;
msgBuffer.write_int64(extents.size());
if (extents.size() > 0) {
int n = extents[0].size();
msgBuffer.write_int64(n);
- D[pdDebug] << "Extent with " << n << " range(s)" << endl ;
+ Debug(D, pdDebug) << "Extent with " << n << " range(s)" << endl ;
for (unsigned int i = 0 ; i < extents.size(); ++i) {
const Extent &e = extents[i] ;
@@ -158,13 +158,13 @@
BasicMessage::readExtents(MessageBuffer& msgBuffer)
{
long nb_extents = msgBuffer.read_int64();
- D[pdDebug] << "Read " << nb_extents << " extent(s)" << endl ;
+ Debug(D, pdDebug) << "Read " << nb_extents << " extent(s)" << endl ;
extents.clear();
if (nb_extents > 0) {
extents.reserve(nb_extents);
long nb_dimensions = msgBuffer.read_int64();
- D[pdDebug] << "Extent with " << nb_dimensions << " range(s)" << endl ;
+ Debug(D, pdDebug) << "Extent with " << nb_dimensions << " range(s)" <<
endl ;
for (long i = 0 ; i < nb_extents ; ++i) {
Extent e(nb_dimensions);
for (long h = 1 ; h <= nb_dimensions ; ++h) {
@@ -225,4 +225,4 @@
} // namespace certi
-// $Id: BasicMessage.cc,v 3.13 2009/10/21 18:56:28 erk Exp $
+// $Id: BasicMessage.cc,v 3.14 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/Subscribable.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Subscribable.cc,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/Subscribable.cc 23 Jun 2008 13:25:04 -0000 3.8
+++ libCERTI/Subscribable.cc 21 Oct 2009 20:04:46 -0000 3.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Subscribable.cc,v 3.8 2008/06/23 13:25:04 erk Exp $
+// $Id: Subscribable.cc,v 3.9 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -88,7 +88,7 @@
bool
Subscriber::match(const RTIRegion *r) const
{
- D[pdTrace] << "Match test: " << (region ? region->getHandle() : 0) << " vs
"
+ Debug(D, pdTrace) << "Match test: " << (region ? region->getHandle() : 0)
<< " vs "
<< (r ? r->getHandle() : 0) << std::endl ;
return (region == 0) || (r == 0) || region->overlaps(*r);
}
@@ -97,7 +97,7 @@
Subscribable::~Subscribable()
{
if (!subscribers.empty())
- D[pdError] << "Subscribers list not empty at termination." << std::endl
;
+ Debug(D, pdError) << "Subscribers list not empty at termination." <<
std::endl ;
}
// ----------------------------------------------------------------------------
@@ -164,7 +164,7 @@
subscribers.push_back(Subscriber(fed, region));
}
else
- D[pdError] << "Inconsistency in subscribe request from federate "
+ Debug(D, pdError) << "Inconsistency in subscribe request from federate
"
<< fed << std::endl ;
}
@@ -201,4 +201,4 @@
} // namespace certi
-// $Id: Subscribable.cc,v 3.8 2008/06/23 13:25:04 erk Exp $
+// $Id: Subscribable.cc,v 3.9 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- libCERTI/Message_R.cc 21 Nov 2008 12:45:25 -0000 3.34
+++ libCERTI/Message_R.cc 21 Oct 2009 20:04:46 -0000 3.35
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.34 2008/11/21 12:45:25 approx Exp $
+// $Id: Message_R.cc,v 3.35 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
@@ -63,7 +63,7 @@
/* We serialize the common Message part
* ALL Messages will contain the following
*/
- D[pdDebug] << "Deserialize <" << getName().c_str()<<">"<<std::endl;
+ Debug(D, pdDebug) << "Deserialize <" <<
getName().c_str()<<">"<<std::endl;
readHeader(msgBuffer);
readBody(msgBuffer) ;
G.Out(pdGendoc,"exit Message::deserialize");
@@ -649,4 +649,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.34 2008/11/21 12:45:25 approx Exp $
+// $Id: Message_R.cc,v 3.35 2009/10/21 20:04:46 erk Exp $
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -b -r3.53 -r3.54
--- libCERTI/NetworkMessage_RW.cc 2 Apr 2009 19:58:08 -0000 3.53
+++ libCERTI/NetworkMessage_RW.cc 21 Oct 2009 20:04:46 -0000 3.54
@@ -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_RW.cc,v 3.53 2009/04/02 19:58:08 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.54 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "NetworkMessage.hh"
@@ -24,7 +24,6 @@
using std::vector;
using std::endl;
-using std::cout;
namespace certi {
@@ -73,7 +72,7 @@
/* We serialize the common Network message part
* ALL Network Messages will contain the following
*/
- D[pdDebug] << "Deserialize <" << getName().c_str()<<">"<<endl;
+ Debug(D, pdDebug) << "Deserialize <" << getName() << ">" << endl;
/* deserialize common part */
type = static_cast<NetworkMessage::Type>(msgBuffer.read_int32());
exception = static_cast<TypeException>(msgBuffer.read_int32());
@@ -152,4 +151,4 @@
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.53 2009/04/02 19:58:08 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.54 2009/10/21 20:04:46 erk Exp $
Index: libRTI/RTItypes.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTItypes.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libRTI/RTItypes.cc 4 Apr 2009 13:30:54 -0000 1.4
+++ libRTI/RTItypes.cc 21 Oct 2009 20:04:46 -0000 1.5
@@ -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: RTItypes.cc,v 1.4 2009/04/04 13:30:54 gotthardp Exp $
+// $Id: RTItypes.cc,v 1.5 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "Exception.hh"
@@ -245,7 +245,7 @@
msg << std::endl;
msg << std::flush;
- PD_RTIException[pdExcept] << msg.str().c_str();
+ Debug(PD_RTIException, pdExcept) << msg.str();
return msg.str();
}
@@ -263,4 +263,4 @@
return os<<(*ex);
}
-// $Id: RTItypes.cc,v 1.4 2009/04/04 13:30:54 gotthardp Exp $
+// $Id: RTItypes.cc,v 1.5 2009/10/21 20:04:46 erk Exp $
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -b -r3.20 -r3.21
--- libRTI/RTIambPrivateRefs.cc 12 Jun 2009 08:59:28 -0000 3.20
+++ libRTI/RTIambPrivateRefs.cc 21 Oct 2009 20:04:46 -0000 3.21
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cc,v 3.20 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.21 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -27,6 +27,7 @@
#include "RTItypesImp.hh"
#include "PrettyDebug.hh"
#include <sstream>
+#include <iostream>
namespace {
static PrettyDebug D("LIBRTI", __FILE__);
@@ -912,4 +913,4 @@
}
}
-// $Id: RTIambPrivateRefs.cc,v 3.20 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.21 2009/10/21 20:04:46 erk Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.108
retrieving revision 3.109
diff -u -b -r3.108 -r3.109
--- libRTI/RTIambassador.cc 21 Oct 2009 18:56:29 -0000 3.108
+++ libRTI/RTIambassador.cc 21 Oct 2009 20:04:46 -0000 3.109
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.108 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIambassador.cc,v 3.109 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -2008,7 +2008,7 @@
{
try {
RegionImp ®ion = dynamic_cast<RegionImp &>(r);
- D[pdDebug] << "Notify About Region " << region.getHandle()
+ Debug(D, pdDebug) << "Notify About Region " << region.getHandle()
<< " Modification" << endl ;
Message req, rep ;
@@ -2149,7 +2149,7 @@
RTI::RestoreInProgress,
RTI::RTIinternalError)
{
- D[pdDebug] << "+ Associate Region for Updates" << endl ;
+ Debug(D, pdDebug) << "+ Associate Region for Updates" << endl ;
Message req, rep ;
@@ -2159,7 +2159,7 @@
req.setAHS(certi_cast<AttributeHandleSetImp>()(attributes).getAttributeHandles());
privateRefs->executeService(&req, &rep);
- D[pdDebug] << "- Associate Region for Updates" << endl ;
+ Debug(D, pdDebug) << "- Associate Region for Updates" << endl ;
}
// ----------------------------------------------------------------------------
@@ -2181,7 +2181,7 @@
RTI::RestoreInProgress,
RTI::RTIinternalError)
{
- D[pdDebug] << "+ Unassociate Region for Updates" << endl ;
+ Debug(D, pdDebug) << "+ Unassociate Region for Updates" << endl ;
Message req, rep ;
req.type = Message::DDM_UNASSOCIATE_REGION ;
@@ -2189,7 +2189,7 @@
req.setRegion(get_handle(region));
privateRefs->executeService(&req, &rep);
- D[pdDebug] << "- Unassociate Region for Updates" << endl ;
+ Debug(D, pdDebug) << "- Unassociate Region for Updates" << endl ;
}
// ----------------------------------------------------------------------------
@@ -2216,7 +2216,7 @@
RTI::RestoreInProgress,
RTI::RTIinternalError)
{
- D[pdDebug] << "+ Subscribe Object Class Attributes with Region" << endl ;
+ Debug(D, pdDebug) << "+ Subscribe Object Class Attributes with Region" <<
endl ;
Message req, rep ;
req.type = Message::DDM_SUBSCRIBE_ATTRIBUTES ;
@@ -2226,7 +2226,7 @@
req.setBoolean(passive);
privateRefs->executeService(&req, &rep);
- D[pdDebug] << "- Subscribe Object Class Attributes with Region" << endl ;
+ Debug(D, pdDebug) << "- Subscribe Object Class Attributes with Region" <<
endl ;
}
// ----------------------------------------------------------------------------
@@ -2247,7 +2247,7 @@
RTI::RestoreInProgress,
RTI::RTIinternalError)
{
- D[pdDebug] << "+ Unsubscribe Object Class " << object_class
+ Debug(D, pdDebug) << "+ Unsubscribe Object Class " << object_class
<< " with Region" << endl ;
Message req, rep ;
@@ -2256,7 +2256,7 @@
req.setRegion(get_handle(region));
privateRefs->executeService(&req, &rep);
- D[pdDebug] << "- Unsubscribe Object Class with Region" << endl ;
+ Debug(D, pdDebug) << "- Unsubscribe Object Class with Region" << endl ;
}
// ----------------------------------------------------------------------------
@@ -2615,7 +2615,7 @@
RTI::ConcurrentAccessAttempted,
RTI::RTIinternalError)
{
- D[pdDebug] << "Get routing space handle: " << rs_name << endl ;
+ Debug(D, pdDebug) << "Get routing space handle: " << rs_name << endl ;
Message req, rep ;
req.type = Message::GET_SPACE_HANDLE ;
req.setName(rs_name);
@@ -3031,4 +3031,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.108 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIambassador.cc,v 3.109 2009/10/21 20:04:46 erk Exp $
Index: test/Billard/Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.41
retrieving revision 3.42
diff -u -b -r3.41 -r3.42
--- test/Billard/Billard.cc 21 Oct 2009 18:56:28 -0000 3.41
+++ test/Billard/Billard.cc 21 Oct 2009 20:04:46 -0000 3.42
@@ -30,6 +30,7 @@
#endif
#include <memory>
+#include <iostream>
#include <cstdlib>
#include <cassert>
@@ -120,7 +121,7 @@
break ;
}
catch (RTI::FederateAlreadyExecutionMember& e) {
- D[pdExcept] << "Federate " << federateName.c_str()
+ Debug(D, pdExcept) << "Federate " << federateName.c_str()
<< "already exists." << endl ;
throw ;
@@ -151,7 +152,7 @@
rtiamb.registerFederationSynchronizationPoint("Init", "Waiting all
players.");
}
catch (RTI::Exception& e) {
- D[pdExcept] << "Federate " << federateName.c_str()
+ Debug(D, pdExcept) << "Federate " << federateName
<< " : Register Synchronization Point failed : %d"
<< endl ;
}
@@ -190,7 +191,7 @@
}
}
catch (RTI::Exception& e) {
- D[pdExcept] << "Federate " << federateName.c_str()
+ Debug(D, pdExcept) << "Federate " << federateName
<< " : Register Synchronization Point failed : %d"
<< endl ;
}
@@ -578,10 +579,10 @@
attributes->add(AttrYID);
// Subscribe to Bille objects.
- D[pdDebug] << "subscribe: class " << BilleClassID << ", attributes "
+ Debug(D, pdDebug) << "subscribe: class " << BilleClassID << ", attributes "
<< AttrXID << " and " << AttrYID << "... " << endl ;
rtiamb.subscribeObjectClassAttributes(BilleClassID, *attributes,
RTI::RTI_TRUE);
- D[pdDebug] << "done." << endl ;
+ Debug(D, pdDebug) << "done." << endl ;
// Publish Boule Objects.
attributes->add(AttrColorID);
@@ -600,7 +601,7 @@
void
Billard::getHandles()
{
- D[pdDebug] << "Get handles..." << endl ;
+ Debug(D, pdDebug) << "Get handles..." << endl ;
BilleClassID = rtiamb.getObjectClassHandle(CLA_BILLE);
BouleClassID = rtiamb.getObjectClassHandle(CLA_BOULE);
D.Out(pdInit, "BilleClassID = %d, BouleClassID = %d.",
Index: test/Billard/main.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/main.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- test/Billard/main.cc 21 Oct 2009 18:56:28 -0000 3.24
+++ test/Billard/main.cc 21 Oct 2009 20:04:46 -0000 3.25
@@ -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: main.cc,v 3.24 2009/10/21 18:56:28 erk Exp $
+// $Id: main.cc,v 3.25 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -132,7 +132,7 @@
int autostart = args.auto_given ? args.auto_arg : 0 ;
// Joins federation
- D[pdDebug] << "Create or join federation" << endl ;
+ Debug(D, pdDebug) << "Create or join federation" << endl ;
billard->join(federation, fedfile);
RTI::FederateHandle handle = billard->getHandle();
@@ -144,9 +144,9 @@
args.yoffset_given ? args.yoffset_arg : y_default);
// Continue initialisation...
- D[pdDebug] << "Synchronization" << endl ;
+ Debug(D, pdDebug) << "Synchronization" << endl ;
billard->pause();
- D[pdDebug] << "Publish and subscribe" << endl ;
+ Debug(D, pdDebug) << "Publish and subscribe" << endl ;
billard->publishAndSubscribe();
display->show();
@@ -315,7 +315,7 @@
createBillard(bool demo, const char *s_demo, string name)
{
if (demo) {
- D[pdDebug] << "Create billard " << s_demo << endl ;
+ Debug(D, pdDebug) << "Create billard " << s_demo << endl ;
string s = s_demo ;
Index: test/Billard/BillardDDM.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/BillardDDM.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- test/Billard/BillardDDM.cc 12 Jun 2008 07:39:50 -0000 3.21
+++ test/Billard/BillardDDM.cc 21 Oct 2009 20:04:46 -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: BillardDDM.cc,v 3.21 2008/06/12 07:39:50 erk Exp $
+// $Id: BillardDDM.cc,v 3.22 2009/10/21 20:04:46 erk Exp $
// ----------------------------------------------------------------------------
#include "BillardDDM.hh"
@@ -28,6 +28,7 @@
#include "graph_c.hh"
#endif
+#include <iostream>
#include <cmath>
#ifdef _WIN32
@@ -117,7 +118,7 @@
std::cout << " done." << std::endl ;
local.ID = registerBallInstance(federateName.c_str());
- D[pdDebug] << "Object created (handle " << local.ID << ")" << std::endl ;
+ Debug(D, pdDebug) << "Object created (handle " << local.ID << ")" <<
std::endl ;
}
// ----------------------------------------------------------------------------
@@ -215,7 +216,7 @@
region = rtiamb.createRegion(GeoID, 1);
local.ID = registerBallInstance(federateName.c_str());
- D[pdDebug] << "Object created (handle " << local.ID << ")" << std::endl ;
+ Debug(D, pdDebug) << "Object created (handle " << local.ID << ")" <<
std::endl ;
auto_ptr<RTI::AttributeHandleSet>
attributes(RTI::AttributeHandleSetFactory::create(3));
attributes->add(AttrXID);
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.99
retrieving revision 3.100
diff -u -b -r3.99 -r3.100
--- RTIA/RTIA_federate.cc 21 Oct 2009 18:56:29 -0000 3.99
+++ RTIA/RTIA_federate.cc 21 Oct 2009 20:04:47 -0000 3.100
@@ -874,55 +874,55 @@
break ;
case Message::GET_OBJECT_CLASS:
- D[pdTrace] << "Message from Federate: getObjectClass" << endl ;
+ Debug(D, pdTrace) << "Message from Federate: getObjectClass" << endl ;
rep.setObjectClass(om->getObjectClass(req->getObject()));
break ;
case Message::GET_TRANSPORTATION_HANDLE:
- D[pdTrace] << "Message from Federate: getTransportationHandle" << endl
;
+ Debug(D, pdTrace) << "Message from Federate: getTransportationHandle"
<< endl ;
rep.setTransportation(om->getTransportationHandle(req->getName().c_str()));
break ;
case Message::GET_TRANSPORTATION_NAME:
- D[pdTrace] << "Message from Federate: getTransportationName" << endl ;
+ Debug(D, pdTrace) << "Message from Federate: getTransportationName" <<
endl ;
rep.setName(om->getTransportationName(req->getTransportation()));
break ;
case Message::GET_ORDERING_HANDLE:
- D[pdTrace] << "Message from Federate: getOrderingHandle" << endl ;
+ Debug(D, pdTrace) << "Message from Federate: getOrderingHandle" <<
endl ;
rep.setOrdering(om->getOrderingHandle(req->getName().c_str()));
break ;
case Message::GET_ORDERING_NAME:
- D[pdTrace] << "Message from Federate: getOrderingName" << endl ;
+ Debug(D, pdTrace) << "Message from Federate: getOrderingName" << endl ;
rep.setName(om->getOrderingName(req->getOrdering()));
break ;
case Message::DDM_CREATE_REGION:
- D[pdTrace] << "Receiving Message from Federate: CreateRegion" << endl ;
+ Debug(D, pdTrace) << "Receiving Message from Federate: CreateRegion"
<< endl ;
rep.setRegion(ddm->createRegion(req->getSpace(), req->getNumber(), e));
rep.setNumber(rootObject->getRoutingSpace(req->getSpace()).size());
break ;
case Message::DDM_MODIFY_REGION:
- D[pdTrace] << "Receiving Message from Federate: Modify Region" << endl ;
+ Debug(D, pdTrace) << "Receiving Message from Federate: Modify Region"
<< endl ;
ddm->modifyRegion(req->getRegion(), req->getExtents(), e);
break ;
case Message::DDM_DELETE_REGION:
- D[pdTrace] << "Receiving Message from Federate: DeleteRegion" << endl ;
+ Debug(D, pdTrace) << "Receiving Message from Federate: DeleteRegion"
<< endl ;
ddm->deleteRegion(req->getRegion(), e);
break ;
case Message::DDM_ASSOCIATE_REGION:
- D[pdTrace] << "Receiving Message from Federate: Associate Region"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Associate Region"
<< endl ;
ddm->associateRegion(req->getObject(), req->getRegion(),
req->handleArray, req->handleArraySize, e);
break ;
case Message::DDM_REGISTER_OBJECT:
- D[pdTrace] << "Receiving Message from Federate: Register with Region"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Register with
Region"
<< endl ;
rep.setObject(ddm->registerObject(req->getObjectClass(),
req->getName(),
@@ -933,33 +933,33 @@
break ;
case Message::DDM_UNASSOCIATE_REGION:
- D[pdTrace] << "Receiving Message from Federate: Unassociate Region"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Unassociate
Region"
<< endl ;
ddm->unassociateRegion(req->getObject(), req->getRegion(), e);
break ;
case Message::DDM_SUBSCRIBE_ATTRIBUTES:
- D[pdTrace] << "Receiving Message from Federate: Subscribe Attributes"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Subscribe
Attributes"
<< endl ;
ddm->subscribe(req->getObjectClass(), req->getRegion(),
req->handleArray, req->handleArraySize, e);
break ;
case Message::DDM_UNSUBSCRIBE_ATTRIBUTES:
- D[pdTrace] << "Receiving Message from Federate: Unsubscribe class "
+ Debug(D, pdTrace) << "Receiving Message from Federate: Unsubscribe
class "
<< req->getObjectClass() << endl ;
ddm->unsubscribeAttributes(req->getObjectClass(), req->getRegion(), e);
break ;
case Message::DDM_SUBSCRIBE_INTERACTION:
- D[pdTrace] << "Receiving Message from Federate: Subscribe Interaction"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Subscribe
Interaction"
<< endl ;
ddm->subscribeInteraction(req->getInteractionClass(),
req->getRegion(), e);
break ;
case Message::DDM_UNSUBSCRIBE_INTERACTION:
- D[pdTrace] << "Receiving Message from Federate: Unsubscribe Interaction"
+ Debug(D, pdTrace) << "Receiving Message from Federate: Unsubscribe
Interaction"
<< endl ;
ddm->unsubscribeInteraction(req->getInteractionClass(),
req->getRegion(), e);
Index: RTIA/DataDistribution.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DataDistribution.cc,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- RTIA/DataDistribution.cc 21 Oct 2009 18:56:29 -0000 3.29
+++ RTIA/DataDistribution.cc 21 Oct 2009 20:04:47 -0000 3.30
@@ -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.29 2009/10/21 18:56:29 erk Exp $
+// $Id: DataDistribution.cc,v 3.30 2009/10/21 20:04:47 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -123,7 +123,7 @@
TypeException &e)
throw (SpaceNotDefined)
{
- D[pdDebug] << "Start creating region in space " << space << "..." << endl ;
+ Debug(D, pdDebug) << "Start creating region in space " << space << "..."
<< endl ;
NM_DDM_Create_Region req;
req.federation = fm->_numero_federation ;
@@ -136,7 +136,7 @@
e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
- D[pdDebug] << "Create region " << rep->region << endl ;
+ Debug(D, pdDebug) << "Create region " << rep->region << endl ;
RTIRegion *region = new RTIRegion(rep->region,
rootObject->getRoutingSpace(space),
nb_extents);
@@ -158,7 +158,7 @@
const std::vector<Extent> &extents,
TypeException &e)
{
- D[pdDebug] << "Modify region " << handle << "..." << endl ;
+ Debug(D, pdDebug) << "Modify region " << handle << "..." << endl ;
// check region
RTIRegion *region = rootObject->getRegion(handle);
@@ -177,7 +177,7 @@
if (e == e_NO_EXCEPTION) {
region->replaceExtents(extents);
- D[pdDebug] << "Modified region " << handle << endl ;
+ Debug(D, pdDebug) << "Modified region " << handle << endl ;
}
} /* end of modifyRegion */
@@ -188,7 +188,7 @@
DataDistribution::deleteRegion(long handle, TypeException &e)
throw (RegionNotKnown, RegionInUse)
{
- D[pdDebug] << "Delete region " << handle << "..." << endl ;
+ Debug(D, pdDebug) << "Delete region " << handle << "..." << endl ;
// check region
rootObject->getRegion(handle);
@@ -206,7 +206,7 @@
if (e == e_NO_EXCEPTION) {
rootObject->deleteRegion(handle);
- D[pdDebug] << "Deleted region " << handle << endl ;
+ Debug(D, pdDebug) << "Deleted region " << handle << endl ;
}
} /* end of deleteRegion */
@@ -219,14 +219,14 @@
TypeException &e)
throw (RegionNotKnown)
{
- D[pdDebug] << "Associate Region " << region << std::endl ;
+ Debug(D, pdDebug) << "Associate Region " << region << std::endl ;
RTIRegion *r = rootObject->getRegion(region);
- D[pdDebug] << "- unassociate object " << object << std::endl ;
+ Debug(D, pdDebug) << "- unassociate object " << object << std::endl ;
rootObject->getObject(object)->unassociate(r);
for (int i = 0 ; i < nb ; ++i) {
- D[pdDebug] << "- associate attribute " << attr[i] << std::endl ;
+ Debug(D, pdDebug) << "- associate attribute " << attr[i] << std::endl ;
rootObject->getObjectAttribute(object, attr[i])->associate(r);
}
@@ -255,7 +255,7 @@
const std::vector<RegionHandle> regions,
TypeException &e)
{
- D[pdDebug] << "Register object of class " << class_handle << " with "
+ Debug(D, pdDebug) << "Register object of class " << class_handle << " with
"
<< regions.size() << " region(s)." << std::endl ;
NM_DDM_Register_Object req;
@@ -276,7 +276,7 @@
rootObject->registerObjectInstance(fm->federate, class_handle,
rep->object,
rep->getLabel().c_str());
for (int i = 0 ; i < nb ; ++i) {
- D[pdDebug] << "Register attribute [" << i << "] Attr: " << attrs[i]
+ Debug(D, pdDebug) << "Register attribute [" << i << "] Attr: " <<
attrs[i]
<< " Region: " << regions[i] << std::endl ;
ObjectAttribute *attribute =
rootObject->getObjectAttribute(rep->object, attrs[i]);
@@ -295,7 +295,7 @@
TypeException &e)
throw (ObjectNotKnown, InvalidRegionContext, RegionNotKnown)
{
- D[pdDebug] << "Unassociate Region " << region << std::endl ;
+ Debug(D, pdDebug) << "Unassociate Region " << region << std::endl ;
RTIRegion *r = rootObject->getRegion(region);
@@ -324,7 +324,7 @@
TypeException &e)
throw (RegionNotKnown)
{
- D[pdDebug] << "Subscribe attributes with region " << region << endl ;
+ Debug(D, pdDebug) << "Subscribe attributes with region " << region << endl
;
rootObject->getRegion(region);
NM_DDM_Subscribe_Attributes req;
@@ -349,7 +349,7 @@
TypeException &e)
throw (RegionNotKnown)
{
- D[pdDebug] << "Unsubscribe class " << obj_class
+ Debug(D, pdDebug) << "Unsubscribe class " << obj_class
<< " with region " << region << endl ;
rootObject->getRegion(region);
@@ -374,7 +374,7 @@
TypeException &e)
throw (RegionNotKnown)
{
- D[pdDebug] << "Subscribe interaction with region " << region << endl ;
+ Debug(D, pdDebug) << "Subscribe interaction with region " << region <<
endl ;
rootObject->getRegion(region);
NM_DDM_Subscribe_Interaction req;
@@ -396,7 +396,7 @@
TypeException &e)
throw (RegionNotKnown)
{
- D[pdDebug] << "Unsubscribe interaction with region " << region << endl ;
+ Debug(D, pdDebug) << "Unsubscribe interaction with region " << region <<
endl ;
rootObject->getRegion(region);
NM_DDM_Unsubscribe_Interaction req;
@@ -413,4 +413,4 @@
}} // namespace certi::rtia
-// $Id: DataDistribution.cc,v 3.29 2009/10/21 18:56:29 erk Exp $
+// $Id: DataDistribution.cc,v 3.30 2009/10/21 20:04:47 erk Exp $
Index: libCERTI/DebugOStream.hh
===================================================================
RCS file: libCERTI/DebugOStream.hh
diff -N libCERTI/DebugOStream.hh
--- libCERTI/DebugOStream.hh 21 Oct 2009 19:51:13 -0000 4.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,259 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2003 ONERA
-//
-// This file is part of CERTI-libCERTI
-//
-// CERTI-libCERTI is free software ; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation ; either version 2 of
-// the License, or (at your option) any later version.
-//
-// CERTI-libCERTI is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY ; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// 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: DebugOStream.hh,v 4.3 2009/10/21 19:51:13 erk Exp $
-// ----------------------------------------------------------------------------
-
-#ifndef _CERTI_DEBUGOSTREAM_HH
-#define _CERTI_DEBUGOSTREAM_HH
-
-#include <iostream>
-#include "certi.hh"
-
-/** Stream used by PrettyDebug
- */
-class CERTI_EXPORT DebugOStream
-{
-private:
- std::ostream* ostr;
-
-public:
- DebugOStream(std::ostream* theostr) : ostr(theostr) {}
-
- int isNullOstream(void) {
- return ostr == 0;
- }
-
- // Global insertors on strings and characters are defined as
- // members of DebugOStream.
- DebugOStream& operator<<(const char* thestr)
- {
- if (ostr)
- *ostr << thestr;
- return *this ;
- }
-
- DebugOStream& operator<<(const signed char* thestr)
- {
- if (ostr) *ostr << thestr;
- return *this ;
- }
-
- DebugOStream& operator<<(const unsigned char* thestr)
- {
- if (ostr) *ostr << thestr;
- return *this ;
- }
-
- DebugOStream& operator<<(char ch)
- {
- if (ostr) *ostr << ch;
- return *this ;
- }
-
- DebugOStream& operator<<(signed char ch)
- {
- if (ostr) *ostr << ch;
- return *this ;
- }
-
- DebugOStream& operator<<(unsigned char ch)
- {
- if (ostr) *ostr << ch;
- return *this ;
- }
-
- //Copy And Redefine the ostream public interface
- //Arithmetic Inserters
- DebugOStream& operator<<(bool n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(short n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(unsigned short n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(int n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(unsigned int n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(long n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(unsigned long n)
- {
- if (ostr) *ostr << n;
- return(*this);
- }
-
- DebugOStream& operator<<(float f)
- {
- if (ostr) *ostr << f;
- return(*this);
- }
-
- DebugOStream& operator<<(double f)
- {
- if (ostr) *ostr << f;
- return(*this);
- }
-
- DebugOStream& operator<<(long double f)
- {
- if (ostr) *ostr << f;
- return(*this);
- }
-
- //Specifique gcc, dans la norme le pointeur n'est pas constant.
- DebugOStream& operator<<(const void* p)
- {
- if (ostr) *ostr << p;
- return(*this);
- }
-
-// #ifdef _GLIBCPP_USE_LONG_LONG
-// //Specifique gcc
-// DebugOStream& operator<<(long long n)
-// {
-// if (this != &(DebugOStream::nullOutputStream)) ostr << n;
-// return(*this);
-// }
-
-// //Specifique gcc
-// DebugOStream& operator<<(unsigned long long n)
-// {
-// if (this != &(DebugOStream::nullOutputStream)) ostr << n;
-// return(*this);
-// }
-// #endif
-
- //Specifique gcc
- DebugOStream& operator<<(std::streambuf* sb)
- {
- if (ostr) *ostr << sb;
- return(*this);
- }
-
- //Dans la norme C++, il faut passer une r�f�rence et pas un
- //pointeur mais ca marche pas avec gcc
-
- //DebugOStream& operator<<(streambuf& sb)
- //{
- // if (this != &(DebugOStream::nullOutputStream)) ostr << sb;
- // return(*this);
- //}
-
- DebugOStream& operator<<(std::ostream& (*pf)(std::ostream&))
- {
- if (ostr)
- *ostr << pf;
- return(*this);
- }
-
- DebugOStream& operator<<(std::ios& (*pf)(std::ios&))
- {
- if (ostr)
- *ostr << pf;
- return(*this);
- }
-
- DebugOStream& operator<<(std::ios_base& (*pf)(std::ios_base&))
- {
- if (ostr)
- *ostr << pf;
- return(*this);
- }
-
- // Unformatted output:
- DebugOStream& put(char c)
- {
- if (ostr)
- ostr->put(c);
- return(*this);
- }
-
- DebugOStream& write(const char* str, std::streamsize n)
- {
- if (ostr)
- ostr->write(str, n);
- return(*this);
- }
-
- // Other methods
- DebugOStream& flush(void)
- {
- if (ostr)
- ostr->flush();
- return(*this);
- }
-
- DebugOStream& seekp(std::streampos pos)
- {
- if (ostr)
- ostr->seekp(pos);
- return(*this);
- }
-
- DebugOStream& seekp(std::streamoff off, std::ios_base::seekdir dir)
- {
- if (ostr)
- ostr->seekp(off, dir);
- return(*this);
- }
-
- std::streampos tellp(void)
- {
- if (ostr)
- return(ostr->tellp());
- else return(0);
- }
-
- //End Copy And Redifine the ostream public interface
-
- //The methods herited from ios_base and ios are not redefined in
- //DebugOStream to avoid basic access to these ostreams aimed at
- //printing simple debug messages
-};
-
-#endif // _CERTI_DEBUGOSTREAM_HH
-
-// $Id: DebugOStream.hh,v 4.3 2009/10/21 19:51:13 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c...,
certi-cvs <=