harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r649140 - in /harmony/enhanced/drlvm/trunk/vm: include/open/ interpreter/src/ thread/src/ vmcore/include/ vmcore/src/class_support/ vmcore/src/init/ vmcore/src/jni/ vmcore/src/jvmti/ vmcore/src/kernel_classes/native/ vmcore/src/ncai/ vmcore...
Date Thu, 17 Apr 2008 15:05:19 GMT
Author: mcfirst
Date: Thu Apr 17 08:05:04 2008
New Revision: 649140

URL: http://svn.apache.org/viewvc?rev=649140&view=rev
Log:
Moved jthread.h and ti_thread.h from vm/include/open to vm/vmcore/include

Added:
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jthread.h
      - copied, changed from r648680, harmony/enhanced/drlvm/trunk/vm/include/open/jthread.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/ti_thread.h
      - copied, changed from r648680, harmony/enhanced/drlvm/trunk/vm/include/open/ti_thread.h
Removed:
    harmony/enhanced/drlvm/trunk/vm/include/open/jthread.h
    harmony/enhanced/drlvm/trunk/vm/include/open/ti_thread.h
Modified:
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ncai_common.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_trace.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_locals.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread_group.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_timer.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_util_concurrent_locks_LockSupport.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_attrs.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_basic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_interrupt.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_iterator.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_monitors.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_park.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_suspend.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_instr.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_others.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_timing.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp Thu Apr 17 08:05:04
2008
@@ -26,7 +26,6 @@
 #include "vtable.h"
 #include "exceptions.h"
 #include "mon_enter_exit.h"
-#include "open/jthread.h"
 #include "open/vm_method_access.h"
 #include "interp_native.h"
 #include "interp_defs.h"

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp Thu Apr 17 08:05:04
2008
@@ -28,7 +28,6 @@
 #include "interp_defs.h"
 #include "ini.h"
 #include "vtable.h"
-//#include "open/jthread.h"
 #include "open/vm_method_access.h"
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ncai_common.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ncai_common.c?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ncai_common.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ncai_common.c Thu Apr 17 08:05:04 2008
@@ -1,6 +1,18 @@
-/**
- * @author Ilya Berezhniuk
- * @version $Revision$
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 /**
@@ -9,9 +21,9 @@
  */
 
 #include <open/hythread_ext.h>
-#include "thread_private.h"
 #include <open/ncai_thread.h>
-#include <open/jthread.h>
+
+#include "thread_private.h"
 #include "port_thread.h"
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h Thu Apr 17 08:05:04 2008
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <open/types.h>
 #include <open/hythread_ext.h>
-#include <open/ti_thread.h>
 #include <open/ncai_thread.h>
 #include <apr_pools.h>
 #include <apr_thread_mutex.h>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h Thu Apr 17 08:05:04 2008
@@ -21,11 +21,9 @@
 #ifndef _EXCEPTIONS_H_
 #define _EXCEPTIONS_H_
 
-
+#include "open/types.h"
 #include "exceptions_type.h"
 #include "jni.h"
-#include "open/types.h"
-//#include "open/jthread.h"
 
 /**
 @file

Copied: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jthread.h (from r648680, harmony/enhanced/drlvm/trunk/vm/include/open/jthread.h)
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jthread.h?p2=harmony/enhanced/drlvm/trunk/vm/vmcore/include/jthread.h&p1=harmony/enhanced/drlvm/trunk/vm/include/open/jthread.h&r1=648680&r2=649140&rev=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/jthread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jthread.h Thu Apr 17 08:05:04 2008
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef _OPEN_THREAD_GENERIC_H
-#define _OPEN_THREAD_GENERIC_H
+#ifndef __JTHREAD_H__
+#define __JTHREAD_H__
 
 /**
  * @file
@@ -39,7 +39,7 @@
 #include <jvmti.h>
 #include "open/types.h"
 #include "open/hythread_ext.h"
-#include "open/ti_thread.h"
+#include "ti_thread.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -168,4 +168,4 @@
 }
 #endif
 
-#endif  /* _OPEN_THREAD_GENERIC_H */
+#endif  /* __JTHREAD_H__ */

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_trace.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_trace.h?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_trace.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_trace.h Thu Apr 17 08:05:04 2008
@@ -50,7 +50,9 @@
 
 #include <stdio.h>
 
+#include "open/types.h"
 #include "ExpandableMemBlock.h"
+#include "vm_threads.h"
 
 // Defines the StackTraceFrame structure
 #ifdef __cplusplus

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h Thu Apr 17 08:05:04 2008
@@ -19,7 +19,8 @@
 #define THREAD_MANAGER_HEADER
 
 #include "open/hythread.h"
-#include "open/jthread.h"
+
+#include "jthread.h"
 #include "exceptions_type.h"
 
 #define GC_BYTES_IN_THREAD_LOCAL (20 * sizeof(void *))

Copied: harmony/enhanced/drlvm/trunk/vm/vmcore/include/ti_thread.h (from r648680, harmony/enhanced/drlvm/trunk/vm/include/open/ti_thread.h)
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/ti_thread.h?p2=harmony/enhanced/drlvm/trunk/vm/vmcore/include/ti_thread.h&p1=harmony/enhanced/drlvm/trunk/vm/include/open/ti_thread.h&r1=648680&r2=649140&rev=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/ti_thread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/ti_thread.h Thu Apr 17 08:05:04 2008
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef OPEN_THREAD_TI_H
-#define OPEN_THREAD_TI_H
+#ifndef __TI_THREAD_H__
+#define __TI_THREAD_H__
 
 /**
  * @file ti_thread.h
@@ -29,9 +29,8 @@
  * All functions start with <code>jthread_*</code> prefix.
  */
 
+#include "open/hythread.h"
 #include "jvmti_types.h"
-#include "hythread.h"
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -144,4 +143,4 @@
 }
 #endif
 
-#endif  /* OPEN_THREAD_TI_H */
+#endif  /* __TI_THREAD_H__ */

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h Thu Apr 17 08:05:04 2008
@@ -30,14 +30,14 @@
 #include "open/types.h"
 #include "open/hythread.h"
 #include "open/hythread_ext.h"
-#include "open/ti_thread.h"
-#include "open/jthread.h"
 #include "open/vm_gc.h"
 
+#include "ti_thread.h"
+#include "jthread.h"
+#include "thread_manager.h"
 #include "jvmti.h"
 #include "jvmti_direct.h"
 #include "jni_direct.h"
-#include "thread_manager.h"
 #include "vm_core_types.h"
 #include "object_layout.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp Thu Apr 17 08:05:04
2008
@@ -21,8 +21,7 @@
 #include "open/vm_class_manipulation.h"
 #include "vtable.h"
 #include "Class.h"
-#include "open/jthread.h"
-//#include "open/gc.h"
+#include "jthread.h"
 #include "exceptions.h"
 #include "thread_manager.h"
 #include "vm_strings.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp Thu Apr 17 08:05:04 2008
@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include "open/types.h"
+
 #include "lock_manager.h"
 #include "object_layout.h"
-#include "open/types.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "Class.h"
-#include "open/vm_util.h"
 #include "environment.h"
 #include "ini.h"
 #include "m2n.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp Thu Apr 17 08:05:04
2008
@@ -25,7 +25,7 @@
 #include "finalize.h"
 #include "vm_threads.h"
 #include "init.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "jni_direct.h"
 #include "jni_utils.h"
 #include "slot.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp Thu Apr 17 08:05:04
2008
@@ -25,7 +25,7 @@
 #include "finalize.h"
 #include "vm_threads.h"
 #include "init.h"
-#include "open/jthread.h"
+#include "jthread.h"
 
 
 static Boolean native_ref_thread_flag = FALSE;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Thu Apr 17 08:05:04 2008
@@ -27,9 +27,9 @@
 #include "open/vm_properties.h"
 #include "open/gc.h"
 #include "open/hythread_ext.h"
-#include "open/jthread.h"   // this is for jthread_self()
 #include "open/vm_class_manipulation.h"
 
+#include "jthread.h"
 #include "vtable.h"
 #include "init.h"
 #include "classloader.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp Thu Apr 17 08:05:04 2008
@@ -23,9 +23,9 @@
 #include <apr_thread_mutex.h>
 
 #include "open/hythread.h"
-#include "open/jthread.h"
 #include "open/gc.h"
 
+#include "jthread.h"
 #include "jni.h"
 #include "jni_direct.h"
 #include "environment.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Thu Apr 17 08:05:04 2008
@@ -22,19 +22,18 @@
 #define LOG_DOMAIN "jni"
 #include "cxxlog.h"
 
-#include <port_atomic.h>
 #include <apr_pools.h>
 #include <apr_thread_mutex.h>
 #include <apr_time.h>
+#include "port_atomic.h"
 #include "port_vmem.h"
 
 #include "open/gc.h"
 #include "open/types.h"
 #include "open/hythread.h"
-#include "open/jthread.h"
-#include "open/vm_util.h"
 
 #include "jni.h"
+#include "jthread.h"
 #include "lock_manager.h"
 #include "vtable.h"
 #include "Class.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp Thu Apr 17 08:05:04 2008
@@ -18,7 +18,9 @@
  * JVMTI API for working with breakpoints
  */
 
+#include "open/hythread_ext.h"
 #include "open/vm_method_access.h"
+
 #include "jvmti_direct.h"
 #include "jvmti_utils.h"
 #include "jvmti_internal.h"
@@ -32,8 +34,7 @@
 #include "interpreter_exports.h"
 #include "jvmti_break_intf.h"
 
-#include "open/jthread.h"
-#include "open/hythread_ext.h"
+#include "jthread.h"
 
 
 // Callback function for JVMTI breakpoint processing

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Thu Apr 17 08:05:04 2008
@@ -25,10 +25,11 @@
 #define LOG_DOMAIN "jvmti"
 #include "cxxlog.h"
 #include "vm_log.h"
-#include "port_mutex.h"
 
 #include "open/vm_method_access.h"
 #include "open/gc.h"
+
+#include "port_mutex.h"
 #include "jvmti_direct.h"
 #include "jvmti_internal.h"
 #include "jvmti_utils.h"
@@ -36,7 +37,7 @@
 #include "interpreter_exports.h"
 #include "interpreter_imports.h"
 #include "classloader.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "suspend_checker.h"
 #include "jit_intf_cpp.h"
 #include "vm_log.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_locals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_locals.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_locals.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_locals.cpp Thu Apr 17 08:05:04
2008
@@ -28,9 +28,8 @@
 #include "interpreter_exports.h"
 #include "object_handles.h"
 #include "environment.h"
-#include "open/vm_util.h"
 #include "thread_generic.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "suspend_checker.h"
 #include "stack_iterator.h"
 #include "stack_trace.h"
@@ -40,7 +39,6 @@
 #include "vtable.h"
 
 #define LOG_DOMAIN "jvmti.locals"
-
 #include "cxxlog.h"
 
 /*

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp Thu Apr 17 08:05:04
2008
@@ -21,12 +21,13 @@
 
 #define LOG_DOMAIN "jvmti.stack.popframe"
 
+#include "open/vm_method_access.h"
+
 #include "jvmti_direct.h"
 #include "jvmti_interface.h"
-#include "open/vm_method_access.h"
 #include "exceptions.h"
 #include "environment.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "vm_threads.h"
 #include "jit_intf_cpp.h"
 #include "m2n.h"
@@ -35,7 +36,6 @@
 #include "jvmti_break_intf.h"
 #include "cci.h"
 #include "clog.h"
-#include "open/vm_class_info.h"
 
 static void jvmti_pop_frame_callback()
 {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp Thu Apr 17 08:05:04
2008
@@ -31,7 +31,7 @@
 #include "vm_threads.h"
 #include "vm_process.h"
 #include "cxxlog.h"
-#include "open/ti_thread.h"
+#include "ti_thread.h"
 #include "suspend_checker.h"
 #include "exceptions.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp Thu Apr 17 08:05:04 2008
@@ -23,13 +23,13 @@
 #include "cxxlog.h"
 
 // global headers
-#include <open/gc.h>
-#include <open/vm_gc.h>
-#include <open/jthread.h>
-#include <open/hythread_ext.h>
-#include <jvmti_support.h>
+#include "open/gc.h"
+#include "open/vm_gc.h"
+#include "open/hythread_ext.h"
 #include "jit_import_rt.h"
 // VM headers
+#include "jvmti_support.h"
+#include "jthread.h"
 #include "Class.h"
 #include "cci.h"
 #include "classloader.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp Thu Apr 17 08:05:04 2008
@@ -25,11 +25,11 @@
 #define LOG_DOMAIN "jvmti.stack"
 
 #include "open/vm_method_access.h"
-#include "open/jthread.h"
 
 #include "jvmti_direct.h"
 #include "jvmti_utils.h"
 #include "interpreter_exports.h"
+#include "jthread.h"
 #include "vm_threads.h"
 #include "environment.h"
 #include "Class.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp Thu Apr 17 08:05:04 2008
@@ -19,8 +19,12 @@
  * @version $Revision: $
  */
 
+#include "open/bytecodes.h"
+#include "open/vm_method_access.h"
+
 #include "port_crash_handler.h"
 #include "jvmti.h"
+#include "jthread.h"
 #include "Class.h"
 #include "cxxlog.h"
 #include "vm_log.h"
@@ -30,9 +34,6 @@
 #include "stack_iterator.h"
 #include "interpreter.h"
 #include "cci.h"
-#include "open/bytecodes.h"
-#include "open/jthread.h"
-#include "open/vm_method_access.h"
 #include "jvmti_break_intf.h"
 #include "jni_utils.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp Thu Apr 17 08:05:04
2008
@@ -30,11 +30,10 @@
 #include "vm_threads.h"
 #include "thread_generic.h"
 
-#include "open/ti_thread.h"
-#include "open/jthread.h"
+#include "ti_thread.h"
+#include "jthread.h"
 #include "thread_manager.h"
 #include "object_handles.h"
-#include "open/vm_util.h"
 #include "platform_lowlevel.h"
 #include "mon_enter_exit.h"
 #include "interpreter_exports.h"
@@ -42,8 +41,7 @@
 #include "suspend_checker.h"
 #include "stack_iterator.h"
 
-
-#include "Class.h" // FIXME: this is for Class::heap_base and Class::heap_end
+//#include "Class.h" // FIXME: this is for Class::heap_base and Class::heap_end
 
 #define MAX_JVMTI_ENV_NUMBER 10
 #define jvmti_test_jenv (p_TLS_vmthread->jni_env)

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread_group.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread_group.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread_group.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread_group.cpp Thu Apr 17 08:05:04
2008
@@ -24,8 +24,7 @@
 
 #include "jvmti_utils.h"
 #include "vm_threads.h"
-#include <open/jthread.h>
-#include "open/vm_util.h"
+#include "jthread.h"
 #include "cxxlog.h"
 #include "suspend_checker.h"
 #include "environment.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_timer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_timer.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_timer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_timer.cpp Thu Apr 17 08:05:04 2008
@@ -22,6 +22,8 @@
  * JVMTI timer API
  */
 
+#include <apr_time.h>
+
 #include "jvmti_direct.h"
 #include "jvmti_utils.h"
 #include "time.h"
@@ -29,9 +31,8 @@
 #include "port_sysinfo.h"
 #include "suspend_checker.h"
 #include "jvmti_internal.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "jvmti.h"
-#include <apr_time.h>
 
 /**
 * Sets field values to provided jvmtiTimerInfo structure.

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
Thu Apr 17 08:05:04 2008
@@ -23,10 +23,9 @@
 #include "cxxlog.h"
 
 #include "java_lang_VMThreadManager.h"
-#include "open/ti_thread.h"
 #include "open/hythread_ext.h"
-#include "open/jthread.h"
-#include "open/ti_thread.h"
+#include "jthread.h"
+#include "ti_thread.h"
 #include "jni_utils.h"
 #include "thread_manager.h"
 #include "vm_threads.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_util_concurrent_locks_LockSupport.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_util_concurrent_locks_LockSupport.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_util_concurrent_locks_LockSupport.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_util_concurrent_locks_LockSupport.cpp
Thu Apr 17 08:05:04 2008
@@ -18,11 +18,11 @@
  * @author Artem Aliev
  * @version $Revision: 1.1.2.1.4.4 $
  */  
-#include "vm_threads.h"
-#include "thread_generic.h"
 #include "java_util_concurrent_locks_LockSupport.h"
+#include "thread_generic.h"
+#include "jthread.h"
+#include "vm_threads.h"
 #include "jni.h"
-#include "open/jthread.h"
 
 /* Inaccessible static: parked */
 /*

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
Thu Apr 17 08:05:04 2008
@@ -33,7 +33,7 @@
 #include "environment.h"
 #include "java_lang_System.h"
 #include "org_apache_harmony_lang_management_ThreadMXBeanImpl.h"
-#include "open/jthread.h"
+#include "jthread.h"
 
 /* Native methods */
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
Thu Apr 17 08:05:04 2008
@@ -28,10 +28,11 @@
 
 #include <vector>
 
-//#include "open/vm_method_access.h"
+#include "org_apache_harmony_vm_VMStack.h"
 #include "open/vm_class_manipulation.h"
-#include "open/jthread.h"
+
 #include "stack_trace.h"
+#include "jthread.h"
 #include "jni_direct.h"
 #include "jni_utils.h"
 #include "environment.h"
@@ -41,8 +42,6 @@
 #include "thread_generic.h"
 
 #include "java_lang_VMClassRegistry.h"
-
-#include "org_apache_harmony_vm_VMStack.h"
 #include "java_security_AccessController.h"
 
 /*

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp Thu Apr 17 08:05:04 2008
@@ -6,11 +6,11 @@
 #define LOG_DOMAIN "ncai.thread"
 #include "cxxlog.h"
 
+#include "open/ncai_thread.h"
+
 #include "suspend_checker.h"
 #include "ncai_utils.h"
-#include <open/jthread.h>
-#include <open/ncai_thread.h>
-//#include "lock_manager.h"
+#include "jthread.h"
 #include "Class.h"
 #include "jni_utils.h"
 #include "jvmti_internal.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp Thu
Apr 17 08:05:04 2008
@@ -31,7 +31,7 @@
 
 #include <open/hythread_ext.h>
 #include <thread_helpers.h>
-#include "open/jthread.h"
+#include "jthread.h"
 #include "object_handles.h"
 #include "port_malloc.h"
 #include "m2n.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp Thu
Apr 17 08:05:04 2008
@@ -26,7 +26,7 @@
 
 #include <open/hythread_ext.h>
 #include <thread_helpers.h>
-#include "open/jthread.h"
+#include "jthread.h"
 #include "object_handles.h"
 #include "port_malloc.h"
 #include "m2n.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp Thu Apr
17 08:05:04 2008
@@ -22,7 +22,7 @@
 
 #include <open/hythread_ext.h>
 #include <thread_helpers.h>
-#include "open/jthread.h"
+#include "jthread.h"
 
 #include <assert.h>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp Thu Apr 17 08:05:04
2008
@@ -22,17 +22,12 @@
 #define LOG_DOMAIN "enumeration"
 #include "cxxlog.h"
 
-#include "platform_lowlevel.h"
-#include <assert.h>
-
-//MVM
-#include <iostream>
-
-using namespace std;
+#include "open/types.h"
 
+#include <assert.h>
 
-#include "open/types.h"
-#include "open/jthread.h"
+#include "platform_lowlevel.h"
+#include "jthread.h"
 #include "object_layout.h"
 #include "vm_threads.h"
 #include "jit_runtime_support.h"
@@ -41,16 +36,12 @@
 #include "Class.h"
 #include "jit_intf_cpp.h"
 #include "cci.h"
-
 #include "mon_enter_exit.h"
 #include "thread_generic.h"
-
 #include "object_generic.h"
 #include "vm_stats.h"
 #include "object_handles.h"
-
 #include "vm_process.h"
-//#include "java_mrte.h"
 #include "port_atomic.h"
 
 static void vm_monitor_exit_default(ManagedObject *p_obj);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp Thu Apr 17 08:05:04
2008
@@ -31,9 +31,8 @@
 
 using namespace std;
 
-
-#include "lock_manager.h"
 #include "open/types.h"
+#include "lock_manager.h"
 #include "environment.h"
 #include "exceptions.h"
 #include "jni_utils.h"
@@ -42,7 +41,7 @@
 
 #include "thread_generic.h"
 
-#include "open/jthread.h"
+#include "jthread.h"
 #include "thread_manager.h"
 #include "object.h"
 #include "object_generic.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp Thu Apr 17 08:05:04
2008
@@ -43,14 +43,12 @@
 
 #include <apr_pools.h>
 
-#include "open/hythread.h"
-#include "open/hythread_ext.h"
-#include "open/jthread.h"
-
 #include "open/types.h"
-#include "open/vm_util.h"
 #include "open/gc.h"
+#include "open/hythread.h"
+#include "open/hythread_ext.h"
 
+#include "jthread.h"
 #include "environment.h"
 #include "vm_strings.h"
 #include "object_layout.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_attrs.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_attrs.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_attrs.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_attrs.cpp Thu Apr 17 08:05:04
2008
@@ -20,8 +20,8 @@
  * @brief Java thread priority related functions
  */
 
-#include <open/jthread.h>
 #include <open/hythread_ext.h>
+#include "jthread.h"
 #include "vm_threads.h"
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_basic.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_basic.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_basic.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_basic.cpp Thu Apr 17 08:05:04
2008
@@ -20,9 +20,9 @@
  * @brief Key threading operations like thread creation and pointer conversion.
  */
 
-#include <open/jthread.h>
-#include <open/hythread_ext.h>
+#include "open/hythread_ext.h"
 #include "open/vm_properties.h"
+#include "jthread.h"
 #include "vm_threads.h"
 #include "jni.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_interrupt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_interrupt.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_interrupt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_interrupt.cpp Thu Apr 17
08:05:04 2008
@@ -20,8 +20,8 @@
  * @brief Java thread interruption related functions
  */
 
-#include <open/jthread.h>
 #include <open/hythread_ext.h>
+#include "jthread.h"
 #include "vm_threads.h"
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_iterator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_iterator.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_iterator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_iterator.cpp Thu Apr 17
08:05:04 2008
@@ -20,9 +20,9 @@
  * @brief Java thread iterator related functions
  */
 
-#include <open/ti_thread.h>
-#include <open/hythread_ext.h>
-#include <open/jthread.h>
+#include "open/hythread_ext.h"
+#include "jthread.h"
+#include "ti_thread.h"
 #include "vm_threads.h"
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_monitors.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_monitors.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_monitors.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_monitors.cpp Thu Apr 17
08:05:04 2008
@@ -20,8 +20,7 @@
  * @brief Java thread monitors related functions
  */
 #include <open/hythread_ext.h>
-#include <open/jthread.h>
-#include <open/hythread_ext.h>
+#include "jthread.h"
 #include "vm_threads.h"
 #include "jni.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_park.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_park.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_park.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_park.cpp Thu Apr 17 08:05:04
2008
@@ -21,8 +21,8 @@
  */
 
 #include <apr_time.h>
-#include <open/jthread.h>
-#include <open/hythread_ext.h>
+#include "open/hythread_ext.h"
+#include "jthread.h"
 #include "vm_threads.h"
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_suspend.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_suspend.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_suspend.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_java_suspend.cpp Thu Apr 17 08:05:04
2008
@@ -23,9 +23,9 @@
 #define LOG_DOMAIN "tm.suspend"
 #include "clog.h"
 
-#include <open/jthread.h>
-#include <open/hythread_ext.h>
-#include <open/vm_util.h>
+#include "open/hythread_ext.h"
+
+#include "jthread.h"
 #include "vm_threads.h"
 #include "environment.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Thu Apr 17 08:05:04
2008
@@ -33,14 +33,12 @@
 #endif
 
 #include "object_layout.h"
-#include "open/vm_util.h"
 #include "object_handles.h"
 //FIXME remove this code
 #include "exceptions.h"
 #include "Class.h"
 #include "environment.h"
 #include "vtable.h"
-#include "open/vm_util.h"
 #include "nogc.h"
 #include "sync_bits.h"
 
@@ -48,11 +46,10 @@
 #include "thread_manager.h"
 #include "thread_generic.h"
 #include "thread_helpers.h"
-#include "open/jthread.h"
+#include "jthread.h"
 
 #include "vm_threads.h"
 #include "tl/memory_pool.h"
-#include "open/vm_util.h"
 #include "suspend_checker.h"
 #include "jni_utils.h"
 #include "heap.h"
@@ -249,7 +246,7 @@
 
 void jthread_set_tm_data(jobject thread, void *val)
 {
-    static unsigned offset = -1;
+    static unsigned offset = (unsigned)-1;
 
     hythread_suspend_disable();
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_instr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_instr.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_instr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_instr.cpp Thu Apr 17 08:05:04
2008
@@ -20,9 +20,9 @@
  * @brief JVMTI basic related functions
  */
 
-#include <open/ti_thread.h>
-#include <open/hythread_ext.h>
-#include <open/jthread.h>
+#include "open/hythread_ext.h"
+#include "jthread.h"
+#include "ti_thread.h"
 #include "vm_threads.h"
 #include "object_handles.h"
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_others.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_others.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_others.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_others.cpp Thu Apr 17 08:05:04
2008
@@ -20,9 +20,9 @@
  * @brief JVMTI peak related functions
  */
 
-#include <open/jthread.h>
 #include <open/hythread_ext.h>
-#include <open/ti_thread.h>
+#include "jthread.h"
+#include "ti_thread.h"
 #include "vm_threads.h"
 
 #define THREAD_CONTENTION_MONITORING_SUPPORTED 1

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_timing.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_timing.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_timing.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_ti_timing.cpp Thu Apr 17 08:05:04
2008
@@ -20,9 +20,9 @@
  * @brief JVMTI timing related functions
  */
 
-#include <open/ti_thread.h>
 #include <open/hythread_ext.h>
-#include <open/jthread.h>
+#include "jthread.h"
+#include "ti_thread.h"
 #include "vm_threads.h"
 
 #define THREAD_CPU_TIME_SUPPORTED 1

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Thu Apr 17 08:05:04 2008
@@ -14,10 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Intel, Evgueni Brevnov
- * @version $Revision$
- */  
 
 /*    MONITOR ENTER RUNTIME SUPPORT    */
 
@@ -26,10 +22,10 @@
 #include "environment.h"
 
 #include "open/hythread_ext.h"
-#include "open/jthread.h"
+#include "jthread.h"
 #include "thread_helpers.h"
 
-#include "open/vm_util.h"
+//#include "open/vm_util.h"
 #include "encoder.h"
 #include "nogc.h"
 #include "compile.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=649140&r1=649139&r2=649140&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Thu
Apr 17 08:05:04 2008
@@ -43,6 +43,7 @@
 
 #include "environment.h"
 #include "Class.h"
+#include "vtable.h"
 #include "object_generic.h"
 #include "object_layout.h"
 #include "mon_enter_exit.h"



Mime
View raw message