X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FContainer_init_python.hxx;h=216a6e374c2bf6e97449ad32995876bd965dd4e9;hb=c5cdc2c959b037c5d2d681c849177894cc315379;hp=156adb1e5693c244325cf0c97d6dafb1dc5b64b7;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/src/Container/Container_init_python.hxx b/src/Container/Container_init_python.hxx
index 156adb1e5..216a6e374 100644
--- a/src/Container/Container_init_python.hxx
+++ b/src/Container/Container_init_python.hxx
@@ -1,35 +1,42 @@
-//  SALOME Container : implementation of container and engine for Kernel
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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) 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, or (at your option) any later version.
 //
+// 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
 //
+
+//  SALOME Container : implementation of container and engine for Kernel
 //  File   : Container_init_python.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : KERNEL
 //  $Header$
-
+//
 #ifndef _CONTAINER_INIT_PYTHON_HXX_
 #define _CONTAINER_INIT_PYTHON_HXX_
 
+#include "SALOME_Container.hxx"
+#include <SALOMEconfig.h>
+
 #include <pthread.h>  // must be before Python.h !
+
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
 #include <Python.h>
 
 
@@ -45,42 +52,15 @@
 //    - There is no need of C Lock protection of the sequence.
 
 
-#if defined CONTAINER_EXPORTS
-#if defined WIN32
-#define CONTAINER_EXPORT __declspec( dllexport )
-#else
-#define CONTAINER_EXPORT
-#endif
-#else
-#if defined WNT
-#define CONTAINER_EXPORT __declspec( dllimport )
-#else
-#define CONTAINER_EXPORT
-#endif
-#endif
-
 #define Py_ACQUIRE_NEW_THREAD \
-  PyEval_AcquireLock(); \
-  PyThreadState *myTstate = PyThreadState_New(KERNEL_PYTHON::_interp); \
-  PyThreadState *myoldTstate = PyThreadState_Swap(myTstate);
+  PyGILState_STATE gil_state = PyGILState_Ensure();
 
 #define Py_RELEASE_NEW_THREAD \
-  PyEval_ReleaseThread(myTstate); \
-  PyThreadState_Delete(myTstate);
+  PyGILState_Release(gil_state);
 
 struct CONTAINER_EXPORT KERNEL_PYTHON
 {
-#ifdef WNT
-  static PyThreadState *get_gtstate() { return KERNEL_PYTHON::_gtstate; }
-  static PyObject *getsalome_shared_modules_module() { return KERNEL_PYTHON::salome_shared_modules_module; }
-  static PyInterpreterState *get_interp() { return KERNEL_PYTHON::_interp; }
-#endif
-  static PyThreadState *_gtstate;
-  static PyObject *salome_shared_modules_module;
-  static PyInterpreterState *_interp;
-
   static void init_python(int argc, char **argv);
-
 };
 
 #endif