Remove support for pthreadw32 in favor of the portability implementation

Summary: It's no longer needed, and was a pain to support properly.

Reviewed By: yfeldblum

Differential Revision: D9846778

fbshipit-source-id: b727a3459efed4e6df3db50f8d7fe0963c3608f8

folly/portability/PThread.h

@@ -20,7 +20,7 @@
 
 #if !defined(_WIN32)
 
-#include <pthread.h> // nolint
+#include <pthread.h>
 
 #elif !FOLLY_HAVE_PTHREAD
 
@@ -29,7 +29,7 @@
 
 #include <folly/portability/Sched.h>
 #include <folly/portability/Time.h>
-#include <folly/portability/Windows.h> // nolint
+#include <folly/portability/Windows.h>
 
 #define PTHREAD_CREATE_JOINABLE 0
 #define PTHREAD_CREATE_DETACHED 1
@@ -143,139 +143,4 @@ int pthread_setspecific(pthread_key_t key, const void* value);
 } // namespace folly
 
 /* using override */ using namespace folly::portability::pthread;
-
-#else
-// The pthread implementation we support on Windows is a bit of a pain to work
-// with in certain places. This entire mess here exists for exactly one reason:
-// `using pid_t = int;`
-// Without all of this mess, the pthread implementation will attempt to define
-// `pid_t` as `void*` which is incompatible with just about every other
-// definition of `pid_t` used by other libraries defining it on Windows, for
-// example, python.
-
-// On Windows, define mode_t and pid_t
-#include <folly/portability/SysTypes.h>
-
-// HANDLE and DWORD for the declarations further down.
-#include <folly/portability/Windows.h> // nolint
-
-// Because of INCLUDE_NP, `errno.h` doesn't get included by pthread, causing it
-// to define the errno values itself, which causes conflicts when `errno.h` ends
-// up actually getting included, so we include it explicitly here to prevent it
-// from defining the values itself.
-#include <errno.h>
-
-// Pretend we are building with AT&T's UWIN project, which is a Unix API for
-// Windows 95 & Windows NT. Yes, really. https://github.com/att/uwin
-// This is the core define that keeps `pthread.h` from defining `pid_t`.
-#define _UWIN 1
-
-// Because we've defined `_UWIN`, the pthread implementation thinks that the
-// pthread types have all also already been defined by default. By defining
-// this, we force `PTW32_LEVEL` to be defined as `2`, which is enough to get it
-// to define the pthread types for us.
-#define INCLUDE_NP 1
-
-// By defining `_UWIN` we cause the pthread implementation to aggressively
-// define `HAVE_MODE_T`, which we define in `folly/portability/SysTypes.h` to
-// keep it from defining an incompatible version of it. We undefine the macro
-// here to keep from generating warnings when the implementation defines it.
-// Note that the implementation leaks its definition of `HAVE_MODE_T`, so we
-// don't need to re-define it after.
-#undef HAVE_MODE_T
-
-#include <pthread.h> // nolint
-
-#ifndef HAVE_MODE_T
-#error We expected pthread.h to define HAVE_MODE_T but that did not happen.
-#endif
-
-// Now clean up our mess so nothing else thinks we're doing crazy things.
-#undef _UWIN
-#undef INCLUDE_NP
-
-// Because we defined `INCLUDE_NP` above, the non-portable APIs don't actually
-// get declared. We still need them, so declare them ourselves instead.
-extern "C" {
-PTW32_DLLPORT HANDLE PTW32_CDECL
-pthread_getw32threadhandle_np(pthread_t thread);
-PTW32_DLLPORT DWORD PTW32_CDECL pthread_getw32threadid_np(pthread_t thread);
-}
-
-// And now everything else that isn't just here for `pid_t`.
-
-// We implement a sane comparison operand for
-// pthread_t and an integer so that it may be
-// compared against 0.
-inline bool operator==(pthread_t ptA, unsigned int b) {
-  if (ptA.p == nullptr) {
-    return b == 0;
-  }
-  return pthread_getw32threadid_np(ptA) == b;
-}
-
-inline bool operator!=(pthread_t ptA, unsigned int b) {
-  if (ptA.p == nullptr) {
-    return b != 0;
-  }
-  return pthread_getw32threadid_np(ptA) != b;
-}
-
-inline bool operator==(pthread_t ptA, pthread_t ptB) {
-  return pthread_equal(ptA, ptB) != 0;
-}
-
-inline bool operator!=(pthread_t ptA, pthread_t ptB) {
-  return pthread_equal(ptA, ptB) == 0;
-}
-
-inline bool operator<(pthread_t ptA, pthread_t ptB) {
-  return ptA.p < ptB.p;
-}
-
-inline bool operator!(pthread_t ptA) {
-  return ptA == 0;
-}
-
-inline int pthread_attr_getstack(
-    pthread_attr_t* attr,
-    void** stackaddr,
-    size_t* stacksize) {
-  if (pthread_attr_getstackaddr(attr, stackaddr) != 0) {
-    return -1;
-  }
-  if (pthread_attr_getstacksize(attr, stacksize) != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-inline int
-pthread_attr_setstack(pthread_attr_t* attr, void* stackaddr, size_t stacksize) {
-  if (pthread_attr_setstackaddr(attr, stackaddr) != 0) {
-    return -1;
-  }
-  if (pthread_attr_setstacksize(attr, stacksize) != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-inline int pthread_attr_getguardsize(
-    pthread_attr_t* /* attr */,
-    size_t* guardsize) {
-  *guardsize = 0;
-  return 0;
-}
-
-#include <functional>
-namespace std {
-template <>
-struct hash<pthread_t> {
-  std::size_t operator()(const pthread_t& k) const {
-    return 0 ^ std::hash<decltype(k.p)>()(k.p) ^
-        std::hash<decltype(k.x)>()(k.x);
-  }
-};
-} // namespace std
 #endif