commit 6e1607e247d979a1671a1fd5a98de3f1031fe719
author Alex Light <allight@google.com> Wed Aug 23 10:06:18 2017 -0700
committer Alex Light <allight@google.com> Wed Aug 23 13:15:17 2017 -0700
tree 1174cdcce601419dcd5d1563777f721477d5cb6a
parent 2ee17e69110a9ef98ea8c94219c7da23b918ef3f

Rename instrumentation ExceptionCaught to ExceptionThrown

The instrumentation ExceptionCaught event was badly named since it is
actually sent at the time the exception is thrown and is sent even if
the exception is never actually caught. Rename it and associated
methods/fields to ExceptionThrown to more accurately reflect the
event's semantics.

Test: ./test.py --host -j50
Change-Id: I1e9c401ab619259b25928dbf19f62d3fa9573d47

runtime/instrumentation.cc

diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc
index a8cf59b..758c9e4 100644
--- a/runtime/instrumentation.cc
+++ b/runtime/instrumentation.cc
@@ -104,7 +104,7 @@
       have_dex_pc_listeners_(false),
       have_field_read_listeners_(false),
       have_field_write_listeners_(false),
-      have_exception_caught_listeners_(false),
+      have_exception_thrown_listeners_(false),
       have_branch_listeners_(false),
       have_invoke_virtual_or_interface_listeners_(false),
       deoptimized_methods_lock_("deoptimized methods lock", kDeoptimizedMethodsLock),
@@ -499,11 +499,11 @@
                            field_write_listeners_,
                            listener,
                            &have_field_write_listeners_);
-  PotentiallyAddListenerTo(kExceptionCaught,
+  PotentiallyAddListenerTo(kExceptionThrown,
                            events,
-                           exception_caught_listeners_,
+                           exception_thrown_listeners_,
                            listener,
-                           &have_exception_caught_listeners_);
+                           &have_exception_thrown_listeners_);
   UpdateInterpreterHandlerTable();
 }
 
@@ -576,11 +576,11 @@
                                 field_write_listeners_,
                                 listener,
                                 &have_field_write_listeners_);
-  PotentiallyRemoveListenerFrom(kExceptionCaught,
+  PotentiallyRemoveListenerFrom(kExceptionThrown,
                                 events,
-                                exception_caught_listeners_,
+                                exception_thrown_listeners_,
                                 listener,
-                                &have_exception_caught_listeners_);
+                                &have_exception_thrown_listeners_);
   UpdateInterpreterHandlerTable();
 }
 
@@ -1082,17 +1082,17 @@
   }
 }
 
-void Instrumentation::ExceptionCaughtEvent(Thread* thread,
+void Instrumentation::ExceptionThrownEvent(Thread* thread,
                                            mirror::Throwable* exception_object) const {
   Thread* self = Thread::Current();
   StackHandleScope<1> hs(self);
   Handle<mirror::Throwable> h_exception(hs.NewHandle(exception_object));
-  if (HasExceptionCaughtListeners()) {
+  if (HasExceptionThrownListeners()) {
     DCHECK_EQ(thread->GetException(), h_exception.Get());
     thread->ClearException();
-    for (InstrumentationListener* listener : exception_caught_listeners_) {
+    for (InstrumentationListener* listener : exception_thrown_listeners_) {
       if (listener != nullptr) {
-        listener->ExceptionCaught(thread, h_exception);
+        listener->ExceptionThrown(thread, h_exception);
       }
     }
     thread->SetException(h_exception.Get());