Changeset 41520 in webkit

Timestamp:

Mar 8, 2009 12:35:54 PM (15 years ago)

Author:

kov@webkit.org

Message:

2009-03-08 Gustavo Noronha Silva <Gustavo Noronha Silva>

Reviewed by Holger Freyther.

Implement proper logging for the GTK+ port, inspired by the one in
Qt. We use the WEBKIT_DEBUG environment variable which was already
being used to decide whether to setup a logger for soup or not.

• platform/gtk/LoggingGtk.cpp: (WebCore::getChannelFromName): (WebCore::InitializeLoggingChannelsIfNecessary):
• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::ensureSessionIsInitialized):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/LoggingGtk.cpp (modified) (2 diffs)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-08  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Holger Freyther.
+
+        Implement proper logging for the GTK+ port, inspired by the one in
+        Qt. We use the WEBKIT_DEBUG environment variable which was already
+        being used to decide whether to setup a logger for soup or not.
+
+        * platform/gtk/LoggingGtk.cpp:
+        (WebCore::getChannelFromName):
+        (WebCore::InitializeLoggingChannelsIfNecessary):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ensureSessionIsInitialized):
+
 2009-03-07  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/gtk/LoggingGtk.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ * Copyright (C) 2009 Gustavo Noronha Silva <gns@gnome.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -21 +22 @@
 #include "Logging.h"
 
+#include <glib.h>
+#include <string.h>
+
 namespace WebCore {
+
+// Inspired by the code used by the Qt port
+
+static WTFLogChannel* getChannelFromName(const char* channelName)
+{
+    if (strlen(channelName) < 3)
+        return 0;
+
+    if (!g_ascii_strcasecmp(channelName, "BackForward"))
+        return &LogBackForward;
+    if (!g_ascii_strcasecmp(channelName, "Editing"))
+        return &LogEditing;
+    if (!g_ascii_strcasecmp(channelName, "Events"))
+        return &LogEvents;
+    if (!g_ascii_strcasecmp(channelName, "Frames"))
+        return &LogFrames;
+    if (!g_ascii_strcasecmp(channelName, "FTP"))
+        return &LogFTP;
+    if (!g_ascii_strcasecmp(channelName, "History"))
+        return &LogHistory;
+    if (!g_ascii_strcasecmp(channelName, "IconDatabase"))
+        return &LogIconDatabase;
+    if (!g_ascii_strcasecmp(channelName, "Loading"))
+        return &LogLoading;
+    if (!g_ascii_strcasecmp(channelName, "Media"))
+        return &LogMedia;
+    if (!g_ascii_strcasecmp(channelName, "Network"))
+        return &LogNetwork;
+    if (!g_ascii_strcasecmp(channelName, "NotYetImplemented"))
+        return &LogNotYetImplemented;
+    if (!g_ascii_strcasecmp(channelName, "PageCache"))
+        return &LogPageCache;
+    if (!g_ascii_strcasecmp(channelName, "PlatformLeaks"))
+        return &LogPlatformLeaks;
+    if (!g_ascii_strcasecmp(channelName, "Plugin"))
+        return &LogPlugin;
+    if (!g_ascii_strcasecmp(channelName, "PopupBlocking"))
+        return &LogPopupBlocking;
+    if (!g_ascii_strcasecmp(channelName, "SpellingAndGrammar"))
+        return &LogSpellingAndGrammar;
+    if (!g_ascii_strcasecmp(channelName, "SQLDatabase"))
+        return &LogSQLDatabase;
+    if (!g_ascii_strcasecmp(channelName, "StorageAPI"))
+        return &LogStorageAPI;
+    if (!g_ascii_strcasecmp(channelName, "TextConversion"))
+        return &LogTextConversion;
+    if (!g_ascii_strcasecmp(channelName, "Threading"))
+        return &LogThreading;
+
+    return 0;
+}
 
 void InitializeLoggingChannelsIfNecessary()
 {
-    // FIXME: Add a way for the user to specify which
-    // logs he/she would like turned on.
+    static bool didInitializeLoggingChannels = false;
+    if (didInitializeLoggingChannels)
+        return;
+
+    didInitializeLoggingChannels = true;
+
+    char* logEnv = getenv("WEBKIT_DEBUG");
+    if (!logEnv)
+        return;
+
+    // we set up the logs anyway because some of our logging, such as
+    // soup's is available in release builds
+#if defined(NDEBUG)
+    g_warning("WEBKIT_DEBUG is not empty, but this is a release build. Notice that many log messages will only appear in a debug build.");
+#endif
+
+    char** logv = g_strsplit(logEnv, " ", -1);
+
+    for (int i = 0; logv[i]; i++) {
+        WTFLogChannel* channel = getChannelFromName(logv[i]);
+        if (!channel)
+            continue;
+        channel->state = WTFLogChannelOn;
+    }
+
+    g_strfreev(logv);
+
+    // to disable logging notImplemented set the DISABLE_NI_WARNING
+    // environment variable to 1
     LogNotYetImplemented.state = WTFLogChannelOn;
 }

trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -34 +34 @@
 #include "Frame.h"
 #include "HTTPParsers.h"
+#include "Logging.h"
 #include "MIMETypeRegistry.h"
 #include "NotImplemented.h"
@@ -402 +403 @@
         setDefaultCookieJar(jar);
 
-    const char* webkitDebug = g_getenv("WEBKIT_DEBUG");
-    if (!soup_session_get_feature(session, SOUP_TYPE_LOGGER)
-        && webkitDebug && !strcmp(webkitDebug, "network")) {
+    if (!soup_session_get_feature(session, SOUP_TYPE_LOGGER) && LogNetwork.state == WTFLogChannelOn) {
         SoupLogger* logger = soup_logger_new(static_cast<SoupLoggerLogLevel>(SOUP_LOGGER_LOG_BODY), -1);
         soup_logger_attach(logger, session);