X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=aa66059adafb5aaa2d0270f0f0634ca3414b34b6;hb=51755dc8c7607233c5f62b7931326d7d95df7910;hp=fe040ae503db83436c8d93a1f23ecf6fc97e3b3c;hpb=d28f6a948209434945e785f2ad3b89aaa67897e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index fe040ae50..aa66059ad 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,6 @@
 
 #include <common/compat/uuid.h>
 
-#include "jul.h"
 #include "trace-ust.h"
 #include "ust-registry.h"
 
@@ -48,9 +47,9 @@ struct ust_app_notify_sock_obj {
 
 struct ust_app_ht_key {
 	const char *name;
-	const struct lttng_ust_filter_bytecode *filter;
+	const struct lttng_filter_bytecode *filter;
 	enum lttng_ust_loglevel_type loglevel;
-	const struct lttng_ust_event_exclusion *exclusion;
+	const struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -115,8 +114,8 @@ struct ust_app_event {
 	struct lttng_ust_event attr;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ht_node_str node;
-	struct lttng_ust_filter_bytecode *filter;
-	struct lttng_ust_event_exclusion *exclusion;
+	struct lttng_filter_bytecode *filter;
+	struct lttng_event_exclusion *exclusion;
 };
 
 struct ust_app_stream {
@@ -212,6 +211,12 @@ 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;
+
+	char root_shm_path[PATH_MAX];
+	char shm_path[PATH_MAX];
 };
 
 /*
@@ -263,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
@@ -306,10 +312,11 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
 int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
-void ust_app_global_update(struct ltt_ust_session *usess, int sock);
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app);
+void ust_app_global_update_all(struct ltt_ust_session *usess);
 
 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);
@@ -322,8 +329,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
@@ -406,10 +415,12 @@ 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)
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
 {}
 static inline
 int ust_app_disable_channel_glb(struct ltt_ust_session *usess,
@@ -507,7 +518,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;
 }
@@ -532,6 +543,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 */