On Tue, 23 Jan 2024 11:12:42 +0000
Vincent Donnefort <vdonnefort@xxxxxxxxxx> wrote:
> The current version for struct trace_buffer_meta is taken from a work in
> progress Linux patch series. Update it.
>
> Signed-off-by: Vincent Donnefort <vdonnefort@xxxxxxxxxx>
>
> diff --git a/src/tracefs-mmap.c b/src/tracefs-mmap.c
> index 499233a..d3af453 100644
> --- a/src/tracefs-mmap.c
> +++ b/src/tracefs-mmap.c
> @@ -10,25 +10,24 @@
> #include "tracefs-local.h"
>
> struct trace_buffer_meta {
> - unsigned long entries;
> - unsigned long overrun;
> - unsigned long read;
> + __u32 meta_page_size;
> + __u32 meta_struct_len;
>
> - unsigned long subbufs_touched;
> - unsigned long subbufs_lost;
> - unsigned long subbufs_read;
> + __u32 subbuf_size;
> + __u32 nr_subbufs;
>
> struct {
> - unsigned long lost_events; /* Events lost at the time of the reader swap */
> - __u32 id; /* Reader subbuf ID from 0 to nr_subbufs - 1 */
> - __u32 read; /* Number of bytes read on the reader subbuf */
> + __u64 lost_events;
> + __u32 id;
> + __u32 read;
> } reader;
>
> - __u32 subbuf_size; /* Size of each subbuf including the header */
> - __u32 nr_subbufs; /* Number of subbufs in the ring-buffer */
> + __u64 entries;
> + __u64 overrun;
> + __u64 read;
>
> - __u32 meta_page_size; /* Size of the meta-page */
> - __u32 meta_struct_len; /* Len of this struct */
> + __u64 subbufs_touched;
> + __u64 subbufs_lost;
> };
>
> #define TRACE_MMAP_IOCTL_GET_READER _IO('T', 0x1)
>
> base-commit: 73ac9c192d058712993f9941927c924f2e206168
I'll hold off applying this until we have the kernel side locked down.
As I'm expecting there to be more versions of this patch.
Thanks,
-- Steve
|