Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vm / jit / optimizing / profile.c

diff --git a/src/vm/jit/optimizing/profile.c b/src/vm/jit/optimizing/profile.c
index 898d8710a60473422dea1e450fd6e96c7fc5013f..9f0a43bf9681f9dd09a76f3b94e053f0577c5a30 100644 (file)
--- a/src/vm/jit/optimizing/profile.c
+++ b/src/vm/jit/optimizing/profile.c
@@ -38,8 +38,6 @@
 
 #include "threads/threads-common.h"
 
-#include "threads/native/threads.h"
-
 #include "vm/builtin.h"
 #include "vm/stringlocal.h"
 
@@ -53,13 +51,6 @@
 #include "vmcore/options.h"
 
 
-/* global variables ***********************************************************/
-
-#if defined(ENABLE_THREADS)
-static threadobject *thread_profile;
-#endif
-
-
 /* profile_init ****************************************************************
 
    Initializes the profile global lock.
@@ -103,66 +94,71 @@ static void profile_thread(void)
                threads_sleep(0, nanos);
                runs++;
 
-               /* iterate over all started threads */
+               /* lock the threads table */
 
-               t = mainthreadobj;
+               threads_table_lock();
+
+               /* iterate over all started threads */
 
-               do {
+               for (t = threads_table_first(); t != NULL; t = threads_table_next(t)) {
                        /* is this a Java thread? */
 
-                       if (t->flags & THREAD_FLAG_JAVA) {
-                               /* send SIGUSR2 to thread to get the current PC */
+                       if (!(t->flags & THREAD_FLAG_JAVA))
+                               continue;
 
-                               pthread_kill(t->tid, SIGUSR2);
+                       /* send SIGUSR2 to thread to get the current PC */
 
-                               /* the thread object now contains the current thread PC */
+                       pthread_kill(t->tid, SIGUSR2);
 
-                               pc = t->pc;
+                       /* the thread object now contains the current thread PC */
 
-                               /* get the PV for the current PC */
+                       pc = t->pc;
 
-                               pv = codegen_get_pv_from_pc_nocheck(pc);
+                       /* get the PV for the current PC */
 
-                               /* get methodinfo pointer from data segment */
+                       pv = codegen_get_pv_from_pc_nocheck(pc);
 
-                               if (pv == NULL) {
-                                       misses++;
-                               }
-                               else {
-                                       code = *((codeinfo **) (pv + CodeinfoPointer));
+                       /* get methodinfo pointer from data segment */
 
-                                       /* For asm_vm_call_method the codeinfo pointer is
-                                          NULL (which is also in the method tree). */
+                       if (pv == NULL) {
+                               misses++;
+                       }
+                       else {
+                               code = *((codeinfo **) (pv + CodeinfoPointer));
 
-                                       if (code != NULL) {
-                                               m = code->m;
+                               /* For asm_vm_call_method the codeinfo pointer is NULL
+                                  (which is also in the method tree). */
 
-                                               /* native methods are never recompiled */
+                               if (code != NULL) {
+                                       m = code->m;
 
-                                               if (!(m->flags & ACC_NATIVE)) {
-                                                       /* increase the method incovation counter */
+                                       /* native methods are never recompiled */
 
-                                                       code->frequency++;
-                                                       hits++;
+                                       if (!(m->flags & ACC_NATIVE)) {
+                                               /* increase the method incovation counter */
 
-                                                       if (code->frequency > 500) {
-                                                               /* clear frequency count before
-                                                                  recompilation */
+                                               code->frequency++;
+                                               hits++;
 
-                                                               code->frequency = 0;
+                                               if (code->frequency > 500) {
+                                                       /* clear frequency count before
+                                                          recompilation */
 
-                                                               /* add this method to the method list
-                                                                  and start recompilation */
+                                                       code->frequency = 0;
 
-                                                               recompile_queue_method(m);
-                                                       }
+                                                       /* add this method to the method list and
+                                                          start recompilation */
+
+                                                       recompile_queue_method(m);
                                                }
                                        }
                                }
                        }
+               }
 
-                       t = t->next;
-               } while ((t != NULL) && (t != mainthreadobj));
+               /* unlock the threads table */
+
+               threads_table_unlock();
        }
 }
 #endif
@@ -181,15 +177,9 @@ bool profile_start_thread(void)
 
        name = utf_new_char("Profiling Sampler");
 
-       thread_profile = threads_create_thread(name);
-
-       if (thread_profile == NULL)
+       if (!threads_thread_start_internal(name, profile_thread))
                return false;
 
-       /* actually start the profile sampling thread */
-
-       threads_start_thread(thread_profile, profile_thread);
-
        /* everything's ok */
 
        return true;