X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.h;h=470df254f41a34927e273c447f78f8b5d1c2ae88;hb=04fa45ade113b270e860aa0e31f6087b740e35ae;hp=f74f9d52cccb81302b18c242712cb2941009a4e1;hpb=3aed4dca825a63757a3c95b9d41019660f83e02d;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index f74f9d52..470df254 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -314,9 +314,6 @@ struct lttng_event {
 			struct lttng_krp *lttng_krp;
 			char *symbol_name;
 		} kretprobe;
-		struct {
-			char *symbol_name;
-		} ftrace;
 		struct {
 			struct inode *inode;
 			struct list_head head;
@@ -521,6 +518,8 @@ struct lttng_session {
 	struct list_head enablers_head;
 	/* Hash table of events */
 	struct lttng_event_ht events_ht;
+	char name[LTTNG_KERNEL_SESSION_NAME_LEN];
+	char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN];
 };
 
 struct lttng_metadata_cache {
@@ -785,6 +784,7 @@ void lttng_kprobes_destroy_private(struct lttng_event *event)
 
 int lttng_event_add_callsite(struct lttng_event *event,
 	struct lttng_kernel_event_callsite *callsite);
+
 #ifdef CONFIG_UPROBES
 int lttng_uprobes_register(const char *name,
 	int fd, struct lttng_event *event);
@@ -802,7 +802,7 @@ int lttng_uprobes_register(const char *name,
 
 static inline
 int lttng_uprobes_add_callsite(struct lttng_event *event,
-	struct lttng_kernel_callsite_uprobe *callsite)
+	struct lttng_kernel_event_callsite *callsite)
 {
 	return -ENOSYS;
 }
@@ -859,32 +859,6 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event,
 }
 #endif
 
-#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(LTTNG_FTRACE_MISSING_HEADER)
-int lttng_ftrace_register(const char *name,
-			  const char *symbol_name,
-			  struct lttng_event *event);
-void lttng_ftrace_unregister(struct lttng_event *event);
-void lttng_ftrace_destroy_private(struct lttng_event *event);
-#else
-static inline
-int lttng_ftrace_register(const char *name,
-			  const char *symbol_name,
-			  struct lttng_event *event)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_ftrace_unregister(struct lttng_event *event)
-{
-}
-
-static inline
-void lttng_ftrace_destroy_private(struct lttng_event *event)
-{
-}
-#endif
-
 int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
 
 extern const struct file_operations lttng_tracepoint_list_fops;