Changeset 96237 in webkit

Timestamp:

Sep 28, 2011 10:56:10 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix webkit2 unit tests in debug builds
​https://bugs.webkit.org/show_bug.cgi?id=69006

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2011-09-28
Reviewed by Martin Robinson.

We are currently using the WorQueue name as thread name which in
this moment can be com.apple.WebKit.ProcessLauncher or
com.apple.CoreIPC.ReceiveQueue. Both names are longer than 31
characters which is the limit of Visual Studio for thread
names. When log is enabled createThread() will assert instead of
truncate the name, so we need to make sure we don't use a name
longer than 31 characters.

• Platform/gtk/WorkQueueGtk.cpp:

(WorkQueue::platformInitialize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/gtk/WorkQueueGtk.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Fix webkit2 unit tests in debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=69006
+
+        Reviewed by Martin Robinson.
+
+        We are currently using the WorQueue name as thread name which in
+        this moment can be com.apple.WebKit.ProcessLauncher or
+        com.apple.CoreIPC.ReceiveQueue. Both names are longer than 31
+        characters which is the limit of Visual Studio for thread
+        names. When log is enabled createThread() will assert instead of
+        truncate the name, so we need to make sure we don't use a name
+        longer than 31 characters.
+
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::platformInitialize):
+
 2011-09-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp

@@ -100 +100 @@
 
 // WorkQueue
+static const size_t kVisualStudioThreadNameLimit = 31;
+
 void WorkQueue::platformInitialize(const char* name)
 {
@@ -106 +108 @@
     m_eventLoop = g_main_loop_new(m_eventContext, FALSE);
     ASSERT(m_eventLoop);
-    m_workQueueThread = createThread(reinterpret_cast<WTF::ThreadFunction>(&WorkQueue::startWorkQueueThread), this, name);
+
+    // This name can be com.apple.WebKit.ProcessLauncher or com.apple.CoreIPC.ReceiveQueue.
+    // We are using those names for the thread name, but both are longer than 31 characters,
+    // which is the limit of Visual Studio for thread names.
+    // When log is enabled createThread() will assert instead of truncate the name, so we need
+    // to make sure we don't use a name longer than 31 characters.
+    const char* threadName = g_strrstr(name, ".");
+    if (threadName)
+        threadName++;
+    else
+        threadName = name;
+    if (strlen(threadName) > kVisualStudioThreadNameLimit)
+        threadName += strlen(threadName) - kVisualStudioThreadNameLimit;
+
+    m_workQueueThread = createThread(reinterpret_cast<WTF::ThreadFunction>(&WorkQueue::startWorkQueueThread), this, threadName);
 }