From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 7 Mar 2016 22:14:24 +0000 (-0500)
Subject: Add extended info to liblttng-ctl's struct lttng_channel
X-Git-Tag: v2.8.0-rc1~118
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=674871507faa4b2f4468d0b67fa35e77e4a2744a;ds=sidebyside

Add extended info to liblttng-ctl's struct lttng_channel

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 <jeremie.galarneau@efficios.com>
---

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];
 };