Fix debug logging, similar to r148519.

Reviewed by: Peter Gal
WebKitNix · Jul 18, 2013 · b8c5bdf · b8c5bdf
1 parent a62e74d
commit b8c5bdf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/README.nix b/README.nix
@@ -116,6 +116,14 @@ WEB_PROCESS_CMD_PREFIX="/usr/bin/xterm -title WebProcess -e gdb --args" \
 WebKitBuild/Debug/bin/WebKitTestRunner --no-timeout-at-all \
                                          LayoutTests/TEST_OF_YOUR_CHOICE
 
+If you want to have detailed logs from LOG(...) functions you can enable
+logging for each log channel with WEBKIT_DEBUG environment variable:
+WEBKIT_DEBUG="WTFLogChannel1 WTFLogChannel2 ... WTFLogChannelN"
+
+You can find log channels in Source/WebCore/platform/Logging.cpp and
+Source/WebKit2/Platform/Logging.cpp. For example: Frames, Events, Network, ...
+
+
 Using the remote inspector
 ==========================
 

diff --git a/Source/WebKit2/Platform/Logging.cpp b/Source/WebKit2/Platform/Logging.cpp
@@ -42,14 +42,14 @@ WTFLogChannel LogNetwork           = { 0x00000080, "WebKit2LogLevel", WTFLogChan
 WTFLogChannel LogNetworkScheduling = { 0x00000100, "WebKit2LogLevel", WTFLogChannelOff };
 WTFLogChannel LogInspectorServer   = { 0x00000200, "WebKit2LogLevel", WTFLogChannelOff };
 
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT) && !PLATFORM(EFL)
+#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT) && !PLATFORM(EFL) && !PLATFORM(NIX)
 void initializeLogChannel(WTFLogChannel* channel)
 {
     // FIXME: Each platform will need to define their own initializeLogChannel().
 }
 #endif
 
-#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX)
 WTFLogChannel* getChannelFromName(const String& channelName)
 {
     if (!(channelName.length() >= 2))

diff --git a/Source/WebKit2/Platform/Logging.h b/Source/WebKit2/Platform/Logging.h
@@ -50,7 +50,7 @@ extern WTFLogChannel LogNetworkScheduling;
 
 void initializeLogChannel(WTFLogChannel*);
 void initializeLogChannelsIfNecessary(void);
-#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(NIX)
 WTFLogChannel* getChannelFromName(const String& channelName);
 #endif
 

diff --git a/Source/WebKit2/PlatformNix.cmake b/Source/WebKit2/PlatformNix.cmake
@@ -4,6 +4,7 @@ list(APPEND WebKit2_LINK_FLAGS
 
 list(APPEND WebKit2_SOURCES
     Platform/gtk/ModuleGtk.cpp
+    Platform/gtk/LoggingGtk.cpp
     Platform/gtk/WorkQueueGtk.cpp
     Platform/unix/SharedMemoryUnix.cpp
 

diff --git a/Source/WebKit2/WebProcess/nix/WebProcessMainNix.cpp b/Source/WebKit2/WebProcess/nix/WebProcessMainNix.cpp
@@ -33,13 +33,12 @@
 #endif
 
 #include "WKBase.h"
+#include "WebKit2Initialize.h"
 #include <WebCore/CoordinatedGraphicsLayer.h>
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/RunLoop.h>
 #include <WebKit2/WebProcess.h>
-#include <runtime/InitializeThreading.h>
 #include <unistd.h>
-#include <wtf/MainThread.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
 
@@ -60,10 +59,7 @@ WK_EXPORT int WebProcessMainNix(int argc, char* argv[])
 #endif
 #endif
 
-    JSC::initializeThreading();
-    WTF::initializeMainThread();
-
-    RunLoop::initializeMainRunLoop();
+    InitializeWebKit2();
 
 #ifdef WTF_USE_SOUP
     SoupSession* session = WebCore::ResourceHandle::defaultSession();