Mercurial > hg > graal-jvmci-8
changeset 22867:69b3b6c3a872
Merge
author | dlong |
---|---|
date | Wed, 04 Mar 2015 19:23:55 +0000 |
parents | c159f0c42cda (current diff) 96c46dd53027 (diff) |
children | c5b00c39d818 |
files | |
diffstat | 9 files changed, 8 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/os/solaris/proc/saproc.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/agent/src/os/solaris/proc/saproc.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -661,30 +661,30 @@ // read FileMapHeader size_t n = read(fd, pheader, sizeof(struct FileMapHeader)); if (n != sizeof(struct FileMapHeader)) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "unable to read shared archive file map header from %s", classes_jsa); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); } // check file magic if (pheader->_magic != 0xf00baba2) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "%s has bad shared archive magic 0x%x, expecting 0xf00baba2", classes_jsa, pheader->_magic); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); } // check version if (pheader->_version != CURRENT_ARCHIVE_VERSION) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "%s has wrong shared archive version %d, expecting %d", classes_jsa, pheader->_version, CURRENT_ARCHIVE_VERSION); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); }
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -6634,7 +6634,6 @@ } void CMSCollector::do_CMS_operation(CMS_op_type op, GCCause::Cause gc_cause) { - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); GCTraceTime t(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer_cm->gc_id()); TraceCollectorStats tcs(counters());
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -1297,7 +1297,6 @@ // Timing assert(gc_cause() != GCCause::_java_lang_system_gc || explicit_gc, "invariant"); - gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps); TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty); {
--- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -230,7 +230,6 @@ } void VM_CGC_Operation::doit() { - gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps); TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty); GCTraceTime t(_printGCMessage, G1Log::fine(), true, G1CollectedHeap::heap()->gc_timer_cm(), G1CollectedHeap::heap()->concurrent_mark()->concurrent_gc_id()); SharedHeap* sh = SharedHeap::heap();
--- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -167,7 +167,6 @@ { HandleMark hm; - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer->gc_id()); TraceCollectorStats tcs(counters());
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -2054,7 +2054,6 @@ gc_task_manager()->task_idle_workers(); heap->set_par_threads(gc_task_manager()->active_workers()); - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer.gc_id()); TraceCollectorStats tcs(counters());
--- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -329,7 +329,6 @@ ResourceMark rm; HandleMark hm; - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); GCTraceTime t1(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer.gc_id()); TraceCollectorStats tcs(counters());
--- a/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -49,10 +49,8 @@ } if (_doit) { - if (PrintGCTimeStamps) { - gclog_or_tty->stamp(); - gclog_or_tty->print(": "); - } + gclog_or_tty->date_stamp(PrintGCDateStamps); + gclog_or_tty->stamp(PrintGCTimeStamps); if (PrintGCID) { gclog_or_tty->print("#%u: ", gc_id.id()); }
--- a/src/share/vm/memory/genCollectedHeap.cpp Wed Mar 04 01:31:16 2015 -0500 +++ b/src/share/vm/memory/genCollectedHeap.cpp Wed Mar 04 19:23:55 2015 +0000 @@ -384,7 +384,6 @@ bool complete = full && (max_level == (n_gens()-1)); const char* gc_cause_prefix = complete ? "Full GC" : "GC"; - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); // The PrintGCDetails logging starts before we have incremented the GC id. We will do that later // so we can assume here that the next GC id is what we want.