X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.h;h=d0e9c22da4a233f0019406e4906cc60c193ae769;hb=refs%2Fheads%2Fstable-2.7;hp=a420dee26167ac9e03bf141ce3fa28a729376377;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index a420dee2..d0e9c22d 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -31,9 +31,6 @@
 #include "lttng-abi.h"
 #include "lttng-abi-old.h"
 
-/* FIXME test */
-#undef CONFIG_HAVE_SYSCALL_TRACEPOINTS
-
 #define lttng_is_signed_type(type)	(((type)(-1)) < 0)
 
 struct lttng_channel;
@@ -418,7 +415,6 @@ struct lttng_metadata_stream {
 	wait_queue_head_t read_wait;	/* Reader buffer-level wait queue */
 	struct list_head list;		/* Stream list */
 	struct lttng_transport *transport;
-	struct mutex lock;
 };
 
 
@@ -464,6 +460,7 @@ struct lttng_metadata_cache {
 	struct kref refcount;		/* Metadata cache usage */
 	struct list_head metadata_stream;	/* Metadata stream list */
 	uuid_le uuid;			/* Trace session unique ID (copy) */
+	struct mutex lock;
 };
 
 void lttng_lock_sessions(void);
@@ -560,7 +557,6 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan,
 		const char *name);
 long lttng_channel_syscall_mask(struct lttng_channel *channel,
 		struct lttng_kernel_syscall_mask __user *usyscall_mask);
-int lttng_abi_syscall_list(void);
 #else
 static inline int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 {
@@ -589,12 +585,6 @@ static inline long lttng_channel_syscall_mask(struct lttng_channel *channel,
 {
 	return -ENOSYS;
 }
-
-static inline
-int lttng_abi_syscall_list(void)
-{
-	return -ENOSYS;
-}
 #endif
 
 void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
@@ -615,6 +605,7 @@ void lttng_remove_context_field(struct lttng_ctx **ctx,
 				struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
 int lttng_add_pid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_prio_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_nice_to_ctx(struct lttng_ctx **ctx);
@@ -684,6 +675,8 @@ int lttng_kretprobes_register(const char *name,
 		struct lttng_event *event_exit);
 void lttng_kretprobes_unregister(struct lttng_event *event);
 void lttng_kretprobes_destroy_private(struct lttng_event *event);
+int lttng_kretprobes_event_enable_state(struct lttng_event *event,
+	int enable);
 #else
 static inline
 int lttng_kretprobes_register(const char *name,
@@ -705,6 +698,13 @@ static inline
 void lttng_kretprobes_destroy_private(struct lttng_event *event)
 {
 }
+
+static inline
+int lttng_kretprobes_event_enable_state(struct lttng_event *event,
+	int enable)
+{
+	return -ENOSYS;
+}
 #endif
 
 #ifdef CONFIG_DYNAMIC_FTRACE