X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMETraceCollector%2FSALOMETraceCollector.cxx;h=ed9b2a9b9e4fefdbbb558cef8ff370d1539436fc;hb=7d2fe213bdf5bf962ce11e253020c9d3e0bc1cce;hp=b1286b9159ce0e64d7e34e80849e5aea333deed2;hpb=03e780a1c197a1161c4a180ae02f8a568674a4be;p=modules%2Fkernel.git diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx index b1286b915..ed9b2a9b9 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx @@ -1,29 +1,29 @@ -// Copyright (C) 2004 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 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2007-2008 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 // +// 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. +// +// 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 // // File : LocalTraceCollector.cxx // Author : Paul RASCLE (EDF) // Module : KERNEL // $Header$ - +// #include #include @@ -70,7 +70,7 @@ BaseTraceCollector* SALOMETraceCollector::instance() sem_init(&_sem,0,0); // to wait until run thread is initialized pthread_t traceThread; int bid = 0; - int re2 = pthread_create(&traceThread, NULL, + pthread_create(&traceThread, NULL, SALOMETraceCollector::run, (void *)bid); sem_wait(&_sem); _singleton = myInstance; // _singleton known only when init done @@ -131,13 +131,13 @@ void* SALOMETraceCollector::run(void *bid) //break; } - int fullBuf = myTraceBuffer->retrieve(myTrace); + myTraceBuffer->retrieve(myTrace); if (!CORBA::is_nil(_orb)) { if (myTrace.traceType == ABORT_MESS) { stringstream abortMessage(""); -#ifndef WNT +#ifndef WIN32 abortMessage << "INTERRUPTION from thread " << myTrace.threadId << " : " << myTrace.trace; #else @@ -153,7 +153,7 @@ void* SALOMETraceCollector::run(void *bid) else { stringstream aMessage(""); -#ifndef WNT +#ifndef WIN32 aMessage << "th. " << myTrace.threadId #else aMessage << "th. " << (void*)&myTrace.threadId