X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FThreadName.h;h=333a329d8e6c4e30108d74c64c06e5da53b3420b;hb=f3f4bcfb67d95e56887204081c94141aae4c89bc;hp=c7a3b15c65de95b8353c79f91499c6b764eeb32a;hpb=275ca94d04e44f28cfa411668eb1c1dd8db90b80;p=folly.git

diff --git a/folly/ThreadName.h b/folly/ThreadName.h
index c7a3b15c..333a329d 100644
--- a/folly/ThreadName.h
+++ b/folly/ThreadName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <thread>
 #include <pthread.h>
 #include <folly/Range.h>
 
@@ -25,17 +26,44 @@ namespace folly {
 // having an undefined compiler function called.
 #if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__ANDROID__)
 #if __GLIBC_PREREQ(2, 12)
-# define FOLLY_HAS_PTHREAD_SETNAME_NP
+// has pthread_setname_np(pthread_t, const char*) (2 params)
+#define FOLLY_HAS_PTHREAD_SETNAME_NP_THREAD_NAME 1
 #endif
 #endif
+#if defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+// has pthread_setname_np(const char*) (1 param)
+#define FOLLY_HAS_PTHREAD_SETNAME_NP_NAME 1
+#endif
+#endif
+
+template <typename T>
+inline bool setThreadName(T /* id */, StringPiece /* name */) {
+  static_assert(
+      std::is_same<T, pthread_t>::value ||
+      std::is_same<T, std::thread::native_handle_type>::value,
+      "type must be pthread_t or std::thread::native_handle_type");
+  return false;
+}
 
+#ifdef FOLLY_HAS_PTHREAD_SETNAME_NP_THREAD_NAME
+template <>
 inline bool setThreadName(pthread_t id, StringPiece name) {
-#ifdef FOLLY_HAS_PTHREAD_SETNAME_NP
   return 0 == pthread_setname_np(id, name.fbstr().substr(0, 15).c_str());
-#else
-  return false;
+}
 #endif
+
+#ifdef FOLLY_HAS_PTHREAD_SETNAME_NP_NAME
+template <>
+inline bool setThreadName(pthread_t id, StringPiece name) {
+  // Since OS X 10.6 it is possible for a thread to set its own name,
+  // but not that of some other thread.
+  if (pthread_equal(pthread_self(), id)) {
+    return 0 == pthread_setname_np(name.fbstr().c_str());
+  }
+  return false;
 }
+#endif
 
 inline bool setThreadName(StringPiece name) {
   return setThreadName(pthread_self(), name);