-// 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 : SALOMETraceCollector.hxx
// Author : Paul RASCLE (EDF)
// Module : KERNEL
// $Header$
-
+//
#ifndef _SALOMETRACECOLLECTOR_HXX_
#define _SALOMETRACECOLLECTOR_HXX_
#include <string>
-#include <CORBA.h>
+#include <omniORB4/CORBA.h>
+#include "BaseTraceCollector.hxx"
#include "LocalTraceBufferPool.hxx"
-//! See LocalTraceCollector instead of SALOMETraceCollector for usage without CORBA
+//! See LocalTraceCollector instead of SALOMETraceCollector,
+//! for usage without CORBA
+
+#ifdef WIN32
+# if defined SALOMETRACECOLLECTOR_EXPORTS || defined with_loggerTraceCollector_EXPORTS
+# define SALOMETRACECOLLECTOR_EXPORT __declspec( dllexport )
+# else
+# define SALOMETRACECOLLECTOR_EXPORT
+# endif
+#else
+# define SALOMETRACECOLLECTOR_EXPORT
+#endif
-class SALOMETraceCollector
+class SALOMETRACECOLLECTOR_EXPORT SALOMETraceCollector:
+ public BaseTraceCollector
{
public:
- static SALOMETraceCollector* instance(CORBA::ORB_ptr theOrb, int typeTrace=0);
+ static BaseTraceCollector* instance();
static void *run(void *bid);
~SALOMETraceCollector();
SALOMETraceCollector();
private:
- static int _threadToClose;
- static int _toFile;
- static SALOMETraceCollector* _singleton;
- static pthread_mutex_t _singletonMutex;
- static pthread_t _threadId;
- static std::string _fileName;
static CORBA::ORB_ptr _orb;
};
