X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.hpp;h=b50c685262aa73eb753a72524b7f85fff322a3c5;hb=dcd24bbf7dbc74e3584d1d0d52715e749023c452;hp=9c61b942bed04f251fd57538c2973fe2db61fc63;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.hpp b/src/bin/lttng-relayd/session.hpp
index 9c61b942b..b50c68526 100644
--- a/src/bin/lttng-relayd/session.hpp
+++ b/src/bin/lttng-relayd/session.hpp
@@ -10,18 +10,19 @@
  *
  */
 
-#include <limits.h>
+#include <common/hashtable/hashtable.hpp>
+#include <common/optional.hpp>
+#include <common/trace-chunk.hpp>
+#include <common/uuid.hpp>
+
+#include <lttng/constant.h>
+
 #include <inttypes.h>
+#include <limits.h>
 #include <pthread.h>
 #include <urcu/list.h>
 #include <urcu/ref.h>
 
-#include <lttng/constant.h>
-#include <common/hashtable/hashtable.hpp>
-#include <common/uuid.hpp>
-#include <common/trace-chunk.hpp>
-#include <common/optional.hpp>
-
 /*
  * Represents a session for the relay point of view
  */
@@ -107,7 +108,7 @@ struct relay_session {
 	 * Traversals are protected by RCU.
 	 * recv_list_lock also protects stream_count.
 	 */
-	struct cds_list_head recv_list;	/* RCU list. */
+	struct cds_list_head recv_list; /* RCU list. */
 	uint32_t stream_count;
 	pthread_mutex_t recv_list_lock;
 
@@ -135,20 +136,21 @@ struct relay_session {
 	 */
 	bool ongoing_rotation;
 	struct lttng_directory_handle *output_directory;
-	struct rcu_head rcu_node;	/* For call_rcu teardown. */
+	struct rcu_head rcu_node; /* For call_rcu teardown. */
 };
 
 struct relay_session *session_create(const char *session_name,
-		const char *hostname, const char *base_path,
-		uint32_t live_timer,
-		bool snapshot,
-		const lttng_uuid sessiond_uuid,
-		const uint64_t *id_sessiond,
-		const uint64_t *current_chunk_id,
-		const time_t *creation_time,
-		uint32_t major,
-		uint32_t minor,
-		bool session_name_contains_creation_timestamp);
+				     const char *hostname,
+				     const char *base_path,
+				     uint32_t live_timer,
+				     bool snapshot,
+				     const lttng_uuid& sessiond_uuid,
+				     const uint64_t *id_sessiond,
+				     const uint64_t *current_chunk_id,
+				     const time_t *creation_time,
+				     uint32_t major,
+				     uint32_t minor,
+				     bool session_name_contains_creation_timestamp);
 struct relay_session *session_get_by_id(uint64_t id);
 bool session_get(struct relay_session *session);
 void session_put(struct relay_session *session);