/hg/release/icedtea7-forest-2.1/hotspot: Back out mistaken check...
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Thu May 31 03:46:18 PDT 2012
changeset d11542907511 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=d11542907511
author: aph
date: Thu May 31 06:42:18 2012 -0400
Back out mistaken checkin of debug code.
diffstat:
make/linux/makefiles/fastdebug.make | 2 +-
make/linux/makefiles/gcc.make | 2 +-
make/solaris/makefiles/gcc.make | 2 +-
src/cpu/zero/vm/asm_helper.cpp | 11 ----
src/os/linux/vm/os_linux.cpp | 7 +--
src/share/vm/gc_implementation/shared/markSweep.cpp | 5 --
src/share/vm/gc_implementation/shared/markSweep.inline.hpp | 6 --
src/share/vm/interpreter/bytecodeInterpreter.cpp | 8 +--
src/share/vm/runtime/frame.cpp | 3 -
src/share/vm/runtime/vmThread.cpp | 35 --------------
10 files changed, 6 insertions(+), 75 deletions(-)
diffs (198 lines):
diff -r 1000c4de30f8 -r d11542907511 make/linux/makefiles/fastdebug.make
--- a/make/linux/makefiles/fastdebug.make Wed May 30 10:20:02 2012 -0400
+++ b/make/linux/makefiles/fastdebug.make Thu May 31 06:42:18 2012 -0400
@@ -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
diff -r 1000c4de30f8 -r d11542907511 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Wed May 30 10:20:02 2012 -0400
+++ b/make/linux/makefiles/gcc.make Thu May 31 06:42:18 2012 -0400
@@ -160,7 +160,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
diff -r 1000c4de30f8 -r d11542907511 make/solaris/makefiles/gcc.make
--- a/make/solaris/makefiles/gcc.make Wed May 30 10:20:02 2012 -0400
+++ b/make/solaris/makefiles/gcc.make Thu May 31 06:42:18 2012 -0400
@@ -121,7 +121,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
diff -r 1000c4de30f8 -r d11542907511 src/cpu/zero/vm/asm_helper.cpp
--- a/src/cpu/zero/vm/asm_helper.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/cpu/zero/vm/asm_helper.cpp Thu May 31 06:42:18 2012 -0400
@@ -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];
diff -r 1000c4de30f8 -r d11542907511 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/os/linux/vm/os_linux.cpp Thu May 31 06:42:18 2012 -0400
@@ -4215,11 +4215,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 );
diff -r 1000c4de30f8 -r d11542907511 src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Thu May 31 06:42:18 2012 -0400
@@ -30,11 +30,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> MarkSweep::_marking_stack;
Stack<DataLayout*> MarkSweep::_revisit_mdo_stack;
Stack<Klass*> MarkSweep::_revisit_klass_stack;
diff -r 1000c4de30f8 -r d11542907511 src/share/vm/gc_implementation/shared/markSweep.inline.hpp
--- a/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Wed May 30 10:20:02 2012 -0400
+++ b/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Thu May 31 06:42:18 2012 -0400
@@ -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");
diff -r 1000c4de30f8 -r d11542907511 src/share/vm/interpreter/bytecodeInterpreter.cpp
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Thu May 31 06:42:18 2012 -0400
@@ -1507,13 +1507,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;
}
diff -r 1000c4de30f8 -r d11542907511 src/share/vm/runtime/frame.cpp
--- a/src/share/vm/runtime/frame.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/share/vm/runtime/frame.cpp Thu May 31 06:42:18 2012 -0400
@@ -785,9 +785,6 @@
}
if (in_stack) {
_f->do_oop(addr);
- } else {
- fprintf(stderr, "Arse! %p\n",
- _fr->interpreter_frame_tos_address());
}
}
}
diff -r 1000c4de30f8 -r d11542907511 src/share/vm/runtime/vmThread.cpp
--- a/src/share/vm/runtime/vmThread.cpp Wed May 30 10:20:02 2012 -0400
+++ b/src/share/vm/runtime/vmThread.cpp Thu May 31 06:42:18 2012 -0400
@@ -245,39 +245,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");
@@ -302,8 +269,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();
More information about the distro-pkg-dev
mailing list