From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 17 Jul 2012 23:34:37 +0000 (-0400)
Subject: Cleanup: rename session list count to "next_uuid"
X-Git-Tag: v2.1.0-rc1~75
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a24f7994321e1b114bf900b530604560786a9131;p=lttng-tools.git

Cleanup: rename session list count to "next_uuid"

Clearly explain that this is not a counter, but rather a unique
identifier.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index d30f4ab19..2181c0dd5 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -45,7 +45,7 @@
 static struct ltt_session_list ltt_session_list = {
 	.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
 	.lock = PTHREAD_MUTEX_INITIALIZER,
-	.count = 0,
+	.next_uuid = 0,
 };
 
 /*
@@ -57,15 +57,13 @@ static struct ltt_session_list ltt_session_list = {
 static unsigned int add_session_list(struct ltt_session *ls)
 {
 	cds_list_add(&ls->list, &ltt_session_list.head);
-	return ++ltt_session_list.count;
+	return ltt_session_list.next_uuid++;
 }
 
 /*
  * Delete a ltt_session structure to the global list.
  *
  * The caller MUST acquire the session list lock before.
- * The session list count CANNOT be decremented, as it is used as unique
- * identifier for the session in UST app hash table lookups.
  */
 static void del_session_list(struct ltt_session *ls)
 {
diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index ebb65bfd8..167ea9c05 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -31,19 +31,19 @@
  */
 struct ltt_session_list {
 	/*
-	 * This lock protects any read/write access to the list and count (which is
-	 * basically the list size). All public functions in session.c acquire this
-	 * lock and release it before returning. If none of those functions are
-	 * used, the lock MUST be acquired in order to iterate or/and do any
-	 * actions on that list.
+	 * This lock protects any read/write access to the list and
+	 * next_uuid. All public functions in session.c acquire this
+	 * lock and release it before returning. If none of those
+	 * functions are used, the lock MUST be acquired in order to
+	 * iterate or/and do any actions on that list.
 	 */
 	pthread_mutex_t lock;
 
 	/*
-	 * Number of element in the list. The session list lock MUST be acquired if
-	 * this counter is used when iterating over the session list.
+	 * Session unique ID generator. The session list lock MUST be
+	 * upon update and read of this counter.
 	 */
-	unsigned int count;
+	unsigned int next_uuid;
 
 	/* Linked list head */
 	struct cds_list_head head;