diff options
| author | Marco Trudel <mtrudel@gmx.ch> | 2007-01-17 13:55:52 +0100 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-17 12:55:52 +0000 |
| commit | 70686a71f66fff497a41cd98768f1e4267463d8b (patch) | |
| tree | 28bd6c20fba37b39f189102df4833d15ec9b926c /libjava | |
| parent | ceb84404df46bbac63d20099cf43281685642f81 (diff) | |
| download | gcc-70686a71f66fff497a41cd98768f1e4267463d8b.zip gcc-70686a71f66fff497a41cd98768f1e4267463d8b.tar.gz gcc-70686a71f66fff497a41cd98768f1e4267463d8b.tar.bz2 | |
jvmti.cc (_Jv_JVMTI_GetAllThreads): Now static.
2007-01-17 Marco Trudel <mtrudel@gmx.ch>
* jvmti.cc (_Jv_JVMTI_GetAllThreads): Now static. Use JNICALL.
Fixed indentation. Removed unused variable.
From-SVN: r120854
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jvmti.cc | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d1377e6..e2ba835 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-01-17 Marco Trudel <mtrudel@gmx.ch> + + * jvmti.cc (_Jv_JVMTI_GetAllThreads): Now static. Use JNICALL. + Fixed indentation. Removed unused variable. + 2007-01-16 Tom Tromey <tromey@redhat.com> * java/lang/natThread.cc (finalize_native): Remove cast. diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index b9646b7..f6df8c5 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -1,6 +1,6 @@ // jvmti.cc - JVMTI implementation -/* Copyright (C) 2006 Free Software Foundation +/* Copyright (C) 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -198,7 +198,7 @@ _Jv_JVMTI_InterruptThread (MAYBE_UNUSED jvmtiEnv *env, jthread thread) return JVMTI_ERROR_NONE; } -jvmtiError +static jvmtiError JNICALL _Jv_JVMTI_GetAllThreads(MAYBE_UNUSED jvmtiEnv *env, jint *thread_cnt, jthread **threads) { @@ -207,7 +207,6 @@ _Jv_JVMTI_GetAllThreads(MAYBE_UNUSED jvmtiEnv *env, jint *thread_cnt, NULL_CHECK (threads); using namespace java::lang; - Thread *thr = Thread::currentThread (); ThreadGroup *root_grp = ThreadGroup::root; jint estimate = root_grp->activeCount (); @@ -217,10 +216,9 @@ _Jv_JVMTI_GetAllThreads(MAYBE_UNUSED jvmtiEnv *env, jint *thread_cnt, // Allocate some extra space since threads can be created between calls try { - thr_arr - = reinterpret_cast<JArray<Thread *> *> (JvNewObjectArray - ((estimate * 2), - &Thread::class$, NULL)); + thr_arr = reinterpret_cast<JArray<Thread *> *> (JvNewObjectArray + ((estimate * 2), + &Thread::class$, NULL)); } catch (java::lang::OutOfMemoryError *err) { |