-// Copyright (C) 2004 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// Author : Paul RASCLE (EDF)
// Module : KERNEL
#ifndef WNT
#include <dlfcn.h>
#else
+#include <windows.h>
#endif
+//#define _DEVDEBUG_
#include "LocalTraceBufferPool.hxx"
#include "BaseTraceCollector.hxx"
#include "LocalTraceCollector.hxx"
// Class static attributes initialisation
LocalTraceBufferPool* LocalTraceBufferPool::_singleton = 0;
-#ifndef WNT
-pthread_mutex_t LocalTraceBufferPool::_singletonMutex;
-#else
+//#ifndef WNT
+//pthread_mutex_t LocalTraceBufferPool::_singletonMutex;
+//#else
pthread_mutex_t LocalTraceBufferPool::_singletonMutex =
PTHREAD_MUTEX_INITIALIZER;
-#endif
+//#endif
BaseTraceCollector *LocalTraceBufferPool::_myThreadTrace = 0;
// ============================================================================
ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
if (_singleton == 0) // another thread may have got
{ // the lock after the first test
- LocalTraceBufferPool* myInstance = new LocalTraceBufferPool();
+ DEVTRACE("New buffer pool");
+ LocalTraceBufferPool* myInstance = new LocalTraceBufferPool();
DESTRUCTOR_OF<LocalTraceBufferPool> *ptrDestroy =
new DESTRUCTOR_OF<LocalTraceBufferPool> (*myInstance);
+ _singleton = myInstance;
// --- start a trace Collector
char* traceKind = getenv("SALOME_trace");
- assert(traceKind);
- //cerr<<"SALOME_trace="<<traceKind<<endl;
- if (strcmp(traceKind,"local")==0)
+ if ( !traceKind || strcmp(traceKind,"local")==0 ) // mkr : 27.11.2006 : PAL13967 - Distributed supervision graphs - Problem with "SALOME_trace"
{
_myThreadTrace = LocalTraceCollector::instance();
}
}
else // --- try a dynamic library
{
- void* handle;
#ifndef WNT
+ void* handle;
string impl_name = string ("lib") + traceKind
+ string("TraceCollector.so");
handle = dlopen( impl_name.c_str() , RTLD_LAZY ) ;
#else
+ HINSTANCE handle;
string impl_name = string ("lib") + traceKind + string(".dll");
- handle = dlopen( impl_name.c_str() , 0 ) ;
+ handle = LoadLibrary( impl_name.c_str() );
#endif
if ( handle )
{
typedef BaseTraceCollector * (*FACTORY_FUNCTION) (void);
+#ifndef WNT
FACTORY_FUNCTION TraceCollectorFactory =
(FACTORY_FUNCTION) dlsym(handle, "SingletonInstance");
- char *error ;
- if ( (error = dlerror() ) != NULL)
- {
+#else
+ FACTORY_FUNCTION TraceCollectorFactory =
+ (FACTORY_FUNCTION)GetProcAddress(handle, "SingletonInstance");
+#endif
+ if ( !TraceCollectorFactory )
+ {
cerr << "Can't resolve symbol: SingletonInstance" <<endl;
- cerr << "dlerror: " << error << endl;
- assert(error == NULL); // to give file and line
- exit(1); // in case assert is deactivated
+#ifndef WNT
+ cerr << "dlerror: " << dlerror() << endl;
+#endif
+ exit( 1 );
}
_myThreadTrace = (TraceCollectorFactory) ();
}
exit(1); // in case assert is deactivated
}
}
- _singleton = myInstance;
+ DEVTRACE("New buffer pool: end");
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
// wait until there is a free buffer in the pool
- int ret = sem_wait(&_freeBufferSemaphore);
+ int ret = -1;
+ while (ret)
+ {
+ ret = sem_wait(&_freeBufferSemaphore);
+ if (ret) perror(" LocalTraceBufferPool::insert, sem_wait");
+ }
// get the next free buffer available (mutex protected)
// wait until there is a buffer in the pool, with a message to print
- int ret = sem_wait(&_fullBufferSemaphore);
+ int ret = -1;
+ while (ret)
+ {
+ ret = sem_wait(&_fullBufferSemaphore);
+ if (ret) perror(" LocalTraceBufferPool::retrieve, sem_wait");
+ }
// get the next buffer to print
ret=pthread_mutex_destroy(&_incrementMutex);
DEVTRACE("LocalTraceBufferPool::~LocalTraceBufferPool()-end");
_singleton = 0;
- ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
+ ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
// ============================================================================
{
int ret;
ret = pthread_mutex_lock(&_incrementMutex); // lock access to counters
- pos++;
+ unsigned long mypos = ++pos;
ret = pthread_mutex_unlock(&_incrementMutex); // release lock
- return pos;
+ return mypos;
}