Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
17565628
Commit
17565628
authored
May 06, 2020
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up some code in the refnanny.
parent
379c37ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
47 deletions
+35
-47
Cython/Runtime/refnanny.pyx
Cython/Runtime/refnanny.pyx
+35
-47
No files found.
Cython/Runtime/refnanny.pyx
View file @
17565628
# cython: language_level=3, auto_pickle=False
# cython: language_level=3, auto_pickle=False
from
cpython.ref
cimport
PyObject
,
Py_INCREF
,
Py_
DECREF
,
Py_XDECREF
,
Py_XINCREF
from
cpython.ref
cimport
PyObject
,
Py_INCREF
,
Py_
CLEAR
,
Py_XDECREF
,
Py_XINCREF
from
cpython.exc
cimport
PyErr_Fetch
,
PyErr_Restore
from
cpython.exc
cimport
PyErr_Fetch
,
PyErr_Restore
from
cpython.pystate
cimport
PyThreadState_Get
from
cpython.pystate
cimport
PyThreadState_Get
...
@@ -50,12 +50,11 @@ cdef class Context(object):
...
@@ -50,12 +50,11 @@ cdef class Context(object):
if
count
==
0
:
if
count
==
0
:
self
.
errors
.
append
(
f"Too many decrefs on line
{
lineno
}
, reference acquired on lines
{
linenumbers
!
r
}
"
)
self
.
errors
.
append
(
f"Too many decrefs on line
{
lineno
}
, reference acquired on lines
{
linenumbers
!
r
}
"
)
return
False
return
False
el
if
count
==
1
:
if
count
==
1
:
del
self
.
refs
[
id_
]
del
self
.
refs
[
id_
]
return
True
else
:
else
:
self
.
refs
[
id_
]
=
(
count
-
1
,
linenumbers
)
self
.
refs
[
id_
]
=
(
count
-
1
,
linenumbers
)
return
True
return
True
cdef
end
(
self
):
cdef
end
(
self
):
if
self
.
refs
:
if
self
.
refs
:
...
@@ -63,10 +62,7 @@ cdef class Context(object):
...
@@ -63,10 +62,7 @@ cdef class Context(object):
for
count
,
linenos
in
self
.
refs
.
itervalues
():
for
count
,
linenos
in
self
.
refs
.
itervalues
():
msg
+=
f"
\
n
(
{
count
}
) acquired on lines:
{
u', '
.
join
([
f'
{
x
}
' for x in linenos])
}
"
msg
+=
f"
\
n
(
{
count
}
) acquired on lines:
{
u', '
.
join
([
f'
{
x
}
' for x in linenos])
}
"
self
.
errors
.
append
(
msg
)
self
.
errors
.
append
(
msg
)
if
self
.
errors
:
return
u"
\
n
"
.
join
([
f'REFNANNY:
{
error
}
'
for
error
in
self
.
errors
])
if
self
.
errors
else
None
return
u"
\
n
"
.
join
([
u'REFNANNY: '
+
error
for
error
in
self
.
errors
])
else
:
return
None
cdef
void
report_unraisable
(
object
e
=
None
):
cdef
void
report_unraisable
(
object
e
=
None
):
try
:
try
:
...
@@ -74,8 +70,8 @@ cdef void report_unraisable(object e=None):
...
@@ -74,8 +70,8 @@ cdef void report_unraisable(object e=None):
import
sys
import
sys
e
=
sys
.
exc_info
()[
1
]
e
=
sys
.
exc_info
()[
1
]
print
(
f"refnanny raised an exception:
{
e
}
"
)
print
(
f"refnanny raised an exception:
{
e
}
"
)
except
:
finally
:
pass
# We absolutely cannot exit with an exception
return
# We absolutely cannot exit with an exception
# All Python operations must happen after any existing
# All Python operations must happen after any existing
# exception has been fetched, in case we are called from
# exception has been fetched, in case we are called from
...
@@ -88,7 +84,6 @@ cdef PyObject* SetupContext(char* funcname, int lineno, char* filename) except N
...
@@ -88,7 +84,6 @@ cdef PyObject* SetupContext(char* funcname, int lineno, char* filename) except N
# like caching and resetting exceptions.
# like caching and resetting exceptions.
return
NULL
return
NULL
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
,
result
=
NULL
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
,
result
=
NULL
PyThreadState_Get
()
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
try
:
try
:
ctx
=
Context
(
funcname
,
lineno
,
filename
)
ctx
=
Context
(
funcname
,
lineno
,
filename
)
...
@@ -104,17 +99,16 @@ cdef void GOTREF(PyObject* ctx, PyObject* p_obj, int lineno):
...
@@ -104,17 +99,16 @@ cdef void GOTREF(PyObject* ctx, PyObject* p_obj, int lineno):
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
try
:
try
:
try
:
(
<
Context
>
ctx
).
regref
(
if
p_obj
is
NULL
:
<
object
>
p_obj
if
p_obj
is
not
NULL
else
None
,
(
<
Context
>
ctx
).
regref
(
None
,
lineno
,
True
)
lineno
,
else
:
is_null
=
p_obj
is
NULL
,
(
<
Context
>
ctx
).
regref
(
<
object
>
p_obj
,
lineno
,
False
)
)
except
:
report_unraisable
()
except
:
except
:
# __Pyx_GetException may itself raise errors
report_unraisable
()
pass
finally
:
PyErr_Restore
(
type
,
value
,
tb
)
PyErr_Restore
(
type
,
value
,
tb
)
return
# swallow any exceptions
cdef
int
GIVEREF_and_report
(
PyObject
*
ctx
,
PyObject
*
p_obj
,
int
lineno
):
cdef
int
GIVEREF_and_report
(
PyObject
*
ctx
,
PyObject
*
p_obj
,
int
lineno
):
if
ctx
==
NULL
:
return
1
if
ctx
==
NULL
:
return
1
...
@@ -122,18 +116,16 @@ cdef int GIVEREF_and_report(PyObject* ctx, PyObject* p_obj, int lineno):
...
@@ -122,18 +116,16 @@ cdef int GIVEREF_and_report(PyObject* ctx, PyObject* p_obj, int lineno):
cdef
bint
decref_ok
=
False
cdef
bint
decref_ok
=
False
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
try
:
try
:
try
:
decref_ok
=
(
<
Context
>
ctx
).
delref
(
if
p_obj
is
NULL
:
<
object
>
p_obj
if
p_obj
is
not
NULL
else
None
,
decref_ok
=
(
<
Context
>
ctx
).
delref
(
None
,
lineno
,
True
)
lineno
,
else
:
is_null
=
p_obj
is
NULL
,
decref_ok
=
(
<
Context
>
ctx
).
delref
(
<
object
>
p_obj
,
lineno
,
False
)
)
except
:
report_unraisable
()
except
:
except
:
# __Pyx_GetException may itself raise errors
report_unraisable
()
pass
finally
:
PyErr_Restore
(
type
,
value
,
tb
)
PyErr_Restore
(
type
,
value
,
tb
)
return
decref_ok
return
decref_ok
# swallow any exceptions
cdef
void
GIVEREF
(
PyObject
*
ctx
,
PyObject
*
p_obj
,
int
lineno
):
cdef
void
GIVEREF
(
PyObject
*
ctx
,
PyObject
*
p_obj
,
int
lineno
):
GIVEREF_and_report
(
ctx
,
p_obj
,
lineno
)
GIVEREF_and_report
(
ctx
,
p_obj
,
lineno
)
...
@@ -153,24 +145,20 @@ cdef void FinishContext(PyObject** ctx):
...
@@ -153,24 +145,20 @@ cdef void FinishContext(PyObject** ctx):
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
cdef
(
PyObject
*
)
type
=
NULL
,
value
=
NULL
,
tb
=
NULL
cdef
object
errors
=
None
cdef
object
errors
=
None
cdef
Context
context
cdef
Context
context
PyThreadState_Get
()
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
PyErr_Fetch
(
&
type
,
&
value
,
&
tb
)
try
:
try
:
try
:
context
=
<
Context
>
ctx
[
0
]
context
=
<
Context
>
ctx
[
0
]
errors
=
context
.
end
()
errors
=
context
.
end
()
if
errors
:
if
errors
:
print
(
f"
{
context
.
filename
.
decode
(
'latin1'
)
}
:
{
context
.
name
.
decode
(
'latin1'
)
}
()"
)
print
(
f"
{
context
.
filename
.
decode
(
'latin1'
)
}
:
{
context
.
name
.
decode
(
'latin1'
)
}
()"
)
print
(
errors
)
print
(
errors
)
context
=
None
context
=
None
except
:
report_unraisable
()
except
:
except
:
# __Pyx_GetException may itself raise errors
report_unraisable
()
pass
finally
:
Py_XDECREF
(
ctx
[
0
])
Py_CLEAR
(
ctx
[
0
])
ctx
[
0
]
=
NULL
PyErr_Restore
(
type
,
value
,
tb
)
PyErr_Restore
(
type
,
value
,
tb
)
return
# swallow any exceptions
ctypedef
struct
RefNannyAPIStruct
:
ctypedef
struct
RefNannyAPIStruct
:
void
(
*
INCREF
)(
PyObject
*
,
PyObject
*
,
int
)
void
(
*
INCREF
)(
PyObject
*
,
PyObject
*
,
int
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment