PR: obsolete

diff --git a/src/A_LIRE_SALOME b/src/A_LIRE_SALOME
deleted file mode 100644 (file)
index 892bf12..0000000
--- a/src/A_LIRE_SALOME
+++ /dev/null
@@ -1,73 +0,0 @@
-Environnement
--------------
-repertoire de construction (build) :
-  variables d'environement, a passer plutot dans les Makefile
-
-  export BUILD_SALOME=${HOME}/devSalome/build
-  export SALOME_LIB_DIR=${BUILD_SALOME}/lib
-  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_SALOME}/lib
-
-naming Service : cf. plus bas.
-
-IAPP_XML (exemple N. Rejneri adapté)
---------
-
-- options de compilation revues (Qt avec threads)
-- creation de librairie
-- initialiser tous les membres de classe pointeurs à NULL dans le constructeur
-  (plantage à la 2° execution de mainWindow sur handler non nul)
-- utilisation de getenv pour trouver le path des ressources (xml, librairies, icones)
-- utilisation "extern C" pour l'appel de methode ds librairie dynamique
-
-Naming Service
---------------
-- creation librairie avec la classe d'implementation de SALOME_NamingService
-- environnement
-
-export OMNIORB_CONFIG=${HOME}/.omniORB.cfg
- 
-1 line in file ${HOME}/.omniORB.cfg
-ORBInitRef NameService=corbaname::localhost
-
-(replace localhost by internet address to access Naming Service from other machines)
-
-# environnement Mico2.3.5
-
-export MICODIR=/opt/mico2.3.5
-export MICOVERSION=` sed -n '/MICO_VERSION/ { y/b/./; s#^[^"]*"\([^"]*\)".*$#\1#p; }' \
-       "$MICODIR/include/mico/version.h" `
-export PATH=${PATH}:${MICODIR}/bin
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MICODIR}/lib
-export MANPATH=${MANPATH}:${MICODIR}/man
-export LIBPATH=${LIBPATH}:${MICODIR}/lib
-export SHLIB_PATH=${SHLIB_PATH}:${MICODIR}/lib
-export LIBRARY_PATH=${MICODIR}/lib
-export CPLUS_INCLUDE_PATH=${MICODIR}/include
-
--------------------------------------------------------------------------------
-TODO LIST
--------------------------------------------------------------------------------
-
-Utils
------
-  - CPU&Memory measurements
-  - Makefile : library, includes
-  - Doxygen comments
-
-Session
--------
-
-Server : 
-  - test only one mainWindow (mutex)
-
-Loader :
-  - get stats to know if Server is OK before get interface
-
-Session stats :
-  - write the code
-  
-Session Kill :
-  - write the code
-  - get stats to know if there is one or more active sessions before kill.
-
-Launch script for everything :

diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in
index e2a978733f49166c128f76d58ddb23315e78a739..cd185a90d34237595ceb9ac183b98a0bb239843e 100644 (file)
--- a/src/Container/Makefile.in
+++ b/src/Container/Makefile.in
@@ -67,6 +67,6 @@ LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSA
 
 LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) $(MPI_LIBS)
 
-LDFLAGSFORBIN= $(LDFLAGS)
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics
 LIBSFORBIN= $(LIBS)
 @CONCLUDE@

diff --git a/src/DataTypeCatalog/Makefile.in b/src/DataTypeCatalog/Makefile.in
index ba0ce38e703324ddfc551f7aab8f5a14cc055f58..d0ed574a65720689d0310996be465f0bca1003f5 100644 (file)
--- a/src/DataTypeCatalog/Makefile.in
+++ b/src/DataTypeCatalog/Makefile.in
@@ -55,5 +55,5 @@ BIN_SERVER_IDL = SALOME_DataTypeCatalog.idl SALOME_Exception.idl
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 CXXFLAGS+= 
 LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace
-LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace
+LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
 @CONCLUDE@

diff --git a/src/LifeCycleCORBA/Makefile.in b/src/LifeCycleCORBA/Makefile.in
index 942c31ba8a897181ceeff18cb50f5a40f0b24b45..123d61272cc76dd0b0aa4f74c25a5ca6c9bec100 100644 (file)
--- a/src/LifeCycleCORBA/Makefile.in
+++ b/src/LifeCycleCORBA/Makefile.in
@@ -54,7 +54,7 @@ BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \
 CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES)
 
 LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager
-LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification
+LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics
 LIBS += $(PYTHON_LIBS)
 
 @CONCLUDE@

diff --git a/src/Makefile.in b/src/Makefile.in
index df0e392ff8aad556b178b4c3f6692856ecb56ae2..3de2e03dfe000e349d0373af0b87c3d807928e41 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,13 +32,41 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-SUBDIRS = SALOMELocalTrace SALOMETraceCollector Logger Utils \
-         CASCatch GenericObj NamingService Registry \
-         ModuleCatalog DataTypeCatalog RessourcesCatalog \
-          ResourcesManager Notification  NOTIFICATION_SWIG \
-         Container TestContainer LifeCycleCORBA LifeCycleCORBA_SWIG HDFPersist \
-         SALOMEDSClient TOOLSDS SALOMEDSImpl SALOMEDS KERNEL_PY \
-         ModuleGenerator Communication
+SUBDIRS = \
+ Basics \
+ SALOMELocalTrace \
+ CASCatch \
+ HDFPersist \
+ Logger \
+ SALOMETraceCollector \
+ Utils \
+ GenericObj \
+ NamingService \
+ Registry \
+ ModuleCatalog \
+ DataTypeCatalog \
+ RessourcesCatalog \
+ ResourcesManager \
+ Notification \
+ NOTIFICATION_SWIG \
+ Container \
+ TestContainer \
+ LifeCycleCORBA \
+ LifeCycleCORBA_SWIG \
+ SALOMEDSClient \
+ TOOLSDS \
+ SALOMEDSImpl \
+ SALOMEDS \
+ KERNEL_PY \
+ ModuleGenerator \
+ Communication \
+ \
+ SALOMELocalTrace/Test \
+ SALOMETraceCollector/Test \
+ Utils/Test \
+ UnitTests
+
+# Basics \
 
 ifeq (@mpi_ok@,yes)
   SUBDIRS+= MPIContainer TestMPIContainer

diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in
index e14a10a3d46d9bcf391e77987c4b2542d40560da..0e4c01ce3f8abbfa892db0fecb7d7ff8f0e34566 100644 (file)
--- a/src/ModuleCatalog/Makefile.in
+++ b/src/ModuleCatalog/Makefile.in
@@ -62,7 +62,7 @@ BIN_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl
 
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lSALOMELocalTrace -lOpUtil
-LDFLAGSFORBIN+=  -lSalomeNS -lSALOMELocalTrace -lOpUtil
+LDFLAGSFORBIN+=  -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics
 
 
 @CONCLUDE@

diff --git a/src/Registry/Makefile.in b/src/Registry/Makefile.in
index d4a9b79fad4bdd0b9836298c3f6f39d263ce53da..73b61f60dc47c8f8b3d8fb727eeb5363c9147c4a 100644 (file)
--- a/src/Registry/Makefile.in
+++ b/src/Registry/Makefile.in
@@ -55,6 +55,6 @@ BIN_SERVER_IDL = SALOME_Registry.idl
 
 LDFLAGS+= -lSalomeNS -lOpUtil -lSALOMELocalTrace
 
-LDFLAGSFORBIN= $(LDFLAGS)
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics
 
 @CONCLUDE@

diff --git a/src/RessourcesCatalog/Makefile.in b/src/RessourcesCatalog/Makefile.in
index 80fab1dd18c882e8c9197e1242e3e1d755454574..8d416a855b33e21a4aa3ac0ad1ebf7cbdb41aed9 100644 (file)
--- a/src/RessourcesCatalog/Makefile.in
+++ b/src/RessourcesCatalog/Makefile.in
@@ -55,7 +55,7 @@ BIN_SERVER_IDL = SALOME_RessourcesCatalog.idl SALOME_Exception.idl
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 CXXFLAGS+= 
 LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace
-LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace 
+LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
 
 @CONCLUDE@
 

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index a280894ae4451c3cc40d7d0c7313119d95714a81..19dbdc47f800429c95e18e5f3be21f3096704acb 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -132,7 +132,7 @@ LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOME
 #
 LDXMUFLAGS= -L/usr/X11R6/lib -lXmu
 LDFLAGS+=$(LDXMUFLAGS)
-LDFLAGSFORBIN= $(LDFLAGS) -lTKLCAF -lTKMath -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager
+LDFLAGSFORBIN= $(LDFLAGS) -lTKLCAF -lTKMath -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics
 
 @CONCLUDE@
 

diff --git a/src/SALOMELocalTrace/FileTraceCollector.cxx b/src/SALOMELocalTrace/FileTraceCollector.cxx
index 12697b53236138178de9a1a1900bff2cb4da3326..e5e51cd2be51d9c11ee95dfb7303c285f655c9ef 100644 (file)
--- a/src/SALOMELocalTrace/FileTraceCollector.cxx
+++ b/src/SALOMELocalTrace/FileTraceCollector.cxx
@@ -167,6 +167,7 @@ void* FileTraceCollector::run(void *bid)
 #endif
            }
        }
+      //cerr <<"traceFile.close();" << endl << flush;
       traceFile.close();
     }
   pthread_exit(NULL);

diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
index b690bb5acee25d6be57d66cfbd6d733cc686d45c..94fed5fd3edaafda8de5f61103d9b00777a2e8e2 100644 (file)
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
@@ -37,23 +37,9 @@
 #include "BaseTraceCollector.hxx"
 #include "LocalTraceCollector.hxx"
 #include "FileTraceCollector.hxx"
-//#include "Utils_DESTRUCTEUR_GENERIQUE.hxx"
+#include "BasicsGenericDestructor.hxx"
 #include "utilities.h"
 
-//! specialisation template...
-
-// void DESTRUCTEUR_DE_<LocalTraceBufferPool>::operator()(void)
-// {
-//   if(_PtrObjet)
-//     {
-//       std::cerr << "deleting _PtrObjet LocalTraceBufferPool" << std::endl;
-//       LocalTraceBufferPool* aPtr =
-//     static_cast<LocalTraceBufferPool*>(_PtrObjet);
-//       delete aPtr;
-//     }
-//       _PtrObjet = NULL ;
-// }
-
 using namespace std;
 
 // In case of truncated message, end of trace contains "...\n\0"
@@ -98,8 +84,8 @@ LocalTraceBufferPool* LocalTraceBufferPool::instance()
        {                                      // the lock after the first test
          _singleton = new LocalTraceBufferPool(); 
 
-//       DESTRUCTEUR_DE_<LocalTraceBufferPool> *ptrDestroy =
-//         new DESTRUCTEUR_DE_<LocalTraceBufferPool> (*_singleton);
+         DESTRUCTOR_OF<LocalTraceBufferPool> *ptrDestroy =
+           new DESTRUCTOR_OF<LocalTraceBufferPool> (*_singleton);
 
          // --- start a trace Collector
 
@@ -299,14 +285,14 @@ LocalTraceBufferPool::~LocalTraceBufferPool()
   int ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
   if (_singleton)
     {
-      //cerr << "LocalTraceBufferPool::~LocalTraceBufferPool()" << endl<<flush;
+      cerr << "LocalTraceBufferPool::~LocalTraceBufferPool()" << endl<<flush;
       delete (_myThreadTrace);
       _myThreadTrace = 0;
       int ret;
       ret=sem_destroy(&_freeBufferSemaphore);
       ret=sem_destroy(&_fullBufferSemaphore);
       ret=pthread_mutex_destroy(&_incrementMutex);
-      //cerr<<"LocalTraceBufferPool::~LocalTraceBufferPool()-end"<<endl<<flush;
+      cerr<<"LocalTraceBufferPool::~LocalTraceBufferPool()-end"<<endl<<flush;
       _singleton = 0;
       ret = pthread_mutex_unlock(&_singletonMutex); // release lock
     }

diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
index 6d64ace3e5ce04b0c113e284e3834185bbd46c19..444730111aead7c7bfda6e9e57a10962695cc5f5 100644 (file)
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
@@ -31,6 +31,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include "BaseTraceCollector.hxx"
+#include "BasicsGenericDestructor.hxx"
 
 #define ABORT_MESS  1   // for traceType field in struct LocalTrace_TraceInfo
 #define NORMAL_MESS 0
@@ -43,17 +44,17 @@ struct SALOMELOCALTRACE_EXPORT LocalTrace_TraceInfo
   int position;                  // to check sequence
 };
 
-class SALOMELOCALTRACE_EXPORT LocalTraceBufferPool
+class SALOMELOCALTRACE_EXPORT LocalTraceBufferPool : public PROTECTED_DELETE
 {
  public:
   static LocalTraceBufferPool* instance();
   int insert(int traceType, const char* msg);
   int retrieve(LocalTrace_TraceInfo& aTrace);
   unsigned long toCollect();
-  ~LocalTraceBufferPool();
 
  protected:
   LocalTraceBufferPool();
+  virtual ~LocalTraceBufferPool();
   unsigned long lockedIncrement(unsigned long& pos);
 
  private:

diff --git a/src/SALOMELocalTrace/Makefile.in b/src/SALOMELocalTrace/Makefile.in
index 57d5623cf16cd2b4d8680f462500c217aa05d4f9..daf7c9d193299243057135f1113b6bfa790658ff 100644 (file)
--- a/src/SALOMELocalTrace/Makefile.in
+++ b/src/SALOMELocalTrace/Makefile.in
@@ -50,7 +50,7 @@ LIB_SRC = BaseTraceCollector.cxx \
          LocalTraceBufferPool.cxx
 
 LIBS= @LIBS@ 
-#LDFLAGS+= 
+LDFLAGS+= -lSALOMEBasics
 
 
 @CONCLUDE@

diff --git a/src/TestContainer/Makefile.in b/src/TestContainer/Makefile.in
index e74d3069228f30f949b1d98d492bc563a05a5f49..40a5e8e626bf004b3be700d5e5ee627148eb25bb 100644 (file)
--- a/src/TestContainer/Makefile.in
+++ b/src/TestContainer/Makefile.in
@@ -46,7 +46,7 @@ BIN = TestContainer TestLogger
 BIN_SRC = 
 
 LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager
-LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager
+LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -lSALOMEBasics
 
 
 @CONCLUDE@