X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=29eaea7ec4141706a7ebc75ddfa770bc773614b3;hp=906a6a209b1e63eca442e438fbb76497d1937775;hb=da0bdb87642b93f9cb657d68a566683a18ce15c3;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 906a6a209..29eaea7ec 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -45,17 +45,16 @@ struct ust_register_msg {
 };
 
 /*
- * Global applications HT used by the session daemon.
+ * Global applications HT used by the session daemon. This table is indexed by
+ * PID using the pid_n node and pid value of an ust_app.
  */
 struct lttng_ht *ust_app_ht;
 
-struct lttng_ht *ust_app_sock_key_map;
-
-struct ust_app_key {
-	pid_t pid;
-	int sock;
-	struct lttng_ht_node_ulong node;
-};
+/*
+ * Global applications HT used by the session daemon. This table is indexed by
+ * socket using the sock_n node and sock value of an ust_app.
+ */
+struct lttng_ht *ust_app_ht_by_sock;
 
 struct ust_app_ctx {
 	int handle;
@@ -106,6 +105,8 @@ struct ust_app_session {
  * and a linked list is kept of all running traceable app.
  */
 struct ust_app {
+	int sock;
+	pid_t pid;
 	pid_t ppid;
 	uid_t uid;           /* User ID that owns the apps */
 	gid_t gid;           /* Group ID that owns the apps */
@@ -118,8 +119,8 @@ struct ust_app {
 	uint32_t v_minor;    /* Verion minor number */
 	char name[17];       /* Process name (short) */
 	struct lttng_ht *sessions;
-	struct lttng_ht_node_ulong node;
-	struct ust_app_key key;
+	struct lttng_ht_node_ulong pid_n;
+	struct lttng_ht_node_ulong sock_n;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -139,6 +140,7 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess);
 int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app);
 int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
 int ust_app_list_events(struct lttng_event **events);
+int ust_app_list_event_fields(struct lttng_event_field **fields);
 int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan);
 int ust_app_create_event_glb(struct ltt_ust_session *usess,
@@ -200,7 +202,12 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess)
 static inline
 int ust_app_list_events(struct lttng_event **events)
 {
-	return 0;
+	return -ENOSYS;
+}
+static inline
+int ust_app_list_event_fields(struct lttng_event_field **fields)
+{
+	return -ENOSYS;
 }
 static inline
 int ust_app_register(struct ust_register_msg *msg, int sock)