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
Boxiang Sun
cython
Commits
46010e39
Commit
46010e39
authored
Apr 11, 2015
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid useless GIL handling on zero-division checks when not in a nogil section
parent
d9f3f244
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+15
-7
No files found.
Cython/Compiler/ExprNodes.py
View file @
46010e39
...
@@ -9841,6 +9841,7 @@ class DivNode(NumBinopNode):
...
@@ -9841,6 +9841,7 @@ class DivNode(NumBinopNode):
self
.
generate_div_warning_code
(
code
)
self
.
generate_div_warning_code
(
code
)
def
generate_div_warning_code
(
self
,
code
):
def
generate_div_warning_code
(
self
,
code
):
in_nogil
=
self
.
in_nogil_context
if
not
self
.
type
.
is_pyobject
:
if
not
self
.
type
.
is_pyobject
:
if
self
.
zerodivision_check
:
if
self
.
zerodivision_check
:
if
not
self
.
infix
:
if
not
self
.
infix
:
...
@@ -9848,9 +9849,11 @@ class DivNode(NumBinopNode):
...
@@ -9848,9 +9849,11 @@ class DivNode(NumBinopNode):
else
:
else
:
zero_test
=
"%s == 0"
%
self
.
operand2
.
result
()
zero_test
=
"%s == 0"
%
self
.
operand2
.
result
()
code
.
putln
(
"if (unlikely(%s)) {"
%
zero_test
)
code
.
putln
(
"if (unlikely(%s)) {"
%
zero_test
)
code
.
put_ensure_gil
()
if
in_nogil
:
code
.
put_ensure_gil
()
code
.
putln
(
'PyErr_SetString(PyExc_ZeroDivisionError, "%s");'
%
self
.
zero_division_message
())
code
.
putln
(
'PyErr_SetString(PyExc_ZeroDivisionError, "%s");'
%
self
.
zero_division_message
())
code
.
put_release_ensured_gil
()
if
in_nogil
:
code
.
put_release_ensured_gil
()
code
.
putln
(
code
.
error_goto
(
self
.
pos
))
code
.
putln
(
code
.
error_goto
(
self
.
pos
))
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
if
self
.
type
.
is_int
and
self
.
type
.
signed
and
self
.
operator
!=
'%'
:
if
self
.
type
.
is_int
and
self
.
type
.
signed
and
self
.
operator
!=
'%'
:
...
@@ -9867,9 +9870,11 @@ class DivNode(NumBinopNode):
...
@@ -9867,9 +9870,11 @@ class DivNode(NumBinopNode):
self
.
type
.
empty_declaration_code
(),
self
.
type
.
empty_declaration_code
(),
minus1_check
,
minus1_check
,
self
.
operand1
.
result
()))
self
.
operand1
.
result
()))
code
.
put_ensure_gil
()
if
in_nogil
:
code
.
put_ensure_gil
()
code
.
putln
(
'PyErr_SetString(PyExc_OverflowError, "value too large to perform division");'
)
code
.
putln
(
'PyErr_SetString(PyExc_OverflowError, "value too large to perform division");'
)
code
.
put_release_ensured_gil
()
if
in_nogil
:
code
.
put_release_ensured_gil
()
code
.
putln
(
code
.
error_goto
(
self
.
pos
))
code
.
putln
(
code
.
error_goto
(
self
.
pos
))
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
if
code
.
globalstate
.
directives
[
'cdivision_warnings'
]
and
self
.
operator
!=
'/'
:
if
code
.
globalstate
.
directives
[
'cdivision_warnings'
]
and
self
.
operator
!=
'/'
:
...
@@ -9877,17 +9882,20 @@ class DivNode(NumBinopNode):
...
@@ -9877,17 +9882,20 @@ class DivNode(NumBinopNode):
code
.
putln
(
"if (unlikely((%s < 0) ^ (%s < 0))) {"
%
(
code
.
putln
(
"if (unlikely((%s < 0) ^ (%s < 0))) {"
%
(
self
.
operand1
.
result
(),
self
.
operand1
.
result
(),
self
.
operand2
.
result
()))
self
.
operand2
.
result
()))
code
.
put_ensure_gil
()
if
in_nogil
:
code
.
put_ensure_gil
()
code
.
putln
(
code
.
set_error_info
(
self
.
pos
,
used
=
True
))
code
.
putln
(
code
.
set_error_info
(
self
.
pos
,
used
=
True
))
code
.
putln
(
"if (__Pyx_cdivision_warning(%(FILENAME)s, "
code
.
putln
(
"if (__Pyx_cdivision_warning(%(FILENAME)s, "
"%(LINENO)s)) {"
%
{
"%(LINENO)s)) {"
%
{
'FILENAME'
:
Naming
.
filename_cname
,
'FILENAME'
:
Naming
.
filename_cname
,
'LINENO'
:
Naming
.
lineno_cname
,
'LINENO'
:
Naming
.
lineno_cname
,
})
})
code
.
put_release_ensured_gil
()
if
in_nogil
:
code
.
put_release_ensured_gil
()
code
.
put_goto
(
code
.
error_label
)
code
.
put_goto
(
code
.
error_label
)
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
code
.
put_release_ensured_gil
()
if
in_nogil
:
code
.
put_release_ensured_gil
()
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
def
calculate_result_code
(
self
):
def
calculate_result_code
(
self
):
...
...
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