Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to include method modifiers #5

Merged
merged 7 commits into from
Mar 15, 2023
Merged

Add option to include method modifiers #5

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a4b28d
Add option to include method modifiers to profiling data
mpozniak95 Mar 6, 2023
b693b5a
Get method modifiers only when includemm flag provided
mpozniak95 Mar 6, 2023
664d04f
Make access flags variable constant, change its type to vector
mpozniak95 Mar 7, 2023
76be7e8
Replace vector of pairs with array of pairs
mpozniak95 Mar 9, 2023
3b60db2
Remove unecessary const variable
mpozniak95 Mar 9, 2023
5e85fe5
Make access_flags static
mpozniak95 Mar 13, 2023
b8696a2
Remove constant number from array initialization
mpozniak95 Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/arguments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,9 @@ Error Arguments::parse(const char* args) {
CASE("meminfolog")
_log_meminfo_on_dump = true;

CASE("includemm")
_includemm = true;

DEFAULT()
if (_unknown_arg == NULL) _unknown_arg = arg;
}
Expand Down
4 changes: 3 additions & 1 deletion src/arguments.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ class Arguments {
bool _sched;
bool _live;
bool _fdtransfer;
bool _includemm;
const char* _fdtransfer_path;
int _style;
CStack _cstack;
Expand Down Expand Up @@ -221,7 +222,8 @@ class Arguments {
_title(NULL),
_minwidth(0),
_reverse(false),
_log_meminfo_on_dump(false) {
_log_meminfo_on_dump(false),
_includemm(false) {
}

~Arguments();
Expand Down
13 changes: 12 additions & 1 deletion src/frameName.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ FrameName::FrameName(Arguments& args, int style, int epoch, Mutex& thread_names_
{
// Require printf to use standard C format regardless of system locale
_saved_locale = uselocale(newlocale(LC_NUMERIC_MASK, "C", (locale_t)0));

_includemm = args._includemm;
buildFilter(_include, args._buf, args._include);
buildFilter(_exclude, args._buf, args._exclude);

Expand Down Expand Up @@ -168,6 +168,7 @@ void FrameName::javaMethodName(jmethodID method) {
char* class_name = NULL;
char* method_name = NULL;
char* method_sig = NULL;
jint modifiers = 0;

jvmtiEnv* jvmti = VM::jvmti();
jvmtiError err;
Expand All @@ -177,6 +178,16 @@ void FrameName::javaMethodName(jmethodID method) {
(err = jvmti->GetClassSignature(method_class, &class_name, NULL)) == 0) {
// Trim 'L' and ';' off the class descriptor like 'Ljava/lang/Object;'
javaClassName(class_name + 1, strlen(class_name) - 2, _style);
if (_includemm) {
jvmti->GetMethodModifiers(method, &modifiers);
std::string modifiers_to_append = "";
for (int i=0; i<access_flags_size; i++) {
if (modifiers & access_flags[i].first) {
modifiers_to_append.append(access_flags[i].second + " ");
}
}
_str.insert(0, modifiers_to_append);
}
_str.append(".").append(method_name);
if (_style & STYLE_SIGNATURES) {
if (_style & STYLE_NO_SEMICOLON) {
Expand Down
18 changes: 18 additions & 0 deletions src/frameName.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@ class FrameName {
Mutex& _thread_names_lock;
ThreadMap& _thread_names;
locale_t _saved_locale;
bool _includemm;
const int access_flags_size = 12;
// Based on: https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#:~:text=Table%C2%A04.5.%C2%A0Method%20access%20and%20property%20flags
// Good practice order from: https://checkstyle.sourceforge.io/config_modifier.html#ModifierOrder
const std::pair<int, std::string> access_flags [12] = {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiler complains about it:

src/frameName.h:94:5: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11 [enabled by default]

I suppose that's why you added -std=c++11.

Can we make this static or move out of the class? It can also be defined in the .cpp file.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making it static makes sure - we don't want to initialize this field for every instance of FrameName.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added -std=c++11 because initializing vector of pairs resulted in compilation error. I'll check if it will work for static

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can keep it array of pairs, but static :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or even array of structs is fine too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it to static and moved from header to source file. Also it seems that if it is static it can be initialized without [12] without any errors

std::make_pair(0x0001, "public"),
std::make_pair(0x0002, "private"),
std::make_pair(0x0004, "protected"),
std::make_pair(0x0400, "abstract"),
std::make_pair(0x0008, "static"),
std::make_pair(0x0010, "final"),
std::make_pair(0x0020, "synchronized"),
std::make_pair(0x0100, "native"),
std::make_pair(0x0800, "strict"),
std::make_pair(0x0040, "bridge"),
std::make_pair(0x0080, "varargs"),
std::make_pair(0x1000, "synthetic"),
};

void buildFilter(std::vector<Matcher>& vector, const char* base, int offset);
const char* decodeNativeSymbol(const char* name);
Expand Down