Merge branch '0.10' into 0.11

pull/2573/head
sebres 2019-12-12 21:45:50 +01:00
commit 5dd85bf4f8
1 changed files with 4 additions and 2 deletions

View File

@ -461,14 +461,16 @@ def substituteRecursiveTags(inptags, conditional='',
if _libcap: if _libcap:
def prctl_set_th_name(name): def prctl_set_th_name(name):
"""Helper to set real thread name (used for identification and diagnostic purposes). """Helper to set real thread name (used for identification and diagnostic purposes).
Side effect: name can be silently truncated to 15 bytes (16 bytes with NTS zero)
""" """
try: try:
if sys.version_info >= (3,): # pragma: 2.x no cover if sys.version_info >= (3,): # pragma: 2.x no cover
name = name.encode() name = name.encode()
else: # pragma: 3.x no cover else: # pragma: 3.x no cover
name = bytes(name) name = bytes(name)
_libcap.prctl(15, name[0:15]) # PR_SET_NAME = 15, name can be up to 15 bytes long (16 bytes with NTS zero) _libcap.prctl(15, name) # PR_SET_NAME = 15
except: except: # pragma: no cover
pass pass
else: # pragma: no cover else: # pragma: no cover
def prctl_set_th_name(name): def prctl_set_th_name(name):