mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 65864 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65864 | jesse.noller | 2008-08-19 14:06:19 -0500 (Tue, 19 Aug 2008) | 2 lines

  issue3352: clean up the multiprocessing API to remove many get_/set_ methods and convert them to properties. Update the docs and the examples included.
........
This commit is contained in:
Benjamin Peterson 2008-08-19 19:17:39 +00:00
parent be2c2b2313
commit 58ea9fedc8
15 changed files with 86 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/multiprocessing/dummy/__init__.py
View file

@ -47,7 +47,8 @@ class DummyProcess(threading.Thread):
self._parent._children[self] = None
threading.Thread.start(self)
def get_exitcode(self):
@property
def exitcode(self):
if self._start_called and not self.is_alive():
return 0
else:

4
Lib/multiprocessing/forking.py
View file

@ -315,7 +315,7 @@ else:
sys_argv=sys.argv,
log_to_stderr=_log_to_stderr,
orig_dir=process.ORIGINAL_DIR,
authkey=process.current_process().get_authkey(),
authkey=process.current_process().authkey,
)
if _logger is not None:
@ -363,7 +363,7 @@ def prepare(data):
old_main_modules.append(sys.modules['__main__'])
if 'name' in data:
process.current_process().set_name(data['name'])
process.current_process().name = data['name']
if 'authkey' in data:
process.current_process()._authkey = data['authkey']

10
Lib/multiprocessing/managers.py
View file

@ -450,7 +450,7 @@ class BaseManager(object):
def __init__(self, address=None, authkey=None, serializer='pickle'):
if authkey is None:
authkey = current_process().get_authkey()
authkey = current_process().authkey
self._address = address # XXX not final address if eg ('', 0)
self._authkey = AuthenticationString(authkey)
self._state = State()
@ -495,7 +495,7 @@ class BaseManager(object):
self._serializer, writer),
)
ident = ':'.join(str(i) for i in self._process._identity)
self._process.set_name(type(self).__name__ + '-' + ident)
self._process.name = type(self).__name__ + '-' + ident
self._process.start()
# get address of server
@ -696,7 +696,7 @@ class BaseProxy(object):
elif self._manager is not None:
self._authkey = self._manager._authkey
else:
self._authkey = current_process().get_authkey()
self._authkey = current_process().authkey
if incref:
self._incref()
@ -705,7 +705,7 @@ class BaseProxy(object):
def _connect(self):
util.debug('making connection to manager')
name = current_process().get_name()
name = current_process().name
if threading.current_thread().name != 'MainThread':
name += '|' + threading.current_thread().name
conn = self._Client(self._token.address, authkey=self._authkey)
@ -886,7 +886,7 @@ def AutoProxy(token, serializer, manager=None, authkey=None,
if authkey is None and manager is not None:
authkey = manager._authkey
if authkey is None:
authkey = current_process().get_authkey()
authkey = current_process().authkey
ProxyType = MakeProxyType('AutoProxy[%s]' % token.typeid, exposed)
proxy = ProxyType(token, serializer, manager=manager, authkey=authkey,

2
Lib/multiprocessing/pool.py
View file

@ -99,7 +99,7 @@ class Pool(object):
args=(self._inqueue, self._outqueue, initializer, initargs)
)
self._pool.append(w)
w.name = w.get_name().replace('Process', 'PoolWorker')
w.name = w.name.replace('Process', 'PoolWorker')
w.daemon = True
w.start()

39
Lib/multiprocessing/process.py
View file

@ -132,45 +132,43 @@ class Process(object):
self._popen.poll()
return self._popen.returncode is None
def get_name(self):
'''
Return name of process
'''
@property
def name(self):
return self._name
def set_name(self, name):
'''
Set name of process
'''
@name.setter
def name(self, name):
assert isinstance(name, str), 'name must be a string'
self._name = name
def is_daemon(self):
@property
def daemon(self):
'''
Return whether process is a daemon
'''
return self._daemonic
def set_daemon(self, daemonic):
@daemon.setter
def daemon(self, daemonic):
'''
Set whether process is a daemon
'''
assert self._popen is None, 'process has already started'
self._daemonic = daemonic
def get_authkey(self):
'''
Return authorization key of process
'''
@property
def authkey(self):
return self._authkey
def set_authkey(self, authkey):
@authkey.setter
def authkey(self, authkey):
'''
Set authorization key of process
'''
self._authkey = AuthenticationString(authkey)
def get_exitcode(self):
@property
def exitcode(self):
'''
Return exit code of process or `None` if it has yet to stop
'''
@ -178,7 +176,8 @@ class Process(object):
return self._popen
return self._popen.poll()
def get_ident(self):
@property
def ident(self):
'''
Return indentifier (PID) of process or `None` if it has yet to start
'''
@ -187,7 +186,7 @@ class Process(object):
else:
return self._popen and self._popen.pid
pid = property(get_ident)
pid = ident
def __repr__(self):
if self is _current_process:
@ -198,7 +197,7 @@ class Process(object):
status = 'initial'
else:
if self._popen.poll() is not None:
status = self.get_exitcode()
status = self.exitcode
else:
status = 'started'
@ -245,7 +244,7 @@ class Process(object):
except:
exitcode = 1
import traceback
sys.stderr.write('Process %s:\n' % self.get_name())
sys.stderr.write('Process %s:\n' % self.name)
sys.stderr.flush()
traceback.print_exc()

6
Lib/multiprocessing/reduction.py
View file

@ -82,9 +82,9 @@ def _get_listener():
try:
if _listener is None:
debug('starting listener and thread for sending handles')
_listener = Listener(authkey=current_process().get_authkey())
_listener = Listener(authkey=current_process().authkey)
t = threading.Thread(target=_serve)
t.set_daemon(True)
t.daemon = True
t.start()
finally:
_lock.release()
@ -127,7 +127,7 @@ def rebuild_handle(pickled_data):
if inherited:
return handle
sub_debug('rebuilding handle %d', handle)
conn = Client(address, authkey=current_process().get_authkey())
conn = Client(address, authkey=current_process().authkey)
conn.send((handle, os.getpid()))
new_handle = recv_handle(conn)
conn.close()

12
Lib/multiprocessing/synchronize.py
View file

@ -108,9 +108,9 @@ class Lock(SemLock):
def __repr__(self):
try:
if self._semlock._is_mine():
name = current_process().get_name()
if threading.current_thread().get_name() != 'MainThread':
name += '|' + threading.current_thread().get_name()
name = current_process().name
if threading.current_thread().name != 'MainThread':
name += '|' + threading.current_thread().name
elif self._semlock._get_value() == 1:
name = 'None'
elif self._semlock._count() > 0:
@ -133,9 +133,9 @@ class RLock(SemLock):
def __repr__(self):
try:
if self._semlock._is_mine():
name = current_process().get_name()
if threading.current_thread().get_name() != 'MainThread':
name += '|' + threading.current_thread().get_name()
name = current_process().name
if threading.current_thread().name != 'MainThread':
name += '|' + threading.current_thread().name
count = self._semlock._count()
elif self._semlock._get_value() == 1:
name, count = 'None', 0

4
Lib/multiprocessing/util.py
View file

@ -274,11 +274,11 @@ def _exit_function():
for p in active_children():
if p._daemonic:
info('calling terminate() for daemon %s', p.get_name())
info('calling terminate() for daemon %s', p.name)
p._popen.terminate()
for p in active_children():
info('calling join() for process %s', p.get_name())
info('calling join() for process %s', p.name)
p.join()
debug('running the remaining "atexit" finalizers')