mirror of
https://github.com/python/cpython.git
synced 2024-11-30 18:51:15 +01:00
b4d1e1f7c1
When PyGILState_Ensure() is called in a non-Python thread before PyEval_InitThreads(), only call PyEval_InitThreads() after calling PyThreadState_New() to fix a crash. Add an unit test in test_embed.
246 lines
7.1 KiB
C
246 lines
7.1 KiB
C
#include <Python.h>
|
|
#include "pythread.h"
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
|
|
/*********************************************************
|
|
* Embedded interpreter tests that need a custom exe
|
|
*
|
|
* Executed via 'EmbeddingTests' in Lib/test/test_capi.py
|
|
*********************************************************/
|
|
|
|
static void _testembed_Py_Initialize(void)
|
|
{
|
|
/* HACK: the "./" at front avoids a search along the PATH in
|
|
Modules/getpath.c */
|
|
Py_SetProgramName(L"./_testembed");
|
|
Py_Initialize();
|
|
}
|
|
|
|
|
|
/*****************************************************
|
|
* Test repeated initialisation and subinterpreters
|
|
*****************************************************/
|
|
|
|
static void print_subinterp(void)
|
|
{
|
|
/* Output information about the interpreter in the format
|
|
expected in Lib/test/test_capi.py (test_subinterps). */
|
|
PyThreadState *ts = PyThreadState_Get();
|
|
PyInterpreterState *interp = ts->interp;
|
|
int64_t id = PyInterpreterState_GetID(interp);
|
|
printf("interp %" PRId64 " <0x%" PRIXPTR ">, thread state <0x%" PRIXPTR ">: ",
|
|
id, (uintptr_t)interp, (uintptr_t)ts);
|
|
fflush(stdout);
|
|
PyRun_SimpleString(
|
|
"import sys;"
|
|
"print('id(modules) =', id(sys.modules));"
|
|
"sys.stdout.flush()"
|
|
);
|
|
}
|
|
|
|
static int test_repeated_init_and_subinterpreters(void)
|
|
{
|
|
PyThreadState *mainstate, *substate;
|
|
PyGILState_STATE gilstate;
|
|
int i, j;
|
|
|
|
for (i=0; i<15; i++) {
|
|
printf("--- Pass %d ---\n", i);
|
|
_testembed_Py_Initialize();
|
|
mainstate = PyThreadState_Get();
|
|
|
|
PyEval_InitThreads();
|
|
PyEval_ReleaseThread(mainstate);
|
|
|
|
gilstate = PyGILState_Ensure();
|
|
print_subinterp();
|
|
PyThreadState_Swap(NULL);
|
|
|
|
for (j=0; j<3; j++) {
|
|
substate = Py_NewInterpreter();
|
|
print_subinterp();
|
|
Py_EndInterpreter(substate);
|
|
}
|
|
|
|
PyThreadState_Swap(mainstate);
|
|
print_subinterp();
|
|
PyGILState_Release(gilstate);
|
|
|
|
PyEval_RestoreThread(mainstate);
|
|
Py_Finalize();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*****************************************************
|
|
* Test forcing a particular IO encoding
|
|
*****************************************************/
|
|
|
|
static void check_stdio_details(const char *encoding, const char * errors)
|
|
{
|
|
/* Output info for the test case to check */
|
|
if (encoding) {
|
|
printf("Expected encoding: %s\n", encoding);
|
|
} else {
|
|
printf("Expected encoding: default\n");
|
|
}
|
|
if (errors) {
|
|
printf("Expected errors: %s\n", errors);
|
|
} else {
|
|
printf("Expected errors: default\n");
|
|
}
|
|
fflush(stdout);
|
|
/* Force the given IO encoding */
|
|
Py_SetStandardStreamEncoding(encoding, errors);
|
|
_testembed_Py_Initialize();
|
|
PyRun_SimpleString(
|
|
"import sys;"
|
|
"print('stdin: {0.encoding}:{0.errors}'.format(sys.stdin));"
|
|
"print('stdout: {0.encoding}:{0.errors}'.format(sys.stdout));"
|
|
"print('stderr: {0.encoding}:{0.errors}'.format(sys.stderr));"
|
|
"sys.stdout.flush()"
|
|
);
|
|
Py_Finalize();
|
|
}
|
|
|
|
static int test_forced_io_encoding(void)
|
|
{
|
|
/* Check various combinations */
|
|
printf("--- Use defaults ---\n");
|
|
check_stdio_details(NULL, NULL);
|
|
printf("--- Set errors only ---\n");
|
|
check_stdio_details(NULL, "ignore");
|
|
printf("--- Set encoding only ---\n");
|
|
check_stdio_details("latin-1", NULL);
|
|
printf("--- Set encoding and errors ---\n");
|
|
check_stdio_details("latin-1", "replace");
|
|
|
|
/* Check calling after initialization fails */
|
|
Py_Initialize();
|
|
|
|
if (Py_SetStandardStreamEncoding(NULL, NULL) == 0) {
|
|
printf("Unexpected success calling Py_SetStandardStreamEncoding");
|
|
}
|
|
Py_Finalize();
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*********************************************************
|
|
* Test parts of the C-API that work before initialization
|
|
*********************************************************/
|
|
|
|
static int test_pre_initialization_api(void)
|
|
{
|
|
/* Leading "./" ensures getpath.c can still find the standard library */
|
|
wchar_t *program = Py_DecodeLocale("./spam", NULL);
|
|
if (program == NULL) {
|
|
fprintf(stderr, "Fatal error: cannot decode program name\n");
|
|
return 1;
|
|
}
|
|
Py_SetProgramName(program);
|
|
|
|
Py_Initialize();
|
|
Py_Finalize();
|
|
|
|
PyMem_RawFree(program);
|
|
return 0;
|
|
}
|
|
|
|
static void bpo20891_thread(void *lockp)
|
|
{
|
|
PyThread_type_lock lock = *((PyThread_type_lock*)lockp);
|
|
|
|
PyGILState_STATE state = PyGILState_Ensure();
|
|
if (!PyGILState_Check()) {
|
|
fprintf(stderr, "PyGILState_Check failed!");
|
|
abort();
|
|
}
|
|
|
|
PyGILState_Release(state);
|
|
|
|
PyThread_release_lock(lock);
|
|
|
|
PyThread_exit_thread();
|
|
}
|
|
|
|
static int test_bpo20891(void)
|
|
{
|
|
/* bpo-20891: Calling PyGILState_Ensure in a non-Python thread before
|
|
calling PyEval_InitThreads() must not crash. PyGILState_Ensure() must
|
|
call PyEval_InitThreads() for us in this case. */
|
|
PyThread_type_lock lock = PyThread_allocate_lock();
|
|
if (!lock) {
|
|
fprintf(stderr, "PyThread_allocate_lock failed!");
|
|
return 1;
|
|
}
|
|
|
|
_testembed_Py_Initialize();
|
|
|
|
unsigned long thrd = PyThread_start_new_thread(bpo20891_thread, &lock);
|
|
if (thrd == PYTHREAD_INVALID_THREAD_ID) {
|
|
fprintf(stderr, "PyThread_start_new_thread failed!");
|
|
return 1;
|
|
}
|
|
PyThread_acquire_lock(lock, WAIT_LOCK);
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* wait until the thread exit */
|
|
PyThread_acquire_lock(lock, WAIT_LOCK);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
PyThread_free_lock(lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* *********************************************************
|
|
* List of test cases and the function that implements it.
|
|
*
|
|
* Names are compared case-sensitively with the first
|
|
* argument. If no match is found, or no first argument was
|
|
* provided, the names of all test cases are printed and
|
|
* the exit code will be -1.
|
|
*
|
|
* The int returned from test functions is used as the exit
|
|
* code, and test_capi treats all non-zero exit codes as a
|
|
* failed test.
|
|
*********************************************************/
|
|
struct TestCase
|
|
{
|
|
const char *name;
|
|
int (*func)(void);
|
|
};
|
|
|
|
static struct TestCase TestCases[] = {
|
|
{ "forced_io_encoding", test_forced_io_encoding },
|
|
{ "repeated_init_and_subinterpreters", test_repeated_init_and_subinterpreters },
|
|
{ "pre_initialization_api", test_pre_initialization_api },
|
|
{ "bpo20891", test_bpo20891 },
|
|
{ NULL, NULL }
|
|
};
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
if (argc > 1) {
|
|
for (struct TestCase *tc = TestCases; tc && tc->name; tc++) {
|
|
if (strcmp(argv[1], tc->name) == 0)
|
|
return (*tc->func)();
|
|
}
|
|
}
|
|
|
|
/* No match found, or no test name provided, so display usage */
|
|
printf("Python " PY_VERSION " _testembed executable for embedded interpreter tests\n"
|
|
"Normally executed via 'EmbeddingTests' in Lib/test/test_capi.py\n\n"
|
|
"Usage: %s TESTNAME\n\nAll available tests:\n", argv[0]);
|
|
for (struct TestCase *tc = TestCases; tc && tc->name; tc++) {
|
|
printf(" %s\n", tc->name);
|
|
}
|
|
|
|
/* Non-zero exit code will cause test_capi.py tests to fail.
|
|
This is intentional. */
|
|
return -1;
|
|
}
|