nettrace: make trace is able to be in multi group

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

src/gen_trace.py

@@ -101,6 +101,8 @@ def gen_name(name, is_trace=False):
 
 
 btf_data = None
+
+
 def get_arg_count(name):
     global btf_data
     if not btf_data:
@@ -155,6 +157,7 @@ def append_trace_field(field, trace, type='string'):
             return f'\n\t.{field} = {trace[field]},'
     return ''
 
+
 def append_filed(field, value, type='string'):
     if type == 'string':
         return f'\n\t.{field} = "{value}",'
@@ -166,7 +169,34 @@ def append_filed(field, value, type='string'):
     return ''
 
 
+def gen_trace_list(trace, p_name):
+    name = trace['define_name']
+    list_count = trace.get('list_count', 1)
+    list_count += 1
+    trace['list_count'] = list_count
+    trace_name = 'trace_' + name
+    trace_list = f'{trace_name}_list_{list_count}'
+    define_str = f'''
+trace_list_t {trace_list} = {{
+\t.trace = &{trace_name},
+\t.list = LIST_HEAD_INIT({trace_list}.list)
+}};
+'''
+    init_str = f'\tlist_add_tail(&{trace_list}.list, &{p_name}.traces);\n'
+
+    return {
+        'define_str': define_str,
+        'init_str': init_str,
+        'probe_str': '',
+        'index_str': ''
+    }
+
+
 def gen_trace(trace, group, p_name):
+    # trace is already defined, just define corresponding trace_list for it
+    if 'define_name' in trace:
+        return gen_trace_list(trace, p_name)
+
     name = gen_name(trace["name"], True)
     trace_name = 'trace_' + name
     trace['define_name'] = name
@@ -197,7 +227,8 @@ def gen_trace(trace, group, p_name):
                 else:
                     arg_count = trace['arg_count']
                 if not arg_count:
-                    print(f"BTF not found for {target}, skip monitor", file=sys.stderr)
+                    print(
+                        f"BTF not found for {target}, skip monitor", file=sys.stderr)
                     trace['monitor'] = 0
                 else:
                     fields_str += append_trace_field('arg_count', trace, 'raw')
@@ -244,12 +275,16 @@ def gen_trace(trace, group, p_name):
 \t.prog = "__trace_{name}",
 \t.parent = &{p_name},
 \t.sk = {sk_index},
-\t.rules =  LIST_HEAD_INIT({trace_name}.rules),
+\t.rules = LIST_HEAD_INIT({trace_name}.rules),
+}};
+trace_list_t {trace_name}_list = {{
+\t.trace = &{trace_name},
+\t.list = LIST_HEAD_INIT({trace_name}_list.list)
 }};
 {rule_str}
 '''
 
-    init_str += f'''\tlist_add_tail(&{trace_name}.list, &{p_name}.traces);
+    init_str += f'''\tlist_add_tail(&{trace_name}_list.list, &{p_name}.traces);
 \tall_traces[INDEX_{name}] = &{trace_name};
 \tlist_add_tail(&{trace_name}.all, &trace_list);
 '''

src/trace.c

@@ -24,12 +24,12 @@ trace_ops_t *trace_ops_all[] = { &tracing_ops, &probe_ops };
 
 static bool trace_group_valid(trace_group_t *group)
 {
+	trace_list_t *trace_list;
 	trace_group_t *pos;
-	trace_t *trace;
 
 	if (!list_empty(&group->traces)) {
-		list_for_each_entry(trace, &group->traces, list)
-			if (!trace_is_invalid(trace))
+		list_for_each_entry(trace_list, &group->traces, list)
+			if (!trace_is_invalid(trace_list->trace))
 				return true;
 		return false;
 	}
@@ -45,8 +45,10 @@ static bool trace_group_valid(trace_group_t *group)
 static void __print_trace_group(trace_group_t *group, int level)
 {
 	char prefix[32] = {}, buf[32], *name;
+	trace_list_t *trace_list;
 	trace_group_t *pos;
 	trace_t *trace;
+	u32 status;
 	int i = 0;
 
 	for (; i< level; i++)
@@ -68,8 +70,9 @@ static void __print_trace_group(trace_group_t *group, int level)
 
 	return;
 print_trace:
-	list_for_each_entry(trace, &group->traces, list) {
-		u32 status = trace->status;
+	list_for_each_entry(trace_list, &group->traces, list) {
+		trace = trace_list->trace;
+		status = trace->status;
 
 #if 1
 		if (trace_is_invalid(trace))
@@ -154,13 +157,13 @@ int trace_enable(char *name)
 static void _trace_group_enable(trace_group_t *group)
 {
 	trace_group_t *pos;
-	trace_t *t;
+	trace_list_t *t;
 
 	list_for_each_entry(pos, &group->children, list)
 		_trace_group_enable(pos);
 
 	list_for_each_entry(t, &group->traces, list)
-		trace_set_enable(t);
+		trace_set_enable(t->trace);
 }
 
 /* enable all traces in the group of 'name' */

src/trace.h

@@ -83,6 +83,11 @@ typedef struct trace {
 	bool	def;
 } trace_t;
 
+typedef struct {
+	struct list_head list;
+	trace_t * trace;
+} trace_list_t;
+
 typedef struct trace_args {
 	bool timeline;
 	bool ret;