X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=59ef85b78cf9c082eb00b407066a1e78a272acb7;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hp=2fd3b56d936f764e46c31c3ba0e19ba53480dbb2;hpb=ad7a91070f0b04bf69868efcbc572602449ac9bf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 2fd3b56d9..59ef85b78 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"
 
@@ -215,6 +215,8 @@ struct ust_app_session {
 
 	/* Metadata channel attributes. */
 	struct ustctl_consumer_channel_attr metadata_attr;
+
+	char shm_path[PATH_MAX];
 };
 
 /*
@@ -266,13 +268,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
@@ -312,7 +315,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);
+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);
@@ -325,8 +328,10 @@ 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);
-unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess);
+		struct snapshot_output *output, int wait,
+		uint64_t nb_packets_per_stream);
+uint64_t ust_app_get_size_one_more_packet_per_stream(
+		struct ltt_ust_session *usess, uint64_t cur_nr_packets);
 struct ust_app *ust_app_find_by_sock(int sock);
 
 static inline
@@ -409,8 +414,10 @@ struct ust_app *ust_app_get_by_pid(pid_t pid)
 	return NULL;
 }
 static inline
-void ust_app_ht_alloc(void)
-{}
+int ust_app_ht_alloc(void)
+{
+	return 0;
+}
 static inline
 void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 {}
@@ -510,7 +517,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;
 }
@@ -535,6 +542,11 @@ struct ust_app *ust_app_find_by_pid(pid_t pid)
 {
 	return NULL;
 }
+static inline
+uint64_t ust_app_get_size_one_more_packet_per_stream(
+		struct ltt_ust_session *usess, uint64_t cur_nr_packets) {
+	return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */