X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=b029d58e37f489b4d00e0371678b987298380804;hb=1c20f0e29cbf8627bfb1ff444572d52d6655c4e2;hp=ee348df850adb0c4753201595ed2e404b1840a9e;hpb=1624d5b7ba86633d36f3a5c86ea1df5d308c4360;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index ee348df85..b029d58e3 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -126,6 +126,7 @@ enum lttng_event_context_type {
 	LTTNG_EVENT_CONTEXT_VPPID             = 9,
 	LTTNG_EVENT_CONTEXT_PTHREAD_ID        = 10,
 	LTTNG_EVENT_CONTEXT_HOSTNAME          = 11,
+	LTTNG_EVENT_CONTEXT_IP                = 12,
 };
 
 enum lttng_calibrate_type {
@@ -139,6 +140,9 @@ enum lttng_health_component {
 	LTTNG_HEALTH_APP_REG,
 	LTTNG_HEALTH_KERNEL,
 	LTTNG_HEALTH_CONSUMER,
+	LTTNG_HEALTH_HT_CLEANUP,
+	LTTNG_HEALTH_APP_MANAGE_NOTIFY,
+	LTTNG_HEALTH_APP_REG_DISPATCH,
 	LTTNG_HEALTH_ALL,
 };
 
@@ -277,7 +281,7 @@ struct lttng_event_field {
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_CHANNEL_ATTR_PADDING1        LTTNG_SYMBOL_NAME_LEN + 16
+#define LTTNG_CHANNEL_ATTR_PADDING1        LTTNG_SYMBOL_NAME_LEN + 12
 struct lttng_channel_attr {
 	int overwrite;                      /* 1: overwrite, 0: discard */
 	uint64_t subbuf_size;               /* bytes */
@@ -288,6 +292,8 @@ struct lttng_channel_attr {
 	/* LTTng 2.1 padding limit */
 	uint64_t tracefile_size;            /* bytes */
 	uint64_t tracefile_count;           /* number of tracefiles */
+	/* LTTng 2.3 padding limit */
+	unsigned int live_timer_interval;   /* usec */
 
 	char padding[LTTNG_CHANNEL_ATTR_PADDING1];
 };
@@ -322,12 +328,14 @@ struct lttng_calibrate {
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_SESSION_PADDING1             16
+#define LTTNG_SESSION_PADDING1             12
 struct lttng_session {
 	char name[NAME_MAX];
 	/* The path where traces are written */
 	char path[PATH_MAX];
 	uint32_t enabled;	/* enabled/started: 1, disabled/stopped: 0 */
+	uint32_t snapshot_mode;
+	unsigned int live_timer_interval;	/* usec */
 
 	char padding[LTTNG_SESSION_PADDING1];
 };
@@ -386,6 +394,34 @@ extern void lttng_destroy_handle(struct lttng_handle *handle);
  */
 extern int lttng_create_session(const char *name, const char *url);
 
+/*
+ * Create a tracing session that will exclusively be used for snapshot meaning
+ * the session will be in no output mode and every channel enabled for that
+ * session will be set in overwrite mode and in mmap output since splice is not
+ * supported.
+ *
+ * If an url is given, it will be used to create a default snapshot output
+ * using it as a destination. If NULL, no output will be defined and an
+ * add-output call will be needed.
+ *
+ * Name can't be NULL.
+ */
+extern int lttng_create_session_snapshot(const char *name,
+		const char *snapshot_url);
+
+/*
+ * Create a session exclusively used for live reading.
+ *
+ * In this mode, the switch-timer parameter is forced for each UST channel, a
+ * live-switch-timer is enabled for kernel channels, manually setting
+ * switch-timer is forbidden. Synchronization beacons are sent to the relayd,
+ * indexes are sent and metadata is checked for each packet.
+ *
+ * Returns LTTNG_OK on success or a negative error code.
+ */
+extern int lttng_create_session_live(const char *name, const char *url,
+		unsigned int timer_interval);
+
 /*
  * Destroy a tracing session.
  *
@@ -601,13 +637,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);
 
 /*