diff src/share/vm/graal/graalCompilerToVM.cpp @ 15054:d4a9d6f6e57d

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 10 Apr 2014 09:14:35 +0200
parents 5e6f29f287d6 0286888f792b
children 4df6d7c966a2
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Apr 10 00:05:24 2014 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Thu Apr 10 09:14:35 2014 +0200
@@ -782,6 +782,12 @@
   return method->lookup_osr_nmethod_for(entry_bci, comp_level, true) != NULL;
 C2V_END
 
+C2V_VMENTRY(jlong, getTimeStamp, (JNIEnv *env, jobject))
+  // tty->time_stamp is the time since VM start which should be used
+  // for all HotSpot log output when a timestamp is required.
+  return tty->time_stamp().milliseconds();
+C2V_END
+
 #define CC (char*)  /*cast a literal from (const char*)*/
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
 
@@ -855,6 +861,7 @@
   {CC"allocateCompileId",                            CC"("METASPACE_METHOD"I)I",                                       FN_PTR(allocateCompileId)},
   {CC"isMature",                                     CC"("METASPACE_METHOD_DATA")Z",                                   FN_PTR(isMature)},
   {CC"hasCompiledCodeForOSR",                        CC"("METASPACE_METHOD"II)Z",                                      FN_PTR(hasCompiledCodeForOSR)},
+  {CC"getTimeStamp",                                 CC"()J",                                                          FN_PTR(getTimeStamp)},
 };
 
 int CompilerToVM_methods_count() {