diff options
| author | Michi Henning <michi@zeroc.com> | 2003-06-23 02:21:51 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-06-23 02:21:51 +0000 |
| commit | 6ced1ca4c0731741313122cfb8a8a3332f3a5093 (patch) | |
| tree | 3c56c9923db00ba7c4fb9972ec305d56f698886b /cpp/src/Ice/TraceUtil.cpp | |
| parent | added destroyOnInterrupt() to Application (diff) | |
| download | ice-6ced1ca4c0731741313122cfb8a8a3332f3a5093.tar.bz2 ice-6ced1ca4c0731741313122cfb8a8a3332f3a5093.tar.xz ice-6ced1ca4c0731741313122cfb8a8a3332f3a5093.zip | |
Merging changes from trace_slicing branc
Diffstat (limited to 'cpp/src/Ice/TraceUtil.cpp')
| -rw-r--r-- | cpp/src/Ice/TraceUtil.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp index 798e1c25dc1..a48995f5b2b 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -380,24 +380,18 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const Logge } } -/* -static IceUtil::StaticMutex slicingMutex; -static set<string> slicingIds; +static IceUtil::StaticMutex slicingMutex = ICE_STATIC_MUTEX_INITIALIZER; void -IceInternal::traceSlicing(const char* kind, const string& typeId, - const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::traceSlicing(const char* kind, const string& typeId, const char* slicingCat, const LoggerPtr& logger) { - if(tl->slicing >= 1) + IceUtil::StaticMutex::Lock lock(slicingMutex); + static set<string> slicingIds; + if(slicingIds.insert(typeId).second) { - IceUtil::StaticMutex::Lock lock(slicingMutex); - if(slicingIds.insert(typeId).second) - { - string s("unknown "); - s += kind; - s += " type `" + typeId + "'"; - logger->trace(tl->slicingCat, s); - } + string s("unknown "); + s += kind; + s += " type `" + typeId + "'"; + logger->trace(slicingCat, s); } } -*/ |