X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=7754bcdbce6de2352ab1d0f73c8cd8ae1a9d46a3;hp=73f291466be9368e183d2a856603919b1b67cda1;hb=139ac87245fd1ca18d60a0efca32b50e4c1d8730;hpb=3a5713dad195a7cfa3f4866ad2c75f3a83d73a2f

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 73f291466..7754bcdbc 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -87,21 +87,21 @@ enum lttng_loglevel_type {
  * Available loglevels.
  */
 enum lttng_loglevel {
-        LTTNG_LOGLEVEL_EMERG                  = 0,
-        LTTNG_LOGLEVEL_ALERT                  = 1,
-        LTTNG_LOGLEVEL_CRIT                   = 2,
-        LTTNG_LOGLEVEL_ERR                    = 3,
-        LTTNG_LOGLEVEL_WARNING                = 4,
-        LTTNG_LOGLEVEL_NOTICE                 = 5,
-        LTTNG_LOGLEVEL_INFO                   = 6,
-        LTTNG_LOGLEVEL_DEBUG_SYSTEM           = 7,
-        LTTNG_LOGLEVEL_DEBUG_PROGRAM          = 8,
-        LTTNG_LOGLEVEL_DEBUG_PROCESS          = 9,
-        LTTNG_LOGLEVEL_DEBUG_MODULE           = 10,
-        LTTNG_LOGLEVEL_DEBUG_UNIT             = 11,
-        LTTNG_LOGLEVEL_DEBUG_FUNCTION         = 12,
-        LTTNG_LOGLEVEL_DEBUG_LINE             = 13,
-        LTTNG_LOGLEVEL_DEBUG                  = 14,
+	LTTNG_LOGLEVEL_EMERG                  = 0,
+	LTTNG_LOGLEVEL_ALERT                  = 1,
+	LTTNG_LOGLEVEL_CRIT                   = 2,
+	LTTNG_LOGLEVEL_ERR                    = 3,
+	LTTNG_LOGLEVEL_WARNING                = 4,
+	LTTNG_LOGLEVEL_NOTICE                 = 5,
+	LTTNG_LOGLEVEL_INFO                   = 6,
+	LTTNG_LOGLEVEL_DEBUG_SYSTEM           = 7,
+	LTTNG_LOGLEVEL_DEBUG_PROGRAM          = 8,
+	LTTNG_LOGLEVEL_DEBUG_PROCESS          = 9,
+	LTTNG_LOGLEVEL_DEBUG_MODULE           = 10,
+	LTTNG_LOGLEVEL_DEBUG_UNIT             = 11,
+	LTTNG_LOGLEVEL_DEBUG_FUNCTION         = 12,
+	LTTNG_LOGLEVEL_DEBUG_LINE             = 13,
+	LTTNG_LOGLEVEL_DEBUG                  = 14,
 };
 
 /*
@@ -131,11 +131,21 @@ enum lttng_calibrate_type {
 	LTTNG_CALIBRATE_FUNCTION              = 0,
 };
 
+/* Health component for the health check function. */
+enum lttng_health_component {
+	LTTNG_HEALTH_CMD,
+	LTTNG_HEALTH_APP_MANAGE,
+	LTTNG_HEALTH_APP_REG,
+	LTTNG_HEALTH_KERNEL,
+	LTTNG_HEALTH_CONSUMER,
+	LTTNG_HEALTH_ALL,
+};
+
 /* Destination type of lttng URI */
 enum lttng_dst_type {
-	LTTNG_DST_IPV4,		/* IPv4 protocol */
-	LTTNG_DST_IPV6,		/* IPv6 protocol */
-	LTTNG_DST_PATH,		/* Local file system */
+	LTTNG_DST_IPV4                        = 1,
+	LTTNG_DST_IPV6                        = 2,
+	LTTNG_DST_PATH                        = 3,
 };
 
 /* Type of lttng URI where it is a final destination or a hop */
@@ -179,6 +189,7 @@ struct lttng_uri {
 	enum lttng_proto_type proto;
 	in_port_t port;
 	char padding[LTTNG_URI_PADDING1_LEN];
+	char subdir[PATH_MAX];
 	union {
 		char ipv4[INET_ADDRSTRLEN];
 		char ipv6[INET6_ADDRSTRLEN];
@@ -268,7 +279,7 @@ struct lttng_event_function_attr {
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_EVENT_PADDING1               16
+#define LTTNG_EVENT_PADDING1               15
 #define LTTNG_EVENT_PADDING2               LTTNG_SYMBOL_NAME_LEN + 32
 struct lttng_event {
 	enum lttng_event_type type;
@@ -279,6 +290,7 @@ struct lttng_event {
 
 	int32_t enabled;	/* Does not apply: -1 */
 	pid_t pid;
+	unsigned char filter;	/* filter enabled ? */
 
 	char padding[LTTNG_EVENT_PADDING1];
 
@@ -414,6 +426,14 @@ extern void lttng_destroy_handle(struct lttng_handle *handle);
  */
 extern int lttng_create_session(const char *name, const char *path);
 
+/*
+ * Create a tracing sessioin using a name, URIs and a consumer enable flag.
+ * The control URI is mandatory for consumer local or network.
+ */
+extern int lttng_create_session_uri(const char *name,
+		struct lttng_uri *ctrl_uri, struct lttng_uri *data_uri,
+		unsigned int enable_consumer);
+
 /*
  * Destroy a tracing session.
  *
@@ -539,6 +559,17 @@ extern int lttng_add_context(struct lttng_handle *handle,
 extern int lttng_enable_event(struct lttng_handle *handle,
 		struct lttng_event *ev, const char *channel_name);
 
+/*
+ * Apply a filter expression to an event.
+ *
+ * If event_name is NULL, the filter is applied to all events of the channel.
+ * If channel_name is NULL, a lookup of the event's channel is done.
+ * If both are NULL, the filter is applied to all events of all channels.
+ */
+extern int lttng_set_event_filter(struct lttng_handle *handle,
+		const char *event_name,
+		const char *channel_name,
+		const char *filter_expression);
 /*
  * Create or enable a channel.
  * The channel name cannot be NULL.
@@ -578,4 +609,36 @@ extern int lttng_calibrate(struct lttng_handle *handle,
 extern void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		struct lttng_channel_attr *attr);
 
+/*
+ * Set URI for a consumer for a session and domain.
+ *
+ * For network streaming, both data and control stream type MUST be defined
+ * with a specific URIs. Default port are 5342 and 5343 respectively for
+ * control and data which uses the TCP protocol.
+ */
+extern int lttng_set_consumer_uri(struct lttng_handle *handle,
+		struct lttng_uri *uri);
+
+/*
+ * Enable the consumer for a session and domain.
+ */
+extern int lttng_enable_consumer(struct lttng_handle *handle);
+
+/*
+ * Disable consumer for a session and domain.
+ */
+extern int lttng_disable_consumer(struct lttng_handle *handle);
+
+/*
+ * Check session daemon health for a specific component.
+ *
+ * Return 0 if health is OK or 1 if BAD. A returned value of -1 indicate that
+ * the control library was not able to connect to the session daemon health
+ * socket.
+ *
+ * Any other positive value is an lttcomm error which can be translate with
+ * lttng_strerror().
+ */
+extern int lttng_health_check(enum lttng_health_component c);
+
 #endif /* _LTTNG_H */