Describe autotools/libtool/automake version dependency

[lttng-tools.git] / tests / test_sessions.c

diff --git a/tests/test_sessions.c b/tests/test_sessions.c
index 422c4160387575fff6e6929cf15685ceb9f8f393..3e45c21b669563846e41dbfd0e624496cf95b9df 100644 (file)
--- a/tests/test_sessions.c
+++ b/tests/test_sessions.c
@@ -25,7 +25,9 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "ltt-sessiond/session.h"
+#include <lttng-sessiond-comm.h>
+
+#include <lttng-sessiond/session.h>
 #include "utils.h"
 
 #define SESSION1 "test1"
@@ -116,8 +118,8 @@ static int create_one_session(char *name, char *path)
 {
        int ret;
 
-       ret = create_session(name, path);
-       if (ret >= 0) {
+       ret = session_create(name, path);
+       if (ret == LTTCOMM_OK) {
                /* Validate */
                ret = find_session_name(name);
                if (ret < 0) {
@@ -128,8 +130,8 @@ static int create_one_session(char *name, char *path)
                        /* Success */
                        return 0;
                }
-       } else if (ret < 0) {
-               if (ret == -EEXIST) {
+       } else {
+               if (ret == LTTCOMM_EXIST_SESS) {
                        printf("(session already exists) ");
                }
                return -1;
@@ -141,14 +143,18 @@ static int create_one_session(char *name, char *path)
 /*
  * Test deletion of 1 session
  */
-static int destroy_one_session(char *name)
+static int destroy_one_session(struct ltt_session *session)
 {
        int ret;
 
-       ret = destroy_session(name);
-       if (ret == 1) {
+       ret = session_destroy(session);
+
+       if (ret == LTTCOMM_OK) {
                /* Validate */
-               ret = find_session_name(name);
+               if (session == NULL) {
+                       return 0;
+               }
+               ret = find_session_name(session->name);
                if (ret < 0) {
                        /* Success, -1 means that the sesion is NOT found */
                        return 0;
@@ -156,11 +162,6 @@ static int destroy_one_session(char *name)
                        /* Fail */
                        return -1;
                }
-       } else if (ret < 0) {
-               if (ret == -EEXIST) {
-                       printf("(session already exists) ");
-               }
-               return -1;
        }
 
        return 0;
@@ -171,19 +172,19 @@ static int fuzzing_create_args(void)
        int ret;
 
        ret = create_one_session(NULL, NULL);
-       if (ret >= 0) {
+       if (ret > 0) {
                printf("Session created with (null),(null)\n");
                return -1;
        }
 
        ret = create_one_session(NULL, PATH1);
-       if (ret >= 0) {
+       if (ret > 0) {
                printf("Session created with (null), %s)\n", PATH1);
                return -1;
        }
 
        ret = create_one_session(SESSION1, NULL);
-       if (ret >= 0) {
+       if (ret > 0) {
                printf("Session created with %s, (null)\n", SESSION1);
                return -1;
        }
@@ -199,17 +200,11 @@ static int fuzzing_destroy_args(void)
        int ret;
 
        ret = destroy_one_session(NULL);
-       if (ret >= 0) {
+       if (ret > 0) {
                printf("Session destroyed with (null)\n");
                return -1;
        }
 
-       ret = destroy_one_session(OVERFLOW_SESSION_NAME);
-       if (ret >= 0) {
-               printf("Session destroyed with %s\n", OVERFLOW_SESSION_NAME);
-               return -1;
-       }
-
        /* Session list must be 0 */
        assert(!session_list->count);
 
@@ -250,7 +245,7 @@ int main(int argc, char **argv)
 
        printf("\nTesting Sessions:\n-----------\n");
 
-       session_list = get_session_list();
+       session_list = session_get_list();
        if (session_list == NULL) {
                return -1;
        }
@@ -263,22 +258,21 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Validating created session %s: ", SESSION1);
-       tmp = find_session_by_name(SESSION1);
+       tmp = session_find_by_name(SESSION1);
        if (tmp == NULL) {
                return -1;
        }
        /* Basic init session values */
        assert(tmp->kernel_session == NULL);
-       assert(tmp->ust_trace_count == 0);
        assert(strlen(tmp->path));
        assert(strlen(tmp->name));
-       lock_session(tmp);
-       unlock_session(tmp);
+       session_lock(tmp);
+       session_unlock(tmp);
 
        PRINT_OK();
 
        printf("Destroy 1 session %s: ", SESSION1);
-       ret = destroy_one_session(SESSION1);
+       ret = destroy_one_session(tmp);
        if (ret < 0) {
                return -1;
        }
@@ -322,7 +316,7 @@ int main(int argc, char **argv)
        printf("Destroying %d sessions: ", MAX_SESSIONS);
        for (i = 0; i < MAX_SESSIONS; i++) {
                cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
-                       ret = destroy_one_session(iter->name);
+                       ret = destroy_one_session(iter);
                        if (ret < 0) {
                                printf("session %d (name: %s) creation failed\n", i, iter->name);
                                return -1;