X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=2d3695cef67459315104e0bc5cef9c6f7547f699;hp=252255710be6fcdc85196d64fa336f52d0b6f83e;hb=57703f6e0047955a0c68829630fcc42aad988a39;hpb=0c53bbada6234c946dcacf5cc3b9c7c0ab070810

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 252255710..2d3695cef 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,7 @@
 
 #include <common/compat/uuid.h>
 
-#include "jul.h"
+#include "agent.h"
 #include "trace-ust.h"
 #include "ust-registry.h"
 
@@ -212,6 +212,9 @@ struct ust_app_session {
 	/* If the channel's streams have to be outputed or not. */
 	unsigned int output_traces;
 	unsigned int live_timer_interval;	/* usec */
+
+	/* Metadata channel attributes. */
+	struct ustctl_consumer_channel_attr metadata_attr;
 };
 
 /*
@@ -263,13 +266,14 @@ struct ust_app {
 	 * Hash table containing ust_app_channel indexed by channel objd.
 	 */
 	struct lttng_ht *ust_objd;
+
 	/*
-	 * If this application is of the JUL domain and this is non negative then a
-	 * lookup MUST be done to acquire a read side reference to the
-	 * corresponding JUL app object. If the lookup fails, this should be set to
-	 * a negative value indicating that the JUL application is gone.
+	 * If this application is of the agent domain and this is non negative then
+	 * a lookup MUST be done to acquire a read side reference to the
+	 * corresponding agent app object. If the lookup fails, this should be set
+	 * to a negative value indicating that the agent application is gone.
 	 */
-	int jul_app_sock;
+	int agent_app_sock;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -282,7 +286,6 @@ int ust_app_register_done(int sock)
 }
 int ust_app_version(struct ust_app *app);
 void ust_app_unregister(int sock);
-unsigned long ust_app_list_count(void);
 int ust_app_start_trace_all(struct ltt_ust_session *usess);
 int ust_app_stop_trace_all(struct ltt_ust_session *usess);
 int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
@@ -292,9 +295,6 @@ 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,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
-int ust_app_disable_event_pid(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
-		pid_t pid);
 int ust_app_enable_event_pid(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
 		pid_t pid);
@@ -304,8 +304,6 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan);
 int ust_app_enable_event_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
-int ust_app_disable_all_event_glb(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan);
 int ust_app_enable_all_event_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan);
 int ust_app_disable_event_glb(struct ltt_ust_session *usess,
@@ -315,8 +313,7 @@ int ust_app_add_ctx_channel_glb(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);
-struct lttng_ht *ust_app_get_ht(void);
+int ust_app_ht_alloc(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
 int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate);
 struct ust_app_stream *ust_app_alloc_stream(void);
@@ -329,7 +326,7 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
 		struct consumer_socket *socket, int send_zero_data);
 void ust_app_destroy(struct ust_app *app);
 int ust_app_snapshot_record(struct ltt_ust_session *usess,
-		struct snapshot_output *output, int wait, unsigned int nb_streams);
+		struct snapshot_output *output, int wait, uint64_t max_stream_size);
 unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess);
 struct ust_app *ust_app_find_by_sock(int sock);
 
@@ -391,11 +388,6 @@ void ust_app_unregister(int sock)
 {
 }
 static inline
-unsigned int ust_app_list_count(void)
-{
-	return 0;
-}
-static inline
 void ust_app_lock_list(void)
 {
 }
@@ -418,11 +410,6 @@ struct ust_app *ust_app_get_by_pid(pid_t pid)
 	return NULL;
 }
 static inline
-struct lttng_ht *ust_app_get_ht(void)
-{
-	return NULL;
-}
-static inline
 void ust_app_ht_alloc(void)
 {}
 static inline
@@ -447,12 +434,6 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 	return 0;
 }
 static inline
-int ust_app_disable_all_event_glb(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan)
-{
-	return 0;
-}
-static inline
 int ust_app_enable_all_event_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan)
 {
@@ -490,13 +471,6 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess,
 	return 0;
 }
 static inline
-int ust_app_disable_event_pid(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
-		pid_t pid)
-{
-	return 0;
-}
-static inline
 int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
 {
 	return 0;
@@ -537,7 +511,7 @@ void ust_app_destroy(struct ust_app *app)
 }
 static inline
 int ust_app_snapshot_record(struct ltt_ust_session *usess,
-		struct snapshot_output *output, int wait, unsigned int nb_stream)
+		struct snapshot_output *output, int wait, uint64_t max_stream_size)
 {
 	return 0;
 }