Skip to content
This repository has been archived by the owner on May 9, 2024. It is now read-only.

Fix python3 support, fix mixed callstacks in release mode #7

Merged
merged 15 commits into from
Dec 20, 2018
Merged

Fix python3 support, fix mixed callstacks in release mode #7

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
129a381
Disabled some unnecessary warnings and enabled building against Python3
vnlitvinov Dec 19, 2018
6e8f676
Now _pysamprof.c compiles for Py3
vnlitvinov Dec 19, 2018
342923e
Code reporting migrated to python3-compatible state
vnlitvinov Dec 19, 2018
408d3fb
Fix extension interface for Python3
vnlitvinov Dec 19, 2018
95f0c9f
Add overriding signal altstack for main thread
vnlitvinov Dec 19, 2018
5ace73e
Remove old makefiles
vnlitvinov Dec 19, 2018
6177fe8
Change minimal correct stack depth to 4
vnlitvinov Dec 19, 2018
5b63f53
Fix detecting PyEval_EvalFrameEx in release mode
vnlitvinov Dec 19, 2018
9af7150
Improve support for Python stack unwinding for Python >= 3.6
vnlitvinov Dec 19, 2018
296f280
Partially fix build for VS2015 for targeting Python3
vnlitvinov Dec 19, 2018
6896917
Add prerequisite building for either Python 2 or 3
vnlitvinov Dec 19, 2018
57fe624
FFix inttype_helper better for different MSVC versions
vnlitvinov Dec 19, 2018
8c8a003
Build XED with correct MSVC (depending on Python version)
vnlitvinov Dec 19, 2018
60c759d
Update readme - add Windows build details
vnlitvinov Dec 19, 2018
5fefcd3
Fix review comments by anmyachev
vnlitvinov Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
106 changes: 75 additions & 31 deletions pyext/_pysamprof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
#ifndef WITH_THREAD
#error Python without threading not supported for profiling so far
#endif
#include <patchlevel.h>

#if PY_VERSION_HEX < 0x03000000
// Python 2.x
#define GET_CURRENT_PYSTATE (_PyThreadState_Current)
#elif PY_VERSION_HEX < 0x03060000
// Python 3.0 - 3.5
#define Py_BUILD_CORE
#include <pystate.h>
#undef Py_BUILD_CORE
#define GET_CURRENT_PYSTATE (PyThreadState_GET())
#else
// Python 3.6 or newer
#include <pystate.h>
#define GET_CURRENT_PYSTATE (_PyThreadState_UncheckedGet())
#endif

#ifndef PYSAMPROF_BUILDING_LIB
#error PYSAMPROF_BUILDING_LIB must be defined
Expand Down Expand Up @@ -152,6 +168,12 @@ operation_result_t collect_one_sample(workspace_t* wsp, context_ptr_t ctx, timeu
free_wsp_timer(wsp);
#endif
return or_stop_sampling_service;
case pes_native: // fallthrough
case pes_is_python:
break;
default:
PYSAMPROF_LOG(PL_ERROR, "Got unexpected value of wsp->python_enabled: %d", (int)wsp->python_enabled);
return or_fail;
}

#ifdef __linux__
Expand Down Expand Up @@ -1240,14 +1262,30 @@ static PyObject* pysamprof_request_server_pid(PyObject* self, PyObject* args)
}

static PyMethodDef module_methods[] = {
// {"listthreads", pysamprof_listthreads, METH_NOARGS, NULL},
{"start", pysamprof_start, METH_VARARGS, start_docstring },
{"pause_current", pysamprof_pause_current, METH_NOARGS, pause_current_docstring},
{"resume_current", pysamprof_resume_current, METH_NOARGS, pause_current_docstring},
{"resume_current", pysamprof_resume_current, METH_NOARGS, resume_current_docstring},
{"request_server_pid", pysamprof_request_server_pid, METH_VARARGS, request_server_pid_docstring},
{NULL, NULL, 0, NULL}
{NULL, NULL, 0, NULL}
};

#if PY_MAJOR_VERSION >= 3
static struct PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
"pysamprof",
module_docstring,
0,
module_methods,
NULL, // m_slots
NULL, // m_traverse
NULL, // m_clear
NULL // m_free
};
#define INIT_ERROR NULL
#else
#define INIT_ERROR
#endif

#ifdef __linux__
static void before_fork_mark_sampling_unsafe()
{
Expand Down Expand Up @@ -1413,7 +1451,7 @@ void before_exec()

int has_gil = 0;
workspace_t* wsp = get_thread_wsp();
if (wsp != NULL && wsp->tstate != NULL && wsp->tstate == _PyThreadState_Current) has_gil = 1;
if (wsp != NULL && wsp->tstate != NULL && wsp->tstate == GET_CURRENT_PYSTATE) has_gil = 1;

pysamprof_stop_collection(has_gil, cs_stopped);
PYSAMPROF_LOG(PL_INFO, "Before exec: pysamprof_stop_collection() finished");
Expand Down Expand Up @@ -1445,41 +1483,41 @@ PyMODINIT_FUNC initpysamprof(void)
{
PYSAMPROF_LOG(PL_ERROR, "Cannot register atfork() in main pysamprof routine, error: %d",
err);
return;
return INIT_ERROR;
}
#endif

res = init_ipc_innards();
CHECK_AND_REPORT_ERROR(res, "Cannot init IPC innards",);
CHECK_AND_REPORT_ERROR(res, "Cannot init IPC innards", INIT_ERROR);

#ifdef _WIN32
if (!SymInitialize(GetCurrentProcess(), NULL, TRUE))
{
PYSAMPROF_LOG(PL_ERROR, "Cannot do SymInitialize, error: %ld", GetLastError());
return;
return INIT_ERROR;
}
#endif

res = init_collector_state();
CHECK_AND_REPORT_ERROR(res, "Cannot init collector state",);
CHECK_AND_REPORT_ERROR(res, "Cannot init collector state", INIT_ERROR);
res = parse_memory_regions(&s_memory_regions, 0);
CHECK_AND_REPORT_ERROR(res, "Cannot parse memory regions",);
CHECK_AND_REPORT_ERROR(res, "Cannot parse memory regions", INIT_ERROR);

xed_initialize();

res = init_hang_protection(s_memory_regions);
CHECK_AND_REPORT_ERROR(res, "Cannot init hang protection",);
CHECK_AND_REPORT_ERROR(res, "Cannot init hang protection", INIT_ERROR);

res = init_workspace_machinery();
CHECK_AND_REPORT_ERROR(res, "Cannot init workspace machinery",);
CHECK_AND_REPORT_ERROR(res, "Cannot init workspace machinery", INIT_ERROR);

#ifdef __linux__
err = pthread_atfork(before_fork, after_fork_in_parent, after_fork_in_child);
if (err != 0)
{
PYSAMPROF_LOG(PL_ERROR, "Cannot register atfork() in main pysamprof routine, error: %d",
err);
return;
return INIT_ERROR;
}
#endif

Expand All @@ -1491,15 +1529,15 @@ PyMODINIT_FUNC initpysamprof(void)
#else
#error Unsupported platform
#endif
CHECK_AND_REPORT_ERROR(res, "Cannot start following threads",);
CHECK_AND_REPORT_ERROR(res, "Cannot start following threads", INIT_ERROR);
res = init_callstack_helper(s_memory_regions);
CHECK_AND_REPORT_ERROR(res, "Cannot init callstack helper",);
CHECK_AND_REPORT_ERROR(res, "Cannot init callstack helper", INIT_ERROR);

res = setup_server_pointer_thread();
CHECK_AND_REPORT_ERROR(res, "Cannot setup pointer thread",);
CHECK_AND_REPORT_ERROR(res, "Cannot setup pointer thread", INIT_ERROR);

res = get_server_info(&g_server_info);
CHECK_AND_REPORT_ERROR(res, "Cannot get server whereabouts",);
CHECK_AND_REPORT_ERROR(res, "Cannot get server whereabouts", INIT_ERROR);
if (g_server_info.pid == 0)
{
PYSAMPROF_LOG(PL_INFO, "No server in current session, will spawn one on collection start");
Expand All @@ -1512,21 +1550,21 @@ PyMODINIT_FUNC initpysamprof(void)
if (atexit(pysamprof_stop_collection_atextit) != 0)
{
PYSAMPROF_LOG(PL_ERROR, "Cannot register atexit() handler, errno: %d", errno);
return;
return INIT_ERROR;
}

res = probe_function(PyImport_Cleanup, PyImport_Cleanup_probe, s_memory_regions,
(void**)&s_PyImport_Cleanup_original);
CHECK_AND_REPORT_ERROR(res, "Cannot probe PyImport_Cleanup",);
CHECK_AND_REPORT_ERROR(res, "Cannot probe PyImport_Cleanup", INIT_ERROR);

res = init_module_following(s_memory_regions, on_new_lib);
CHECK_AND_REPORT_ERROR(res, "Cannot init module following",);
CHECK_AND_REPORT_ERROR(res, "Cannot init module following", INIT_ERROR);

#ifdef __linux__
res = parse_vdso_table(s_memory_regions, &s_vdso_table);
if (res != or_cannot_find_image)
{
CHECK_AND_REPORT_ERROR(res, "Cannot parse vDSO table",);
CHECK_AND_REPORT_ERROR(res, "Cannot parse vDSO table", INIT_ERROR);
}

#endif
Expand All @@ -1542,37 +1580,43 @@ PyMODINIT_FUNC initpysamprof(void)
res = grab_collector_handles(NULL, NULL);

res = init_master_handle_client(&master, g_server_info.pid);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot init master handle",);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot init master handle", INIT_ERROR);
res = set_collector_handles(NULL, master);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot set collector handles in init",);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot set collector handles in init", INIT_ERROR);

res = get_collection_state(master, &state, &period_nano, &signo, &result_path);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot get collection state",);
CHECK_AND_REPORT_ERROR_FREE_HANDLES(res, "Cannot get collection state", INIT_ERROR);
PYSAMPROF_LOG(PL_INFO, "Got collection status: state=%d, period=%lld ns, signo=%d, result='%s'",
(int )state, (long long )period_nano, signo, result_path);
res = release_collector_handles();
CHECK_AND_REPORT_ERROR(res, "Cannot release collector handles",);
CHECK_AND_REPORT_ERROR(res, "Cannot release collector handles", INIT_ERROR);
if (state == cs_running || state == cs_paused)
{
res = pysamprof_enable_collection(state, result_path,
period_nano / 1000000LL /* convert nano to milli */, signo, 0);
free(result_path);
CHECK_AND_REPORT_ERROR(res, "Cannot start collection",);
CHECK_AND_REPORT_ERROR(res, "Cannot start collection", INIT_ERROR);
PYSAMPROF_LOG(PL_INFO, "Started collection as non-first process");
}
}

if (atexit(atexit_mark_sampling_unsafe) != 0)
{
PYSAMPROF_LOG(PL_ERROR, "Cannot register atexit() handler, errno: %d", errno);
return;
return INIT_ERROR;
}

{
#if PY_MAJOR_VERSION >= 3
PyObject* m = PyModule_Create(&module_def);
#else
PyObject* m = Py_InitModule3("pysamprof", module_methods, module_docstring);
if (m == NULL) return;
#endif
if (m == NULL) INIT_ERROR;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add return

PyEval_InitThreads();
PYSAMPROF_LOG(PL_INFO, "pysamprof initialized");
#if PY_MAJOR_VERSION >= 3
return m;
#endif
}
PyEval_InitThreads();
PYSAMPROF_LOG(PL_INFO, "pysamprof initialized");
/* do more initialization if needed */
}