fixup! cygthread: suspend thread before terminating.

jeremyd2019 · dscho · commit 54a725237845 · 2024-11-14T12:14:23.000+01:00
Suppress error output if ReadFile on child wait pipe returns
ERROR_OPERATION_ABORTED due to addition of CancelSynchronousIo call.

Cherry picked from commit eafd9a22bc (fixup! cygthread: suspend thread
before terminating., 2024-11-13) from msys2/msys2-runtime.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
@@ -1262,13 +1262,14 @@ proc_waiter (void *arg)
 
   for (;;)
     {
-      DWORD nb;
+      DWORD nb, err;
       char buf = '\0';
 
       if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
-	  && GetLastError () != ERROR_BROKEN_PIPE)
+	  && (err = GetLastError ()) != ERROR_BROKEN_PIPE)
 	{
-	  system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
+	  if (err != ERROR_OPERATION_ABORTED)
+	    system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
 	  break;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1262,13 +1262,14 @@ proc_waiter (void *arg)`
`1262`	`1262`
`1263`	`1263`	`for (;;)`
`1264`	`1264`	`{`
`1265`		`- DWORD nb;`
	`1265`	`+ DWORD nb, err;`
`1266`	`1266`	`char buf = '\0';`
`1267`	`1267`
`1268`	`1268`	`if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)`
`1269`		`- && GetLastError () != ERROR_BROKEN_PIPE)`
	`1269`	`+ && (err = GetLastError ()) != ERROR_BROKEN_PIPE)`
`1270`	`1270`	`{`
`1271`		`- system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);`
	`1271`	`+ if (err != ERROR_OPERATION_ABORTED)`
	`1272`	`+ system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);`
`1272`	`1273`	`break;`
`1273`	`1274`	`}`
`1274`	`1275`