X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=a8b7ac09a37351b307dc87714693217698b3a8d3;hb=f3ed775ef4842019b396f06095b053c3a70bc3c8;hp=3bb245239fd6889f86a3122b9f90cc9d3733ebcb;hpb=16421f6edd83b37e777b55add8396a91afcbb08a;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 3bb245239..a8b7ac09a 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -1,4 +1,8 @@
 /*
+ * lttng.h
+ *
+ * Linux Trace Toolkit Control Library Header File
+ *
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or
@@ -16,83 +20,129 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef _LIBLTTNGCTL_H
-#define _LIBLTTNGCTL_H
+#ifndef _LTTNG_H
+#define _LTTNG_H
 
-#include <limits.h>
+#include <asm/types.h>
 #include <stdint.h>
-#include <uuid/uuid.h>
+#include <limits.h>
 
-/* Default unix group name for tracing.
- */
-#define DEFAULT_TRACING_GROUP "tracing"
+/* Default unix group name for tracing. */
+#define LTTNG_DEFAULT_TRACING_GROUP "tracing"
 
-/* Environment variable to set session daemon
- * binary path.
- */
+/* Environment variable to set session daemon binary path. */
 #define LTTNG_SESSIOND_PATH_ENV "LTTNG_SESSIOND_PATH"
 
-/* UUID string length (including \0) */
-#define UUID_STR_LEN 37
-/* UUID short string version length (including \0) */
-#define UUID_SHORT_STR_LEN 9
+/*
+ * Event symbol length.
+ */
+#define LTTNG_SYMBOL_NAME_LEN 128
 
-typedef uint64_t u64;
+enum lttng_event_type {
+	LTTNG_EVENT_TRACEPOINTS,
+	LTTNG_EVENT_KPROBES,
+	LTTNG_EVENT_FUNCTION,
+};
 
-/* Trace type for lttng_trace.
+/*
+ * Either addr is used or symbol_name and offset.
  */
-enum lttng_trace_type {
-	KERNEL, USERSPACE,
+struct lttng_event_kprobe_attr {
+	uint64_t addr;
+
+	uint64_t offset;
+	char symbol_name[LTTNG_SYMBOL_NAME_LEN];
 };
 
-/* Simple structure representing a session.
+/*
+ * Function tracer
  */
-struct lttng_session {
-	char name[NAME_MAX];
-	uuid_t uuid;
+struct lttng_event_function_attr {
+	char symbol_name[LTTNG_SYMBOL_NAME_LEN];
 };
 
-/* Simple trace representation.
+/*
+ * Generic lttng event
  */
-struct lttng_trace {
-	char name[NAME_MAX];
-	pid_t pid;
-	enum lttng_trace_type type;
+struct lttng_event {
+	char name[LTTNG_SYMBOL_NAME_LEN];
+	enum lttng_event_type type;
+	/* Per event type configuration */
+	union {
+		struct lttng_event_kprobe_attr kprobe;
+		struct lttng_event_function_attr ftrace;
+	} attr;
+};
+
+/* Tracer channel attributes */
+struct lttng_channel_attr {
+	int overwrite;                        /* 1: overwrite, 0: discard */
+	uint64_t subbuf_size;                      /* bytes */
+	uint64_t num_subbuf;                       /* power of 2 */
+	unsigned int switch_timer_interval;   /* usec */
+	unsigned int read_timer_interval;     /* usec */
 };
 
 /*
- * LTTng DebugFS ABI structures.
+ * Basic session information.
  */
-enum lttng_instrum_type {
-	INSTRUM_TRACEPOINTS,
+struct lttng_session {
+	char name[NAME_MAX];
+	char path[PATH_MAX];
 };
 
+/* Channel information structure */
 struct lttng_channel {
-	int overwrite;         /* 1: overwrite, 0: discard */
-	u64 subbuf_size;
-	u64 num_subbuf;
-	unsigned int switch_timer_interval;
-	unsigned int read_timer_interval;
-};
-
-struct lttng_event {
-	enum lttng_instrum_type itype;
-	char name[];
+	char name[NAME_MAX];
+	struct lttng_channel_attr attr;
 };
 
-extern int lttng_create_session(char *name, uuid_t *session_id);
-extern int lttng_destroy_session(uuid_t *uuid);
+/*
+ * Session daemon control
+ */
 extern int lttng_connect_sessiond(void);
+
+extern int lttng_create_session(char *name, char *path);
+
+extern int lttng_destroy_session(char *name);
+
 extern int lttng_disconnect_sessiond(void);
+
+/* Return an allocated array of lttng_session */
+extern int lttng_list_sessions(struct lttng_session **sessions);
+
+extern int lttng_session_daemon_alive(void);
+
+/* Set tracing group for the current execution */
 extern int lttng_set_tracing_group(const char *name);
-extern int lttng_check_session_daemon(void);
+
+extern void lttng_set_session_name(char *name);
+
 extern const char *lttng_get_readable_code(int code);
-extern int lttng_ust_list_apps(pid_t **pids);
-extern int lttng_list_sessions(struct lttng_session **sessions);
-extern int lttng_list_traces(uuid_t *uuid, struct lttng_trace **traces);
-extern void lttng_set_current_session_uuid(uuid_t *uuid);
-extern int lttng_ust_create_trace(pid_t pid);
-extern int lttng_ust_start_trace(pid_t pid);
-extern int lttng_ust_stop_trace(pid_t pid);
 
-#endif /* _LIBLTTNGCTL_H */
+extern int lttng_start_tracing(char *session_name);
+
+extern int lttng_stop_tracing(char *session_name);
+
+//extern int lttng_ust_list_traceable_apps(pid_t **pids);
+
+/*
+ * LTTng Kernel tracer control
+ */
+extern int lttng_kernel_create_channel(struct lttng_channel *chan);
+
+extern int lttng_kernel_enable_event(struct lttng_event *ev, char *channel_name);
+
+extern int lttng_kernel_enable_channel(char *name);
+
+extern int lttng_kernel_disable_event(char *name, char *channel_name);
+
+extern int lttng_kernel_disable_channel(char *name);
+
+extern int lttng_kernel_list_events(char **event_list);
+
+/*
+ * LTTng User-space tracer control
+ */
+
+#endif /* _LTTNG_H */