pr feedback

Signed-off-by: Alan Chiu <achiu@lyft.com>
envoyproxy · Jul 10, 2020 · 6af202b · 6af202b
1 parent e1881fb
commit 6af202b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/include/envoy/common/platform.h b/include/envoy/common/platform.h
@@ -237,13 +237,18 @@ struct mmsghdr {
 #endif
 
 #ifdef __linux__
-#define SUPPORTS_PTHREAD_GETNAME_NP
+#define SUPPORTS_PTHREAD_GETNAME_NP 1
 #endif
 
 // https://android.googlesource.com/platform/bionic/+/master/docs/status.md
 // pthread_getname_np is introduced in API 26
 #ifdef __ANDROID_API__
-#if __ANDROID_API__ < 26
-#define SUPPORTS_PTHREAD_GETNAME_NP
-#endif // __ANDROID_API__ < 26
+#if __ANDROID_API__ > 26
+#define SUPPORTS_PTHREAD_GETNAME_NP 1
+#endif // __ANDROID_API__ > 26
 #endif // ifdef __ANDROID_API__
+
+// Ensure we set SUPPORTS_PTHREAD_GETNAME_NP
+#ifndef SUPPORTS_PTHREAD_GETNAME_NP
+#define SUPPORTS_PTHREAD_GETNAME_NP 0
+#endif
diff --git a/source/common/common/posix/thread_impl.cc b/source/common/common/posix/thread_impl.cc
@@ -52,7 +52,7 @@ class ThreadImplPosix : public Thread {
         this);
     RELEASE_ASSERT(rc == 0, "");
 
-#ifdef SUPPORTS_PTHREAD_GETNAME_NP
+#if SUPPORTS_PTHREAD_GETNAME_NP
     // If the name was not specified, get it from the OS. If the name was
     // specified, write it into the thread, and assert that the OS sees it the
     // same way.
@@ -93,7 +93,7 @@ class ThreadImplPosix : public Thread {
   }
 
 private:
-#ifdef SUPPORTS_PTHREAD_GETNAME_NP
+#if SUPPORTS_PTHREAD_GETNAME_NP
   // Attempts to get the name from the operating system, returning true and
   // updating 'name' if successful. Note that during normal operation this
   // may fail, if the thread exits prior to the system call.