Skip to content

Resolves #169 #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 5, 2020
Merged

Resolves #169 #170

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c43a915
Resolves #169
May 29, 2020
9b1d890
fixing the name of defined macros
Jun 3, 2020
6f69cd4
use macros against the naked fields
Jun 4, 2020
ed69827
supressing c2275 with declaring local variable 'refcnt' at the top
Jun 4, 2020
0ca7987
delete unnecessary assigment
Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions greenlet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ extern PyTypeObject PyGreenlet_Type;
#define GREENLET_USE_TRACING 1
#endif

#ifndef Py_SET_REFCNT
/* Py_REFCNT and Py_SIZE macros are converted to functions
https://bugs.python.org/issue39573 */
#define Py_SET_REFCNT(obj, refcnt) Py_REFCNT(obj) = (refcnt)
#endif

#ifndef _Py_DEC_REFTOTAL
/* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
Expand Down Expand Up @@ -1006,6 +1012,7 @@ static int green_clear(PyGreenlet* self)
static void green_dealloc(PyGreenlet* self)
{
PyObject *error_type, *error_value, *error_traceback;
Py_ssize_t refcnt;

#if GREENLET_USE_GC
PyObject_GC_UnTrack(self);
Expand All @@ -1015,7 +1022,7 @@ static void green_dealloc(PyGreenlet* self)
/* Hacks hacks hacks copied from instance_dealloc() */
/* Temporarily resurrect the greenlet. */
assert(Py_REFCNT(self) == 0);
Py_REFCNT(self) = 1;
Py_SET_REFCNT(self, 1);
/* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
if (kill_greenlet(self) < 0) {
Expand Down Expand Up @@ -1044,11 +1051,13 @@ static void green_dealloc(PyGreenlet* self)
* it would cause a recursive call.
*/
assert(Py_REFCNT(self) > 0);
if (--Py_REFCNT(self) != 0) {

refcnt = Py_REFCNT(self) - 1;
Py_SET_REFCNT(self, refcnt);
if (refcnt != 0) {
/* Resurrected! */
Py_ssize_t refcnt = Py_REFCNT(self);
_Py_NewReference((PyObject*) self);
Py_REFCNT(self) = refcnt;
Py_SET_REFCNT(self, refcnt);
#if GREENLET_USE_GC
PyObject_GC_Track((PyObject *)self);
#endif
Expand Down