X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=a777b041428443fe856b4e7613920a377e7b494f;hb=d022620a4a3ce49862b49527c5e29d7ba6cce743;hp=17dc3544dbe55a4dac884b5af9f178e2f1c44991;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 17dc3544d..a777b0414 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,7 +55,7 @@ static struct ltt_session_list ltt_session_list = {
  * The caller MUST acquire the session list lock before.
  * Returns the unique identifier for the session.
  */
-static unsigned int add_session_list(struct ltt_session *ls)
+static uint64_t add_session_list(struct ltt_session *ls)
 {
 	assert(ls);
 
@@ -147,6 +148,7 @@ found:
  * Delete session from the session list and free the memory.
  *
  * Return -1 if no session is found.  On success, return 1;
+ * Should *NOT* be called with RCU read-side lock held.
  */
 int session_destroy(struct ltt_session *session)
 {
@@ -157,9 +159,8 @@ int session_destroy(struct ltt_session *session)
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
 
-	rcu_read_lock();
 	consumer_destroy_output(session->consumer);
-	rcu_read_unlock();
+	snapshot_destroy(&session->snapshot);
 	free(session);
 
 	return LTTNG_OK;
@@ -203,6 +204,12 @@ int session_create(char *name, uid_t uid, gid_t gid)
 	new_session->uid = uid;
 	new_session->gid = gid;
 
+	ret = snapshot_init(&new_session->snapshot);
+	if (ret < 0) {
+		ret = LTTNG_ERR_NOMEM;
+		goto error;
+	}
+
 	/* Add new session to the session list */
 	session_lock_list();
 	new_session->id = add_session_list(new_session);
@@ -213,8 +220,8 @@ int session_create(char *name, uid_t uid, gid_t gid)
 	 * up and, if valid, assign it to the session.
 	 */
 
-	DBG("Tracing session %s created with ID %u by UID %d GID %d", name,
-			new_session->id, new_session->uid, new_session->gid);
+	DBG("Tracing session %s created with ID %" PRIu64 " by UID %d GID %d",
+			name, new_session->id, new_session->uid, new_session->gid);
 
 	return LTTNG_OK;