Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/thread.cpp @ 21519:cecb4e39521c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Wed, 27 May 2015 17:40:26 +0200
parents 7848fc12602b
children 47bebae7454f
comparison
equal deleted inserted replaced
21518:c2e58b2a2a76 21519:cecb4e39521c
3393 3393
3394 // Parse arguments 3394 // Parse arguments
3395 jint parse_result = Arguments::parse(args); 3395 jint parse_result = Arguments::parse(args);
3396 if (parse_result != JNI_OK) return parse_result; 3396 if (parse_result != JNI_OK) return parse_result;
3397 3397
3398 #ifdef GRAAL
3399 OptionsValueTable* options = GraalRuntime::parse_arguments();
3400 if (options == NULL) {
3401 return JNI_ERR;
3402 }
3403 #endif
3404
3398 os::init_before_ergo(); 3405 os::init_before_ergo();
3399 3406
3400 jint ergo_result = Arguments::apply_ergo(); 3407 jint ergo_result = Arguments::apply_ergo();
3401 if (ergo_result != JNI_OK) return ergo_result; 3408 if (ergo_result != JNI_OK) return ergo_result;
3402 3409
3701 if (CleanChunkPoolAsync) { 3708 if (CleanChunkPoolAsync) {
3702 Chunk::start_chunk_pool_cleaner_task(); 3709 Chunk::start_chunk_pool_cleaner_task();
3703 } 3710 }
3704 3711
3705 #ifdef GRAAL 3712 #ifdef GRAAL
3706 status = GraalRuntime::check_arguments(main_thread); 3713 GraalRuntime::set_options(options, main_thread);
3707 if (status != JNI_OK) {
3708 *canTryAgain = false; // don't let caller call JNI_CreateJavaVM again
3709 return status;
3710 }
3711 #endif 3714 #endif
3712 3715
3713 // initialize compiler(s) 3716 // initialize compiler(s)
3714 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERGRAAL) 3717 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERGRAAL)
3715 CompileBroker::compilation_init(); 3718 CompileBroker::compilation_init();