Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
fef7e94f
Commit
fef7e94f
authored
Sep 09, 2016
by
Łukasz Langa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't run garbage collection on interpreter exit if it was explicitly disabled
by the user.
parent
9e3ef52a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
Include/objimpl.h
Include/objimpl.h
+2
-1
Modules/gcmodule.c
Modules/gcmodule.c
+9
-0
Python/pylifecycle.c
Python/pylifecycle.c
+3
-3
No files found.
Include/objimpl.h
View file @
fef7e94f
...
...
@@ -224,11 +224,12 @@ PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
* ==========================
*/
/* C equivalent of gc.collect(). */
/* C equivalent of gc.collect()
which ignores the state of gc.enabled
. */
PyAPI_FUNC
(
Py_ssize_t
)
PyGC_Collect
(
void
);
#ifndef Py_LIMITED_API
PyAPI_FUNC
(
Py_ssize_t
)
_PyGC_CollectNoFail
(
void
);
PyAPI_FUNC
(
Py_ssize_t
)
_PyGC_CollectIfEnabled
(
void
);
#endif
/* Test if a type has a GC head */
...
...
Modules/gcmodule.c
View file @
fef7e94f
...
...
@@ -1596,6 +1596,15 @@ PyGC_Collect(void)
return
n
;
}
Py_ssize_t
_PyGC_CollectIfEnabled
(
void
)
{
if
(
!
enabled
)
return
0
;
return
PyGC_Collect
();
}
Py_ssize_t
_PyGC_CollectNoFail
(
void
)
{
...
...
Python/pylifecycle.c
View file @
fef7e94f
...
...
@@ -600,12 +600,12 @@ Py_FinalizeEx(void)
* XXX but I'm unclear on exactly how that one happens. In any case,
* XXX I haven't seen a real-life report of either of these.
*/
PyGC_Collect
();
_PyGC_CollectIfEnabled
();
#ifdef COUNT_ALLOCS
/* With COUNT_ALLOCS, it helps to run GC multiple times:
each collection might release some types from the type
list, so they become garbage. */
while
(
PyGC_Collect
()
>
0
)
while
(
_PyGC_CollectIfEnabled
()
>
0
)
/* nothing */
;
#endif
/* Destroy all modules */
...
...
@@ -632,7 +632,7 @@ Py_FinalizeEx(void)
* XXX Python code getting called.
*/
#if 0
PyGC_Collect
();
_PyGC_CollectIfEnabled
();
#endif
/* Disable tracemalloc after all Python objects have been destroyed,
...
...
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