feat: allow to skip obj functions from a cli option

Author: art049

callgrind/bbcc.c

@@ -725,8 +725,23 @@ void CLG_(setup_bbcc)(BB* bb)
     }
   }
 
-  if (jmpkind == jk_Call)
-    skip = CLG_(get_fn_node)(bb)->skip;
+  if (jmpkind == jk_Call) {
+    fn_node* node = CLG_(get_fn_node)(bb);
+    skip = node->skip;
+    if (!skip && !node->obj_skip_checked){
+      HChar* obj_name = node->file->obj->name;
+      // VG_(printf)("  %s\n", obj_name);
+      for (int i=0; i<CLG_(clo).objs_to_skip_count; i++) {
+        // VG_(printf)("     %s\n", CLG_(clo).objs_to_skip[i]);
+        if (VG_(strcmp)(obj_name, CLG_(clo).objs_to_skip[i]) == 0) {
+          node->skip = True;
+          skip = True;
+          break;
+        }
+      }
+      node->obj_skip_checked = True;
+    }
+  }
 
   CLG_DEBUGIF(1) {
     if (isConditionalJump)

callgrind/clo.c

@@ -430,6 +430,14 @@ Bool CLG_(process_cmd_line_option)(const HChar* arg)
        fn_config* fnc = get_fnc(tmp_str);
        fnc->skip = CONFIG_TRUE;
    }
+   else if VG_STR_CLO(arg, "--obj-skip", tmp_str) {
+       HChar *obj_name = VG_(strdup)("cl.clo.pclo.1", tmp_str);
+       CLG_(clo).objs_to_skip_count++;
+       CLG_(clo).objs_to_skip = VG_(realloc)("cl.clo.pclo.2",
+                                             CLG_(clo).objs_to_skip,
+                                             CLG_(clo).objs_to_skip_count*sizeof(HChar*));
+       CLG_(clo).objs_to_skip[CLG_(clo).objs_to_skip_count-1] = obj_name;
+   }
 
    else if VG_STR_CLO(arg, "--dump-before", tmp_str) {
        fn_config* fnc = get_fnc(tmp_str);
@@ -611,6 +619,7 @@ void CLG_(print_usage)(void)
 "    --skip-plt=no|yes         Ignore calls to/from PLT sections? [yes]\n"
 "    --skip-direct-rec=no|yes  Ignore direct recursions? [yes]\n"
 "    --fn-skip=<function>      Ignore calls to/from function?\n"
+"    --obj-skip=<object>       Ignore calls to/from object?\n"
 #if CLG_EXPERIMENTAL
 "    --fn-group<no>=<func>     Put function into separation group <no>\n"
 #endif
@@ -681,6 +690,8 @@ void CLG_(set_clo_defaults)(void)
 
   /* Call graph */
   CLG_(clo).pop_on_jump = False;
+  CLG_(clo).objs_to_skip_count = 0;
+  CLG_(clo).objs_to_skip = 0;
 
 #if CLG_ENABLE_DEBUG
   CLG_(clo).verbose = 0;

callgrind/fn.c

@@ -452,6 +452,7 @@ fn_node* new_fn_node(const HChar *fnname,
     fn->zero_before  = False;
     fn->toggle_collect = False;
     fn->skip         = False;
+    fn->obj_skip_checked = False;
     fn->pop_on_jump  = CLG_(clo).pop_on_jump;
     fn->is_malloc    = False;
     fn->is_realloc   = False;

callgrind/global.h

@@ -119,6 +119,8 @@ struct _CommandLineOptions {
 
   /* Call graph generation */
   Bool pop_on_jump;       /* Handle a jump between functions as ret+call */
+  Int objs_to_skip_count; /* Number of objects to skip */
+  HChar** objs_to_skip;  /* List of objects to skip */
 
 #if CLG_ENABLE_DEBUG
   Int   verbose;
@@ -407,6 +409,7 @@ struct _fn_node {
   Bool zero_before :1;
   Bool toggle_collect :1;
   Bool skip :1;
+  Bool obj_skip_checked : 1;
   Bool pop_on_jump : 1;
 
   Bool is_malloc :1;