-// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// 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
//
+// 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 <SALOMEconfig.h>
#include <iostream>
#include <sstream>
#include <fstream>
#include <cstdlib>
-#include <CORBA.h>
-
-using namespace std;
+#include <omniORB4/CORBA.h>
#include "SALOMETraceCollector.hxx"
#include "TraceCollector_WaitForServerReadiness.hxx"
int ret;
ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
if (_singleton == 0) // another thread may have got
- { // the lock after the first test
- BaseTraceCollector* myInstance = new SALOMETraceCollector();
- int argc=0;
- char *_argv=0;
- char ** argv = &_argv;
- _orb = CORBA::ORB_init (argc, argv);
-
- sem_init(&_sem,0,0); // to wait until run thread is initialized
- pthread_t traceThread;
- int bid;
- int re2 = pthread_create(&traceThread, NULL,
- SALOMETraceCollector::run, (void *)bid);
- sem_wait(&_sem);
- _singleton = myInstance; // _singleton known only when init done
- }
+ { // the lock after the first test
+ BaseTraceCollector* myInstance = new SALOMETraceCollector();
+ int argc=0;
+ char *_argv=0;
+ char ** argv = &_argv;
+ _orb = CORBA::ORB_init (argc, argv);
+
+ sem_init(&_sem,0,0); // to wait until run thread is initialized
+ pthread_t traceThread;
+ int bid = 0;
+ pthread_create(&traceThread, NULL,
+ SALOMETraceCollector::run, &bid);
+ sem_wait(&_sem);
+ _singleton = myInstance; // _singleton known only when init done
+ }
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
return _singleton;
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
{
CORBA::String_var LogMsg =
- CORBA::string_dup("\n---Init logger trace---\n");
+ CORBA::string_dup("\n---Init logger trace---\n");
m_pInterfaceLogger->putMessage(LogMsg);
DEVTRACE("Logger server found");
}
while ((!_threadToClose) || myTraceBuffer->toCollect() )
{
if (_threadToClose)
- {
- DEVTRACE("SALOMETraceCollector _threadToClose");
- //break;
- }
+ {
+ DEVTRACE("SALOMETraceCollector _threadToClose");
+ //break;
+ }
- int fullBuf = myTraceBuffer->retrieve(myTrace);
+ myTraceBuffer->retrieve(myTrace);
if (!CORBA::is_nil(_orb))
- {
- if (myTrace.traceType == ABORT_MESS)
- {
- stringstream abortMessage("");
-#ifndef WNT
- abortMessage << "INTERRUPTION from thread "
- << myTrace.threadId << " : " << myTrace.trace;
+ {
+ if (myTrace.traceType == ABORT_MESS)
+ {
+ std::stringstream abortMessage("");
+#ifndef WIN32
+ abortMessage << "INTERRUPTION from thread "
+ << myTrace.threadId << " : " << myTrace.trace;
#else
- abortMessage << "INTERRUPTION from thread "
- << (void*)&myTrace.threadId
- << " : " << myTrace.trace;
+ abortMessage << "INTERRUPTION from thread "
+ << (void*)&myTrace.threadId
+ << " : " << myTrace.trace;
#endif
- CORBA::String_var LogMsg =
- CORBA::string_dup(abortMessage.str().c_str());
- m_pInterfaceLogger->putMessage(LogMsg);
- exit(1);
- }
- else
- {
- stringstream aMessage("");
-#ifndef WNT
- aMessage << "th. " << myTrace.threadId
+ CORBA::String_var LogMsg =
+ CORBA::string_dup(abortMessage.str().c_str());
+ m_pInterfaceLogger->putMessage(LogMsg);
+ exit(1);
+ }
+ else
+ {
+ std::stringstream aMessage("");
+#ifndef WIN32
+ aMessage << "th. " << myTrace.threadId
#else
- aMessage << "th. " << (void*)&myTrace.threadId
+ aMessage << "th. " << (void*)&myTrace.threadId
#endif
- << " " << myTrace.trace;
- CORBA::String_var LogMsg =
- CORBA::string_dup(aMessage.str().c_str());
- m_pInterfaceLogger->putMessage(LogMsg);
- }
- }
+ << " " << myTrace.trace;
+ CORBA::String_var LogMsg =
+ CORBA::string_dup(aMessage.str().c_str());
+ m_pInterfaceLogger->putMessage(LogMsg);
+ }
+ }
}
pthread_exit(NULL);
return NULL;
_threadToClose = 1;
myTraceBuffer->insert(NORMAL_MESS,"end of trace\n"); // to wake up thread
if (_threadId)
- {
- int ret = pthread_join(*_threadId, NULL);
- if (ret) cerr << "error close SALOMETraceCollector : "<< ret << endl;
- else DEVTRACE("SALOMETraceCollector destruction OK");
- _threadId = 0;
- _threadToClose = 0;
- }
+ {
+ int ret = pthread_join(*_threadId, NULL);
+ if (ret) std::cerr << "error close SALOMETraceCollector : "<< ret << std::endl;
+ else DEVTRACE("SALOMETraceCollector destruction OK");
+ delete _threadId;
+ _threadId = 0;
+ _threadToClose = 0;
+ }
_singleton = 0;
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
extern "C"
{
+ SALOMETRACECOLLECTOR_EXPORT
BaseTraceCollector *SingletonInstance(void)
{
BaseTraceCollector *instance = SALOMETraceCollector::instance();
