commit aaa208006d7c8cc0f381c4aa9b525be24066c495
author Ian Rogers <irogers@google.com> Sun Sep 11 21:47:37 2011 -0700
committer Ian Rogers <irogers@google.com> Mon Sep 12 10:53:58 2011 -0700
tree 7a19bb527abaa56a98462d2c212ebe043b9435d2
parent 31384c59bb4b387f29f2b6d4d3db886c29b81170

Implement Throwable::nativeFillInStackTrace and nativeGetStackTrace.

Refactor stack trace into compact internal form which is then used to
compute larger and more verbose StackTraceElement[] form. Fix some
potential problems with GC.

Change-Id: I4a4308c1ec5b82fd95b649d5ec0504b9607e688f

src/java_lang_Throwable.cc

diff --git a/src/java_lang_Throwable.cc b/src/java_lang_Throwable.cc
index 1d13907..4c3bfcf 100644
--- a/src/java_lang_Throwable.cc
+++ b/src/java_lang_Throwable.cc
@@ -15,7 +15,7 @@
  */
 
 #include "jni_internal.h"
-#include "object.h"
+#include "thread.h"
 
 #include "JniConstants.h" // Last to avoid problems with LOG redefinition.
 
@@ -24,22 +24,12 @@
 namespace {
 
 jobject Throwable_nativeFillInStackTrace(JNIEnv* env, jclass) {
-  UNIMPLEMENTED(WARNING);
-  //Object* stackState = dvmFillInStackTrace(dvmThreadSelf());
-  //return addLocalReference(env, stackState);
-  return NULL;
+  JNIEnvExt* env_ext = reinterpret_cast<JNIEnvExt*>(env);
+  return env_ext->self->CreateInternalStackTrace();
 }
 
 jobjectArray Throwable_nativeGetStackTrace(JNIEnv* env, jclass, jobject javaStackState) {
-  UNIMPLEMENTED(WARNING);
-  //Object* stackState = dvmDecodeIndirectRef(env, javaStackState);
-  //if (stackState == NULL) {
-    //LOGW("getStackTrace() called but no trace available");
-    //return NULL;   /* could throw NPE; currently caller will do so */
-  //}
-  //ArrayObject* elements = dvmGetStackTrace(stackState);
-  //return reinterpret_cast<jobjectArray>(addLocalReference(env, elements));
-  return NULL;
+  return Thread::InternalStackTraceToStackTraceElementArray(javaStackState, env);
 }
 
 JNINativeMethod gMethods[] = {