<div dir="ltr">Merged in master, stable-2.6 and stable-2.5.<div><br></div><div>Thanks!</div><div>Jérémie</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jul 10, 2015 at 5:50 PM, Jonathan Rajotte <span dir="ltr"><<a href="mailto:jonathan.rajotte-julien@efficios.com" target="_blank">jonathan.rajotte-julien@efficios.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Jonathan Rajotte <<a href="mailto:jonathan.rajotte-julien@efficios.com">jonathan.rajotte-julien@efficios.com</a>><br>
---<br>
include/lttng/channel.h | 2 +-<br>
src/bin/lttng-sessiond/lttng-ust-abi.h | 2 +-<br>
src/bin/lttng-sessiond/lttng-ust-ctl.h | 2 +-<br>
3 files changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/include/lttng/channel.h b/include/lttng/channel.h<br>
index 6ab0c7b..2007d06 100644<br>
--- a/include/lttng/channel.h<br>
+++ b/include/lttng/channel.h<br>
@@ -33,7 +33,7 @@ extern "C" {<br>
#define LTTNG_CHANNEL_ATTR_PADDING1 LTTNG_SYMBOL_NAME_LEN + 12<br>
struct lttng_channel_attr {<br>
int overwrite; /* 1: overwrite, 0: discard */<br>
- uint64_t subbuf_size; /* bytes */<br>
+ uint64_t subbuf_size; /* bytes power of 2 */<br>
uint64_t num_subbuf; /* power of 2 */<br>
unsigned int switch_timer_interval; /* usec */<br>
unsigned int read_timer_interval; /* usec */<br>
diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h<br>
index 81b6149..ae3ac22 100644<br>
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h<br>
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h<br>
@@ -166,7 +166,7 @@ struct lttng_ust_context {<br>
*/<br>
#define LTTNG_UST_CHANNEL_ATTR_PADDING (LTTNG_UST_SYM_NAME_LEN + 32)<br>
struct lttng_ust_channel_attr {<br>
- uint64_t subbuf_size; /* bytes */<br>
+ uint64_t subbuf_size; /* bytes power of 2 */<br>
uint64_t num_subbuf; /* power of 2 */<br>
int overwrite; /* 1: overwrite, 0: discard */<br>
unsigned int switch_timer_interval; /* usec */<br>
diff --git a/src/bin/lttng-sessiond/lttng-ust-ctl.h b/src/bin/lttng-sessiond/lttng-ust-ctl.h<br>
index 7f59b86..0bb717e 100644<br>
--- a/src/bin/lttng-sessiond/lttng-ust-ctl.h<br>
+++ b/src/bin/lttng-sessiond/lttng-ust-ctl.h<br>
@@ -45,7 +45,7 @@ struct lttng_ust_lib_ring_buffer;<br>
<br>
struct ustctl_consumer_channel_attr {<br>
enum lttng_ust_chan_type type;<br>
- uint64_t subbuf_size; /* bytes */<br>
+ uint64_t subbuf_size; /* bytes power of 2 */<br>
uint64_t num_subbuf; /* power of 2 */<br>
int overwrite; /* 1: overwrite, 0: discard */<br>
unsigned int switch_timer_interval; /* usec */<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Jérémie Galarneau<br>EfficiOS Inc.<br><a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a></div>
</div>