# HG changeset patch
# User stuefe
# Date 1528893312 -7200
# Wed Jun 13 14:35:12 2018 +0200
# Node ID 1fb4fa1818f7782c316762b2546317e621a4e473
# Parent d12828b7cd64e3c7d9cc3fcef2f2d480b3026eb9
[mq]: jcmd-cleanups
diff --git a/src/hotspot/share/services/diagnosticArgument.cpp b/src/hotspot/share/services/diagnosticArgument.cpp
--- a/src/hotspot/share/services/diagnosticArgument.cpp
+++ b/src/hotspot/share/services/diagnosticArgument.cpp
@@ -68,27 +68,27 @@
set_is_set(true);
}
-void GenDCmdArgument::to_string(jlong l, char* buf, size_t len) {
+void GenDCmdArgument::to_string(jlong l, char* buf, size_t len) const {
jio_snprintf(buf, len, INT64_FORMAT, l);
}
-void GenDCmdArgument::to_string(bool b, char* buf, size_t len) {
+void GenDCmdArgument::to_string(bool b, char* buf, size_t len) const {
jio_snprintf(buf, len, b ? "true" : "false");
}
-void GenDCmdArgument::to_string(NanoTimeArgument n, char* buf, size_t len) {
+void GenDCmdArgument::to_string(NanoTimeArgument n, char* buf, size_t len) const {
jio_snprintf(buf, len, INT64_FORMAT, n._nanotime);
}
-void GenDCmdArgument::to_string(MemorySizeArgument m, char* buf, size_t len) {
+void GenDCmdArgument::to_string(MemorySizeArgument m, char* buf, size_t len) const {
jio_snprintf(buf, len, INT64_FORMAT, m._size);
}
-void GenDCmdArgument::to_string(char* c, char* buf, size_t len) {
+void GenDCmdArgument::to_string(char* c, char* buf, size_t len) const {
jio_snprintf(buf, len, "%s", (c != NULL) ? c : "");
}
-void GenDCmdArgument::to_string(StringArrayArgument* f, char* buf, size_t len) {
+void GenDCmdArgument::to_string(StringArrayArgument* f, char* buf, size_t len) const {
int length = f->array()->length();
size_t written = 0;
buf[0] = 0;
diff --git a/src/hotspot/share/services/diagnosticArgument.hpp b/src/hotspot/share/services/diagnosticArgument.hpp
--- a/src/hotspot/share/services/diagnosticArgument.hpp
+++ b/src/hotspot/share/services/diagnosticArgument.hpp
@@ -62,40 +62,37 @@
class GenDCmdArgument : public ResourceObj {
protected:
GenDCmdArgument* _next;
- const char* _name;
- const char* _description;
- const char* _type;
- const char* _default_string;
- bool _is_set;
- bool _is_mandatory;
+ const char* const _name;
+ const char* const _description;
+ const char* const _type;
+ const char* const _default_string;
+ bool _is_set;
+ const bool _is_mandatory;
bool _allow_multiple;
GenDCmdArgument(const char* name, const char* description, const char* type,
- const char* default_string, bool mandatory) {
- _name = name;
- _description = description;
- _type = type;
- _default_string = default_string;
- _is_mandatory = mandatory;
- _is_set = false;
- _allow_multiple = false;
- };
+ const char* default_string, bool mandatory)
+ : _next(NULL)
+ , _name(name), _description(description), _type(type)
+ , _default_string(default_string), _is_mandatory(mandatory)
+ , _is_set(false), _allow_multiple(false) {}
+
public:
- const char* name() { return _name; }
- const char* description() { return _description; }
- const char* type() { return _type; }
- const char* default_string() { return _default_string; }
- bool is_set() { return _is_set; }
+ const char* name() const { return _name; }
+ const char* description() const { return _description; }
+ const char* type() const { return _type; }
+ const char* default_string() const { return _default_string; }
+ bool is_set() const { return _is_set; }
void set_is_set(bool b) { _is_set = b; }
- bool allow_multiple() { return _allow_multiple; }
- bool is_mandatory() { return _is_mandatory; }
- bool has_value() { return _is_set || _default_string != NULL; }
- bool has_default() { return _default_string != NULL; }
+ bool allow_multiple() const { return _allow_multiple; }
+ bool is_mandatory() const { return _is_mandatory; }
+ bool has_value() const { return _is_set || _default_string != NULL; }
+ bool has_default() const { return _default_string != NULL; }
void read_value(const char* str, size_t len, TRAPS);
virtual void parse_value(const char* str, size_t len, TRAPS) = 0;
virtual void init_value(TRAPS) = 0;
virtual void reset(TRAPS) = 0;
virtual void cleanup() = 0;
- virtual void value_as_str(char* buf, size_t len) = 0;
+ virtual void value_as_str(char* buf, size_t len) const = 0;
void set_next(GenDCmdArgument* arg) {
_next = arg;
}
@@ -103,12 +100,12 @@
return _next;
}
- void to_string(jlong l, char* buf, size_t len);
- void to_string(bool b, char* buf, size_t len);
- void to_string(char* c, char* buf, size_t len);
- void to_string(NanoTimeArgument n, char* buf, size_t len);
- void to_string(MemorySizeArgument f, char* buf, size_t len);
- void to_string(StringArrayArgument* s, char* buf, size_t len);
+ void to_string(jlong l, char* buf, size_t len) const;
+ void to_string(bool b, char* buf, size_t len) const;
+ void to_string(char* c, char* buf, size_t len) const;
+ void to_string(NanoTimeArgument n, char* buf, size_t len) const;
+ void to_string(MemorySizeArgument f, char* buf, size_t len) const;
+ void to_string(StringArrayArgument* s, char* buf, size_t len) const;
};
template <class ArgType> class DCmdArgument: public GenDCmdArgument {
@@ -123,7 +120,7 @@
GenDCmdArgument(name, description, type, defaultvalue, mandatory)
{ }
~DCmdArgument() { destroy_value(); }
- ArgType value() { return _value;}
+ ArgType value() const { return _value;}
void set_value(ArgType v) { _value = v; }
void reset(TRAPS) {
destroy_value();
@@ -136,7 +133,7 @@
void parse_value(const char* str, size_t len, TRAPS);
void init_value(TRAPS);
void destroy_value();
- void value_as_str(char *buf, size_t len) { return to_string(_value, buf, len);}
+ void value_as_str(char *buf, size_t len) const { to_string(_value, buf, len);}
};
#endif /* SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP */
diff --git a/src/hotspot/share/services/diagnosticFramework.cpp b/src/hotspot/share/services/diagnosticFramework.cpp
--- a/src/hotspot/share/services/diagnosticFramework.cpp
+++ b/src/hotspot/share/services/diagnosticFramework.cpp
@@ -251,7 +251,7 @@
}
}
-void DCmdParser::print_help(outputStream* out, const char* cmd_name) {
+void DCmdParser::print_help(outputStream* out, const char* cmd_name) const {
out->print("Syntax : %s %s", cmd_name, _options == NULL ? "" : "[options]");
GenDCmdArgument* arg = _arguments_list;
while (arg != NULL) {
@@ -323,7 +323,7 @@
}
}
-int DCmdParser::num_arguments() {
+int DCmdParser::num_arguments() const {
GenDCmdArgument* arg = _arguments_list;
int count = 0;
while (arg != NULL) {
@@ -338,7 +338,7 @@
return count;
}
-GrowableArray<const char *>* DCmdParser::argument_name_array() {
+GrowableArray<const char *>* DCmdParser::argument_name_array() const {
int count = num_arguments();
GrowableArray<const char *>* array = new GrowableArray<const char *>(count);
GenDCmdArgument* arg = _arguments_list;
@@ -354,7 +354,7 @@
return array;
}
-GrowableArray<DCmdArgumentInfo*>* DCmdParser::argument_info_array() {
+GrowableArray<DCmdArgumentInfo*>* DCmdParser::argument_info_array() const {
int count = num_arguments();
GrowableArray<DCmdArgumentInfo*>* array = new GrowableArray<DCmdArgumentInfo *>(count);
int idx = 0;
@@ -399,6 +399,7 @@
break;
}
if (line.is_executable()) {
+ ResourceMark rm;
DCmd* command = DCmdFactory::create_local_DCmd(source, line, out, CHECK);
assert(command != NULL, "command error must be handled before this line");
DCmdMark mark(command);
@@ -413,7 +414,7 @@
_dcmdparser.parse(line, delim, CHECK);
}
-void DCmdWithParser::print_help(const char* name) {
+void DCmdWithParser::print_help(const char* name) const {
_dcmdparser.print_help(output(), name);
}
@@ -425,11 +426,11 @@
_dcmdparser.cleanup();
}
-GrowableArray<const char*>* DCmdWithParser::argument_name_array() {
+GrowableArray<const char*>* DCmdWithParser::argument_name_array() const {
return _dcmdparser.argument_name_array();
}
-GrowableArray<DCmdArgumentInfo*>* DCmdWithParser::argument_info_array() {
+GrowableArray<DCmdArgumentInfo*>* DCmdWithParser::argument_info_array() const {
return _dcmdparser.argument_info_array();
}
@@ -519,20 +520,6 @@
return 0; // Actually, there's no checks for duplicates
}
-DCmd* DCmdFactory::create_global_DCmd(DCmdSource source, CmdLine &line,
- outputStream* out, TRAPS) {
- DCmdFactory* f = factory(source, line.cmd_addr(), line.cmd_len());
- if (f != NULL) {
- if (f->is_enabled()) {
- THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
- f->disabled_message());
- }
- return f->create_Cheap_instance(out);
- }
- THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
- "Unknown diagnostic command");
-}
-
DCmd* DCmdFactory::create_local_DCmd(DCmdSource source, CmdLine &line,
outputStream* out, TRAPS) {
DCmdFactory* f = factory(source, line.cmd_addr(), line.cmd_len());
diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp
--- a/src/hotspot/share/services/diagnosticFramework.hpp
+++ b/src/hotspot/share/services/diagnosticFramework.hpp
@@ -75,19 +75,15 @@
class DCmdIter : public StackObj {
friend class DCmd;
private:
- const char* _str;
- char _delim;
- size_t _len;
+ const char* const _str;
+ const char _delim;
+ const size_t _len;
size_t _cursor;
public:
- DCmdIter(const char* str, char delim) {
- _str = str;
- _delim = delim;
- _len = strlen(str);
- _cursor = 0;
- }
- bool has_next() { return _cursor < _len; }
+ DCmdIter(const char* str, char delim)
+ : _str(str), _delim(delim), _len(::strlen(str)), _cursor(0) {}
+ bool has_next() const { return _cursor < _len; }
CmdLine next() {
assert(_cursor <= _len, "Cannot iterate more");
size_t n = _cursor;
@@ -102,26 +98,23 @@
// Iterator class to iterate over diagnostic command arguments
class DCmdArgIter : public ResourceObj {
- const char* _buffer;
- size_t _len;
+ const char* const _buffer;
+ const size_t _len;
size_t _cursor;
const char* _key_addr;
size_t _key_len;
const char* _value_addr;
size_t _value_len;
- char _delim;
+ const char _delim;
public:
- DCmdArgIter(const char* buf, size_t len, char delim) {
- _buffer = buf;
- _len = len;
- _delim = delim;
- _cursor = 0;
- }
+ DCmdArgIter(const char* buf, size_t len, char delim)
+ : _buffer(buf), _len(len), _delim(delim), _cursor(0) {}
+
bool next(TRAPS);
- const char* key_addr() { return _key_addr; }
- size_t key_length() { return _key_len; }
- const char* value_addr() { return _value_addr; }
- size_t value_length() { return _value_len; }
+ const char* key_addr() const { return _key_addr; }
+ size_t key_length() const { return _key_len; }
+ const char* value_addr() const { return _value_addr; }
+ size_t value_length() const { return _value_len; }
};
// A DCmdInfo instance provides a description of a diagnostic command. It is
@@ -163,43 +156,24 @@
// framework.
class DCmdArgumentInfo : public ResourceObj {
protected:
- const char* _name; /* Option/Argument name*/
- const char* _description; /* Short description */
- const char* _type; /* Type: STRING, BOOLEAN, etc. */
- const char* _default_string; /* Default value in a parsable string */
- bool _mandatory; /* True if the option/argument is mandatory */
- bool _option; /* True if it is an option, false if it is an argument */
+ const char* const _name; /* Option/Argument name*/
+ const char* const _description; /* Short description */
+ const char* const _type; /* Type: STRING, BOOLEAN, etc. */
+ const char* const _default_string; /* Default value in a parsable string */
+ const bool _mandatory; /* True if the option/argument is mandatory */
+ const bool _option; /* True if it is an option, false if it is an argument */
/* (see diagnosticFramework.hpp for option/argument definitions) */
- bool _multiple; /* True is the option can be specified several time */
- int _position; /* Expected position for this argument (this field is */
+ const bool _multiple; /* True is the option can be specified several time */
+ const int _position; /* Expected position for this argument (this field is */
/* meaningless for options) */
public:
DCmdArgumentInfo(const char* name, const char* description, const char* type,
const char* default_string, bool mandatory, bool option,
- bool multiple) {
- this->_name = name;
- this->_description = description;
- this->_type = type;
- this->_default_string = default_string;
- this->_option = option;
- this->_mandatory = mandatory;
- this->_option = option;
- this->_multiple = multiple;
- this->_position = -1;
- }
- DCmdArgumentInfo(const char* name, const char* description, const char* type,
- const char* default_string, bool mandatory, bool option,
- bool multiple, int position) {
- this->_name = name;
- this->_description = description;
- this->_type = type;
- this->_default_string = default_string;
- this->_option = option;
- this->_mandatory = mandatory;
- this->_option = option;
- this->_multiple = multiple;
- this->_position = position;
- }
+ bool multiple, int position = -1)
+ : _name(name), _description(description), _type(type)
+ , _default_string(default_string), _mandatory(mandatory)
+ , _option(option), _multiple(multiple), _position(-1) {}
+
const char* name() const { return _name; }
const char* description() const { return _description; }
const char* type() const { return _type; }
@@ -233,25 +207,21 @@
private:
GenDCmdArgument* _options;
GenDCmdArgument* _arguments_list;
- char _delim;
public:
- DCmdParser() {
- _options = NULL;
- _arguments_list = NULL;
- _delim = ' ';
- }
+ DCmdParser()
+ : _options(NULL), _arguments_list(NULL) {}
void add_dcmd_option(GenDCmdArgument* arg);
void add_dcmd_argument(GenDCmdArgument* arg);
GenDCmdArgument* lookup_dcmd_option(const char* name, size_t len);
- GenDCmdArgument* arguments_list() { return _arguments_list; };
+ GenDCmdArgument* arguments_list() const { return _arguments_list; };
void check(TRAPS);
void parse(CmdLine* line, char delim, TRAPS);
- void print_help(outputStream* out, const char* cmd_name);
+ void print_help(outputStream* out, const char* cmd_name) const;
void reset(TRAPS);
void cleanup();
- int num_arguments();
- GrowableArray<const char*>* argument_name_array();
- GrowableArray<DCmdArgumentInfo*>* argument_info_array();
+ int num_arguments() const;
+ GrowableArray<const char*>* argument_name_array() const;
+ GrowableArray<DCmdArgumentInfo*>* argument_info_array() const;
};
// The DCmd class is the parent class of all diagnostic commands
@@ -270,13 +240,11 @@
// thread that will access the instance.
class DCmd : public ResourceObj {
protected:
- outputStream* _output;
- bool _is_heap_allocated;
+ outputStream* const _output;
+ const bool _is_heap_allocated;
public:
- DCmd(outputStream* output, bool heap_allocated) {
- _output = output;
- _is_heap_allocated = heap_allocated;
- }
+ DCmd(outputStream* output, bool heap_allocated)
+ : _output(output), _is_heap_allocated(heap_allocated) {}
static const char* name() { return "No Name";}
static const char* description() { return "No Help";}
@@ -306,9 +274,9 @@
return p;
}
static int num_arguments() { return 0; }
- outputStream* output() { return _output; }
- bool is_heap_allocated() { return _is_heap_allocated; }
- virtual void print_help(const char* name) {
+ outputStream* output() const { return _output; }
+ bool is_heap_allocated() const { return _is_heap_allocated; }
+ virtual void print_help(const char* name) const {
output()->print_cr("Syntax: %s", name);
}
virtual void parse(CmdLine* line, char delim, TRAPS) {
@@ -324,11 +292,11 @@
virtual void cleanup() { }
// support for the JMX interface
- virtual GrowableArray<const char*>* argument_name_array() {
+ virtual GrowableArray<const char*>* argument_name_array() const {
GrowableArray<const char*>* array = new GrowableArray<const char*>(0);
return array;
}
- virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array() {
+ virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array() const {
GrowableArray<DCmdArgumentInfo*>* array = new GrowableArray<DCmdArgumentInfo*>(0);
return array;
}
@@ -353,15 +321,15 @@
virtual void execute(DCmdSource source, TRAPS) { }
virtual void reset(TRAPS);
virtual void cleanup();
- virtual void print_help(const char* name);
- virtual GrowableArray<const char*>* argument_name_array();
- virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array();
+ virtual void print_help(const char* name) const;
+ virtual GrowableArray<const char*>* argument_name_array() const;
+ virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array() const;
};
class DCmdMark : public StackObj {
- DCmd* _ref;
+ DCmd* const _ref;
public:
- DCmdMark(DCmd* cmd) { _ref = cmd; }
+ DCmdMark(DCmd* cmd) : _ref(cmd) {}
~DCmdMark() {
if (_ref != NULL) {
_ref->cleanup();
@@ -388,31 +356,23 @@
// When disabled, a diagnostic command cannot be executed. Any attempt to
// execute it will result in the printing of the disabled message without
// instantiating the command.
- bool _enabled;
+ const bool _enabled;
// When hidden, a diagnostic command doesn't appear in the list of commands
// provided by the 'help' command.
- bool _hidden;
- uint32_t _export_flags;
- int _num_arguments;
+ const bool _hidden;
+ const uint32_t _export_flags;
+ const int _num_arguments;
static DCmdFactory* _DCmdFactoryList;
public:
- DCmdFactory(int num_arguments, uint32_t flags, bool enabled, bool hidden) {
- _next = NULL;
- _enabled = enabled;
- _hidden = hidden;
- _export_flags = flags;
- _num_arguments = num_arguments;
- }
+ DCmdFactory(int num_arguments, uint32_t flags, bool enabled, bool hidden)
+ : _num_arguments(num_arguments), _enabled(enabled), _hidden(hidden)
+ , _export_flags(flags), _next(NULL) {}
bool is_enabled() const { return _enabled; }
- void set_enabled(bool b) { _enabled = b; }
bool is_hidden() const { return _hidden; }
- void set_hidden(bool b) { _hidden = b; }
- uint32_t export_flags() { return _export_flags; }
- void set_export_flags(uint32_t f) { _export_flags = f; }
- int num_arguments() { return _num_arguments; }
- DCmdFactory* next() { return _next; }
- virtual DCmd* create_Cheap_instance(outputStream* output) = 0;
- virtual DCmd* create_resource_instance(outputStream* output) = 0;
+ uint32_t export_flags() const { return _export_flags; }
+ int num_arguments() const { return _num_arguments; }
+ DCmdFactory* next() const { return _next; }
+ virtual DCmd* create_resource_instance(outputStream* output) const = 0;
virtual const char* name() const = 0;
virtual const char* description() const = 0;
virtual const char* impact() const = 0;
@@ -424,8 +384,6 @@
// enabled flag to false.
static int register_DCmdFactory(DCmdFactory* factory);
static DCmdFactory* factory(DCmdSource source, const char* cmd, size_t len);
- // Returns a C-heap allocated diagnostic command for the given command line
- static DCmd* create_global_DCmd(DCmdSource source, CmdLine &line, outputStream* out, TRAPS);
// Returns a resourceArea allocated diagnostic command for the given command line
static DCmd* create_local_DCmd(DCmdSource source, CmdLine &line, outputStream* out, TRAPS);
static GrowableArray<const char*>* DCmd_list(DCmdSource source);
@@ -449,12 +407,8 @@
public:
DCmdFactoryImpl(uint32_t flags, bool enabled, bool hidden) :
DCmdFactory(DCmdClass::num_arguments(), flags, enabled, hidden) { }
- // Returns a C-heap allocated instance
- virtual DCmd* create_Cheap_instance(outputStream* output) {
- return new (ResourceObj::C_HEAP, mtInternal) DCmdClass(output, true);
- }
// Returns a resourceArea allocated instance
- virtual DCmd* create_resource_instance(outputStream* output) {
+ virtual DCmd* create_resource_instance(outputStream* output) const {
return new DCmdClass(output, false);
}
virtual const char* name() const {