X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-app.h;h=76b81b29a1eb5a2560fe2e05148d601dc0788a3d;hp=04c3472dd6851e83bc9b71e3de16ead92241d3e0;hb=421cb6011479aad4a37260e2e496c353a89318c0;hpb=74d0b6427faafd5f5d59b7e9d5f78ac52924a7a2

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index 04c3472dd..76b81b29a 100644
--- a/lttng-sessiond/ust-app.h
+++ b/lttng-sessiond/ust-app.h
@@ -65,7 +65,7 @@ struct ust_app_channel {
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ust_channel attr;
 	struct lttng_ust_object_data *obj;
-	struct cds_lfht *streams;
+	struct ltt_ust_stream_list streams;
 	struct cds_lfht *ctx;
 	struct cds_lfht *events;
 	struct cds_lfht_node node;
@@ -101,12 +101,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_add_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_add_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);
+void ust_app_global_update(struct ltt_ust_session *usess, int sock);
 
 void ust_app_clean_list(void);
 void ust_app_ht_alloc(void);
@@ -115,6 +117,16 @@ 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, 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_register(struct ust_register_msg *msg, int sock)
 {
@@ -129,7 +141,6 @@ unsigned int ust_app_list_count(void)
 {
 	return 0;
 }
-
 static inline
 void ust_app_lock_list(void)
 {
@@ -152,13 +163,31 @@ 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_all(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
+{
+	return 0;
+}
+static inline
+struct cds_lfht *ust_app_get_ht(void)
+{
+	return NULL;
+}
+static inline
+void ust_app_ht_alloc(void)
+{
+}
+static inline
+void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+{
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */