Changeset 41626 in webkit

Timestamp:

Mar 12, 2009, 8:01:46 AM (16 years ago)

Author:

Adam Roben

Message:

Adopt setThreadNameInternal on Windows

Also changed a Windows-only assertion about thread name length to an
all-platform log message.

Reviewed by Adam Treat.

• wtf/Threading.cpp: (WTF::createThread): Warn if the thread name is longer than 31 characters, as Visual Studio will truncate names longer than that length.

• wtf/ThreadingWin.cpp: (WTF::setThreadNameInternal): Renamed from setThreadName and changed to always operate on the current thread. (WTF::initializeThreading): Changed to use setThreadNameInternal. (WTF::createThreadInternal): Removed call to setThreadName. This is now handled by threadEntryPoint and setThreadNameInternal.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Threading.cpp (modified) (1 diff)
• wtf/ThreadingWin.cpp (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-03-12  Adam Roben  <[email protected]>
+
+        Adopt setThreadNameInternal on Windows
+
+        Also changed a Windows-only assertion about thread name length to an
+        all-platform log message.
+
+        Reviewed by Adam Treat.
+
+        * wtf/Threading.cpp:
+        (WTF::createThread): Warn if the thread name is longer than 31
+        characters, as Visual Studio will truncate names longer than that
+        length.
+
+        * wtf/ThreadingWin.cpp:
+        (WTF::setThreadNameInternal): Renamed from setThreadName and changed
+        to always operate on the current thread.
+        (WTF::initializeThreading): Changed to use setThreadNameInternal.
+        (WTF::createThreadInternal): Removed call to setThreadName. This is
+        now handled by threadEntryPoint and setThreadNameInternal.
+
 2009-03-11  David Kilzer  <[email protected]>
 

trunk/JavaScriptCore/wtf/Threading.cpp

@@ -65 +65 @@
 ThreadIdentifier createThread(ThreadFunction entryPoint, void* data, const char* name)
 {
+    // Visual Studio has a 31-character limit on thread names. Longer names will
+    // be truncated silently, but we'd like callers to know about the limit.
+#if !LOG_DISABLED
+    if (strlen(name) > 31)
+        LOG_ERROR("Thread name \"%s\" is longer than 31 characters and will be truncated by Visual Studio", name);
+#endif
+
     NewThreadContext* context = new NewThreadContext(entryPoint, data, name);
 

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -99 +99 @@
 namespace WTF {
 
-// MS_VC_EXCEPTION, THREADNAME_INFO, and setThreadName all come from <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>.
+// MS_VC_EXCEPTION, THREADNAME_INFO, and setThreadNameInternal all come from <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>.
 static const DWORD MS_VC_EXCEPTION = 0x406D1388;
 
@@ -111 +111 @@
 #pragma pack(pop)
 
-static void setThreadName(DWORD dwThreadID, LPCSTR szThreadName)
-{
-    // Visual Studio has a 31-character limit on thread names. Longer names will
-    // be truncated silently, but we'd like callers to know about the limit.
-    ASSERT_ARG(szThreadName, strlen(szThreadName) <= 31);
-
+void setThreadNameInternal(const char* szThreadName)
+{
     THREADNAME_INFO info;
     info.dwType = 0x1000;
     info.szName = szThreadName;
-    info.dwThreadID = dwThreadID;
+    info.dwThreadID = GetCurrentThreadId();
     info.dwFlags = 0;
 
@@ -158 +154 @@
         initializeMainThread();
         mainThreadIdentifier = currentThread();
-        setThreadName(mainThreadIdentifier, "Main Thread");
+        setThreadNameInternal("Main Thread");
     }
 }
@@ -221 +217 @@
     }
 
-    if (threadName)
-        setThreadName(threadIdentifier, threadName);
-
     threadID = static_cast<ThreadIdentifier>(threadIdentifier);
     storeThreadHandleByIdentifier(threadIdentifier, threadHandle);
 
     return threadID;
-}
-
-void setThreadNameInternal(const char*)
-{
 }