X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=1fe7c89b5554a250981a43907ed77bc5fbcf9e95;hb=a1ae2ea59428174575b7328b1062a6248d636b72;hp=b8d5630f472aed7b37e16a5ad9827fdb205bf0b0;hpb=491d15395b58df09f8a3e7ba7404eb1f46392b79;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index b8d5630f4..1fe7c89b5 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -108,8 +108,8 @@ struct consumer_data {
 	struct consumer_socket metadata_sock;
 
 	/* consumer error and command Unix socket path */
-	char err_unix_sock_path[PATH_MAX];
-	char cmd_unix_sock_path[PATH_MAX];
+	const char *err_unix_sock_path;
+	const char *cmd_unix_sock_path;
 
 	/*
 	 * This lock has two purposes. It protects any change to the consumer
@@ -140,6 +140,9 @@ struct consumer_net {
 
 	/* Data path for network streaming. */
 	struct lttng_uri data;
+
+	/* <hostname>/<session-name> */
+	char base_dir[PATH_MAX];
 };
 
 /*
@@ -163,9 +166,10 @@ struct consumer_output {
 	uint32_t relay_minor_version;
 
 	/*
-	 * Subdirectory path name used for both local and network consumer.
+	 * Subdirectory path name used for both local and network
+	 * consumer (/kernel or /ust).
 	 */
-	char subdir[PATH_MAX];
+	char subdir[LTTNG_PATH_MAX];
 
 	/*
 	 * Hashtable of consumer_socket index by the file descriptor value. For
@@ -178,9 +182,15 @@ struct consumer_output {
 	unsigned int snapshot:1;
 
 	union {
-		char trace_path[PATH_MAX];
+		char session_root_path[LTTNG_PATH_MAX];
 		struct consumer_net net;
 	} dst;
+
+	/*
+	 * Sub-directory below the session_root_path where the next chunk of
+	 * trace will be stored (\0 before the first session rotation).
+	 */
+	char chunk_path[LTTNG_PATH_MAX];
 };
 
 struct consumer_socket *consumer_find_socket(int key,
@@ -305,4 +315,8 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 		struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
 		const char *session_path, int wait, uint64_t nb_packets_per_stream);
 
+int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
+		const struct consumer_output *output, const char *path,
+		uid_t uid, gid_t gid);
+
 #endif /* _CONSUMER_H */