diff options
| author | Andy McFadden <fadden@android.com> | 2009-08-26 07:24:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-26 07:24:01 -0700 |
| commit | ce114ac196211d6b2673650d9d565d689f6c094f (patch) | |
| tree | d3401f83149fec652da3fc9cd3e52ffc0b202388 /vm/Thread.h | |
| parent | 1a593e324585e26e1ac229d6ecbb279a5f3bb23f (diff) | |
| parent | f7fb00865dd05c32aab5b968fd79ae0ef63e9d6c (diff) | |
| download | android_dalvik-ce114ac196211d6b2673650d9d565d689f6c094f.tar.gz android_dalvik-ce114ac196211d6b2673650d9d565d689f6c094f.tar.bz2 android_dalvik-ce114ac196211d6b2673650d9d565d689f6c094f.zip | |
am f7fb0086: Merge change 22659 into eclair
Merge commit 'f7fb00865dd05c32aab5b968fd79ae0ef63e9d6c'
* commit 'f7fb00865dd05c32aab5b968fd79ae0ef63e9d6c':
Another round of scary indirect ref changes.
Diffstat (limited to 'vm/Thread.h')
| -rw-r--r-- | vm/Thread.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vm/Thread.h b/vm/Thread.h index 2271c11a0..669b1a186 100644 --- a/vm/Thread.h +++ b/vm/Thread.h @@ -68,6 +68,7 @@ void dvmThreadShutdown(void); void dvmSlayDaemons(void); +#define kJniLocalRefMin 32 #define kJniLocalRefMax 512 /* arbitrary; should be plenty */ #define kInternalRefDefault 32 /* equally arbitrary */ #define kInternalRefMax 4096 /* mainly a sanity check */ @@ -152,7 +153,11 @@ typedef struct Thread { ReferenceTable internalLocalRefTable; /* JNI local reference tracking */ +#ifdef USE_INDIRECT_REF + IndirectRefTable jniLocalRefTable; +#else ReferenceTable jniLocalRefTable; +#endif /* JNI native monitor reference tracking (initialized on first use) */ ReferenceTable jniMonitorRefTable; |