Add includeln argument which includes method line number to frame (#8)

gProfiler PR: intel/gprofiler#821
Granulate · Jan 27, 2024 · 952b30f · 952b30f
1 parent af215c5
commit 952b30f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/arguments.cpp b/src/arguments.cpp
@@ -389,6 +389,9 @@ Error Arguments::parse(const char* args) {
             CASE("includemm")
                 _includemm = true;
 
+            CASE("includeln")
+                _includeln = true;
+
             DEFAULT()
                 if (_unknown_arg == NULL) _unknown_arg = arg;
         }

diff --git a/src/arguments.h b/src/arguments.h
@@ -180,6 +180,7 @@ class Arguments {
     bool _live;
     bool _fdtransfer;
     bool _includemm;
+    bool _includeln;
     const char* _fdtransfer_path;
     int _style;
     StackWalkFeatures _features;
@@ -250,7 +251,8 @@ class Arguments {
         _minwidth(0),
         _reverse(false),
         _log_meminfo_on_dump(false),
-        _includemm(false) {
+        _includemm(false),
+        _includeln(false) {
     }
 
     ~Arguments();

diff --git a/src/frameName.cpp b/src/frameName.cpp
@@ -103,6 +103,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;
+    _includeln = args._includeln;
     buildFilter(_include, args._buf, args._include);
     buildFilter(_exclude, args._buf, args._exclude);
 
@@ -183,6 +184,8 @@ void FrameName::javaMethodName(jmethodID method) {
     char* class_name = NULL;
     char* method_name = NULL;
     char* method_sig = NULL;
+    jvmtiLineNumberEntry* line_number_table = NULL;
+    jint entry_count = 0;
     jint modifiers = 0;
 
     jvmtiEnv* jvmti = VM::jvmti();
@@ -204,6 +207,13 @@ void FrameName::javaMethodName(jmethodID method) {
             _str.insert(0, modifiers_to_append);
         }
         _str.append(".").append(method_name);
+        if (_includeln) {
+            if (jvmti->GetLineNumberTable(method, &entry_count, &line_number_table) == 0) {
+                char buf[32];
+                sprintf(buf, ":%d", line_number_table[0].line_number);
+                _str.append(buf);
+            }
+        }
         if (_style & STYLE_SIGNATURES) {
             if (_style & STYLE_NO_SEMICOLON) {
                 for (char* s = method_sig; *s; s++) {

diff --git a/src/frameName.h b/src/frameName.h
@@ -65,6 +65,7 @@ class FrameName {
     ThreadMap& _thread_names;
     locale_t _saved_locale;
     bool _includemm;
+    bool _includeln;
 
     void buildFilter(std::vector<Matcher>& vector, const char* base, int offset);
     const char* decodeNativeSymbol(const char* name);