Changeset 176120 in webkit

Timestamp:

Nov 14, 2014 1:21:48 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Use GMainLoopSource for request timeout in ResourceHandle
​https://bugs.webkit.org/show_bug.cgi?id=138695

Reviewed by Sergio Villar Senin.

We are currently using soup_timeout_add() that simply creates a
GSource and attaches it to the given context. Using
GMainLoopSource we simplify the code and fix any potential problem
of converting the double value into milliseconds.

• platform/network/ResourceHandleInternal.h:
• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::cleanupSoupRequestOperation):
(WebCore::ResourceHandle::sendPendingRequest):
(WebCore::ResourceHandle::platformSetDefersLoading):
(WebCore::requestTimeoutCallback): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Use GMainLoopSource for request timeout in ResourceHandle
+        https://bugs.webkit.org/show_bug.cgi?id=138695
+
+        Reviewed by Sergio Villar Senin.
+
+        We are currently using soup_timeout_add() that simply creates a
+        GSource and attaches it to the given context. Using
+        GMainLoopSource we simplify the code and fix any potential problem
+        of converting the double value into milliseconds.
+
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::cleanupSoupRequestOperation):
+        (WebCore::ResourceHandle::sendPendingRequest):
+        (WebCore::ResourceHandle::platformSetDefersLoading):
+        (WebCore::requestTimeoutCallback): Deleted.
+
 2014-11-13  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

@@ -52 +52 @@
 #include "GUniquePtrSoup.h"
 #include <libsoup/soup.h>
+#include <wtf/gobject/GMainLoopSource.h>
 #include <wtf/gobject/GRefPtr.h>
 #endif
@@ -197 +198 @@
         GRefPtr<GCancellable> m_cancellable;
         GRefPtr<GAsyncResult> m_deferredResult;
-        GRefPtr<GSource> m_timeoutSource;
+        GMainLoopSource m_timeoutSource;
         GUniquePtr<SoupBuffer> m_soupBuffer;
         unsigned long m_bodySize;

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

@@ -232 +232 @@
 static void sendRequestCallback(GObject*, GAsyncResult*, gpointer);
 static void readCallback(GObject*, GAsyncResult*, gpointer);
-static gboolean requestTimeoutCallback(void*);
 #if ENABLE(WEB_TIMING)
 static int  milisecondsSinceRequest(double requestTime);
@@ -591 +590 @@
     }
 
-    if (d->m_timeoutSource) {
-        g_source_destroy(d->m_timeoutSource.get());
-        d->m_timeoutSource.clear();
-    }
+    d->m_timeoutSource.cancel();
 
     if (!isDestroying)
@@ -1016 +1012 @@
 
     if (d->m_firstRequest.timeoutInterval() > 0) {
-        // soup_add_timeout returns a GSource* whose only reference is owned by
-        // the context. We need to have our own reference to it, hence not using adoptRef.
-        d->m_timeoutSource = soup_add_timeout(g_main_context_get_thread_default(),
-            d->m_firstRequest.timeoutInterval() * 1000, requestTimeoutCallback, this);
+        d->m_timeoutSource.scheduleAfterDelay("[WebKit] ResourceHandle request timeout", [this] {
+            client()->didFail(this, ResourceError::timeoutError(firstRequest().url().string()));
+            cancel();
+        }, std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(d->m_firstRequest.timeoutInterval())),
+        G_PRIORITY_DEFAULT, nullptr, g_main_context_get_thread_default());
     }
 
@@ -1224 +1221 @@
     // Except when canceling a possible timeout timer, we only need to take action here to UN-defer loading.
     if (defersLoading) {
-        if (d->m_timeoutSource) {
-            g_source_destroy(d->m_timeoutSource.get());
-            d->m_timeoutSource.clear();
-        }
+        d->m_timeoutSource.cancel();
         return;
     }
@@ -1346 +1340 @@
 }
 
-static gboolean requestTimeoutCallback(gpointer data)
-{
-    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
-    handle->client()->didFail(handle.get(), ResourceError::timeoutError(handle->getInternal()->m_firstRequest.url().string()));
-    handle->cancel();
-
-    return FALSE;
-}
-
 }