Commit09a34f1

and

authored

[3.14]gh-134381: Fix RuntimeError when starting not-yet started Thread after fork (gh-134514) (gh-134596)

(cherry picked from commit9a2346d)Co-authored-by: Jiucheng(Oliver) <git.jiucheng@gmail.com>

1 parent6e60586 commit09a34f1Copy full SHA for 09a34f1

File tree

+29

-0

lines changed

+29

-0

lines changed

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6832,6 +6832,28 @@ def f(x): return x*x`
`6832`	`6832`	`self.assertEqual("332833500",out.decode('utf-8').strip())`
`6833`	`6833`	`self.assertFalse(err,msg=err.decode('utf-8'))`
`6834`	`6834`
	`6835`	`+deftest_forked_thread_not_started(self):`
	`6836`	`+# gh-134381: Ensure that a thread that has not been started yet in`
	`6837`	`+# the parent process can be started within a forked child process.`
	`6838`	`+`
	`6839`	`+ifmultiprocessing.get_start_method()!="fork":`
	`6840`	`+self.skipTest("fork specific test")`
	`6841`	`+`
	`6842`	`+q=multiprocessing.Queue()`
	`6843`	`+t=threading.Thread(target=lambda:q.put("done"),daemon=True)`
	`6844`	`+`
	`6845`	`+defchild():`
	`6846`	`+t.start()`
	`6847`	`+t.join()`
	`6848`	`+`
	`6849`	`+p=multiprocessing.Process(target=child)`
	`6850`	`+p.start()`
	`6851`	`+p.join(support.SHORT_TIMEOUT)`
	`6852`	`+`
	`6853`	`+self.assertEqual(p.exitcode,0)`
	`6854`	`+self.assertEqual(q.get_nowait(),"done")`
	`6855`	`+close_queue(q)`
	`6856`	`+`
`6835`	`6857`
`6836`	`6858`	`#`
`6837`	`6859`	`# Mixins`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:exc:`RuntimeError` when using a not-started:class:`threading.Thread` after calling:func:`os.fork`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,12 @@ _PyThread_AfterFork(struct _pythread_runtime_state *state)`
`281`	`281`	`continue;`
`282`	`282`	`}`
`283`	`283`
	`284`	`+// Keep handles for threads that have not been started yet. They are`
	`285`	`+// safe to start in the child process.`
	`286`	`+if (handle->state==THREAD_HANDLE_NOT_STARTED) {`
	`287`	`+continue;`
	`288`	`+ }`
	`289`	`+`
`284`	`290`	`// Mark all threads as done. Any attempts to join or detach the`
`285`	`291`	`// underlying OS thread (if any) could crash. We are the only thread;`
`286`	`292`	`// it's safe to set this non-atomically.`

Comments

(0)