[v3,8/8] trace/simple: add st_init_group

Commit Message

Gerd Hoffmann Jan. 21, 2021, 12:50 p.m. UTC

Add helper function and call it for each trace event group added.
Makes sure that events added at module load time are initialized
properly.

Signed-off-by: Gerd Hoffmann <[e-mail]>
---
 trace/simple.h  |  1 +
 trace/control.c |  4 ++++
 trace/simple.c  | 12 ++++++++++++
 3 files changed, 17 insertions(+)

Comments

Stefan Hajnoczi Feb. 3, 2021, 4:22 p.m. UTC | #1

On Thu, Jan 21, 2021 at 01:50:28PM +0100, Gerd Hoffmann wrote:
> Add helper function and call it for each trace event group added.
> Makes sure that events added at module load time are initialized
> properly.
> 
> Signed-off-by: Gerd Hoffmann <[e-mail]>
> ---
>  trace/simple.h  |  1 +
>  trace/control.c |  4 ++++
>  trace/simple.c  | 12 ++++++++++++
>  3 files changed, 17 insertions(+)

Reviewed-by: Stefan Hajnoczi <[e-mail]>

Patch

diff --git a/trace/simple.h b/trace/simple.h
index 26ccbc8b8ae3..ee1983ce5617 100644
--- a/trace/simple.h
+++ b/trace/simple.h
@@ -15,6 +15,7 @@  void st_print_trace_file_status(void);
 bool st_set_trace_file_enabled(bool enable);
 void st_set_trace_file(const char *file);
 bool st_init(void);
+void st_init_group(size_t group);
 void st_flush_trace_buffer(void);
 
 typedef struct {
diff --git a/trace/control.c b/trace/control.c
index f1cc880b7cd1..9649d0979e70 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -81,6 +81,10 @@  void trace_event_register_group(TraceEvent **events)
     event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
     event_groups[nevent_groups].events = events;
     nevent_groups++;
+
+#ifdef CONFIG_TRACE_SIMPLE
+    st_init_group(nevent_groups - 1);
+#endif
 }
 
 
diff --git a/trace/simple.c b/trace/simple.c
index ec2156d135cb..ac499edee0d5 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -422,3 +422,15 @@  bool st_init(void)
     atexit(st_flush_trace_buffer);
     return true;
 }
+
+void st_init_group(size_t group)
+{
+    TraceEventIter iter;
+
+    if (!trace_writeout_enabled) {
+        return;
+    }
+
+    trace_event_iter_init_group(&iter, group);
+    st_write_event_mapping(&iter);
+}