X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=f92ccb6fdb3615266bb86c06dc465accb01ded9b;hp=6823579a9e2d4712976c53b07d8c2c296c6f66ca;hb=590b9e3c8fdaf2912d5919244a475f0e2f32f1b5;hpb=44a5e5eb99f1d8b528f83fda5585677a3882f5f5 diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index 6823579a9..f92ccb6fd 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -19,25 +19,25 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _LTTNG_H -#define _LTTNG_H +#ifndef LTTNG_H +#define LTTNG_H #include -#include #include #include +/* Error codes that can be returned by API calls */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + /* * Event symbol length. Copied from LTTng kernel ABI. */ #define LTTNG_SYMBOL_NAME_LEN 256 -/* - * Maximum length of a domain name. This is the limit for the total length of a - * domain name specified by the RFC 1035 (https://www.ietf.org/rfc/rfc1035.txt) - */ -#define LTTNG_MAX_DNNAME 255 - /* * Every lttng_event_* structure both apply to kernel event and user-space * event. @@ -125,6 +125,7 @@ enum lttng_event_context_type { LTTNG_EVENT_CONTEXT_PPID = 8, LTTNG_EVENT_CONTEXT_VPPID = 9, LTTNG_EVENT_CONTEXT_PTHREAD_ID = 10, + LTTNG_EVENT_CONTEXT_HOSTNAME = 11, }; enum lttng_calibrate_type { @@ -134,69 +135,13 @@ enum lttng_calibrate_type { /* 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 = 1, - LTTNG_DST_IPV6 = 2, - LTTNG_DST_PATH = 3, -}; - -/* Type of lttng URI where it is a final destination or a hop */ -enum lttng_uri_type { - LTTNG_URI_DST, /* The URI is a final destination */ - /* - * Hop are not supported yet but planned for a future release. - * - LTTNG_URI_HOP, - */ -}; - -/* Communication stream type of a lttng URI */ -enum lttng_stream_type { - LTTNG_STREAM_CONTROL, - LTTNG_STREAM_DATA, -}; - -/* - * Protocol type of a lttng URI. The value 0 indicate that the proto_type field - * should be ignored. - */ -enum lttng_proto_type { - LTTNG_TCP = 1, - /* - * UDP protocol is not supported for now. - * - LTTNG_UDP = 2, - */ -}; - -/* - * Structure representing an URI supported by lttng. - */ -#define LTTNG_URI_PADDING1_LEN 16 -#define LTTNG_URI_PADDING2_LEN LTTNG_SYMBOL_NAME_LEN + 32 -struct lttng_uri { - enum lttng_dst_type dtype; - enum lttng_uri_type utype; - enum lttng_stream_type stype; - 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]; - char path[PATH_MAX]; - char padding[LTTNG_URI_PADDING2_LEN]; - } dst; -}; - /* * The structures should be initialized to zero before use. */ @@ -316,6 +261,7 @@ struct lttng_event_field { enum lttng_event_field_type type; char padding[LTTNG_EVENT_FIELD_PADDING]; struct lttng_event event; + int nowrite; }; /* @@ -420,18 +366,11 @@ extern struct lttng_handle *lttng_create_handle(const char *session_name, extern void lttng_destroy_handle(struct lttng_handle *handle); /* - * Create a tracing session using a name and a path where the trace will be - * written. - */ -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. + * Create a tracing session using a name and an optional URL. + * + * If _url_ is NULL, no consumer is created for the session. */ -extern int lttng_create_session_uri(const char *name, - struct lttng_uri *ctrl_uri, struct lttng_uri *data_uri, - unsigned int enable_consumer); +extern int lttng_create_session(const char *name, const char *url); /* * Destroy a tracing session. @@ -609,14 +548,16 @@ 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. + * Set URL 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. + * Both data and control URL must be defined. If both URLs are the same, only + * the control URL is used even for network streaming. + * + * 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); +extern int lttng_set_consumer_url(struct lttng_handle *handle, + const char *control_url, const char *data_url); /* * Enable the consumer for a session and domain. @@ -640,4 +581,8 @@ extern int lttng_disable_consumer(struct lttng_handle *handle); */ extern int lttng_health_check(enum lttng_health_component c); -#endif /* _LTTNG_H */ +#ifdef __cplusplus +} +#endif + +#endif /* LTTNG_H */