Merge pull request #2370 from mitza-oci/thread-names

mitza-oci · web-flow · commit e3b027b753b2 · 2025-04-28T08:13:27.000-05:00
Support thread names on Windows and Integrity
diff --git a/ACE/NEWS b/ACE/NEWS
@@ -21,6 +21,9 @@ USER VISIBLE CHANGES BETWEEN ACE-8.0.2 and ACE-8.0.3
 . Updated support for Green Hills INTEGRITY and INTEGRITY-178 tuMP RTOS.
   Tested on INTEGRITY 11.4.6 and INTEGRITY-178 5.0.0.
 
+. Thread names given to ACE_OS::thr_create are now passed down to the OS
+  on Windows and on INTEGRITY.
+
 USER VISIBLE CHANGES BETWEEN ACE-8.0.1 and ACE-8.0.2
 ====================================================
 
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
@@ -3455,7 +3455,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                     void *stack,
                     size_t stacksize,
                     ACE_Base_Thread_Adapter *thread_adapter,
-                    const char** thr_name)
+                    const char **thr_name)
 {
   ACE_OS_TRACE ("ACE_OS::thr_create");
 
@@ -3882,6 +3882,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                                                 flags,
                                                 thr_id);
 
+      if (thr_name && *thr_name && *thr_handle)
+        {
+          SetThreadDescription (*thr_handle, ACE_Ascii_To_Wide (*thr_name).wchar_rep ());
+        }
+
       if (priority != ACE_DEFAULT_THREAD_PRIORITY && *thr_handle != 0)
         {
           // Set the priority of the new thread and then let it
@@ -3937,7 +3942,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       // The call below to ::taskSpawn () causes VxWorks to assign a
       // unique task name of the form: "t" + an integer, because the
       // first argument is 0.
-      tid = ::taskSpawn (thr_name && *thr_name ? const_cast <char*> (*thr_name) : 0,
+      tid = ::taskSpawn (thr_name && *thr_name ? const_cast <char *> (*thr_name) : 0,
                          priority,
                          (int) flags,
                          stacksize,
@@ -3957,7 +3962,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
       // The TID is defined to be the address of the TCB.
       int status = ::taskInit (tcb,
-                               thr_name && *thr_name ? const_cast <char*>(*thr_name) : 0,
+                               thr_name && *thr_name ? const_cast <char *> (*thr_name) : 0,
                                priority,
                                (int) flags,
                                (char *) stack + sizeof (WIND_TCB),
@@ -4023,17 +4028,20 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
     // Don't let this Task run immediately; we have to set its entrypoint's argument below.
     err_code = ::SetupTask (AddressSpaceObjectNumber (1), priority /* priority */, 0 /* weight */, 0 /* timeslice */,
-                          (Address) stack /* stack */, (Address) stacksize /* stackLength */, true /* enableClibrary */,
-                          true /* allocTLS */, (Address) &integrity_task_adapter, false /* startIt */, 0 /* name */,
-                          0 /* symbolFile */, thr_handle /* newTask */, 0 /* newActivity */);
+                            (Address) stack /* stack */, (Address) stacksize /* stackLength */, true /* enableClibrary */,
+                            true /* allocTLS */, (Address) &integrity_task_adapter, false /* startIt */,
+                            thr_name ? const_cast<char *> (*thr_name) : nullptr /* name */,
+                            0 /* symbolFile */, thr_handle /* newTask */, 0 /* newActivity */);
 
 #   else
     ACE_UNUSED_ARG (stack);
     // INTEGRITY has kernel calls in which we can pass argument for the new Task's entry point,
     // e.g. CommonCreateTaskWithArgument.
     // However, we are imitating INTEGRITY-178 and the call without entrypoint's argument is used.
     err_code = ::CommonCreateTask (priority, (Address) &integrity_task_adapter /* entrypoint */,
-                                   (Address) stacksize, 0 /* name */, thr_handle /* newtask */);
+                                   (Address) stacksize,
+                                   thr_name ? const_cast<char *> (*thr_name) : nullptr /* name */,
+                                   thr_handle /* newtask */);
 #   endif
 
     if (err_code != Success)
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
@@ -1640,7 +1640,7 @@ namespace ACE_OS {
                   void *stack = 0,
                   size_t stacksize = ACE_DEFAULT_THREAD_STACKSIZE,
                   ACE_Base_Thread_Adapter *thread_adapter = 0,
-                  const char** thr_name = 0);
+                  const char **thr_name = 0);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int thr_equal (ACE_thread_t t1, ACE_thread_t t2);
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
@@ -2379,6 +2379,9 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
     // means forever.
     *sig = ::sigtimedwait (sset, 0, 0);
     return *sig;
+# else
+    ACE_UNUSED_ARG (sset);
+    ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_WTHREADS || ACE_LACKS_SIGWAIT */
 #else
     ACE_UNUSED_ARG (sset);
@@ -2843,18 +2846,14 @@ ACE_OS::thr_self ()
 #endif /* ACE_HAS_THREADS */
 }
 
-ACE_INLINE const char*
+ACE_INLINE const char *
 ACE_OS::thr_name ()
 {
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_VXTHREADS)
+#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_VXTHREADS)
   return ::taskName (ACE_OS::thr_self ());
 #else
   ACE_NOTSUP_RETURN (0);
 #endif
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif
 }
 
 ACE_INLINE void
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
@@ -841,10 +841,10 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 {
 #if defined (SIOCGIFNUM)
 # if defined (SIOCGLIFNUM)
-  int cmd = SIOCGLIFNUM;
+  ACE_IOCTL_TYPE_ARG2 cmd = SIOCGLIFNUM;
   struct lifnum if_num = {AF_UNSPEC,0,0};
 # else
-  int cmd = SIOCGIFNUM;
+  ACE_IOCTL_TYPE_ARG2 cmd = SIOCGIFNUM;
   int if_num = 0;
 # endif /* SIOCGLIFNUM */
   if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1)
diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp
@@ -48,11 +48,14 @@ ACE_Stack_Trace::c_str () const
   return &this->buf_[0];
 }
 
+#if defined(__GLIBC__) || defined(ACE_HAS_EXECINFO_H) || defined(VXWORKS) || \
+    (defined(ACE_WIN32) && !defined (__MINGW32__) && !defined(__BORLANDC__))
 static inline size_t
 determine_starting_frame (ssize_t initial_frame, ssize_t offset)
 {
   return (std::max)( initial_frame + offset, static_cast<ssize_t>(0));
 }
+#endif
 
 #if defined(ACE_FACE_SAFETY_BASE) && !defined(ACE_FACE_DEV)
 void
diff --git a/ACE/ace/Thread.cpp b/ACE/ace/Thread.cpp
@@ -17,7 +17,7 @@ ACE_Thread::spawn_n (size_t n,
                      void *stack[],
                      size_t stack_size[],
                      ACE_Thread_Adapter *thread_adapter,
-                     const char* thr_name[])
+                     const char *thr_name[])
 {
   ACE_TRACE ("ACE_Thread::spawn_n");
   size_t i;
@@ -53,7 +53,7 @@ ACE_Thread::spawn_n (ACE_thread_t thread_ids[],
                      size_t stack_size[],
                      ACE_hthread_t thread_handles[],
                      ACE_Thread_Adapter *thread_adapter,
-                     const char* thr_name[])
+                     const char *thr_name[])
 {
   ACE_TRACE ("ACE_Thread::spawn_n");
   size_t i = 0;
diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h
@@ -88,7 +88,7 @@ class ACE_Export ACE_Thread
                     void *stack = 0,
                     size_t stack_size = ACE_DEFAULT_THREAD_STACKSIZE,
                     ACE_Thread_Adapter *thread_adapter = 0,
-                    const char** thr_name = 0);
+                    const char **thr_name = 0);
 
   /**
    * Spawn N new threads, which execute @a func with argument @a arg (if
@@ -112,7 +112,7 @@ class ACE_Export ACE_Thread
                          void *stack[] = 0,
                          size_t stack_size[] = 0,
                          ACE_Thread_Adapter *thread_adapter = 0,
-                         const char* thr_name[] = 0);
+                         const char *thr_name[] = 0);
 
   /**
    * Spawn @a n new threads, which execute @a func with argument @a arg
@@ -142,7 +142,7 @@ class ACE_Export ACE_Thread
                          size_t stack_size[] = 0,
                          ACE_hthread_t thread_handles[] = 0,
                          ACE_Thread_Adapter *thread_adapter = 0,
-                         const char* thr_name[] = 0);
+                         const char *thr_name[] = 0);
 
   /**
    * Wait for one or more threads to exit and reap their exit status.
diff --git a/ACE/ace/Thread.inl b/ACE/ace/Thread.inl
@@ -76,7 +76,7 @@ ACE_Thread::spawn (ACE_THR_FUNC func,
                    void *thr_stack,
                    size_t thr_stack_size,
                    ACE_Thread_Adapter *thread_adapter,
-                   const char** thr_name)
+                   const char **thr_name)
 {
   ACE_TRACE ("ACE_Thread::spawn");
 
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
@@ -577,7 +577,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                              void *stack,
                              size_t stack_size,
                              ACE_Task_Base *task,
-                             const char** thr_name)
+                             const char **thr_name)
 {
   // First, threads created by Thread Manager should not be daemon threads.
   // Using assertion is probably a bit too strong.  However, it helps
@@ -692,7 +692,7 @@ ACE_Thread_Manager::spawn (ACE_THR_FUNC func,
                            int grp_id,
                            void *stack,
                            size_t stack_size,
-                           const char** thr_name)
+                           const char **thr_name)
 {
   ACE_TRACE ("ACE_Thread_Manager::spawn");
 
@@ -733,7 +733,7 @@ ACE_Thread_Manager::spawn_n (size_t n,
                              ACE_hthread_t thread_handles[],
                              void *stack[],
                              size_t stack_size[],
-                             const char* thr_name[])
+                             const char *thr_name[])
 {
   ACE_TRACE ("ACE_Thread_Manager::spawn_n");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
@@ -776,7 +776,7 @@ ACE_Thread_Manager::spawn_n (ACE_thread_t thread_ids[],
                              size_t stack_size[],
                              ACE_hthread_t thread_handles[],
                              ACE_Task_Base *task,
-                             const char* thr_name[])
+                             const char *thr_name[])
 {
   ACE_TRACE ("ACE_Thread_Manager::spawn_n");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h
@@ -530,7 +530,7 @@ class ACE_Export ACE_Thread_Manager
              int grp_id = -1,
              void *stack = 0,
              size_t stack_size = ACE_DEFAULT_THREAD_STACKSIZE,
-             const char** thr_name = 0);
+             const char **thr_name = 0);
 
   /**
    * Spawn a specified number of threads, all of which execute @a func
@@ -607,7 +607,7 @@ class ACE_Export ACE_Thread_Manager
                ACE_hthread_t thread_handles[] = 0,
                void *stack[] = 0,
                size_t stack_size[] = 0,
-               const char* thr_name[] = 0);
+               const char *thr_name[] = 0);
 
   /**
    * Spawn a specified number of threads, all of which execute @a func
@@ -690,7 +690,7 @@ class ACE_Export ACE_Thread_Manager
                size_t stack_size[] = 0,
                ACE_hthread_t thread_handles[] = 0,
                ACE_Task_Base *task = 0,
-               const char* thr_name[] = 0);
+               const char *thr_name[] = 0);
 
   /**
    * Called to clean up when a thread exits.
@@ -1108,14 +1108,14 @@ class ACE_Export ACE_Thread_Manager
   int spawn_i (ACE_THR_FUNC func,
                void *arg,
                long flags,
-               ACE_thread_t * = 0,
+               ACE_thread_t *t_id = 0,
                ACE_hthread_t *t_handle = 0,
                long priority = ACE_DEFAULT_THREAD_PRIORITY,
                int grp_id = -1,
                void *stack = 0,
                size_t stack_size = 0,
                ACE_Task_Base *task = 0,
-               const char** thr_name = 0);
+               const char **thr_name = 0);
 
   /// Run the registered hooks when the thread exits.
   void run_thread_exit_hooks (int i);
diff --git a/ACE/ace/config-integrity-common.h b/ACE/ace/config-integrity-common.h
@@ -35,6 +35,7 @@
 #define ACE_HAS_DIRENT
 
 #define ACE_PAGE_SIZE 4096
+#define ACE_IOCTL_TYPE_ARG2 unsigned long
 
 #define ACE_LACKS_KEY_T
 
diff --git a/TAO/NEWS b/TAO/NEWS
@@ -9,6 +9,8 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.2 and TAO-4.0.3
 . When no preferred interfaces are provided we don't query for all IP interfaces
   as that could be slow
 
+. Threads created by TAO_Thread_Per_Connection_Handler now have names
+
 USER VISIBLE CHANGES BETWEEN TAO-4.0.1 and TAO-4.0.2
 ====================================================
 
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
@@ -126,8 +126,8 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
                       -1);
 
       result =
-        tpch->activate (f->server_connection_thread_flags (),
-                        f->server_connection_thread_count ());
+        tpch->activate_ch (f->server_connection_thread_flags (),
+                           f->server_connection_thread_count ());
     }
   else
     {
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
@@ -1358,25 +1358,19 @@ TAO_GIOP_Message_Base::get_parser (
           return
             const_cast<TAO_GIOP_Message_Generator_Parser_10 *> (
                                      &this->tao_giop_impl_.tao_giop_10);
-          break;
         case 1:
           return
             const_cast<TAO_GIOP_Message_Generator_Parser_11 *> (
                                      &this->tao_giop_impl_.tao_giop_11);
-          break;
         case 2:
           return
             const_cast<TAO_GIOP_Message_Generator_Parser_12 *> (
                                      &this->tao_giop_impl_.tao_giop_12);
-          break;
         default:
           throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
-          break;
         }
-      break;
     default:
       throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
-      break;
     }
 }
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
@@ -3135,29 +3135,18 @@ TAO_ORB_Core::get_transport_queueing_strategy (TAO_Stub *,
                                                Messaging::SyncScope &scope)
 {
   switch (scope)
-  {
+    {
     case Messaging::SYNC_WITH_TRANSPORT:
     case Messaging::SYNC_WITH_SERVER:
     case Messaging::SYNC_WITH_TARGET:
-    {
       return this->flush_transport_queueing_strategy_;
-    }
-    break;
     case Messaging::SYNC_NONE:
-    {
       return this->eager_transport_queueing_strategy_;
-    }
-    break;
     case TAO::SYNC_DELAYED_BUFFERING:
-    {
       return this->delayed_transport_queueing_strategy_;
-    }
-    break;
     default:
-    {
       return nullptr;
     }
-  }
 }
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
@@ -39,7 +39,7 @@ TAO_Stub::reset_profiles_i ()
   if (this->forward_profiles_perm_)
     {
       // The *permanent* forward is being kept in the transient
-      // forward queue (??!). We have just nuked it. Put it back the way it was.
+      // forward queue (?). We have just nuked it. Put it back the way it was.
       // reset_base should have reset the profile success.
       // @todo We have knives in the spoon draw - TAO_Stub needs total rewrite.
       this->forward_profiles_ = this->forward_profiles_perm_;
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,14 @@ ACE_Stack_Trace::c_str () const`
`48`	`48`	`return &this->buf_[0];`
`49`	`49`	`}`
`50`	`50`
	`51`	`+#if defined(__GLIBC__) \|\| defined(ACE_HAS_EXECINFO_H) \|\| defined(VXWORKS) \|\| \`
	`52`	`+ (defined(ACE_WIN32) && !defined (__MINGW32__) && !defined(__BORLANDC__))`
`51`	`53`	`static inline size_t`
`52`	`54`	`determine_starting_frame (ssize_t initial_frame, ssize_t offset)`
`53`	`55`	`{`
`54`	`56`	`return (std::max)( initial_frame + offset, static_cast<ssize_t>(0));`
`55`	`57`	`}`
	`58`	`+#endif`
`56`	`59`
`57`	`60`	`#if defined(ACE_FACE_SAFETY_BASE) && !defined(ACE_FACE_DEV)`
`58`	`61`	`void`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ ACE_Thread::spawn (ACE_THR_FUNC func,`
`76`	`76`	`void *thr_stack,`
`77`	`77`	`size_t thr_stack_size,`
`78`	`78`	`ACE_Thread_Adapter *thread_adapter,`
`79`		`- const char** thr_name)`
	`79`	`+ const char **thr_name)`
`80`	`80`	`{`
`81`	`81`	`ACE_TRACE ("ACE_Thread::spawn");`
`82`	`82`