traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-35059: Add Py_STATIC_INLINE() macro (GH-10093) 

* Add Py_STATIC_INLINE() macro to declare a "static inline" function.
  If the compiler supports it, try to always inline the function even if no
  optimization level was specified.
* Modify pydtrace.h to use Py_STATIC_INLINE() when WITH_DTRACE is
  not defined.
* Add an unit test on Py_DECREF() to make sure that
  _Py_NegativeRefcount() reports the correct filename.
This commit is contained in:
Victor Stinner 2018-10-25 17:28:11 +02:00 committed by GitHub
parent d03b775781
commit 18618e652c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 92 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/object.h
View File

@ -729,8 +729,8 @@ you can count such references to the type object.)
*/ */
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
PyAPI_DATA(Py_ssize_t) _Py_RefTotal; PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname, PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno,
int lineno, PyObject *op); PyObject *op);
PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
#define _Py_INC_REFTOTAL _Py_RefTotal++ #define _Py_INC_REFTOTAL _Py_RefTotal++
#define _Py_DEC_REFTOTAL _Py_RefTotal-- #define _Py_DEC_REFTOTAL _Py_RefTotal--

44
Include/pydtrace.h
View File

@ -25,29 +25,29 @@ extern "C" {
/* Without DTrace, compile to nothing. */ /* Without DTrace, compile to nothing. */
static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {} Py_STATIC_INLINE(void) PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2) {} Py_STATIC_INLINE(void) PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2) {}
static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {} Py_STATIC_INLINE(void) PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
static inline void PyDTrace_GC_START(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_GC_START(int arg0) {}
static inline void PyDTrace_GC_DONE(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_GC_DONE(int arg0) {}
static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_INSTANCE_NEW_START(int arg0) {}
static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_INSTANCE_DELETE_START(int arg0) {}
static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {} Py_STATIC_INLINE(void) PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
static inline void PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {} Py_STATIC_INLINE(void) PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {}
static inline void PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {} Py_STATIC_INLINE(void) PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {}
static inline int PyDTrace_LINE_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_LINE_ENABLED(void) { return 0; }
static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
static inline int PyDTrace_GC_START_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_GC_START_ENABLED(void) { return 0; }
static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_GC_DONE_ENABLED(void) { return 0; }
static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
static inline int PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; }
static inline int PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; } Py_STATIC_INLINE(int) PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; }
#endif /* !WITH_DTRACE */ #endif /* !WITH_DTRACE */

37
Include/pyport.h
View File

@ -164,20 +164,37 @@ typedef int Py_ssize_clean_t;
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if defined(PY_LOCAL_AGGRESSIVE) # if defined(PY_LOCAL_AGGRESSIVE)
/* enable more aggressive optimization for visual studio */ /* enable more aggressive optimization for visual studio */
#pragma optimize("agtw", on) # pragma optimize("agtw", on)
#endif #endif
/* ignore warnings if the compiler decides not to inline a function */ /* ignore warnings if the compiler decides not to inline a function */
#pragma warning(disable: 4710) # pragma warning(disable: 4710)
/* fastest possible local call under MSVC */ /* fastest possible local call under MSVC */
#define Py_LOCAL(type) static type __fastcall # define Py_LOCAL(type) static type __fastcall
#define Py_LOCAL_INLINE(type) static __inline type __fastcall # define Py_LOCAL_INLINE(type) static __inline type __fastcall
#else #else
#define Py_LOCAL(type) static type # define Py_LOCAL(type) static type
#define Py_LOCAL_INLINE(type) static inline type # define Py_LOCAL_INLINE(type) static inline type
#endif #endif
/* Declare a "static inline" function. Typical usage:
Py_STATIC_INLINE(int) add(int a, int b) { return a + b; }
If the compiler supports it, try to always inline the function even if no
optimization level was specified. */
#if defined(__GNUC__) || defined(__clang__)
# define Py_STATIC_INLINE(TYPE) \
__attribute__((always_inline)) static inline TYPE
#elif defined(_MSC_VER)
# define Py_STATIC_INLINE(TYPE) \
static __forceinline TYPE
#else
# define Py_STATIC_INLINE(TYPE) static inline TYPE
#endif
/* Py_MEMCPY is kept for backwards compatibility, /* Py_MEMCPY is kept for backwards compatibility,
* see https://bugs.python.org/issue28126 */ * see https://bugs.python.org/issue28126 */
#define Py_MEMCPY memcpy #define Py_MEMCPY memcpy

17
Lib/test/test_capi.py
View File

@ -315,6 +315,23 @@ class CAPITest(unittest.TestCase):
self.assertRaises(TypeError, _testcapi.get_mapping_values, bad_mapping) self.assertRaises(TypeError, _testcapi.get_mapping_values, bad_mapping)
self.assertRaises(TypeError, _testcapi.get_mapping_items, bad_mapping) self.assertRaises(TypeError, _testcapi.get_mapping_items, bad_mapping)
@unittest.skipUnless(hasattr(_testcapi, 'negative_refcount'),
'need _testcapi.negative_refcount')
def test_negative_refcount(self):
# bpo-35059: Check that Py_DECREF() reports the correct filename
# when calling _Py_NegativeRefcount() to abort Python.
code = textwrap.dedent("""
import _testcapi
from test import support
with support.SuppressCrashReport():
_testcapi.negative_refcount()
""")
rc, out, err = assert_python_failure('-c', code)
self.assertRegex(err,
br'_testcapimodule\.c:[0-9]+ object at .* '
br'has negative ref count', err)
class TestPendingCalls(unittest.TestCase): class TestPendingCalls(unittest.TestCase):

22
Modules/_testcapimodule.c
View File

@ -4818,6 +4818,25 @@ fail:
} }
#ifdef Py_REF_DEBUG
static PyObject *
negative_refcount(PyObject *self, PyObject *Py_UNUSED(args))
{
PyObject *obj = PyUnicode_FromString("negative_refcount");
if (obj == NULL) {
return NULL;
}
assert(Py_REFCNT(obj) == 1);
Py_REFCNT(obj) = 0;
/* Py_DECREF() must call _Py_NegativeRefcount() and abort Python */
Py_DECREF(obj);
Py_RETURN_NONE;
}
#endif
static PyMethodDef TestMethods[] = { static PyMethodDef TestMethods[] = {
{"raise_exception", raise_exception, METH_VARARGS}, {"raise_exception", raise_exception, METH_VARARGS},
{"raise_memoryerror", raise_memoryerror, METH_NOARGS}, {"raise_memoryerror", raise_memoryerror, METH_NOARGS},
@ -5043,6 +5062,9 @@ static PyMethodDef TestMethods[] = {
{"EncodeLocaleEx", encode_locale_ex, METH_VARARGS}, {"EncodeLocaleEx", encode_locale_ex, METH_VARARGS},
{"DecodeLocaleEx", decode_locale_ex, METH_VARARGS}, {"DecodeLocaleEx", decode_locale_ex, METH_VARARGS},
{"get_coreconfig", get_coreconfig, METH_NOARGS}, {"get_coreconfig", get_coreconfig, METH_NOARGS},
#ifdef Py_REF_DEBUG
{"negative_refcount", negative_refcount, METH_NOARGS},
#endif
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };

4
Objects/object.c
View File

@ -200,14 +200,14 @@ void dec_count(PyTypeObject *tp)
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
/* Log a fatal error; doesn't return. */ /* Log a fatal error; doesn't return. */
void void
_Py_NegativeRefcount(const char *fname, int lineno, PyObject *op) _Py_NegativeRefcount(const char *filename, int lineno, PyObject *op)
{ {
char buf[300]; char buf[300];
PyOS_snprintf(buf, sizeof(buf), PyOS_snprintf(buf, sizeof(buf),
"%s:%i object at %p has negative ref count " "%s:%i object at %p has negative ref count "
"%" PY_FORMAT_SIZE_T "d", "%" PY_FORMAT_SIZE_T "d",
fname, lineno, op, op->ob_refcnt); filename, lineno, op, op->ob_refcnt);
Py_FatalError(buf); Py_FatalError(buf);
} }