archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

replace macro PYC_INTERPRETER_ACTIVE for PyC_IsInterpreterActive() function call,

Browse Source 
(indirectly referenced Python define of ~30 lines, most were optimized out but still caused some code bloat).
This commit is contained in:
Campbell Barton
2013-09-18 23:21:24 +00:00
parent 7335a4af04
commit 4dd7d4110a
6 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/generic/idprop_py_api.c
View File

@@ -1518,7 +1518,7 @@ void IDP_spit(IDProperty *prop)
{
if (prop) {
PyGILState_STATE gilstate;
int use_gil = TRUE; /* !PYC_INTERPRETER_ACTIVE; */
int use_gil = TRUE; /* !PyC_IsInterpreterActive(); */
PyObject *ret_dict;
PyObject *ret_str;

11
source/blender/python/generic/py_capi_utils.c
View File

@@ -191,7 +191,7 @@ void PyC_LineSpit(void)
int lineno;
/* Note, allow calling from outside python (RNA) */
if (!PYC_INTERPRETER_ACTIVE) {
if (!PyC_IsInterpreterActive()) {
fprintf(stderr, "python line lookup failed, interpreter inactive\n");
return;
}
@@ -205,7 +205,7 @@ void PyC_LineSpit(void)
void PyC_StackSpit(void)
{
/* Note, allow calling from outside python (RNA) */
if (!PYC_INTERPRETER_ACTIVE) {
if (!PyC_IsInterpreterActive()) {
fprintf(stderr, "python line lookup failed, interpreter inactive\n");
return;
}
@@ -258,7 +258,7 @@ void PyC_FileAndNum(const char **filename, int *lineno)
void PyC_FileAndNum_Safe(const char **filename, int *lineno)
{
if (!PYC_INTERPRETER_ACTIVE) {
if (!PyC_IsInterpreterActive()) {
return;
}
@@ -599,6 +599,11 @@ void PyC_SetHomePath(const char *py_path_bundle)
}
}
bool PyC_IsInterpreterActive(void)
{
return (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL);
}
/* Would be nice if python had this built in
* See: http://wiki.blender.org/index.php/Dev:Doc/Tools/Debugging/PyFromC
*/

2
source/blender/python/generic/py_capi_utils.h
View File

@@ -56,7 +56,7 @@ void PyC_MainModule_Restore(PyObject *main_mod);
void PyC_SetHomePath(const char *py_path_bundle);
#define PYC_INTERPRETER_ACTIVE (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL)
bool PyC_IsInterpreterActive(void);
void *PyC_RNA_AsPointer(PyObject *value, const char *type_name);