[webkit-changes] [201872] trunk

Thu, 09 Jun 2016 10:35:14 -0700

Title: [201872] trunk
Revision
201872
Author
[email protected]
Date
2016-06-09 10:34:55 -0700 (Thu, 09 Jun 2016)

Log Message

Greatly simplify CrossThreadTask.h.
https://bugs.webkit.org/show_bug.cgi?id=158542

Reviewed by Darin Adler.

Source/WTF:

* wtf/CrossThreadTask.h:
(WTF::crossThreadCopy):
(WTF::callFunctionForCrossThreadTaskImpl):
(WTF::callFunctionForCrossThreadTask):
(WTF::createCrossThreadTask):
(WTF::callMemberFunctionForCrossThreadTaskImpl):
(WTF::callMemberFunctionForCrossThreadTask):

Tools:

* TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (201871 => 201872)


--- trunk/Source/WTF/ChangeLog	2016-06-09 17:31:08 UTC (rev 201871)
+++ trunk/Source/WTF/ChangeLog	2016-06-09 17:34:55 UTC (rev 201872)
@@ -1,3 +1,18 @@
+2016-06-09  Brady Eidson  <[email protected]>
+
+        Greatly simplify CrossThreadTask.h.
+        https://bugs.webkit.org/show_bug.cgi?id=158542
+
+        Reviewed by Darin Adler.
+
+        * wtf/CrossThreadTask.h:
+        (WTF::crossThreadCopy):
+        (WTF::callFunctionForCrossThreadTaskImpl):
+        (WTF::callFunctionForCrossThreadTask):
+        (WTF::createCrossThreadTask):
+        (WTF::callMemberFunctionForCrossThreadTaskImpl):
+        (WTF::callMemberFunctionForCrossThreadTask):
+
 2016-06-08  Brady Eidson  <[email protected]>
 
         Make CrossThreadCopier more efficient (fewer copies!).

Modified: trunk/Source/WTF/wtf/CrossThreadTask.h (201871 => 201872)


--- trunk/Source/WTF/wtf/CrossThreadTask.h	2016-06-09 17:31:08 UTC (rev 201871)
+++ trunk/Source/WTF/wtf/CrossThreadTask.h	2016-06-09 17:34:55 UTC (rev 201872)
@@ -32,24 +32,6 @@
 namespace WTF {
 
 class CrossThreadTask {
-    template<class T>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)());
-    template<class T, class P1, class MP1>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1), const P1&);
-    template<class T, class P1, class MP1, class P2, class MP2>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2), const P1&, const P2&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3), const P1&, const P2&, const P3&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3, class P4, class MP4>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3, MP4), const P1&, const P2&, const P3&, const P4&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3, class P4, class MP4, class P5, class MP5>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3, MP4, MP5), const P1&, const P2&, const P3&, const P4&, const P5&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3, class P4, class MP4, class P5, class MP5, class P6, class MP6>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3, MP4, MP5, MP6), const P1&, const P2&, const P3&, const P4&, const P5&, const P6&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3, class P4, class MP4, class P5, class MP5, class P6, class MP6, class P7, class MP7>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3, MP4, MP5, MP6, MP7), const P1&, const P2&, const P3&, const P4&, const P5&, const P6&, const P7&);
-    template<class T, class P1, class MP1, class P2, class MP2, class P3, class MP3, class P4, class MP4, class P5, class MP5, class P6, class MP6, class P7, class MP7, class P8, class MP8>
-    friend CrossThreadTask createCrossThreadTask(T&, void (T::*)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8), const P1&, const P2&, const P3&, const P4&, const P5&, const P6&, const P7&, const P8&);
 public:
     CrossThreadTask() = default;
 
@@ -68,183 +50,52 @@
     NoncopyableFunction<void ()> m_taskFunction;
 };
 
-template<typename T>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)())
+template <typename T>
+T crossThreadCopy(const T& t)
 {
-    return CrossThreadTask([callee = &callee, method]() mutable {
-        (callee->*method)();
-    });
+    return CrossThreadCopier<T>::copy(t);
 }
 
-template<typename T, typename P1, typename MP1>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1),
-    const P1& parameter1)
+template <typename F, typename ArgsTuple, size_t... ArgsIndex>
+void callFunctionForCrossThreadTaskImpl(F function, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
 {
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1)]() mutable {
-        (callee->*method)(p1);
-    });
+    function(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))...);
 }
 
-template<typename T, typename P1, typename MP1, typename P2, typename MP2>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2),
-    const P1& parameter1,
-    const P2& parameter2)
+template <typename F, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callFunctionForCrossThreadTask(F function, ArgsTuple&& args)
 {
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2)]() mutable {
-        (callee->*method)(p1, p2);
-    });
+    callFunctionForCrossThreadTaskImpl(function, std::forward<ArgsTuple>(args), ArgsIndicies());
 }
 
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3)
+template<typename... Parameters, typename... Arguments>
+CrossThreadTask createCrossThreadTask(void (*method)(Parameters...), const Arguments&... arguments)
 {
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3)]() mutable {
-        (callee->*method)(p1, p2, p3);
+    return CrossThreadTask([method, arguments = std::make_tuple(crossThreadCopy<Arguments>(arguments)...)]() mutable {
+        callFunctionForCrossThreadTask(method, WTFMove(arguments));
     });
 }
 
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
-CrossThreadTask createCrossThreadTask(
-    void (*method)(MP1, MP2, MP3),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3)
+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionForCrossThreadTaskImpl(C* object, MF function, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
 {
-    return CrossThreadTask([method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3)]() mutable {
-        method(p1, p2, p3);
-    });
+    (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))...);
 }
 
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3, MP4),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3,
-    const P4& parameter4)
+template <typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunctionForCrossThreadTask(C* object, MF function, ArgsTuple&& args)
 {
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3),
-        p4 = CrossThreadCopier<P4>::copy(parameter4)]() mutable {
-        (callee->*method)(p1, p2, p3, p4);
-    });
+    callMemberFunctionForCrossThreadTaskImpl(object, function, std::forward<ArgsTuple>(args), ArgsIndicies());
 }
 
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3, MP4, MP5),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3,
-    const P4& parameter4,
-    const P5& parameter5)
+template<typename T, typename... Parameters, typename... Arguments>
+CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments)
 {
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3),
-        p4 = CrossThreadCopier<P4>::copy(parameter4),
-        p5 = CrossThreadCopier<P5>::copy(parameter5)]() mutable {
-        (callee->*method)(p1, p2, p3, p4, p5);
+    return CrossThreadTask([callee = &callee, method, arguments = std::make_tuple(crossThreadCopy<Arguments>(arguments)...)]() mutable {
+        callMemberFunctionForCrossThreadTask(callee, method, WTFMove(arguments));
     });
 }
 
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3,
-    const P4& parameter4,
-    const P5& parameter5,
-    const P6& parameter6)
-{
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3),
-        p4 = CrossThreadCopier<P4>::copy(parameter4),
-        p5 = CrossThreadCopier<P5>::copy(parameter5),
-        p6 = CrossThreadCopier<P6>::copy(parameter6)]() mutable {
-        (callee->*method)(p1, p2, p3, p4, p5, p6);
-    });
-}
-
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3,
-    const P4& parameter4,
-    const P5& parameter5,
-    const P6& parameter6,
-    const P7& parameter7)
-{
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3),
-        p4 = CrossThreadCopier<P4>::copy(parameter4),
-        p5 = CrossThreadCopier<P5>::copy(parameter5),
-        p6 = CrossThreadCopier<P6>::copy(parameter6),
-        p7 = CrossThreadCopier<P7>::copy(parameter7)]() mutable {
-        (callee->*method)(p1, p2, p3, p4, p5, p6, p7);
-    });
-}
-
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
-CrossThreadTask createCrossThreadTask(
-    T& callee,
-    void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
-    const P1& parameter1,
-    const P2& parameter2,
-    const P3& parameter3,
-    const P4& parameter4,
-    const P5& parameter5,
-    const P6& parameter6,
-    const P7& parameter7,
-    const P8& parameter8)
-{
-    return CrossThreadTask([callee = &callee, method,
-        p1 = CrossThreadCopier<P1>::copy(parameter1),
-        p2 = CrossThreadCopier<P2>::copy(parameter2),
-        p3 = CrossThreadCopier<P3>::copy(parameter3),
-        p4 = CrossThreadCopier<P4>::copy(parameter4),
-        p5 = CrossThreadCopier<P5>::copy(parameter5),
-        p6 = CrossThreadCopier<P6>::copy(parameter6),
-        p7 = CrossThreadCopier<P7>::copy(parameter7),
-        p8 = CrossThreadCopier<P8>::copy(parameter8)]() mutable {
-        (callee->*method)(p1, p2, p3, p4, p5, p6, p7, p8);
-    });
-}
-
 } // namespace WTF
 
 using WTF::CrossThreadTask;

Modified: trunk/Tools/ChangeLog (201871 => 201872)


--- trunk/Tools/ChangeLog	2016-06-09 17:31:08 UTC (rev 201871)
+++ trunk/Tools/ChangeLog	2016-06-09 17:34:55 UTC (rev 201872)
@@ -1,3 +1,13 @@
+2016-06-09  Brady Eidson  <[email protected]>
+
+        Greatly simplify CrossThreadTask.h.
+        https://bugs.webkit.org/show_bug.cgi?id=158542
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp:
+        (TestWebKitAPI::TEST):
+
 2016-06-09  Chris Dumez  <[email protected]>
 
         Unreviewed, rolling out r201836, r201845, and r201848.

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp (201871 => 201872)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp	2016-06-09 17:31:08 UTC (rev 201871)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/CrossThreadTask.cpp	2016-06-09 17:34:55 UTC (rev 201872)
@@ -85,7 +85,6 @@
         log().str("");
         return string;
     }
-
 };
 
 void testFunction(const LifetimeLogger&, const LifetimeLogger&, const LifetimeLogger&)
@@ -103,7 +102,7 @@
         auto task = createCrossThreadTask(testFunction, logger1, logger2, logger3);
         task.performTask();
     }
-    ASSERT_STREQ("default_constructor(<default>-0-0) copy_constructor(<default>-1-0) name_constructor(logger-0-0) isolatedCopy() copy_constructor(<default>-1-0) isolatedCopy() copy_constructor(<default>-2-0) isolatedCopy() copy_constructor(logger-1-0) move_constructor(<default>-1-1) move_constructor(<default>-2-1) move_constructor(logger-1-1) destructor(logger-1-0) destructor(<default>-2-0) destructor(<default>-1-0) testFunction called destructor(logger-1-1) destructor(<default>-2-1) destructor(<default>-1-1) destructor(logger-0-0) destructor(<default>-1-0) destructor(<default>-0-0) ", LifetimeLogger::takeLogStr().c_str());
+    ASSERT_STREQ("default_constructor(<default>-0-0) copy_constructor(<default>-1-0) name_constructor(logger-0-0) isolatedCopy() copy_constructor(<default>-1-0) isolatedCopy() copy_constructor(<default>-2-0) isolatedCopy() copy_constructor(logger-1-0) move_constructor(<default>-1-1) move_constructor(<default>-2-1) move_constructor(logger-1-1) destructor(logger-1-0) destructor(<default>-2-0) destructor(<default>-1-0) move_constructor(<default>-1-2) move_constructor(<default>-2-2) move_constructor(logger-1-2) destructor(logger-1-1) destructor(<default>-2-1) destructor(<default>-1-1) testFunction called destructor(logger-1-2) destructor(<default>-2-2) destructor(<default>-1-2) destructor(logger-0-0) destructor(<default>-1-0) destructor(<default>-0-0) ", LifetimeLogger::takeLogStr().c_str());
 }
     
 } // namespace TestWebKitAPI

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to