fix flaky ConnectTFOTimeout and ConnectTFOFallbackTimeout tests

[folly.git] / folly / ThreadName.h

diff --git a/folly/ThreadName.h b/folly/ThreadName.h
index 2d30efa0af94f1ede599bf0b19d8fe546eaf944d..1f745e7702f83d2ef89831f1fe827454881157e2 100644 (file)
--- a/folly/ThreadName.h
+++ b/folly/ThreadName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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,18 +16,35 @@
 
 #pragma once
 
+#include <thread>
 #include <pthread.h>
-#include "Range.h"
+#include <folly/Range.h>
 
 namespace folly {
 
+// This looks a bit weird, but it's necessary to avoid
+// having an undefined compiler function called.
+#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__ANDROID__)
+#if __GLIBC_PREREQ(2, 12)
+# define FOLLY_HAS_PTHREAD_SETNAME_NP
+#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
+template <>
 inline bool setThreadName(pthread_t id, StringPiece name) {
-#if (defined(__GLIBC__) && __GLIBC_PREREQ(2, 12))
   return 0 == pthread_setname_np(id, name.fbstr().substr(0, 15).c_str());
-#else
-  return false;
-#endif
 }
+#endif
 
 inline bool setThreadName(StringPiece name) {
   return setThreadName(pthread_self(), name);