X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=bcccdb47733722420a6997c506df00d06913c60e;hp=8566deabe61d91dea58337e94bb74f5075c970e2;hb=0b2dc8df2a6d7b3341a72a04767dd6328907c97c;hpb=7972aab22f74b18faa168c0482216a3dd711a075

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 8566deabe..bcccdb477 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -139,6 +139,7 @@ enum lttng_health_component {
 	LTTNG_HEALTH_APP_REG,
 	LTTNG_HEALTH_KERNEL,
 	LTTNG_HEALTH_CONSUMER,
+	LTTNG_HEALTH_HT_CLEANUP,
 	LTTNG_HEALTH_ALL,
 };
 
@@ -277,7 +278,7 @@ struct lttng_event_field {
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_CHANNEL_ATTR_PADDING1        LTTNG_SYMBOL_NAME_LEN + 32
+#define LTTNG_CHANNEL_ATTR_PADDING1        LTTNG_SYMBOL_NAME_LEN + 16
 struct lttng_channel_attr {
 	int overwrite;                      /* 1: overwrite, 0: discard */
 	uint64_t subbuf_size;               /* bytes */
@@ -285,6 +286,9 @@ struct lttng_channel_attr {
 	unsigned int switch_timer_interval; /* usec */
 	unsigned int read_timer_interval;   /* usec */
 	enum lttng_event_output output;     /* splice, mmap */
+	/* LTTng 2.1 padding limit */
+	uint64_t tracefile_size;            /* bytes */
+	uint64_t tracefile_count;           /* number of tracefiles */
 
 	char padding[LTTNG_CHANNEL_ATTR_PADDING1];
 };
@@ -598,13 +602,13 @@ extern int lttng_set_consumer_url(struct lttng_handle *handle,
 /*
  * Enable the consumer for a session and domain.
  */
-extern LTTNG_DEPRECATED("This call is now obselete.")
+extern LTTNG_DEPRECATED("This call is now obsolete.")
 int lttng_enable_consumer(struct lttng_handle *handle);
 
 /*
  * Disable consumer for a session and domain.
  */
-extern LTTNG_DEPRECATED("This call is now obselete.")
+extern LTTNG_DEPRECATED("This call is now obsolete.")
 int lttng_disable_consumer(struct lttng_handle *handle);
 
 /*