[Blink-WebWorkers] WorkerSharedTimer cancels extra delayed tasks.

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 67 matching lines @@
     DEFINE_STATIC_LOCAL(HashSet<WorkerThread*>, threads, ());
     return threads;
 }
 
 unsigned WorkerThread::workerThreadCount()
 {
     MutexLocker lock(threadSetMutex());
     return workerThreads().size();
 }
 
+class WorkerThreadTask : public blink::WebThread::Task {
+    WTF_MAKE_NONCOPYABLE(WorkerThreadTask); WTF_MAKE_FAST_ALLOCATED;
+public:
+    static PassOwnPtr<WorkerThreadTask> create(const WorkerThread& workerThread, PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
+    {
+        return adoptPtr(new WorkerThreadTask(workerThread, task, isInstrumented));
+    }
+
+    virtual ~WorkerThreadTask() { }
+
+    virtual void run() OVERRIDE
+    {
+        WorkerGlobalScope* workerGlobalScope = m_workerThread.workerGlobalScope();
+        // Tasks could be put on the message loop after the cleanup task,
+        // ensure none of those are ran.
+        if (!workerGlobalScope)
+            return;
+
+        if (m_isInstrumented)
+            InspectorInstrumentation::willPerformExecutionContextTask(workerGlobalScope, m_task.get());
+        if ((!workerGlobalScope->isClosing() && !m_workerThread.terminated()) || m_task->isCleanupTask())
+            m_task->performTask(workerGlobalScope);
+        if (m_isInstrumented)
+            InspectorInstrumentation::didPerformExecutionContextTask(workerGlobalScope);
+    }
+
+    base::WeakPtrFactory<blink::WebThread::Task>& weakPtrFactory()
+    {
+        return m_weakFactory;
+    }
+
+private:
+    WorkerThreadTask(const WorkerThread& workerThread, PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
+        : m_workerThread(workerThread)
+        , m_task(task)
+        , m_isInstrumented(isInstrumented)
+        , m_weakFactory(this)
+    {
+        if (m_isInstrumented)
+            m_isInstrumented = !m_task->taskNameForInstrumentation().isEmpty();
+        if (m_isInstrumented)
+            InspectorInstrumentation::didPostExecutionContextTask(m_workerThread.workerGlobalScope(), m_task.get());
+    }
+
+    const WorkerThread& m_workerThread;
+    OwnPtr<ExecutionContextTask> m_task;
+    bool m_isInstrumented;
+    base::WeakPtrFactory<blink::WebThread::Task> m_weakFactory;
+};
+
 class WorkerSharedTimer : public SharedTimer {
 public:
     explicit WorkerSharedTimer(WorkerThread* workerThread)
         : m_workerThread(workerThread)
         , m_nextFireTime(0.0)
         , m_running(false)
     { }
 
     typedef void (*SharedTimerFunction)();
     virtual void setFiredFunction(SharedTimerFunction func)
@@ skipping 11 matching lines @@
         // why ceil is used in the interval calculation.
         int64 delay = static_cast<int64>(ceil(interval * 1000));
 
         if (delay < 0) {
             delay = 0;
             m_nextFireTime = 0.0;
         }
 
         m_running = true;
         m_nextFireTime = currentTime() + interval;
-        m_workerThread->postDelayedTask(createSameThreadTask(&WorkerSharedTimer::OnTimeout, this), delay);
+        if (m_lastQueuedTask) {
+            // If something was queued up before this, check if its later than the current timer
+            if (interval < m_lastQueuedTaskTimer->nextFireInterval()) {
+                m_lastQueuedTask->weakPtrFactory().InvalidateWeakPtrs();
+                m_lastQueuedTask = 0;
+                m_lastQueuedTaskTimer = 0;
+            }
+        }
+        if (!m_lastQueuedTask) {
+            // Now queue the task as a cancellable one.
+            WorkerThreadTask* nextDelayedTask = WorkerThreadTask::create(*m_workerThread
+                , createSameThreadTask(&WorkerSharedTimer::OnTimeout, this), true).leakPtr();
+            m_workerThread->postCancellableDelayedTask(nextDelayedTask, delay);
+            // The current timer should ideally be at the top of the heap as its assumed to be the smallest interval in the heap
+            m_lastQueuedTask = nextDelayedTask;
+            m_lastQueuedTaskTimer = PlatformThreadData::current().threadTimers().timerHeap().first();
+        }
     }
 
     virtual void stop()
     {
         m_running = false;
     }
 
     double nextFireTime() { return m_nextFireTime; }
 
 private:
     void OnTimeout()
     {
         ASSERT(m_workerThread->workerGlobalScope());
+
+        m_lastQueuedTask = 0;
+        m_lastQueuedTaskTimer = 0;
+
         if (m_sharedTimerFunction && m_running && !m_workerThread->workerGlobalScope()->isClosing())
             m_sharedTimerFunction();
     }
 
     WorkerThread* m_workerThread;
     SharedTimerFunction m_sharedTimerFunction;
     double m_nextFireTime;
     bool m_running;
+    static WorkerThreadTask* m_lastQueuedTask;
+    static TimerBase* m_lastQueuedTaskTimer;
 };
 
-class WorkerThreadTask : public blink::WebThread::Task {
-    WTF_MAKE_NONCOPYABLE(WorkerThreadTask); WTF_MAKE_FAST_ALLOCATED;
-public:
-    static PassOwnPtr<WorkerThreadTask> create(const WorkerThread& workerThread, PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
-    {
-        return adoptPtr(new WorkerThreadTask(workerThread, task, isInstrumented));
-    }
-
-    virtual ~WorkerThreadTask() { }
-
-    virtual void run() OVERRIDE
-    {
-        WorkerGlobalScope* workerGlobalScope = m_workerThread.workerGlobalScope();
-        // Tasks could be put on the message loop after the cleanup task,
-        // ensure none of those are ran.
-        if (!workerGlobalScope)
-            return;
-
-        if (m_isInstrumented)
-            InspectorInstrumentation::willPerformExecutionContextTask(workerGlobalScope, m_task.get());
-        if ((!workerGlobalScope->isClosing() && !m_workerThread.terminated()) || m_task->isCleanupTask())
-            m_task->performTask(workerGlobalScope);
-        if (m_isInstrumented)
-            InspectorInstrumentation::didPerformExecutionContextTask(workerGlobalScope);
-    }
-
-private:
-    WorkerThreadTask(const WorkerThread& workerThread, PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
-        : m_workerThread(workerThread)
-        , m_task(task)
-        , m_isInstrumented(isInstrumented)
-    {
-        if (m_isInstrumented)
-            m_isInstrumented = !m_task->taskNameForInstrumentation().isEmpty();
-        if (m_isInstrumented)
-            InspectorInstrumentation::didPostExecutionContextTask(m_workerThread.workerGlobalScope(), m_task.get());
-    }
-
-    const WorkerThread& m_workerThread;
-    OwnPtr<ExecutionContextTask> m_task;
-    bool m_isInstrumented;
-};
+WorkerThreadTask* WorkerSharedTimer::m_lastQueuedTask = 0;
+TimerBase* WorkerSharedTimer::m_lastQueuedTaskTimer = 0;
 
 class RunDebuggerQueueTask FINAL : public ExecutionContextTask {
 public:
     static PassOwnPtr<RunDebuggerQueueTask> create(WorkerThread* thread)
     {
         return adoptPtr(new RunDebuggerQueueTask(thread));
     }
     virtual void performTask(ExecutionContext* context) OVERRIDE
     {
         ASSERT(context->isWorkerGlobalScope());
@@ skipping 250 matching lines @@
 void WorkerThread::postTask(PassOwnPtr<ExecutionContextTask> task)
 {
     m_thread->postTask(WorkerThreadTask::create(*this, task, true).leakPtr());
 }
 
 void WorkerThread::postDelayedTask(PassOwnPtr<ExecutionContextTask> task, long long delayMs)
 {
     m_thread->postDelayedTask(WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
 }
 
+void WorkerThread::postCancellableDelayedTask(WorkerThreadTask* task, long long delayMs)
+{
+    m_thread->postCancellableDelayedTask(task->weakPtrFactory(), delayMs);
+}
+
 void WorkerThread::postDebuggerTask(PassOwnPtr<ExecutionContextTask> task)
 {
     m_debuggerMessageQueue.append(WorkerThreadTask::create(*this, task, false));
     postTask(RunDebuggerQueueTask::create(this));
 }
 
 MessageQueueWaitResult WorkerThread::runDebuggerTask(WaitMode waitMode)
 {
     ASSERT(isCurrentThread());
     MessageQueueWaitResult result;
@@ skipping 25 matching lines @@
     InspectorInstrumentation::didLeaveNestedRunLoop(m_workerGlobalScope.get());
 }
 
 void WorkerThread::setWorkerInspectorController(WorkerInspectorController* workerInspectorController)
 {
     MutexLocker locker(m_workerInspectorControllerMutex);
     m_workerInspectorController = workerInspectorController;
 }
 
 } // namespace blink