Title: [259016] trunk/Source/WTF
- Revision
- 259016
- Author
- sihui_...@apple.com
- Date
- 2020-03-25 15:53:10 -0700 (Wed, 25 Mar 2020)
Log Message
Remove unused suspend functions in CrossThreadTaskHandler
https://bugs.webkit.org/show_bug.cgi?id=209553
Reviewed by Geoffrey Garen.
* wtf/CrossThreadTaskHandler.cpp:
(WTF::CrossThreadTaskHandler::taskRunLoop):
(WTF::CrossThreadTaskHandler::suspendAndWait): Deleted.
(WTF::CrossThreadTaskHandler::resume): Deleted.
* wtf/CrossThreadTaskHandler.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (259015 => 259016)
--- trunk/Source/WTF/ChangeLog 2020-03-25 22:28:41 UTC (rev 259015)
+++ trunk/Source/WTF/ChangeLog 2020-03-25 22:53:10 UTC (rev 259016)
@@ -1,3 +1,16 @@
+2020-03-25 Sihui Liu <sihui_...@apple.com>
+
+ Remove unused suspend functions in CrossThreadTaskHandler
+ https://bugs.webkit.org/show_bug.cgi?id=209553
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/CrossThreadTaskHandler.cpp:
+ (WTF::CrossThreadTaskHandler::taskRunLoop):
+ (WTF::CrossThreadTaskHandler::suspendAndWait): Deleted.
+ (WTF::CrossThreadTaskHandler::resume): Deleted.
+ * wtf/CrossThreadTaskHandler.h:
+
2020-03-24 Per Arne Vollan <pvol...@apple.com>
[Cocoa] Fix launch time regression with CF prefs direct mode enabled
Modified: trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp (259015 => 259016)
--- trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp 2020-03-25 22:28:41 UTC (rev 259015)
+++ trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp 2020-03-25 22:53:10 UTC (rev 259016)
@@ -72,22 +72,9 @@
}
while (!m_taskQueue.isKilled()) {
- {
- std::unique_ptr<AutodrainedPool> autodrainedPool = (m_useAutodrainedPool == AutodrainedPoolForRunLoop::Use) ? makeUnique<AutodrainedPool>() : nullptr;
+ std::unique_ptr<AutodrainedPool> autodrainedPool = (m_useAutodrainedPool == AutodrainedPoolForRunLoop::Use) ? makeUnique<AutodrainedPool>() : nullptr;
- m_taskQueue.waitForMessage().performTask();
- }
-
- Locker<Lock> shouldSuspendLocker(m_shouldSuspendLock);
- while (m_shouldSuspend) {
- m_suspendedLock.lock();
- if (!m_suspended) {
- m_suspended = true;
- m_suspendedCondition.notifyOne();
- }
- m_suspendedLock.unlock();
- m_shouldSuspendCondition.wait(m_shouldSuspendLock);
- }
+ m_taskQueue.waitForMessage().performTask();
}
}
@@ -102,34 +89,4 @@
task->performTask();
}
-void CrossThreadTaskHandler::suspendAndWait()
-{
- ASSERT(isMainThread());
- {
- Locker<Lock> locker(m_shouldSuspendLock);
- m_shouldSuspend = true;
- }
-
- // Post an empty task to ensure database thread knows m_shouldSuspend and sets m_suspended.
- postTask(CrossThreadTask([]() { }));
-
- Locker<Lock> locker(m_suspendedLock);
- while (!m_suspended)
- m_suspendedCondition.wait(m_suspendedLock);
-}
-
-void CrossThreadTaskHandler::resume()
-{
- ASSERT(isMainThread());
- Locker<Lock> locker(m_shouldSuspendLock);
- if (m_shouldSuspend) {
- m_suspendedLock.lock();
- if (m_suspended)
- m_suspended = false;
- m_suspendedLock.unlock();
- m_shouldSuspend = false;
- m_shouldSuspendCondition.notifyOne();
- }
-}
-
} // namespace WTF
Modified: trunk/Source/WTF/wtf/CrossThreadTaskHandler.h (259015 => 259016)
--- trunk/Source/WTF/wtf/CrossThreadTaskHandler.h 2020-03-25 22:28:41 UTC (rev 259015)
+++ trunk/Source/WTF/wtf/CrossThreadTaskHandler.h 2020-03-25 22:53:10 UTC (rev 259016)
@@ -45,8 +45,6 @@
WTF_EXPORT_PRIVATE void postTask(CrossThreadTask&&);
WTF_EXPORT_PRIVATE void postTaskReply(CrossThreadTask&&);
- WTF_EXPORT_PRIVATE void suspendAndWait();
- WTF_EXPORT_PRIVATE void resume();
private:
void handleTaskRepliesOnMainThread();
@@ -58,14 +56,6 @@
Lock m_mainThreadReplyLock;
bool m_mainThreadReplyScheduled { false };
- bool m_shouldSuspend { false };
- Condition m_shouldSuspendCondition;
- Lock m_shouldSuspendLock;
-
- bool m_suspended { false };
- Condition m_suspendedCondition;
- Lock m_suspendedLock;
-
CrossThreadQueue<CrossThreadTask> m_taskQueue;
CrossThreadQueue<CrossThreadTask> m_taskReplyQueue;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
