Merge pull request #2446 from mitza-oci/ace6-windows-thread-names

mitza-oci · web-flow · commit 728e90dedfe1 · 2025-08-07T13:42:31.000-05:00
[ACE 6] Conditional compilation for Windows thread names
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
@@ -4113,10 +4113,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                                                 flags,
                                                 thr_id);
 
+#   ifndef ACE_LACKS_SETTHREADDESCRIPTION
       if (thr_name && *thr_name && *thr_handle)
         {
           SetThreadDescription (*thr_handle, ACE_Ascii_To_Wide (*thr_name).wchar_rep ());
         }
+#   endif
 
       if (priority != ACE_DEFAULT_THREAD_PRIORITY && *thr_handle != 0)
         {
diff --git a/ACE/ace/README b/ACE/ace/README
@@ -990,6 +990,8 @@ ACE_LACKS_SETDETACH                     Platform lacks
 ACE_LACKS_SETSCHED                      Platform lacks
                                         pthread_attr_setsched()
                                         (e.g. MVS)
+ACE_LACKS_SETTHREADDESCRIPTION          Platform lacks SetThreadDescription
+                                        (e.g. Windows Server 2016)
 ACE_LACKS_SIGACTION                     Platform lacks struct
                                         sigaction (e.g., Win32 and
                                         Chorus)

Original file line number	Diff line number	Diff line change
`@@ -4113,10 +4113,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,`
`4113`	`4113`	`flags,`
`4114`	`4114`	`thr_id);`
`4115`	`4115`
	`4116`	`+# ifndef ACE_LACKS_SETTHREADDESCRIPTION`
`4116`	`4117`	`if (thr_name && thr_name && thr_handle)`
`4117`	`4118`	`{`
`4118`	`4119`	`SetThreadDescription (thr_handle, ACE_Ascii_To_Wide (thr_name).wchar_rep ());`
`4119`	`4120`	`}`
	`4121`	`+# endif`
`4120`	`4122`
`4121`	`4123`	`if (priority != ACE_DEFAULT_THREAD_PRIORITY && *thr_handle != 0)`
`4122`	`4124`	`{`