SERVER-11020 Don't overload the meaning of _DEBUG, use our own debug macro

1 files changed, 0 insertions, 37 deletions

diff --git a/src/mongo/util/concurrency/thread_name.cpp b/src/mongo/util/concurrency/thread_name.cpp
index 1d9fe2ff201..ee26720f871 100644
--- a/src/mongo/util/concurrency/thread_name.cpp
+++ b/src/mongo/util/concurrency/thread_name.cpp
@@ -27,7 +27,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/platform/compiler.h"
 #include "mongo/util/concurrency/thread_name.h"
 
 #include <boost/thread/tss.hpp>
@@ -38,46 +37,10 @@ namespace mongo {
 
 namespace {
     boost::thread_specific_ptr<std::string> _threadName;
-
-#if defined(_WIN32)
-
-#define MS_VC_EXCEPTION 0x406D1388
-#pragma pack(push,8)
-    typedef struct tagTHREADNAME_INFO {
-        DWORD dwType; // Must be 0x1000.
-        LPCSTR szName; // Pointer to name (in user addr space).
-        DWORD dwThreadID; // Thread ID (-1=caller thread).
-        DWORD dwFlags; // Reserved for future use, must be zero.
-    } THREADNAME_INFO;
-#pragma pack(pop)
-
-    void setWinThreadName(const char *name) {
-        /* is the sleep here necessary???
-           Sleep(10);
-           */
-        THREADNAME_INFO info;
-        info.dwType = 0x1000;
-        info.szName = name;
-        info.dwThreadID = -1;
-        info.dwFlags = 0;
-        __try {
-            RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
-        }
-        __except(EXCEPTION_EXECUTE_HANDLER) {
-        }
-    }
-#endif
-
 }  // namespace
 
     void setThreadName(StringData name) {
         _threadName.reset(new string(name.rawData(), name.size()));
-
-#if defined( DEBUG ) && defined( _WIN32 )
-        // naming might be expensive so don't do "conn*" over and over
-        setWinThreadName(_threadName.get()->c_str());
-#endif
-
     }
 
     const std::string& getThreadName() {