harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r559857 - in /harmony/enhanced/drlvm/trunk/vm: include/open/vm_gc.h vmcore/include/vm_threads.h vmcore/src/class_support/C_Interface.cpp vmcore/src/gc/stop_the_world_root_set_enum.cpp vmcore/src/thread/thread_manager.cpp
Date Thu, 26 Jul 2007 15:37:30 GMT
Author: gshimansky
Date: Thu Jul 26 08:37:28 2007
New Revision: 559857

URL: http://svn.apache.org/viewvc?view=rev&rev=559857
Log:
Applied patch from HARMONY-4534
[drlvm][thread] Need to remove obsolete variables p_the_safepoint_control_thread and global_safepoint_status


Modified:
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h?view=diff&rev=559857&r1=559856&r2=559857
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h Thu Jul 26 08:37:28 2007
@@ -148,11 +148,6 @@
 };
 
 /**
- * @return Thread safepoint state.
- */
-VMEXPORT enum safepoint_state get_global_safepoint_status();
-
-/**
  * @return <code>TRUE</code> if no apparent trash was found in the object.
  * 
  * Used for debugging.

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?view=diff&rev=559857&r1=559856&r2=559857
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h Thu Jul 26 08:37:28 2007
@@ -131,7 +131,4 @@
 jint jthread_allocate_vm_thread_pool(JavaVM * java_vm, vm_thread_t vm_thread);
 void jthread_deallocate_vm_thread_pool(vm_thread_t vm_thread);
 
-extern volatile VM_thread *p_the_safepoint_control_thread;      // only set when a gc is
happening
-extern volatile safepoint_state global_safepoint_status;
-
 #endif //!_VM_THREADS_H_

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?view=diff&rev=559857&r1=559856&r2=559857
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Thu Jul 26 08:37:28
2007
@@ -2381,13 +2381,6 @@
 
 
 
-enum safepoint_state get_global_safepoint_status()
-{
-    return global_safepoint_status;
-} //get_global_safepoint_status
-
-
-
 void vm_gc_lock_enum()
 {
     hythread_global_lock();

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp?view=diff&rev=559857&r1=559856&r2=559857
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp Thu Jul
26 08:37:28 2007
@@ -137,14 +137,6 @@
     // it is convenient to have gc_enabled_status == disabled
     // during the enumeration -salikh
 
-    // Mark the global safepoint status as enumerating the universe..
-    assert(get_global_safepoint_status() == nill);
-    global_safepoint_status = enumerate_the_universe;
-
-    // Identify the thread driving the GC.
-    assert(p_the_safepoint_control_thread == 0);    
-    p_the_safepoint_control_thread = p_TLS_vmthread;
-
     stop_the_world_root_set_enumeration();
     
     assert(!hythread_is_suspend_enabled());
@@ -157,11 +149,6 @@
 void vm_resume_threads_after()
 {
     TRACE2("vm.gc", "vm_resume_threads_after()");
-    // Check that we are still enumerating the universe and formally mark the end of it.
-    assert(get_global_safepoint_status() == enumerate_the_universe);
-    global_safepoint_status = nill;
-    assert(p_the_safepoint_control_thread == p_TLS_vmthread);
-    p_the_safepoint_control_thread = 0;
 
     jvmti_send_gc_finish_event();
     jvmti_clean_reclaimed_object_tags();

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?view=diff&rev=559857&r1=559856&r2=559857
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Thu Jul 26 08:37:28
2007
@@ -73,17 +73,6 @@
 #define LOG_DOMAIN "vmcore.thread"
 #include "cxxlog.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-volatile VM_thread *p_the_safepoint_control_thread = 0;     // only set when a gc is happening
-volatile safepoint_state global_safepoint_status = nill;
-
-#ifdef __cplusplus
-}
-#endif
 
 jint jthread_allocate_vm_thread_pool(JavaVM *java_vm,
                                      vm_thread_t vm_thread)



Mime
View raw message