From 674871507faa4b2f4468d0b67fa35e77e4a2744a Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 7 Mar 2016 17:14:24 -0500 Subject: [PATCH] Add extended info to liblttng-ctl's struct lttng_channel MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The change has been tested to maintain lttng_channel's size on x86, x86-64 and ARM32. The alignment rules of these architectures should cover all cases. Signed-off-by: Jérémie Galarneau --- include/lttng/channel.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/lttng/channel.h b/include/lttng/channel.h index bb5bbcd38..e770f6835 100644 --- a/include/lttng/channel.h +++ b/include/lttng/channel.h @@ -43,6 +43,12 @@ struct lttng_channel_attr { uint64_t tracefile_count; /* number of tracefiles */ /* LTTng 2.3 padding limit */ unsigned int live_timer_interval; /* usec */ + /* LTTng 2.7 padding limit */ + uint32_t align_to_64; + union { + uint64_t padding; + void *ptr; + } extended; char padding[LTTNG_CHANNEL_ATTR_PADDING1]; }; -- 2.34.1