[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 7/8] trace/simple: pass iter to st_write_event_mapping
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 7/8] trace/simple: pass iter to st_write_event_mapping |
Date: |
Thu, 21 Jan 2021 13:50:27 +0100 |
Pass an iter to st_write_event_mapping, so the function can interate
different things depending on how we initialize the iter.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
trace/simple.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/trace/simple.c b/trace/simple.c
index 97b6f85168e7..ec2156d135cb 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -280,14 +280,12 @@ void trace_record_finish(TraceBufferRecord *rec)
}
}
-static int st_write_event_mapping(void)
+static int st_write_event_mapping(TraceEventIter *iter)
{
uint64_t type = TRACE_RECORD_TYPE_MAPPING;
- TraceEventIter iter;
TraceEvent *ev;
- trace_event_iter_init_all(&iter);
- while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ while ((ev = trace_event_iter_next(iter)) != NULL) {
uint64_t id = trace_event_get_id(ev);
const char *name = trace_event_get_name(ev);
uint32_t len = strlen(name);
@@ -309,6 +307,7 @@ static int st_write_event_mapping(void)
*/
bool st_set_trace_file_enabled(bool enable)
{
+ TraceEventIter iter;
bool was_enabled = trace_fp;
if (enable == !!trace_fp) {
@@ -333,8 +332,9 @@ bool st_set_trace_file_enabled(bool enable)
return was_enabled;
}
+ trace_event_iter_init_all(&iter);
if (fwrite(&header, sizeof header, 1, trace_fp) != 1 ||
- st_write_event_mapping() < 0) {
+ st_write_event_mapping(&iter) < 0) {
fclose(trace_fp);
trace_fp = NULL;
return was_enabled;
--
2.29.2
- [PATCH v3 0/8] [RfC] fix tracing for modules, Gerd Hoffmann, 2021/01/21
- [PATCH v3 1/8] meson: add trace_events_config[], Gerd Hoffmann, 2021/01/21
- [PATCH v3 5/8] trace: iter init tweaks, Gerd Hoffmann, 2021/01/21
- [PATCH v3 3/8] meson: add module_trace & module_trace_src, Gerd Hoffmann, 2021/01/21
- [PATCH v3 4/8] meson: move qxl trace events to separate file, Gerd Hoffmann, 2021/01/21
- [PATCH v3 6/8] trace: add trace_event_iter_init_group, Gerd Hoffmann, 2021/01/21
- [PATCH v3 8/8] trace/simple: add st_init_group, Gerd Hoffmann, 2021/01/21
- [PATCH v3 2/8] meson: move up hw subdir (specifically before trace subdir), Gerd Hoffmann, 2021/01/21
- [PATCH v3 7/8] trace/simple: pass iter to st_write_event_mapping,
Gerd Hoffmann <=