comparison 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
comparison
equal deleted inserted replaced
15053:04f1723150b4 15054:d4a9d6f6e57d
778 C2V_END 778 C2V_END
779 779
780 C2V_VMENTRY(jboolean, hasCompiledCodeForOSR, (JNIEnv *env, jobject, jlong metaspace_method, int entry_bci, int comp_level)) 780 C2V_VMENTRY(jboolean, hasCompiledCodeForOSR, (JNIEnv *env, jobject, jlong metaspace_method, int entry_bci, int comp_level))
781 Method* method = asMethod(metaspace_method); 781 Method* method = asMethod(metaspace_method);
782 return method->lookup_osr_nmethod_for(entry_bci, comp_level, true) != NULL; 782 return method->lookup_osr_nmethod_for(entry_bci, comp_level, true) != NULL;
783 C2V_END
784
785 C2V_VMENTRY(jlong, getTimeStamp, (JNIEnv *env, jobject))
786 // tty->time_stamp is the time since VM start which should be used
787 // for all HotSpot log output when a timestamp is required.
788 return tty->time_stamp().milliseconds();
783 C2V_END 789 C2V_END
784 790
785 #define CC (char*) /*cast a literal from (const char*)*/ 791 #define CC (char*) /*cast a literal from (const char*)*/
786 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f)) 792 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
787 793
853 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)}, 859 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)},
854 {CC"getGPUs", CC"()"STRING, FN_PTR(getGPUs)}, 860 {CC"getGPUs", CC"()"STRING, FN_PTR(getGPUs)},
855 {CC"allocateCompileId", CC"("METASPACE_METHOD"I)I", FN_PTR(allocateCompileId)}, 861 {CC"allocateCompileId", CC"("METASPACE_METHOD"I)I", FN_PTR(allocateCompileId)},
856 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)}, 862 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)},
857 {CC"hasCompiledCodeForOSR", CC"("METASPACE_METHOD"II)Z", FN_PTR(hasCompiledCodeForOSR)}, 863 {CC"hasCompiledCodeForOSR", CC"("METASPACE_METHOD"II)Z", FN_PTR(hasCompiledCodeForOSR)},
864 {CC"getTimeStamp", CC"()J", FN_PTR(getTimeStamp)},
858 }; 865 };
859 866
860 int CompilerToVM_methods_count() { 867 int CompilerToVM_methods_count() {
861 return sizeof(CompilerToVM_methods) / sizeof(JNINativeMethod); 868 return sizeof(CompilerToVM_methods) / sizeof(JNINativeMethod);
862 } 869 }