X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.h;h=6148fe12f0e1c90ce35a3c9d56cabe8f22c30761;hb=b2e8ba42a765741d1365fe39e3ad6c26690137b9;hp=cdb520e8dd91fe07ae3f121a02f5fefe8ba52704;hpb=dc923e75c174ee4e7a80e5f9af1dfd39fb8346ea;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index cdb520e8..6148fe12 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;
@@ -489,19 +486,36 @@ struct lttng_dynamic_len_stack {
 DECLARE_PER_CPU(struct lttng_dynamic_len_stack, lttng_dynamic_len_stack);
 
 /*
- * struct lttng_pid_tracker declared in header due to deferencing of *v
+ * struct lttng_id_tracker declared in header due to deferencing of *v
  * in RCU_INITIALIZER(v).
  */
-#define LTTNG_PID_HASH_BITS	6
-#define LTTNG_PID_TABLE_SIZE	(1 << LTTNG_PID_HASH_BITS)
+#define LTTNG_ID_HASH_BITS	6
+#define LTTNG_ID_TABLE_SIZE	(1 << LTTNG_ID_HASH_BITS)
+
+enum tracker_type {
+	TRACKER_PID,
+	TRACKER_VPID,
+	TRACKER_UID,
+	TRACKER_VUID,
+	TRACKER_GID,
+	TRACKER_VGID,
+
+	TRACKER_UNKNOWN,
+};
+
+struct lttng_id_tracker_rcu {
+	struct hlist_head id_hash[LTTNG_ID_TABLE_SIZE];
+};
 
-struct lttng_pid_tracker {
-	struct hlist_head pid_hash[LTTNG_PID_TABLE_SIZE];
+struct lttng_id_tracker {
+	struct lttng_session *session;
+	enum tracker_type tracker_type;
+	struct lttng_id_tracker_rcu *p;	/* RCU dereferenced. */
 };
 
-struct lttng_pid_hash_node {
+struct lttng_id_hash_node {
 	struct hlist_node hlist;
-	int pid;
+	int id;
 };
 
 struct lttng_session {
@@ -514,7 +528,12 @@ struct lttng_session {
 	unsigned int free_chan_id;	/* Next chan ID to allocate */
 	uuid_le uuid;			/* Trace session unique ID */
 	struct lttng_metadata_cache *metadata_cache;
-	struct lttng_pid_tracker *pid_tracker;
+	struct lttng_id_tracker pid_tracker;
+	struct lttng_id_tracker vpid_tracker;
+	struct lttng_id_tracker uid_tracker;
+	struct lttng_id_tracker vuid_tracker;
+	struct lttng_id_tracker gid_tracker;
+	struct lttng_id_tracker vgid_tracker;
 	unsigned int metadata_dumped:1,
 		tstate:1;		/* Transient enable state */
 	/* List of enablers */
@@ -611,17 +630,20 @@ void lttng_probes_exit(void);
 int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
 		struct channel *chan);
 
-int lttng_pid_tracker_get_node_pid(const struct lttng_pid_hash_node *node);
-struct lttng_pid_tracker *lttng_pid_tracker_create(void);
-void lttng_pid_tracker_destroy(struct lttng_pid_tracker *lpf);
-bool lttng_pid_tracker_lookup(struct lttng_pid_tracker *lpf, int pid);
-int lttng_pid_tracker_add(struct lttng_pid_tracker *lpf, int pid);
-int lttng_pid_tracker_del(struct lttng_pid_tracker *lpf, int pid);
+int lttng_id_tracker_get_node_id(const struct lttng_id_hash_node *node);
+int lttng_id_tracker_empty_set(struct lttng_id_tracker *lf);
+void lttng_id_tracker_destroy(struct lttng_id_tracker *lf, bool rcu);
+bool lttng_id_tracker_lookup(struct lttng_id_tracker_rcu *p, int id);
+int lttng_id_tracker_add(struct lttng_id_tracker *lf, int id);
+int lttng_id_tracker_del(struct lttng_id_tracker *lf, int id);
 
-int lttng_session_track_pid(struct lttng_session *session, int pid);
-int lttng_session_untrack_pid(struct lttng_session *session, int pid);
+int lttng_session_track_id(struct lttng_session *session,
+		enum tracker_type tracker_type, int id);
+int lttng_session_untrack_id(struct lttng_session *session,
+		enum tracker_type tracker_type, int id);
 
-int lttng_session_list_tracker_pids(struct lttng_session *session);
+int lttng_session_list_tracker_ids(struct lttng_session *session,
+		enum tracker_type tracker_type);
 
 void lttng_clock_ref(void);
 void lttng_clock_unref(void);
@@ -953,32 +975,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;