X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=0fd323c8bf3e158edd0b3a77781ac85ecfb67a7f;hp=3f96a24b695819560047dccf43831ade3fa46609;hb=9197c5c48e2d1db4c2f9318bbf0af0af9918fdc8;hpb=cd80958d00fddabced5fbd60641978516a01e29e diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index 3f96a24b6..0fd323c8b 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -23,24 +23,14 @@ #ifndef _LTTNG_H #define _LTTNG_H -#include -#include -#include #include - -/* Default unix group name for tracing. */ -#define LTTNG_DEFAULT_TRACING_GROUP "tracing" - -/* Environment variable to set session daemon binary path. */ -#define LTTNG_SESSIOND_PATH_ENV "LTTNG_SESSIOND_PATH" - -/* Default trace output directory name */ -#define LTTNG_DEFAULT_TRACE_DIR_NAME "lttng-traces" +#include +#include /* * Event symbol length. Copied from LTTng kernel ABI. */ -#define LTTNG_SYMBOL_NAME_LEN 128 +#define LTTNG_SYMBOL_NAME_LEN 256 /* * Every lttng_event_* structure both apply to kernel event and user-space @@ -53,45 +43,57 @@ enum lttng_domain_type { LTTNG_DOMAIN_KERNEL = 1, LTTNG_DOMAIN_UST = 2, + + /* + * For now, the domains below are not implemented. However, we keep them + * here in order to retain their enum values for future development. Note + * that it is on the roadmap to implement them. + * LTTNG_DOMAIN_UST_EXEC_NAME = 3, LTTNG_DOMAIN_UST_PID = 4, LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN = 5, + */ }; /* * Instrumentation type of tracing event. */ enum lttng_event_type { - LTTNG_EVENT_TRACEPOINT, - LTTNG_EVENT_PROBE, - LTTNG_EVENT_FUNCTION, - LTTNG_EVENT_FUNCTION_ENTRY, + LTTNG_EVENT_ALL = -1, + LTTNG_EVENT_TRACEPOINT = 0, + LTTNG_EVENT_PROBE = 1, + LTTNG_EVENT_FUNCTION = 2, + LTTNG_EVENT_FUNCTION_ENTRY = 3, + LTTNG_EVENT_NOOP = 4, + LTTNG_EVENT_SYSCALL = 5, + LTTNG_EVENT_TRACEPOINT_LOGLEVEL = 6, }; /* * LTTng consumer mode */ enum lttng_event_output { - LTTNG_EVENT_SPLICE = 0, - LTTNG_EVENT_MMAP = 1, + LTTNG_EVENT_SPLICE = 0, + LTTNG_EVENT_MMAP = 1, }; /* Event context possible type */ enum lttng_event_context_type { - LTTNG_EVENT_CONTEXT_PID = 0, - LTTNG_EVENT_CONTEXT_PERF_COUNTER = 1, - LTTNG_EVENT_CONTEXT_COMM = 2, - LTTNG_EVENT_CONTEXT_PRIO = 3, - LTTNG_EVENT_CONTEXT_NICE = 4, - LTTNG_EVENT_CONTEXT_VPID = 5, - LTTNG_EVENT_CONTEXT_TID = 6, - LTTNG_EVENT_CONTEXT_VTID = 7, - LTTNG_EVENT_CONTEXT_PPID = 8, - LTTNG_EVENT_CONTEXT_VPPID = 9, + LTTNG_EVENT_CONTEXT_PID = 0, + LTTNG_EVENT_CONTEXT_PERF_COUNTER = 1, + LTTNG_EVENT_CONTEXT_PROCNAME = 2, + LTTNG_EVENT_CONTEXT_PRIO = 3, + LTTNG_EVENT_CONTEXT_NICE = 4, + LTTNG_EVENT_CONTEXT_VPID = 5, + LTTNG_EVENT_CONTEXT_TID = 6, + LTTNG_EVENT_CONTEXT_VTID = 7, + LTTNG_EVENT_CONTEXT_PPID = 8, + LTTNG_EVENT_CONTEXT_VPPID = 9, + LTTNG_EVENT_CONTEXT_PTHREAD_ID = 10, }; enum lttng_calibrate_type { - LTTNG_CALIBRATE_FUNCTION = 0, + LTTNG_CALIBRATE_FUNCTION = 0, }; struct lttng_domain { @@ -141,8 +143,11 @@ struct lttng_event_function_attr { */ struct lttng_event { char name[LTTNG_SYMBOL_NAME_LEN]; + char loglevel[LTTNG_SYMBOL_NAME_LEN]; + int64_t loglevel_value; enum lttng_event_type type; uint32_t enabled; + pid_t pid; /* Per event type configuration */ union { struct lttng_event_probe_attr probe; @@ -166,7 +171,7 @@ struct lttng_channel_attr { * Channel information structure. For both kernel and user-space. */ struct lttng_channel { - char name[NAME_MAX]; + char name[LTTNG_SYMBOL_NAME_LEN]; uint32_t enabled; struct lttng_channel_attr attr; }; @@ -186,6 +191,7 @@ 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 */ }; /* @@ -206,7 +212,7 @@ struct lttng_handle { * array. * * On error, a negative value is returned being a specific lttng-tools error - * code which can be humanly interpreted with lttng_get_readable_code(err). + * code which can be humanly interpreted with lttng_strerror(err). */ /* @@ -235,7 +241,7 @@ extern int lttng_create_session(const char *name, const char *path); * The session will not be useable anymore, tracing will stopped for all * registered trace and tracing buffers will be flushed. */ -extern int lttng_destroy_session(struct lttng_handle *handle); +extern int lttng_destroy_session(const char *name); /* * List all tracing sessions. @@ -249,7 +255,7 @@ extern int lttng_list_sessions(struct lttng_session **sessions); * * Return the size of the "lttng_domain" array. Caller must free(3). */ -extern int lttng_list_domains(struct lttng_handle *handle, +extern int lttng_list_domains(const char *session_name, struct lttng_domain **domains); /* @@ -291,17 +297,28 @@ extern int lttng_set_tracing_group(const char *name); * * Parameter MUST be a negative value or else you'll get a generic message. */ -extern const char *lttng_get_readable_code(int code); +extern const char *lttng_strerror(int code); + +/* + * This call permits to register an "outside consumer" to a session and a lttng + * domain. No consumer will be spawned and all fds/commands will go through the + * socket path given (socket_path). + * + * NOTE: At the moment, if you use the liblttng-kconsumer, you can only use the + * command socket. The error socket is not supported yet for roaming consumers. + */ +extern int lttng_register_consumer(struct lttng_handle *handle, + const char *socket_path); /* * Start tracing for *all* registered trace (kernel and user-space). */ -extern int lttng_start_tracing(struct lttng_handle *handle); +extern int lttng_start_tracing(const char *session_name); /* * Stop tracing for *all* registered trace (kernel and user-space). */ -extern int lttng_stop_tracing(struct lttng_handle *handle); +extern int lttng_stop_tracing(const char *session_name); /* * Add context to event for a specific channel. @@ -355,4 +372,11 @@ extern int lttng_disable_channel(struct lttng_handle *handle, extern int lttng_calibrate(struct lttng_handle *handle, struct lttng_calibrate *calibrate); +/* + * Set the default channel attributes for a specific domain and an allocated + * lttng_channel_attr pointer. + */ +extern void lttng_channel_set_default_attr(struct lttng_domain *domain, + struct lttng_channel_attr *attr); + #endif /* _LTTNG_H */