comparison src/share/vm/prims/jni.cpp @ 17810:62c54fcc0a35

Merge
author kvn
date Tue, 25 Mar 2014 17:07:36 -0700
parents 191174b49bec
children 0118c8c7b80f
comparison
equal deleted inserted replaced
17809:a433eb716ce1 17810:62c54fcc0a35
4448 directBufferClass = (jclass) env->NewGlobalRef(directBufferClass); 4448 directBufferClass = (jclass) env->NewGlobalRef(directBufferClass);
4449 directByteBufferClass = (jclass) env->NewGlobalRef(directByteBufferClass); 4449 directByteBufferClass = (jclass) env->NewGlobalRef(directByteBufferClass);
4450 4450
4451 // Get needed field and method IDs 4451 // Get needed field and method IDs
4452 directByteBufferConstructor = env->GetMethodID(directByteBufferClass, "<init>", "(JI)V"); 4452 directByteBufferConstructor = env->GetMethodID(directByteBufferClass, "<init>", "(JI)V");
4453 if (env->ExceptionCheck()) {
4454 env->ExceptionClear();
4455 directBufferSupportInitializeFailed = 1;
4456 return false;
4457 }
4453 directBufferAddressField = env->GetFieldID(bufferClass, "address", "J"); 4458 directBufferAddressField = env->GetFieldID(bufferClass, "address", "J");
4459 if (env->ExceptionCheck()) {
4460 env->ExceptionClear();
4461 directBufferSupportInitializeFailed = 1;
4462 return false;
4463 }
4454 bufferCapacityField = env->GetFieldID(bufferClass, "capacity", "I"); 4464 bufferCapacityField = env->GetFieldID(bufferClass, "capacity", "I");
4465 if (env->ExceptionCheck()) {
4466 env->ExceptionClear();
4467 directBufferSupportInitializeFailed = 1;
4468 return false;
4469 }
4455 4470
4456 if ((directByteBufferConstructor == NULL) || 4471 if ((directByteBufferConstructor == NULL) ||
4457 (directBufferAddressField == NULL) || 4472 (directBufferAddressField == NULL) ||
4458 (bufferCapacityField == NULL)) { 4473 (bufferCapacityField == NULL)) {
4459 directBufferSupportInitializeFailed = 1; 4474 directBufferSupportInitializeFailed = 1;
5066 void TestMetachunk_test(); 5081 void TestMetachunk_test();
5067 void TestVirtualSpaceNode_test(); 5082 void TestVirtualSpaceNode_test();
5068 #if INCLUDE_ALL_GCS 5083 #if INCLUDE_ALL_GCS
5069 void TestOldFreeSpaceCalculation_test(); 5084 void TestOldFreeSpaceCalculation_test();
5070 void TestG1BiasedArray_test(); 5085 void TestG1BiasedArray_test();
5086 void TestCodeCacheRemSet_test();
5071 #endif 5087 #endif
5072 5088
5073 void execute_internal_vm_tests() { 5089 void execute_internal_vm_tests() {
5074 if (ExecuteInternalVMTests) { 5090 if (ExecuteInternalVMTests) {
5075 tty->print_cr("Running internal VM tests"); 5091 tty->print_cr("Running internal VM tests");
5091 #endif 5107 #endif
5092 #if INCLUDE_ALL_GCS 5108 #if INCLUDE_ALL_GCS
5093 run_unit_test(TestOldFreeSpaceCalculation_test()); 5109 run_unit_test(TestOldFreeSpaceCalculation_test());
5094 run_unit_test(TestG1BiasedArray_test()); 5110 run_unit_test(TestG1BiasedArray_test());
5095 run_unit_test(HeapRegionRemSet::test_prt()); 5111 run_unit_test(HeapRegionRemSet::test_prt());
5112 run_unit_test(TestCodeCacheRemSet_test());
5096 #endif 5113 #endif
5097 tty->print_cr("All internal VM tests passed"); 5114 tty->print_cr("All internal VM tests passed");
5098 } 5115 }
5099 } 5116 }
5100 5117