diff options
| author | iveresov <none@none> | 2013-10-08 07:08:27 -0700 |
|---|---|---|
| committer | iveresov <none@none> | 2013-10-08 07:08:27 -0700 |
| commit | 3df475b376f7c1b4b533aa15954170dbe80966d5 (patch) | |
| tree | 38a677952bdf3cc437b4daa80ad237201c1625d0 /src/share/vm/utilities | |
| parent | 78f91ecb063bc4a027d21ce52cf5818f0ae90838 (diff) | |
| parent | be32bec5abc992e936229026ecd534f8ec573187 (diff) | |
Merge
Diffstat (limited to 'src/share/vm/utilities')
| -rw-r--r-- | src/share/vm/utilities/ostream.cpp | 4 | ||||
| -rw-r--r-- | src/share/vm/utilities/vmError.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/share/vm/utilities/ostream.cpp b/src/share/vm/utilities/ostream.cpp index e4215504a..39f87a477 100644 --- a/src/share/vm/utilities/ostream.cpp +++ b/src/share/vm/utilities/ostream.cpp @@ -465,7 +465,7 @@ static const char* make_log_name_internal(const char* log_name, const char* forc } // log_name comes from -XX:LogFile=log_name or -Xloggc:log_name -// in log_name, %p => pipd1234 and +// in log_name, %p => pid1234 and // %t => YYYY-MM-DD_HH-MM-SS static const char* make_log_name(const char* log_name, const char* force_directory) { char timestr[32]; @@ -792,7 +792,7 @@ bool defaultStream::has_log_file() { void defaultStream::init_log() { // %%% Need a MutexLocker? - const char* log_name = LogFile != NULL ? LogFile : "hotspot_pid%p.log"; + const char* log_name = LogFile != NULL ? LogFile : "hotspot_%p.log"; const char* try_name = make_log_name(log_name, NULL); fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name); if (!file->is_open()) { diff --git a/src/share/vm/utilities/vmError.cpp b/src/share/vm/utilities/vmError.cpp index 79769aeb3..bbf983953 100644 --- a/src/share/vm/utilities/vmError.cpp +++ b/src/share/vm/utilities/vmError.cpp @@ -1050,7 +1050,7 @@ void VMError::report_and_die() { FILE* replay_data_file = os::open(fd, "w"); if (replay_data_file != NULL) { fileStream replay_data_stream(replay_data_file, /*need_close=*/true); - env->dump_replay_data(&replay_data_stream); + env->dump_replay_data_unsafe(&replay_data_stream); out.print_raw("#\n# Compiler replay data is saved as:\n# "); out.print_raw_cr(buffer); } else { |