Commit8e8d5c9

and

authored

[3.14]gh-132542: Set native thread ID after fork (GH-132701) (GH-134356)

(cherry picked from commit6b73502)Co-authored-by: Noam Cohen <noam@noam.me>

1 parentdc5866a commit8e8d5c9Copy full SHA for 8e8d5c9

File tree

+32

-0

lines changed

+32

-0

lines changed

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,34 @@ def do_flush(args, *kwargs):`
`1352`	`1352`	`''')`
`1353`	`1353`	`assert_python_ok("-c",script)`
`1354`	`1354`
	`1355`	`+@skip_unless_reliable_fork`
	`1356`	`+deftest_native_id_after_fork(self):`
	`1357`	`+script="""if True:`
	`1358`	`+ import threading`
	`1359`	`+ import os`
	`1360`	`+ from test import support`
	`1361`	`+`
	`1362`	`+ parent_thread_native_id = threading.current_thread().native_id`
	`1363`	`+ print(parent_thread_native_id, flush=True)`
	`1364`	`+ assert parent_thread_native_id == threading.get_native_id()`
	`1365`	`+ childpid = os.fork()`
	`1366`	`+ if childpid == 0:`
	`1367`	`+ print(threading.current_thread().native_id, flush=True)`
	`1368`	`+ assert threading.current_thread().native_id == threading.get_native_id()`
	`1369`	`+ else:`
	`1370`	`+ try:`
	`1371`	`+ assert parent_thread_native_id == threading.current_thread().native_id`
	`1372`	`+ assert parent_thread_native_id == threading.get_native_id()`
	`1373`	`+ finally:`
	`1374`	`+ support.wait_process(childpid, exitcode=0)`
	`1375`	`+ """`
	`1376`	`+rc,out,err=assert_python_ok('-c',script)`
	`1377`	`+self.assertEqual(rc,0)`
	`1378`	`+self.assertEqual(err,b"")`
	`1379`	`+native_ids=out.strip().splitlines()`
	`1380`	`+self.assertEqual(len(native_ids),2)`
	`1381`	`+self.assertNotEqual(native_ids[0],native_ids[1])`
	`1382`	`+`
`1355`	`1383`	`classThreadJoinOnShutdown(BaseTestCase):`
`1356`	`1384`
`1357`	`1385`	`def_run_and_join(self,script):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -951,6 +951,8 @@ def _after_fork(self, new_ident=None):`
`951`	`951`	`# This thread is alive.`
`952`	`952`	`self._ident=new_ident`
`953`	`953`	`assertself._os_thread_handle.ident==new_ident`
	`954`	`+if_HAVE_THREAD_NATIVE_ID:`
	`955`	`+self._set_native_id()`
`954`	`956`	`else:`
`955`	`957`	`# Otherwise, the thread is dead, Jim. _PyThread_AfterFork()`
`956`	`958`	`# already marked our handle done.`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Update:attr:`Thread.native_id <threading.Thread.native_id>` after
	`2`	+:manpage:`fork(2)` to ensure accuracy. Patch by Noam Cohen.

Comments

(0)