Try to kill Salome application when a YACS Launcher job is killed

[modules/kernel.git] / src / SALOMELocalTrace / FileTraceCollector.cxx

diff --git a/src/SALOMELocalTrace/FileTraceCollector.cxx b/src/SALOMELocalTrace/FileTraceCollector.cxx
index 6255da95644b927ae7f9053ca4847416fed2db98..d7cdaf69ffda4251ca53fc8576814811031ec4ea 100644 (file)
--- a/src/SALOMELocalTrace/FileTraceCollector.cxx
+++ b/src/SALOMELocalTrace/FileTraceCollector.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   : FileTraceCollector.cxx
 //  Author : Paul RASCLE (EDF)
 //  Module : KERNEL
@@ -29,8 +30,6 @@
 #include <fstream>
 #include <cstdlib>
 
-using namespace std;
-
 //#define _DEVDEBUG_
 #include "FileTraceCollector.hxx"
 
@@ -66,7 +65,7 @@ BaseTraceCollector* FileTraceCollector::instance(const char *fileName)
           pthread_t traceThread;
           int bid = 0;
           pthread_create(&traceThread, NULL,
-                                   FileTraceCollector::run, (void *)bid);
+                                   FileTraceCollector::run, &bid);
           sem_wait(&_sem);
           _singleton = myInstance; // _singleton known only when init done
           DEVTRACE("FileTraceCollector:: instance()-end");
@@ -100,13 +99,13 @@ void* FileTraceCollector::run(void *bid)
   // --- opens a file with append mode
   //     so, several processes can share the same file
 
-  ofstream traceFile;
+  std::ofstream traceFile;
   const char *theFileName = _fileName.c_str();
   DEVTRACE("try to open trace file "<< theFileName);
-  traceFile.open(theFileName, ios::out | ios::app);
+  traceFile.open(theFileName, std::ios::out | std::ios::app);
   if (!traceFile)
     {
-      cerr << "impossible to open trace file "<< theFileName << endl;
+      std::cerr << "impossible to open trace file "<< theFileName << std::endl;
       exit (1);
     }
 
@@ -133,15 +132,15 @@ void* FileTraceCollector::run(void *bid)
                     << " : " <<  myTrace.trace;
 #endif
           traceFile.close();
-          cout << flush ;
+          std::cout << std::flush ;
 #ifndef WIN32
-          cerr << "INTERRUPTION from thread " << myTrace.threadId
+          std::cerr << "INTERRUPTION from thread " << myTrace.threadId
                << " : " <<  myTrace.trace;
 #else
-          cerr << "INTERRUPTION from thread " << (void*)(&myTrace.threadId)
+          std::cerr << "INTERRUPTION from thread " << (void*)(&myTrace.threadId)
                << " : " <<  myTrace.trace;
 #endif
-          cerr << flush ; 
+          std::cerr << std::flush ; 
           exit(1);     
         }
       else
@@ -180,7 +179,7 @@ FileTraceCollector:: ~FileTraceCollector()
       if (_threadId)
         {
           int ret = pthread_join(*_threadId, NULL);
-          if (ret) cerr << "error close FileTraceCollector : "<< ret << endl;
+          if (ret) std::cerr << "error close FileTraceCollector : "<< ret << std::endl;
           else DEVTRACE("FileTraceCollector destruction OK");
           delete _threadId;
           _threadId = 0;