Mercurial > hg > release > icedtea7-forest-2.4 > hotspot
changeset 5038:a644c3ec2b16
Back out mistaken checkin of debug code.
author | aph |
---|---|
date | Fri, 12 Jul 2013 20:27:35 +0100 |
parents | f8dd5ae19039 |
children | 70e201bcbb24 |
files | make/linux/makefiles/fastdebug.make make/linux/makefiles/gcc.make make/solaris/makefiles/gcc.make src/cpu/zero/vm/asm_helper.cpp src/os/linux/vm/os_linux.cpp src/share/vm/gc_implementation/shared/markSweep.cpp src/share/vm/gc_implementation/shared/markSweep.inline.hpp src/share/vm/interpreter/bytecodeInterpreter.cpp src/share/vm/runtime/frame.cpp src/share/vm/runtime/vmThread.cpp |
diffstat | 10 files changed, 6 insertions(+), 75 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/fastdebug.make Fri Jul 12 20:26:41 2013 +0100 +++ b/make/linux/makefiles/fastdebug.make Fri Jul 12 20:27:35 2013 +0100 @@ -31,7 +31,7 @@ # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) ifeq ($(BUILDARCH), ia64) - # Bug in GCC, causes hang. -O1 will override the -O0 specified earlier + # Bug in GCC, causes hang. -O1 will override the -O3 specified earlier OPT_CFLAGS/callGenerator.o += -O1 OPT_CFLAGS/ciTypeFlow.o += -O1 OPT_CFLAGS/compile.o += -O1
--- a/make/linux/makefiles/gcc.make Fri Jul 12 20:26:41 2013 +0100 +++ b/make/linux/makefiles/gcc.make Fri Jul 12 20:27:35 2013 +0100 @@ -148,7 +148,7 @@ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) # The flags to use for an Optimized g++ build -OPT_CFLAGS += -O0 +OPT_CFLAGS += -O3 # Hotspot uses very unstrict aliasing turn this optimization off OPT_CFLAGS += -fno-strict-aliasing
--- a/make/solaris/makefiles/gcc.make Fri Jul 12 20:26:41 2013 +0100 +++ b/make/solaris/makefiles/gcc.make Fri Jul 12 20:27:35 2013 +0100 @@ -126,7 +126,7 @@ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) # The flags to use for an Optimized g++ build -OPT_CFLAGS += -O0 +OPT_CFLAGS += -O3 # Hotspot uses very unstrict aliasing turn this optimization off OPT_CFLAGS += -fno-strict-aliasing
--- a/src/cpu/zero/vm/asm_helper.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/cpu/zero/vm/asm_helper.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -403,8 +403,6 @@ return thread->pending_exception(); } -extern "C" void ps(); - extern "C" oop Helper_SafePoint(JavaThread *thread) { { @@ -414,15 +412,6 @@ return thread->pending_exception(); } -extern "C" oop Helper_SafePoint2(JavaThread *thread) -{ - { - HandleMarkCleaner __hmc(thread); - } - SafepointSynchronize::block(thread); - return thread->pending_exception(); -} - extern "C" void Helper_RaiseArrayBoundException(JavaThread *thread, int index) { char message[jintAsStringSize];
--- a/src/os/linux/vm/os_linux.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/os/linux/vm/os_linux.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -4598,11 +4598,8 @@ Linux::fast_thread_clock_init(); // Allocate a single page and mark it as readable for safepoint polling - julong foo = (julong) ::mmap(NULL, 65536, PROT_READ, - MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0); - address polling_page = (address)(foo & -65536L); - if ((julong)polling_page < foo) - polling_page += 65536; + address polling_page = (address) ::mmap(NULL, Linux::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + guarantee( polling_page != MAP_FAILED, "os::init_2: failed to allocate polling page" ); os::set_polling_page( polling_page );
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -32,11 +32,6 @@ #include "oops/objArrayKlass.inline.hpp" #include "oops/oop.inline.hpp" - -void *arse[2]; - -void sa(void*a, void *b) { arse[0] = a; arse [1] = b; } - Stack<oop, mtGC> MarkSweep::_marking_stack; Stack<DataLayout*, mtGC> MarkSweep::_revisit_mdo_stack; Stack<Klass*, mtGC> MarkSweep::_revisit_klass_stack;
--- a/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Fri Jul 12 20:27:35 2013 +0100 @@ -43,15 +43,9 @@ } } -extern "C" void *arse[2]; - -extern "C" void sa(void*a, void *b); - template <class T> inline void MarkSweep::follow_root(T* p) { assert(!Universe::heap()->is_in_reserved(p), "roots shouldn't be things within the heap"); - if (arse[0] <= (void *)p && arse[1] >= (void *)p) - fprintf(stderr, "Whip\n"); #ifdef VALIDATE_MARK_SWEEP if (ValidateMarkSweep) { guarantee(!_root_refs_stack->contains(p), "should only be in here once");
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -1509,13 +1509,7 @@ CASE(_freturn): { // Allow a safepoint before returning to frame manager. - if ( SafepointSynchronize::is_synchronizing()) { - { - /* zap freed handles rather than GC'ing them */ - HandleMarkCleaner __hmc(THREAD); - } - CALL_VM(SafepointSynchronize::block(THREAD), handle_exception); - } + SAFEPOINT; goto handle_return; }
--- a/src/share/vm/runtime/frame.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/share/vm/runtime/frame.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -786,9 +786,6 @@ } if (in_stack) { _f->do_oop(addr); - } else { - fprintf(stderr, "Arse! %p\n", - _fr->interpreter_frame_tos_address()); } } }
--- a/src/share/vm/runtime/vmThread.cpp Fri Jul 12 20:26:41 2013 +0100 +++ b/src/share/vm/runtime/vmThread.cpp Fri Jul 12 20:27:35 2013 +0100 @@ -257,39 +257,6 @@ } } -class BangerThread : NamedThread -{ -public: - - static BangerThread *the_thread; - - static void create() { - the_thread = new BangerThread(); - os::create_thread (the_thread, os::watcher_thread); - Thread::start(the_thread); - } - - BangerThread() : NamedThread() { - set_name("banger"); - } - - void run() { - struct timespec req; - req.tv_nsec = 0.5e9; - req.tv_sec = 0; - - for (;;) - { - nanosleep(&req, NULL); - // VM_ForceSafepoint op; - // VMThread::execute(&op); - Universe::heap()->collect(GCCause::_java_lang_system_gc); - } - } -}; - -BangerThread *BangerThread::the_thread; - void VMThread::run() { assert(this == vm_thread(), "check"); @@ -314,8 +281,6 @@ // possible to set the VM thread priority higher than any Java thread. os::set_native_priority( this, prio ); - BangerThread::create(); - // Wait for VM_Operations until termination this->loop();