thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that

Browse Source 
both may work.
This commit is contained in:
Bram Moolenaar 2010-08-09 22:06:13 +02:00
parent 82d1c33a8a
commit b61f95c31f
3 changed files with 79 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -408,6 +408,8 @@ CClink = $(CC)
# ln -s python3 python3.1 # ln -s python3 python3.1
# If both python2.x and python3.x are enabled then the linking will be via # If both python2.x and python3.x are enabled then the linking will be via
# dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
# However, this may still cause problems, such as "import termios" failing.
# Build two separate versions of Vim in that case.
#CONF_OPT_PYTHON = --enable-pythoninterp #CONF_OPT_PYTHON = --enable-pythoninterp
#CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp

52
src/if_python.c
View File

@ -93,32 +93,38 @@ struct PyMethodDef { Py_ssize_t a; };
# define PY_CAN_RECURSE # define PY_CAN_RECURSE
#endif #endif
#if defined(DYNAMIC_PYTHON) || defined(PROTO) # if defined(DYNAMIC_PYTHON) || defined(PROTO)
# ifndef DYNAMIC_PYTHON # ifndef DYNAMIC_PYTHON
# define HINSTANCE long_u /* for generating prototypes */ # define HINSTANCE long_u /* for generating prototypes */
# endif # endif
#ifndef WIN3264 # ifndef WIN3264
# include <dlfcn.h> # include <dlfcn.h>
# define FARPROC void* # define FARPROC void*
# define HINSTANCE void* # define HINSTANCE void*
# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL) # ifdef FEAT_PYTHON3
# define close_dll dlclose /* Don't use RTLD_GLOBAL, it may cause a crash if both :python and :py3 are
# define symbol_from_dll dlsym * used. But without it importing may fail, e.g., for termios. */
#else # define load_dll(n) dlopen((n), RTLD_LAZY)
# define load_dll LoadLibrary # else
# define close_dll FreeLibrary # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
# define symbol_from_dll GetProcAddress # endif
#endif # define close_dll dlclose
# define symbol_from_dll dlsym
# else
# define load_dll LoadLibrary
# define close_dll FreeLibrary
# define symbol_from_dll GetProcAddress
# endif
/* This makes if_python.c compile without warnings against Python 2.5 /* This makes if_python.c compile without warnings against Python 2.5
* on Win32 and Win64. */ * on Win32 and Win64. */
#undef PyRun_SimpleString # undef PyRun_SimpleString
#undef PyArg_Parse # undef PyArg_Parse
#undef PyArg_ParseTuple # undef PyArg_ParseTuple
#undef Py_BuildValue # undef Py_BuildValue
#undef Py_InitModule4 # undef Py_InitModule4
#undef Py_InitModule4_64 # undef Py_InitModule4_64
/* /*
* Wrapper defines * Wrapper defines
@ -345,6 +351,7 @@ python_runtime_link_init(char *libname, int verbose)
{ {
int i; int i;
#if 0 /* this should be OK now that we don't use RTLD_GLOBAL */
#if defined(UNIX) && defined(FEAT_PYTHON3) #if defined(UNIX) && defined(FEAT_PYTHON3)
/* Can't have Python and Python3 loaded at the same time, it may cause a /* Can't have Python and Python3 loaded at the same time, it may cause a
* crash. */ * crash. */
@ -353,6 +360,7 @@ python_runtime_link_init(char *libname, int verbose)
EMSG(_("E999: Python: Cannot use :py and :py3 in one session")); EMSG(_("E999: Python: Cannot use :py and :py3 in one session"));
return FAIL; return FAIL;
} }
#endif
#endif #endif
if (hinstPython) if (hinstPython)

85
src/if_python3.c
View File

@ -76,24 +76,30 @@ static void init_structs(void);
#if defined(DYNAMIC_PYTHON3) #if defined(DYNAMIC_PYTHON3)
#ifndef WIN3264 # ifndef WIN3264
#include <dlfcn.h> # include <dlfcn.h>
#define FARPROC void* # define FARPROC void*
#define HINSTANCE void* # define HINSTANCE void*
#define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL) # ifdef FEAT_PYTHON
#define close_dll dlclose /* Don't use RTLD_GLOBAL, it may cause a crash if both :python and :py3 are
#define symbol_from_dll dlsym * used. But without it importing may fail, e.g., for termios. */
#else # define load_dll(n) dlopen((n), RTLD_LAZY)
#define load_dll LoadLibrary # else
#define close_dll FreeLibrary # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
#define symbol_from_dll GetProcAddress # endif
#endif # define close_dll dlclose
# define symbol_from_dll dlsym
# else
# define load_dll LoadLibrary
# define close_dll FreeLibrary
# define symbol_from_dll GetProcAddress
# endif
/* /*
* Wrapper defines * Wrapper defines
*/ */
#undef PyArg_Parse # undef PyArg_Parse
# define PyArg_Parse py3_PyArg_Parse # define PyArg_Parse py3_PyArg_Parse
#undef PyArg_ParseTuple # undef PyArg_ParseTuple
# define PyArg_ParseTuple py3_PyArg_ParseTuple # define PyArg_ParseTuple py3_PyArg_ParseTuple
# define PyDict_SetItemString py3_PyDict_SetItemString # define PyDict_SetItemString py3_PyDict_SetItemString
# define PyErr_BadArgument py3_PyErr_BadArgument # define PyErr_BadArgument py3_PyErr_BadArgument
@ -137,30 +143,31 @@ static void init_structs(void);
# define _PyUnicode_AsString py3__PyUnicode_AsString # define _PyUnicode_AsString py3__PyUnicode_AsString
# define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
# define PySlice_Type (*py3_PySlice_Type) # define PySlice_Type (*py3_PySlice_Type)
#ifdef Py_DEBUG # ifdef Py_DEBUG
# define _Py_NegativeRefcount py3__Py_NegativeRefcount # define _Py_NegativeRefcount py3__Py_NegativeRefcount
# define _Py_RefTotal (*py3__Py_RefTotal) # define _Py_RefTotal (*py3__Py_RefTotal)
# define _Py_Dealloc py3__Py_Dealloc # define _Py_Dealloc py3__Py_Dealloc
# define _PyObject_DebugMalloc py3__PyObject_DebugMalloc # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc
# define _PyObject_DebugFree py3__PyObject_DebugFree # define _PyObject_DebugFree py3__PyObject_DebugFree
#else # else
# define PyObject_Malloc py3_PyObject_Malloc # define PyObject_Malloc py3_PyObject_Malloc
# define PyObject_Free py3_PyObject_Free # define PyObject_Free py3_PyObject_Free
#endif # endif
# define PyType_GenericAlloc py3_PyType_GenericAlloc # define PyType_GenericAlloc py3_PyType_GenericAlloc
# define PyType_GenericNew py3_PyType_GenericNew # define PyType_GenericNew py3_PyType_GenericNew
# define PyModule_Create2 py3_PyModule_Create2 # define PyModule_Create2 py3_PyModule_Create2
#undef PyUnicode_FromString # undef PyUnicode_FromString
# define PyUnicode_FromString py3_PyUnicode_FromString # define PyUnicode_FromString py3_PyUnicode_FromString
#undef PyUnicode_FromStringAndSize # undef PyUnicode_FromStringAndSize
# define PyUnicode_FromStringAndSize py3_PyUnicode_FromStringAndSize # define PyUnicode_FromStringAndSize py3_PyUnicode_FromStringAndSize
#ifdef Py_DEBUG # ifdef Py_DEBUG
#undef PyObject_NEW # undef PyObject_NEW
#define PyObject_NEW(type, typeobj) \ # define PyObject_NEW(type, typeobj) \
( (type *) PyObject_Init( \ ( (type *) PyObject_Init( \
(PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) ) (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) )
#endif # endif
/* /*
* Pointers for dynamic link * Pointers for dynamic link
*/ */
@ -212,16 +219,16 @@ static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_
static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems); static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems);
static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds);
static PyTypeObject* py3_PySlice_Type; static PyTypeObject* py3_PySlice_Type;
#ifdef Py_DEBUG # ifdef Py_DEBUG
static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op); static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
static Py_ssize_t* py3__Py_RefTotal; static Py_ssize_t* py3__Py_RefTotal;
static void (*py3__Py_Dealloc)(PyObject *obj); static void (*py3__Py_Dealloc)(PyObject *obj);
static void (*py3__PyObject_DebugFree)(void*); static void (*py3__PyObject_DebugFree)(void*);
static void* (*py3__PyObject_DebugMalloc)(size_t); static void* (*py3__PyObject_DebugMalloc)(size_t);
#else # else
static void (*py3_PyObject_Free)(void*); static void (*py3_PyObject_Free)(void*);
static void* (*py3_PyObject_Malloc)(size_t); static void* (*py3_PyObject_Malloc)(size_t);
#endif # endif
static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */ static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
@ -294,16 +301,16 @@ static struct
{"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
{"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
{"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
#ifdef Py_DEBUG # ifdef Py_DEBUG
{"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
{"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
{"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc},
{"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree},
{"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc}, {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc},
#else # else
{"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
{"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free}, {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
#endif # endif
{"", NULL}, {"", NULL},
}; };
@ -331,7 +338,8 @@ py3_runtime_link_init(char *libname, int verbose)
int i; int i;
void *ucs_from_string, *ucs_from_string_and_size; void *ucs_from_string, *ucs_from_string_and_size;
#if defined(UNIX) && defined(FEAT_PYTHON) # if 0 /* this should be OK now that we don't use RTLD_GLOBAL */
# if defined(UNIX) && defined(FEAT_PYTHON)
/* Can't have Python and Python3 loaded at the same time, it may cause a /* Can't have Python and Python3 loaded at the same time, it may cause a
* crash. */ * crash. */
if (python_loaded()) if (python_loaded())
@ -339,7 +347,8 @@ py3_runtime_link_init(char *libname, int verbose)
EMSG(_("E999: Python: Cannot use :py and :py3 in one session")); EMSG(_("E999: Python: Cannot use :py and :py3 in one session"));
return FAIL; return FAIL;
} }
#endif # endif
# endif
if (hinstPy3 != 0) if (hinstPy3 != 0)
return OK; return OK;