X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_sessions.c;h=c7dd32036655f4203619ebd735ef620d16dad40a;hb=refs%2Fheads%2Fcygwin-2.0-experimental;hp=5faf64f27f7d60ea27176a6da17ed4d1808a60b6;hpb=e6dd5671bbf33f7f939fe48880d9c2ccb9030742;p=lttng-tools.git

diff --git a/tests/test_sessions.c b/tests/test_sessions.c
index 5faf64f27..c7dd32036 100644
--- a/tests/test_sessions.c
+++ b/tests/test_sessions.c
@@ -55,8 +55,8 @@
 static struct ltt_session_list *session_list;
 
 /* For lttngerr.h */
-int opt_quiet = 1;
-int opt_verbose = 0;
+int lttng_opt_quiet = 1;
+int lttng_opt_verbose = 0;
 
 static const char alphanum[] =
 	"0123456789"
@@ -97,6 +97,17 @@ static int find_session_name(char *name)
 	return -1;
 }
 
+static int session_list_count(void)
+{
+	int count = 0;
+	struct ltt_session *iter;
+
+	cds_list_for_each_entry(iter, &session_list->head, list) {
+		count++;
+	}
+	return count;
+}
+
 /*
  * Empty session list manually.
  */
@@ -106,12 +117,11 @@ static void empty_session_list(void)
 
 	cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
 		cds_list_del(&iter->list);
-		session_list->count--;
 		free(iter);
 	}
 
 	/* Session list must be 0 */
-	assert(!session_list->count);
+	assert(!session_list_count());
 }
 
 /*
@@ -193,7 +203,7 @@ static int fuzzing_create_args(void)
 	}
 
 	/* Session list must be 0 */
-	assert(!session_list->count);
+	assert(!session_list_count());
 
 	return 0;
 }
@@ -209,7 +219,7 @@ static int fuzzing_destroy_args(void)
 	}
 
 	/* Session list must be 0 */
-	assert(!session_list->count);
+	assert(!session_list_count());
 
 	return 0;
 }
@@ -319,6 +329,11 @@ int main(int argc, char **argv)
 			printf("session %d (name: %s) creation failed\n", i, tmp_name);
 			return -1;
 		}
+
+		if ((i % 1000) == 0) {
+			fprintf(stdout, "%d..", i);
+			fflush(stdout);
+		}
 	}
 	PRINT_OK();
 
@@ -336,7 +351,7 @@ int main(int argc, char **argv)
 	PRINT_OK();
 
 	/* Session list must be 0 */
-	assert(!session_list->count);
+	assert(!session_list_count());
 
 	/* Success */
 	return 0;