ThreadPthread: better hardware_concurrency implementation

GitOrigin-RevId: 4cccfcbf5f6ad5e1293993ff111b8021bb5c70a1

tdutils/CMakeLists.txt

@@ -75,6 +75,7 @@ set(TDUTILS_SOURCE
   td/utils/port/detail/Poll.cpp
   td/utils/port/detail/Select.cpp
   td/utils/port/detail/ThreadIdGuard.cpp
+  td/utils/port/detail/ThreadPthread.cpp
   td/utils/port/detail/WineventPoll.cpp
 
   ${TDMIME_AUTO}

tdutils/td/utils/port/detail/ThreadPthread.cpp

@@ -0,0 +1,92 @@
+//
+// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2019
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+#include "td/utils/port/detail/ThreadPthread.h"
+
+#if TD_THREAD_PTHREAD
+#include <unistd.h>
+#include <pthread.h>
+#include <sched.h>
+#include <sys/sysctl.h>
+
+namespace td {
+namespace detail {
+unsigned ThreadPthread::hardware_concurrency() {
+// Linux and MacOs
+#if defined(_SC_NPROCESSORS_ONLN)
+  {
+    auto res = sysconf(_SC_NPROCESSORS_ONLN);
+    if (res > 0) {
+      return narrow_cast<unsigned>(res);
+    }
+  }
+#endif
+
+// *BSD
+#if defined(HW_AVAILCPU) && defined(CTL_HW)
+  {
+    int mib[2];
+    int res{0};
+    size_t len = sizeof(res);
+    mib[0] = CTL_HW;
+    mib[1] = HW_AVAILCPU;
+    len = sizeof(res);
+    if (sysctl(mib, 2, &res, &len, NULL, 0) == 0 && res != 0) {
+      return res;
+    }
+  }
+#endif
+
+#if defined(HW_NCPU) && defined(CTL_HW)
+  {
+    int mib[2];
+    int res{0};
+    size_t len = sizeof(res);
+    mib[0] = CTL_HW;
+    mib[1] = HW_NCPU;
+    len = sizeof(res);
+    if (sysctl(mib, 2, &res, &len, NULL, 0) == 0 && res != 0) {
+      return res;
+    }
+  }
+#endif
+
+  // Just in case
+  return 8;
+}
+void ThreadPthread::set_name(CSlice name) {
+#if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 12)
+  pthread_setname_np(thread_, name.c_str());
+#endif
+#endif
+}
+void ThreadPthread::join() {
+  if (is_inited_.get()) {
+    is_inited_ = false;
+    pthread_join(thread_, nullptr);
+  }
+}
+void ThreadPthread::detach() {
+  if (is_inited_.get()) {
+    is_inited_ = false;
+    pthread_detach(thread_);
+  }
+}
+int do_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg) {
+  return pthread_create(thread, attr, start_routine, arg);
+}
+namespace this_thread_pthread {
+void yield() {
+  sched_yield();
+}
+ThreadPthread::id get_id() {
+  return pthread_self();
+}
+}  // namespace this_thread_pthread
+}  // namespace detail
+}  // namespace td
+#endif

tdutils/td/utils/port/detail/ThreadPthread.h

@@ -17,13 +17,13 @@
 #include "td/utils/port/detail/ThreadIdGuard.h"
 #include "td/utils/port/thread_local.h"
 #include "td/utils/Slice.h"
+#include "td/utils/misc.h"
 
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
-#include <pthread.h>
-#include <sched.h>
+#include <sys/types.h>
 
 namespace td {
 namespace detail {
@@ -49,33 +49,15 @@ class ThreadPthread {
     pthread_create(&thread_, nullptr, run_thread, func.release());
     is_inited_ = true;
   }
-  void set_name(CSlice name) {
-#if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ)
-#if __GLIBC_PREREQ(2, 12)
-    pthread_setname_np(thread_, name.c_str());
-#endif
-#endif
-  }
-  void join() {
-    if (is_inited_.get()) {
-      is_inited_ = false;
-      pthread_join(thread_, nullptr);
-    }
-  }
+  void set_name(CSlice name);
+  void join();
 
-  void detach() {
-    if (is_inited_.get()) {
-      is_inited_ = false;
-      pthread_detach(thread_);
-    }
-  }
+  void detach();
   ~ThreadPthread() {
     join();
   }
 
-  static unsigned hardware_concurrency() {
-    return 8;
-  }
+  static unsigned hardware_concurrency();
 
   using id = pthread_t;
 
@@ -88,6 +70,8 @@ class ThreadPthread {
     return std::forward<T>(v);
   }
 
+  int do_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg);
+
   static void *run_thread(void *ptr) {
     ThreadIdGuard thread_id_guard;
     auto func = unique_ptr<Destructor>(static_cast<Destructor *>(ptr));
@@ -96,12 +80,8 @@ class ThreadPthread {
 };
 
 namespace this_thread_pthread {
-inline void yield() {
-  sched_yield();
-}
-inline ThreadPthread::id get_id() {
-  return pthread_self();
-}
+void yield();
+ThreadPthread::id get_id();
 }  // namespace this_thread_pthread
 }  // namespace detail
 }  // namespace td