From e2105727007fc608a612f9a6a4cd785455ea4666 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 27 Jul 2023 14:25:06 -0700 Subject: [PATCH] libsysprof-capture: add bus type to add_dbus API --- src/libsysprof-capture/sysprof-capture-writer-cat.c | 1 + src/libsysprof-capture/sysprof-capture-writer.c | 4 +++- src/libsysprof-capture/sysprof-capture-writer.h | 3 ++- src/libsysprof/sysprof-dbus-monitor.c | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libsysprof-capture/sysprof-capture-writer-cat.c b/src/libsysprof-capture/sysprof-capture-writer-cat.c index 23a19b4c..16ac3482 100644 --- a/src/libsysprof-capture/sysprof-capture-writer-cat.c +++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c @@ -402,6 +402,7 @@ sysprof_capture_writer_cat (SysprofCaptureWriter *self, frame->frame.time, frame->frame.cpu, frame->frame.pid, + frame->bus_type, frame->flags, frame->message, frame->message_len); diff --git a/src/libsysprof-capture/sysprof-capture-writer.c b/src/libsysprof-capture/sysprof-capture-writer.c index 28baeec5..aa2f9481 100644 --- a/src/libsysprof-capture/sysprof-capture-writer.c +++ b/src/libsysprof-capture/sysprof-capture-writer.c @@ -772,7 +772,8 @@ sysprof_capture_writer_add_dbus_message (SysprofCaptureWriter *self, int64_t time, int cpu, int32_t pid, - uint32_t flags, + uint16_t bus_type, + uint16_t flags, const uint8_t *message_data, size_t message_len) { @@ -802,6 +803,7 @@ sysprof_capture_writer_add_dbus_message (SysprofCaptureWriter *self, time, SYSPROF_CAPTURE_FRAME_DBUS_MESSAGE); + ev->bus_type = bus_type; ev->flags = flags; ev->message_len = message_len; memcpy (ev->message, message_data, message_len); diff --git a/src/libsysprof-capture/sysprof-capture-writer.h b/src/libsysprof-capture/sysprof-capture-writer.h index 3ec27503..f18d217d 100644 --- a/src/libsysprof-capture/sysprof-capture-writer.h +++ b/src/libsysprof-capture/sysprof-capture-writer.h @@ -234,7 +234,8 @@ bool sysprof_capture_writer_add_dbus_message (Sy int64_t time, int cpu, int32_t pid, - uint32_t flags, + uint16_t bus_type, + uint16_t flags, const uint8_t *message_data, size_t message_len); SYSPROF_AVAILABLE_IN_ALL diff --git a/src/libsysprof/sysprof-dbus-monitor.c b/src/libsysprof/sysprof-dbus-monitor.c index becfe734..d1da301e 100644 --- a/src/libsysprof/sysprof-dbus-monitor.c +++ b/src/libsysprof/sysprof-dbus-monitor.c @@ -173,6 +173,7 @@ sysprof_dbus_monitor_record_fiber (gpointer user_data) SYSPROF_CAPTURE_CURRENT_TIME, -1, -1, + record->bus_type, SYSPROF_CAPTURE_DBUS_FLAGS_MESSAGE_TOO_LARGE, NULL, 0); @@ -209,6 +210,7 @@ sysprof_dbus_monitor_record_fiber (gpointer user_data) SYSPROF_CAPTURE_CURRENT_TIME, -1, -1, + record->bus_type, 0, read_buffer, n_needed); }