Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/jfr/dcmd/jfrDcmds.cpp	Mon Oct 01 16:41:10 2018 +0200
     1.2 +++ b/src/share/vm/jfr/dcmd/jfrDcmds.cpp	Fri Nov 23 16:36:07 2018 +0900
     1.3 @@ -534,12 +534,12 @@
     1.4                                                                 bool heap) : DCmdWithParser(output, heap),
     1.5    _repository_path("repositorypath", "Path to repository,.e.g \\\"My Repository\\\"", "STRING", false, NULL),
     1.6    _dump_path("dumppath", "Path to dump,.e.g \\\"My Dump path\\\"", "STRING", false, NULL),
     1.7 -  _stack_depth("stackdepth", "Stack Depth", "JLONG", false, "64"),
     1.8 -  _global_buffer_count("globalbuffercount", "Number of global buffers,", "JLONG", false, "32"),
     1.9 -  _global_buffer_size("globalbuffersize", "Size of a global buffers,", "JLONG", false, "524288"),
    1.10 -  _thread_buffer_size("thread_buffer_size", "Size of a thread buffer", "JLONG", false, "8192"),
    1.11 -  _memory_size("memorysize", "Overall memory size, ", "JLONG", false, "16777216"),
    1.12 -  _max_chunk_size("maxchunksize", "Size of an individual disk chunk", "JLONG", false, "12582912"),
    1.13 +  _stack_depth("stackdepth", "Stack Depth", "JULONG", false, "64"),
    1.14 +  _global_buffer_count("globalbuffercount", "Number of global buffers,", "JULONG", false, "20"),
    1.15 +  _global_buffer_size("globalbuffersize", "Size of a global buffers,", "MEMORY SIZE", false, "512k"),
    1.16 +  _thread_buffer_size("thread_buffer_size", "Size of a thread buffer", "MEMORY SIZE", false, "8k"),
    1.17 +  _memory_size("memorysize", "Overall memory size, ", "MEMORY SIZE", false, "10m"),
    1.18 +  _max_chunk_size("maxchunksize", "Size of an individual disk chunk", "MEMORY SIZE", false, "12m"),
    1.19    _sample_threads("samplethreads", "Activate Thread sampling", "BOOLEAN", false, "true") {
    1.20    _dcmdparser.add_dcmd_option(&_repository_path);
    1.21    _dcmdparser.add_dcmd_option(&_dump_path);
    1.22 @@ -602,22 +602,22 @@
    1.23  
    1.24    jobject global_buffer_size = NULL;
    1.25    if (_global_buffer_size.is_set()) {
    1.26 -    global_buffer_size = JfrJavaSupport::new_java_lang_Long(_global_buffer_size.value(), CHECK);
    1.27 +    global_buffer_size = JfrJavaSupport::new_java_lang_Long(_global_buffer_size.value()._size, CHECK);
    1.28    }
    1.29  
    1.30    jobject thread_buffer_size = NULL;
    1.31    if (_thread_buffer_size.is_set()) {
    1.32 -    thread_buffer_size = JfrJavaSupport::new_java_lang_Long(_thread_buffer_size.value(), CHECK);
    1.33 +    thread_buffer_size = JfrJavaSupport::new_java_lang_Long(_thread_buffer_size.value()._size, CHECK);
    1.34    }
    1.35  
    1.36    jobject max_chunk_size = NULL;
    1.37    if (_max_chunk_size.is_set()) {
    1.38 -    max_chunk_size = JfrJavaSupport::new_java_lang_Long(_max_chunk_size.value(), CHECK);
    1.39 +    max_chunk_size = JfrJavaSupport::new_java_lang_Long(_max_chunk_size.value()._size, CHECK);
    1.40    }
    1.41  
    1.42    jobject memory_size = NULL;
    1.43    if (_memory_size.is_set()) {
    1.44 -    memory_size = JfrJavaSupport::new_java_lang_Long(_memory_size.value(), CHECK);
    1.45 +    memory_size = JfrJavaSupport::new_java_lang_Long(_memory_size.value()._size, CHECK);
    1.46    }
    1.47  
    1.48    jobject sample_threads = NULL;

     2.1 --- a/src/share/vm/jfr/dcmd/jfrDcmds.hpp	Mon Oct 01 16:41:10 2018 +0200
     2.2 +++ b/src/share/vm/jfr/dcmd/jfrDcmds.hpp	Fri Nov 23 16:36:07 2018 +0900
     2.3 @@ -145,10 +145,10 @@
     2.4    DCmdArgument<char*> _dump_path;
     2.5    DCmdArgument<jlong> _stack_depth;
     2.6    DCmdArgument<jlong> _global_buffer_count;
     2.7 -  DCmdArgument<jlong> _global_buffer_size;
     2.8 -  DCmdArgument<jlong> _thread_buffer_size;
     2.9 -  DCmdArgument<jlong> _memory_size;
    2.10 -  DCmdArgument<jlong> _max_chunk_size;
    2.11 +  DCmdArgument<MemorySizeArgument> _global_buffer_size;
    2.12 +  DCmdArgument<MemorySizeArgument> _thread_buffer_size;
    2.13 +  DCmdArgument<MemorySizeArgument> _memory_size;
    2.14 +  DCmdArgument<MemorySizeArgument> _max_chunk_size;
    2.15    DCmdArgument<bool>  _sample_threads;
    2.16  
    2.17   public:

     3.1 --- a/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	Mon Oct 01 16:41:10 2018 +0200
     3.2 +++ b/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	Fri Nov 23 16:36:07 2018 +0900
     3.3 @@ -351,19 +351,19 @@
     3.4    configure._stack_depth.set_value(_dcmd_stackdepth.value());
     3.5  
     3.6    configure._thread_buffer_size.set_is_set(_dcmd_threadbuffersize.is_set());
     3.7 -  configure._thread_buffer_size.set_value(_dcmd_threadbuffersize.value()._size);
     3.8 +  configure._thread_buffer_size.set_value(_dcmd_threadbuffersize.value());
     3.9  
    3.10    configure._global_buffer_count.set_is_set(_dcmd_numglobalbuffers.is_set());
    3.11    configure._global_buffer_count.set_value(_dcmd_numglobalbuffers.value());
    3.12  
    3.13    configure._global_buffer_size.set_is_set(_dcmd_globalbuffersize.is_set());
    3.14 -  configure._global_buffer_size.set_value(_dcmd_globalbuffersize.value()._size);
    3.15 +  configure._global_buffer_size.set_value(_dcmd_globalbuffersize.value());
    3.16  
    3.17    configure._max_chunk_size.set_is_set(_dcmd_maxchunksize.is_set());
    3.18 -  configure._max_chunk_size.set_value(_dcmd_maxchunksize.value()._size);
    3.19 +  configure._max_chunk_size.set_value(_dcmd_maxchunksize.value());
    3.20  
    3.21    configure._memory_size.set_is_set(_dcmd_memorysize.is_set());
    3.22 -  configure._memory_size.set_value(_dcmd_memorysize.value()._size);
    3.23 +  configure._memory_size.set_value(_dcmd_memorysize.value());
    3.24  
    3.25    configure._sample_threads.set_is_set(_dcmd_sample_threads.is_set());
    3.26    configure._sample_threads.set_value(_dcmd_sample_threads.value());