ADD a end user module (services.py) to help the manipulation of SALOME KERNEL service...

[modules/kernel.git] / src / SALOMETraceCollector / SALOMETraceCollector.cxx

diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx
index 6494d4400f4bbb61e7ec43e3344b016c14d7354d..b046368aaf1ea88860d68ec99cc19d6f7f403ec5 100644 (file)
--- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx
+++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library 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.1 of the License.
+// This library 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.1 of the License.
 //
-//  This library 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.
+// This library 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 library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : LocalTraceCollector.cxx
 //  Author : Paul RASCLE (EDF)
 //  Module : KERNEL
@@ -32,8 +33,6 @@
 #include <cstdlib>
 #include <omniORB4/CORBA.h>
 
-using namespace std;
-
 #include "SALOMETraceCollector.hxx"
 #include "TraceCollector_WaitForServerReadiness.hxx"
 #include <SALOMEconfig.h>
@@ -71,7 +70,7 @@ BaseTraceCollector* SALOMETraceCollector::instance()
           pthread_t traceThread;
           int bid = 0;
           pthread_create(&traceThread, NULL,
-                                   SALOMETraceCollector::run, (void *)bid);
+                                   SALOMETraceCollector::run, &bid);
           sem_wait(&_sem);
           _singleton = myInstance; // _singleton known only when init done
         }
@@ -108,8 +107,8 @@ void* SALOMETraceCollector::run(void *bid)
     m_pInterfaceLogger = SALOME_Logger::Logger::_narrow(obj);
   if (CORBA::is_nil(m_pInterfaceLogger))
     {
-      cerr << "Logger server not found ! Abort" << endl;
-      cerr << flush ; 
+      std::cerr << "Logger server not found ! Abort" << std::endl;
+      std::cerr << std::flush ; 
       exit(1);
     } 
   else
@@ -136,7 +135,7 @@ void* SALOMETraceCollector::run(void *bid)
         {
           if (myTrace.traceType == ABORT_MESS)
             {
-              stringstream abortMessage("");
+              std::stringstream abortMessage("");
 #ifndef WIN32
               abortMessage << "INTERRUPTION from thread "
                            << myTrace.threadId << " : " << myTrace.trace;
@@ -152,7 +151,7 @@ void* SALOMETraceCollector::run(void *bid)
             }
           else
             {
-              stringstream aMessage("");
+              std::stringstream aMessage("");
 #ifndef WIN32
               aMessage << "th. " << myTrace.threadId
 #else
@@ -188,7 +187,7 @@ SALOMETraceCollector:: ~SALOMETraceCollector()
       if (_threadId)
         {
           int ret = pthread_join(*_threadId, NULL);
-          if (ret) cerr << "error close SALOMETraceCollector : "<< ret << endl;
+          if (ret) std::cerr << "error close SALOMETraceCollector : "<< ret << std::endl;
           else DEVTRACE("SALOMETraceCollector destruction OK");
           delete _threadId;
           _threadId = 0;