comparison src/share/vm/runtime/thread.cpp @ 12252:06ae47d9d088

Merge
author tschatzl
date Thu, 19 Sep 2013 09:26:08 +0200
parents b89a1a870965 40136aa2cdb1
children 179cd89fb279
comparison
equal deleted inserted replaced
12219:41e6ae9f6dd7 12252:06ae47d9d088
3329 3329
3330 // Parse arguments 3330 // Parse arguments
3331 jint parse_result = Arguments::parse(args); 3331 jint parse_result = Arguments::parse(args);
3332 if (parse_result != JNI_OK) return parse_result; 3332 if (parse_result != JNI_OK) return parse_result;
3333 3333
3334 os::init_before_ergo();
3335
3336 jint ergo_result = Arguments::apply_ergo();
3337 if (ergo_result != JNI_OK) return ergo_result;
3338
3334 if (PauseAtStartup) { 3339 if (PauseAtStartup) {
3335 os::pause(); 3340 os::pause();
3336 } 3341 }
3337 3342
3338 #ifndef USDT2 3343 #ifndef USDT2