Mercurial > hg > openjdk > hsx14
changeset 433:de78b80cedec
6772413: code cleanup
Summary: Removed lines in adm64.make with interpret.o and moved few constant strings from header files.
Reviewed-by: never
| author | kvn |
|---|---|
| date | Tue, 18 Nov 2008 12:31:53 -0800 |
| parents | c1345e85f901 |
| children | b1d6a3e95810 |
| files | make/solaris/makefiles/amd64.make src/share/vm/opto/c2_globals.hpp src/share/vm/runtime/globals.hpp src/share/vm/runtime/perfMemory.cpp src/share/vm/runtime/perfMemory.hpp |
| diffstat | 5 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/solaris/makefiles/amd64.make Thu Nov 13 14:50:04 2008 -0800 +++ b/make/solaris/makefiles/amd64.make Tue Nov 18 12:31:53 2008 -0800 @@ -37,8 +37,6 @@ # _lwp_create_interpose must have a frame OPT_CFLAGS/os_solaris_x86_64.o = -xO1 -# force C++ interpreter to be full optimization -#OPT_CFLAGS/interpret.o = -fast -O4 # Temporary until SS10 C++ compiler is fixed OPT_CFLAGS/generateOptoStub.o = -xO2 @@ -50,8 +48,6 @@ # gcc # The serviceability agent relies on frame pointer (%rbp) to walk thread stack CFLAGS += -fno-omit-frame-pointer -# force C++ interpreter to be full optimization -#OPT_CFLAGS/interpret.o = -O3 else # error
--- a/src/share/vm/opto/c2_globals.hpp Thu Nov 13 14:50:04 2008 -0800 +++ b/src/share/vm/opto/c2_globals.hpp Tue Nov 18 12:31:53 2008 -0800 @@ -256,10 +256,10 @@ develop(intx, PrintIdealGraphPort, 4444, \ "Ideal graph printer to network port") \ \ - develop(ccstr, PrintIdealGraphAddress, "127.0.0.1", \ + notproduct(ccstr, PrintIdealGraphAddress, "127.0.0.1", \ "IP address to connect to visualizer") \ \ - develop(ccstr, PrintIdealGraphFile, NULL, \ + notproduct(ccstr, PrintIdealGraphFile, NULL, \ "File to dump ideal graph to. If set overrides the " \ "use of the network") \ \
--- a/src/share/vm/runtime/globals.hpp Thu Nov 13 14:50:04 2008 -0800 +++ b/src/share/vm/runtime/globals.hpp Tue Nov 18 12:31:53 2008 -0800 @@ -493,7 +493,7 @@ develop(bool, DeoptimizeALot, false, \ "deoptimize at every exit from the runtime system") \ \ - develop(ccstrlist, DeoptimizeOnlyAt, "", \ + notproduct(ccstrlist, DeoptimizeOnlyAt, "", \ "a comma separated list of bcis to deoptimize at") \ \ product(bool, DeoptimizeRandom, false, \
--- a/src/share/vm/runtime/perfMemory.cpp Thu Nov 13 14:50:04 2008 -0800 +++ b/src/share/vm/runtime/perfMemory.cpp Tue Nov 18 12:31:53 2008 -0800 @@ -25,6 +25,14 @@ # include "incls/_precompiled.incl" # include "incls/_perfMemory.cpp.incl" +// Prefix of performance data file. +const char PERFDATA_NAME[] = "hsperfdata"; + +// Add 1 for the '_' character between PERFDATA_NAME and pid. The '\0' terminating +// character will be included in the sizeof(PERFDATA_NAME) operation. +static const size_t PERFDATA_FILENAME_LEN = sizeof(PERFDATA_NAME) + + UINT_CHARS + 1; + char* PerfMemory::_start = NULL; char* PerfMemory::_end = NULL; char* PerfMemory::_top = NULL;
--- a/src/share/vm/runtime/perfMemory.hpp Thu Nov 13 14:50:04 2008 -0800 +++ b/src/share/vm/runtime/perfMemory.hpp Tue Nov 18 12:31:53 2008 -0800 @@ -95,7 +95,7 @@ } PerfDataEntry; // Prefix of performance data file. -static const char PERFDATA_NAME[] = "hsperfdata"; +extern const char PERFDATA_NAME[]; // UINT_CHARS contains the number of characters holding a process id // (i.e. pid). pid is defined as unsigned "int" so the maximum possible pid value @@ -103,11 +103,6 @@ // string. static const size_t UINT_CHARS = 10; -// Add 1 for the '_' character between PERFDATA_NAME and pid. The '\0' terminating -// character will be included in the sizeof(PERFDATA_NAME) operation. -static const size_t PERFDATA_FILENAME_LEN = sizeof(PERFDATA_NAME) + - UINT_CHARS + 1; - /* the PerfMemory class manages creation, destruction, * and allocation of the PerfData region. */