NotificationsYou must be signed in to change notification settings
Fork32k
Star67.2k

Commit6787fbf

committed

Use _interpreters.call().

1 parentd58f54e commit6787fbfCopy full SHA for 6787fbf

File tree

1 file changed

+40

-67

lines changed

Lib/concurrent/futures
- interpreter.py

1 file changed

+40

-67

lines changed

`‎Lib/concurrent/futures/interpreter.py`

Lines changed: 40 additions & 67 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,8 @@ def resolve_task(fn, args, kwargs):`
`45`	`45`	`# XXX Circle back to this later.`
`46`	`46`	`raiseTypeError('scripts not supported')`
`47`	`47`	`else:`
`48`		`-# Functions defined in the __main__ module can't be pickled,`
`49`		`-# so they can't be used here. In the future, we could possibly`
`50`		`-# borrow from multiprocessing to work around this.`
`51`	`48`	`task= (fn,args,kwargs)`
`52`		`-data=pickle.dumps(task)`
`53`		`-returndata`
	`49`	`+returntask`
`54`	`50`
`55`	`51`	`ifinitializerisnotNone:`
`56`	`52`	`try:`
`@@ -65,35 +61,6 @@ def create_context():`
`65`	`61`	`returncls(initdata,shared)`
`66`	`62`	`returncreate_context,resolve_task`
`67`	`63`
`68`		`-@classmethod`
`69`		`-@contextlib.contextmanager`
`70`		`-def_capture_exc(cls,resultsid):`
`71`		`-try:`
`72`		`-yield`
`73`		`-exceptBaseExceptionasexc:`
`74`		`-# Send the captured exception out on the results queue,`
`75`		`-# but still leave it unhandled for the interpreter to handle.`
`76`		`-_interpqueues.put(resultsid, (None,exc))`
`77`		`-raise# re-raise`
`78`		`-`
`79`		`-@classmethod`
`80`		`-def_send_script_result(cls,resultsid):`
`81`		`-_interpqueues.put(resultsid, (None,None))`
`82`		`-`
`83`		`-@classmethod`
`84`		`-def_call(cls,func,args,kwargs,resultsid):`
`85`		`-withcls._capture_exc(resultsid):`
`86`		`-res=func(argsor (),*kwargsor {})`
`87`		`-# Send the result back.`
`88`		`-withcls._capture_exc(resultsid):`
`89`		`-_interpqueues.put(resultsid, (res,None))`
`90`		`-`
`91`		`-@classmethod`
`92`		`-def_call_pickled(cls,pickled,resultsid):`
`93`		`-withcls._capture_exc(resultsid):`
`94`		`-fn,args,kwargs=pickle.loads(pickled)`
`95`		`-cls._call(fn,args,kwargs,resultsid)`
`96`		`-`
`97`	`64`	`def__init__(self,initdata,shared=None):`
`98`	`65`	`self.initdata=initdata`
`99`	`66`	`self.shared=dict(shared)ifsharedelseNone`
`@@ -104,11 +71,42 @@ def __del__(self):`
`104`	`71`	`ifself.interpidisnotNone:`
`105`	`72`	`self.finalize()`
`106`	`73`
`107`		`-def_exec(self,script):`
`108`		`-assertself.interpidisnotNone`
`109`		`-excinfo=_interpreters.exec(self.interpid,script,restrict=True)`
	`74`	`+def_call(self,fn,args,kwargs):`
	`75`	`+defdo_call(resultsid,func,args,*kwargs):`
	`76`	`+try:`
	`77`	`+returnfunc(args,*kwargs)`
	`78`	`+exceptBaseExceptionasexc:`
	`79`	`+# Avoid relying on globals.`
	`80`	`+import_interpqueues`
	`81`	`+# Send the captured exception out on the results queue,`
	`82`	`+# but still leave it unhandled for the interpreter to handle.`
	`83`	`+_interpqueues.put(resultsid,err)`
	`84`	`+raise# re-raise`
	`85`	`+`
	`86`	`+args= (self.resultsid,fn,*args)`
	`87`	`+res,excinfo=_interpreters.call(self.interpid,do_call,args,kwargs)`
`110`	`88`	`ifexcinfoisnotNone:`
`111`	`89`	`raiseExecutionFailed(excinfo)`
	`90`	`+returnres`
	`91`	`+`
	`92`	`+def_get_exception(self):`
	`93`	`+# Wait for the exception data to show up.`
	`94`	`+whileTrue:`
	`95`	`+try:`
	`96`	`+excdata=_interpqueues.get(self.resultsid)`
	`97`	`+except_interpqueues.QueueNotFoundError:`
	`98`	`+raise# re-raise`
	`99`	`+except_interpqueues.QueueError:`
	`100`	`+continue`
	`101`	`+exceptModuleNotFoundError:`
	`102`	`+# interpreters.queues doesn't exist, which means`
	`103`	`+# QueueEmpty doesn't. Act as though it does.`
	`104`	`+continue`
	`105`	`+else:`
	`106`	`+break`
	`107`	`+exc,unboundop=excdata`
	`108`	`+assertunboundopisNone,unboundop`
	`109`	`+returnexc`
`112`	`110`
`113`	`111`	`definitialize(self):`
`114`	`112`	`assertself.interpidisNone,self.interpid`
`@@ -148,37 +146,12 @@ def finalize(self):`
`148`	`146`	`pass`
`149`	`147`
`150`	`148`	`defrun(self,task):`
`151`		`-data=task`
`152`		`-script=f'WorkerContext._call_pickled({data!r},{self.resultsid})'`
`153`		`-`
	`149`	`+fn,args,kwargs=task`
`154`	`150`	`try:`
`155`		`-self._exec(script)`
`156`		`-exceptExecutionFailedasexc:`
`157`		`-exc_wrapper=exc`
`158`		`-else:`
`159`		`-exc_wrapper=None`
`160`		`-`
`161`		`-# Return the result, or raise the exception.`
`162`		`-whileTrue:`
`163`		`-try:`
`164`		`-obj=_interpqueues.get(self.resultsid)`
`165`		`-except_interpqueues.QueueNotFoundError:`
`166`		`-raise# re-raise`
`167`		`-except_interpqueues.QueueError:`
`168`		`-continue`
`169`		`-exceptModuleNotFoundError:`
`170`		`-# interpreters.queues doesn't exist, which means`
`171`		`-# QueueEmpty doesn't. Act as though it does.`
`172`		`-continue`
`173`		`-else:`
`174`		`-break`
`175`		`- (res,exc),unboundop=obj`
`176`		`-assertunboundopisNone,unboundop`
`177`		`-ifexcisnotNone:`
`178`		`-assertresisNone,res`
`179`		`-assertexc_wrapperisnotNone`
`180`		`-raiseexcfromexc_wrapper`
`181`		`-returnres`
	`151`	`+returnself._call(fn,args,kwargs)`
	`152`	`+exceptExecutionFailedaswrapper:`
	`153`	`+exc=self._get_exception()`
	`154`	`+raiseexcfromwrapper`
`182`	`155`
`183`	`156`
`184`	`157`	`classBrokenInterpreterPool(_thread.BrokenThreadPool):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit6787fbf

File tree

1 file changed

1 file changed

`‎Lib/concurrent/futures/interpreter.py`

0 commit comments