[tbb-commits] [tor-browser/esr24] Bug 1024765 - Part 1: Add test-case for timers firing when the target thread is not running. r=bwc, a=sledru

[mikeperry at torproject.org]

commit 74160028fb42bf8b86ec5b90c4fd2538f6cd2ac8
Author: Byron Campen [:bwc] <docfaraday at gmail.com>
Date:   Tue Jun 17 13:37:04 2014 -0700

    Bug 1024765 - Part 1: Add test-case for timers firing when the target thread is not running. r=bwc, a=sledru
---
 xpcom/tests/TestTimers.cpp |   36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/xpcom/tests/TestTimers.cpp b/xpcom/tests/TestTimers.cpp
index 8b4ac25..545a8c4 100644
--- a/xpcom/tests/TestTimers.cpp
+++ b/xpcom/tests/TestTimers.cpp
@@ -14,6 +14,7 @@
 #include "nsThreadUtils.h"
 #include "prinrval.h"
 #include "prmon.h"
+#include "prthread.h"
 #include "mozilla/Attributes.h"
 
 #include "mozilla/ReentrantMonitor.h"
@@ -78,6 +79,7 @@ public:
   : mThreadPtr(aThreadPtr), mReentrantMonitor(aReentrantMonitor) { }
 
   NS_IMETHOD Notify(nsITimer* aTimer) {
+    NS_ASSERTION(mThreadPtr, "Callback was not supposed to be called!");
     nsCOMPtr<nsIThread> current(do_GetCurrentThread());
 
     ReentrantMonitorAutoEnter mon(*mReentrantMonitor);
@@ -133,13 +135,45 @@ TestTargetedTimers()
   return NS_OK;
 }
 
+nsresult
+TestTimerWithStoppedTarget()
+{
+  AutoTestThread testThread;
+  NS_ENSURE_TRUE(testThread, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv;
+  nsCOMPtr<nsITimer> timer = do_CreateInstance(NS_TIMER_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsIEventTarget* target = static_cast<nsIEventTarget*>(testThread);
+
+  rv = timer->SetTarget(target);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // If this is called, we'll assert
+  nsCOMPtr<nsITimerCallback> callback =
+    new TimerCallback(nullptr, nullptr);
+  NS_ENSURE_TRUE(callback, NS_ERROR_OUT_OF_MEMORY);
+
+  rv = timer->InitWithCallback(callback, PR_MillisecondsToInterval(100),
+                               nsITimer::TYPE_ONE_SHOT);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  testThread->Shutdown();
+
+  PR_Sleep(400);
+
+  return NS_OK;
+}
+
 int main(int argc, char** argv)
 {
   ScopedXPCOM xpcom("TestTimers");
   NS_ENSURE_FALSE(xpcom.failed(), 1);
 
   static TestFuncPtr testsToRun[] = {
-    TestTargetedTimers
+    TestTargetedTimers,
+    TestTimerWithStoppedTarget
   };
   static uint32_t testCount = sizeof(testsToRun) / sizeof(testsToRun[0]);