Merge pull request #1389 from iguessthislldo/igtd/gettid-export

Inline ACE_OS::thr_gettid
DOCGroup · Jan 7, 2021 · a8ed6a2 · a8ed6a2
2 parents 20d49a4 + 8c07da5
commit a8ed6a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
@@ -4839,16 +4839,6 @@ ACE_OS::unique_name (const void *object,
 }
 #endif
 
-pid_t
-ACE_OS::thr_gettid ()
-{
-#ifdef ACE_HAS_GETTID
-  return syscall (SYS_gettid);
-#else
-  ACE_NOTSUP_RETURN (-1);
-#endif
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)

diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
@@ -1767,6 +1767,7 @@ namespace ACE_OS {
    * For older Linux (pre 2.4.11) and other systems that don't have gettid(),
    * this uses ACE_NOTSUP_RETURN (-1).
    */
+  ACE_NAMESPACE_INLINE_FUNCTION
   pid_t thr_gettid ();
 
   /**

diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
@@ -3179,6 +3179,16 @@ ACE_OS::thr_gettid (char buffer[], size_t buffer_length)
     static_cast<int> (ACE_OS::thr_gettid ()));
 }
 
+ACE_INLINE pid_t
+ACE_OS::thr_gettid ()
+{
+#ifdef ACE_HAS_GETTID
+  return syscall (SYS_gettid);
+#else
+  ACE_NOTSUP_RETURN (-1);
+#endif
+}
+
 ACE_INLINE ACE_thread_t
 ACE_OS::thr_self ()
 {