commit 64277f38032208a0c1081ff9e466c04009b96383
author Brian Carlstrom <bdc@google.com> Mon Mar 26 23:53:34 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue Mar 27 00:03:43 2012 -0700
tree a7c2e92907584521c1caedbf5e6a798f5984c9e9
parent 6e41d42f6b7977325a87a125c344c1c9cdf6c949

Additional check to catch BooksTablet monkey issue

Change-Id: I9dfe695b008b2ca23998d2cfb29e5ba04354a029

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 3388f72..b3d6367 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -963,8 +963,10 @@
   }
 
   void Run() {
+    Thread* self = Thread::Current();
     for (size_t i = begin_; i < end_; i += stripe_) {
       callback_(context_, i);
+      CHECK(!self->IsExceptionPending()) << PrettyTypeOf(self->GetException()) << " " << i;
     }
   }
 
@@ -981,6 +983,8 @@
 };
 
 void ForAll(Context* context, size_t begin, size_t end, Callback callback, size_t thread_count) {
+  Thread* self = Thread::Current();
+  CHECK(!self->IsExceptionPending()) << PrettyTypeOf(self->GetException());
   CHECK_GT(thread_count, 0U);
 
   std::vector<WorkerThread*> threads;
@@ -990,7 +994,7 @@
   threads[0]->Go();
 
   // Switch to kVmWait while we're blocked waiting for the other threads to finish.
-  ScopedThreadStateChange tsc(Thread::Current(), Thread::kVmWait);
+  ScopedThreadStateChange tsc(self, Thread::kVmWait);
   STLDeleteElements(&threads);
 }