X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-app.h;h=f8b0c6c6db604ff12d07e3b1307e3a901057130b;hp=39e5bb6d22aabf41a1dc1ffa3422abee2c8baf9e;hb=6414a7130bcd9773f725da602ba3adffe0a37dd9;hpb=5cf5d0e77ac7ed80737d9346272b8563e21b6504

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index 39e5bb6d2..f8b0c6c6d 100644
--- a/lttng-sessiond/ust-app.h
+++ b/lttng-sessiond/ust-app.h
@@ -24,6 +24,10 @@
 
 #include "trace-ust.h"
 
+#define UST_APP_EVENT_LIST_SIZE 32
+
+extern int ust_consumer_fd;
+
 /*
  * Application registration data structure.
  */
@@ -54,6 +58,7 @@ struct ust_app_event {
 	int enabled;
 	int handle;
 	struct lttng_ust_object_data *obj;
+	struct lttng_ust_event attr;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct cds_lfht *ctx;
 	struct cds_lfht_node node;
@@ -79,6 +84,7 @@ struct ust_app_session {
 	struct lttng_ust_object_data *obj;
 	struct cds_lfht *channels; /* Registered channels */
 	struct cds_lfht_node node;
+	char path[PATH_MAX];
 };
 
 /*
@@ -101,12 +107,14 @@ struct ust_app {
 
 int ust_app_register(struct ust_register_msg *msg, int sock);
 void ust_app_unregister(int sock);
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_create_channel_all(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan);
-int ust_app_add_event(struct ltt_ust_session *usess,
+int ust_app_create_event_all(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
 unsigned long ust_app_list_count(void);
-int ust_app_start_trace(struct ltt_ust_session *usess);
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app);
+int ust_app_start_trace_all(struct ltt_ust_session *usess);
+int ust_app_list_events(struct lttng_event **events);
 void ust_app_global_update(struct ltt_ust_session *usess, int sock);
 
 void ust_app_clean_list(void);
@@ -117,7 +125,17 @@ struct ust_app *ust_app_find_by_pid(pid_t pid);
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline
-int ust_app_start_trace(struct ltt_ust_session *usess)
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
+{
+	return 0;
+}
+static inline
+int ust_app_start_trace_all(struct ltt_ust_session *usess)
+{
+	return 0;
+}
+static inline
+int ust_app_list_events(struct lttng_event **events)
 {
 	return 0;
 }
@@ -158,13 +176,13 @@ struct ust_app *ust_app_get_by_pid(pid_t pid)
 	return NULL;
 }
 static inline
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_add_channel_all(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan)
 {
 	return 0;
 }
 static inline
-int ust_app_add_event(struct ltt_ust_session *usess,
+int ust_app_add_event_all(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
 {
 	return 0;