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
c081c0c6
Commit
c081c0c6
authored
Jul 15, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #12573: Add resource checks for dangling Thread and Process objects.
parent
b8298a01
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
1 deletion
+47
-1
Lib/multiprocessing/process.py
Lib/multiprocessing/process.py
+5
-0
Lib/test/regrtest.py
Lib/test/regrtest.py
+36
-1
Lib/threading.py
Lib/threading.py
+4
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/multiprocessing/process.py
View file @
c081c0c6
...
...
@@ -42,6 +42,7 @@ import os
import
sys
import
signal
import
itertools
from
_weakrefset
import
WeakSet
#
#
...
...
@@ -105,6 +106,7 @@ class Process(object):
self
.
_kwargs
=
dict
(
kwargs
)
self
.
_name
=
name
or
type
(
self
).
__name__
+
'-'
+
\
':'
.
join
(
str
(
i
)
for
i
in
self
.
_identity
)
_dangling
.
add
(
self
)
def
run
(
self
):
'''
...
...
@@ -328,3 +330,6 @@ _exitcode_to_name = {}
for
name
,
signum
in
list
(
signal
.
__dict__
.
items
()):
if
name
[:
3
]
==
'SIG'
and
'_'
not
in
name
:
_exitcode_to_name
[
-
signum
]
=
name
# For debug and leak testing
_dangling
=
WeakSet
()
Lib/test/regrtest.py
View file @
c081c0c6
...
...
@@ -172,6 +172,15 @@ import unittest
import
warnings
from
inspect
import
isabstract
try
:
import
threading
except
ImportError
:
threading
=
None
try
:
import
multiprocessing.process
except
ImportError
:
multiprocessing
=
None
# Some times __path__ and __file__ are not absolute (e.g. while running from
# Lib/) and, if we change the CWD to run the tests in a temporary dir, some
...
...
@@ -864,7 +873,8 @@ class saved_test_environment:
'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
'warnings.filters', 'asyncore.socket_map',
'logging._handlers', 'logging._handlerList',
'sys.warnoptions')
'sys.warnoptions', 'threading._dangling',
'multiprocessing.process._dangling')
def get_sys_argv(self):
return id(sys.argv), sys.argv, sys.argv[:]
...
...
@@ -952,6 +962,31 @@ class saved_test_environment:
sys.warnoptions = saved_options[1]
sys.warnoptions[:] = saved_options[2]
# Controlling dangling references to Thread objects can make it easier
# to track reference leaks.
def get_threading__dangling(self):
if not threading:
return None
# This copies the weakrefs without making any strong reference
return threading._dangling.copy()
def restore_threading__dangling(self, saved):
if not threading:
return
threading._dangling.clear()
threading._dangling.update(saved)
# Same for Process objects
def get_multiprocessing_process__dangling(self):
if not multiprocessing:
return None
# This copies the weakrefs without making any strong reference
return multiprocessing.process._dangling.copy()
def restore_multiprocessing_process__dangling(self, saved):
if not multiprocessing:
return
multiprocessing.process._dangling.clear()
multiprocessing.process._dangling.update(saved)
def resource_info(self):
for name in self.resources:
method_suffix = name.replace('.', '_')
...
...
Lib/threading.py
View file @
c081c0c6
...
...
@@ -6,6 +6,7 @@ import _thread
from
time
import
time
as
_time
,
sleep
as
_sleep
from
traceback
import
format_exc
as
_format_exc
from
collections
import
deque
from
_weakrefset
import
WeakSet
# Note regarding PEP 8 compliant names
# This threading model was originally inspired by Java, and inherited
...
...
@@ -606,6 +607,8 @@ _active_limbo_lock = _allocate_lock()
_active
=
{}
# maps thread id to Thread object
_limbo
=
{}
# For debug and leak testing
_dangling
=
WeakSet
()
# Main class for threads
...
...
@@ -640,6 +643,7 @@ class Thread(_Verbose):
# sys.stderr is not stored in the class like
# sys.exc_info since it can be changed between instances
self
.
_stderr
=
_sys
.
stderr
_dangling
.
add
(
self
)
def
_reset_internal_locks
(
self
):
# private! Called by _after_fork() to reset our internal locks as
...
...
Misc/NEWS
View file @
c081c0c6
...
...
@@ -67,6 +67,8 @@ C-API
Tests
-----
- Issue #12573: Add resource checks for dangling Thread and Process objects.
- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
as the processor type on some Mac systems.
...
...
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