Mercurial > hg > graal-compiler
diff src/share/vm/runtime/fprofiler.cpp @ 628:7bb995fbd3c0
Merge
author | trims |
---|---|
date | Thu, 12 Mar 2009 18:16:36 -0700 |
parents | 98cb887364d3 |
children | c18cbe5936b8 |
line wrap: on
line diff
--- a/src/share/vm/runtime/fprofiler.cpp Mon Mar 09 13:34:00 2009 -0700 +++ b/src/share/vm/runtime/fprofiler.cpp Thu Mar 12 18:16:36 2009 -0700 @@ -988,7 +988,7 @@ void ThreadProfiler::record_tick_for_running_frame(JavaThread* thread, frame fr) { - // The tick happend in real code -> non VM code + // The tick happened in real code -> non VM code if (fr.is_interpreted_frame()) { interval_data_ref()->inc_interpreted(); record_interpreted_tick(thread, fr, tp_code, FlatProfiler::bytecode_ticks); @@ -1019,7 +1019,7 @@ } void ThreadProfiler::record_tick_for_calling_frame(JavaThread* thread, frame fr) { - // The tick happend in VM code + // The tick happened in VM code interval_data_ref()->inc_native(); if (fr.is_interpreted_frame()) { record_interpreted_tick(thread, fr, tp_native, FlatProfiler::bytecode_ticks_stub);