Backported to glibc 2.8

[lttng-tools.git] / tests / regression / tools / live / live_test.c

diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
index 2482e50048610aa8b4c2ee45da5b939e24232993..d2c9050f615fe6e3f04a4935afca7798e45f1de6 100644 (file)
--- a/tests/regression/tools/live/live_test.c
+++ b/tests/regression/tools/live/live_test.c
@@ -40,15 +40,17 @@
 #include <bin/lttng-sessiond/session.h>
 #include <common/common.h>
 
-#include <bin/lttng-relayd/lttng-viewer.h>
-#include <common/index/lttng-index.h>
+#include <bin/lttng-relayd/lttng-viewer-abi.h>
+#include <common/index/ctf-index.h>
+
+#include <common/compat/endian.h>
 
 #define SESSION1 "test1"
 #define RELAYD_URL "net://localhost"
 #define LIVE_TIMER 2000000
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 7
+#define NUM_TESTS 8
 #define mmap_size 524288
 
 int ust_consumerd32_fd;
@@ -125,14 +127,14 @@ int establish_connection(void)
        struct lttng_viewer_connect connect;
        int ret;
 
-       cmd.cmd = htobe32(VIEWER_CONNECT);
+       cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
        cmd.data_size = sizeof(connect);
        cmd.cmd_version = 0;
 
        memset(&connect, 0, sizeof(connect));
        connect.major = htobe32(VERSION_MAJOR);
        connect.minor = htobe32(VERSION_MINOR);
-       connect.type = htobe32(VIEWER_CLIENT_COMMAND);
+       connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND);
 
        do {
                ret = send(control_sock, &cmd, sizeof(cmd), 0);
@@ -173,7 +175,7 @@ int list_sessions(int *session_id)
        int i, ret;
        int first_session = 0;
 
-       cmd.cmd = htobe32(VIEWER_LIST_SESSIONS);
+       cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
        cmd.data_size = 0;
        cmd.cmd_version = 0;
 
@@ -213,6 +215,48 @@ error:
        return ret;
 }
 
+int create_viewer_session()
+{
+       struct lttng_viewer_cmd cmd;
+       struct lttng_viewer_create_session_response resp;
+       int ret;
+       ssize_t ret_len;
+
+       cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
+       cmd.data_size = 0;
+       cmd.cmd_version = 0;
+
+       do {
+               ret_len = send(control_sock, &cmd, sizeof(cmd), 0);
+       } while (ret_len < 0 && errno == EINTR);
+       if (ret_len < 0) {
+               fprintf(stderr, "[error] Error sending cmd\n");
+               ret = ret_len;
+               goto error;
+       }
+       assert(ret_len == sizeof(cmd));
+
+       do {
+               ret_len = recv(control_sock, &resp, sizeof(resp), 0);
+       } while (ret_len < 0 && errno == EINTR);
+       if (ret_len < 0) {
+               fprintf(stderr, "[error] Error receiving create session reply\n");
+               ret = ret_len;
+               goto error;
+       }
+       assert(ret_len == sizeof(resp));
+
+       if (be32toh(resp.status) != LTTNG_VIEWER_CREATE_SESSION_OK) {
+               fprintf(stderr, "[error] Error creating viewer session\n");
+               ret = -1;
+               goto error;
+       }
+       ret = 0;
+
+error:
+       return ret;
+}
+
 int attach_session(int id)
 {
        struct lttng_viewer_cmd cmd;
@@ -227,13 +271,13 @@ int attach_session(int id)
                goto error;
        }
 
-       cmd.cmd = htobe32(VIEWER_ATTACH_SESSION);
+       cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
        cmd.data_size = sizeof(rq);
        cmd.cmd_version = 0;
 
        memset(&rq, 0, sizeof(rq));
        rq.session_id = htobe64(id);
-       rq.seek = htobe32(VIEWER_SEEK_BEGINNING);
+       rq.seek = htobe32(LTTNG_VIEWER_SEEK_BEGINNING);
 
        do {
                ret = send(control_sock, &cmd, sizeof(cmd), 0);
@@ -257,7 +301,7 @@ int attach_session(int id)
                fprintf(stderr, "Error receiving attach response\n");
                goto error;
        }
-       if (be32toh(rp.status) != VIEWER_ATTACH_OK) {
+       if (be32toh(rp.status) != LTTNG_VIEWER_ATTACH_OK) {
                ret = -1;
                goto end;
        }
@@ -312,7 +356,7 @@ int get_metadata(void)
        uint64_t len = 0;
        int metadata_stream_id = -1;
 
-       cmd.cmd = htobe32(VIEWER_GET_METADATA);
+       cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
        cmd.data_size = sizeof(rq);
        cmd.cmd_version = 0;
 
@@ -353,13 +397,13 @@ int get_metadata(void)
                goto error;
        }
        switch (be32toh(rp.status)) {
-               case VIEWER_METADATA_OK:
+               case LTTNG_VIEWER_METADATA_OK:
                        break;
-               case VIEWER_NO_NEW_METADATA:
+               case LTTNG_VIEWER_NO_NEW_METADATA:
                        fprintf(stderr, "NO NEW\n");
                        ret = -1;
                        goto end;
-               case VIEWER_METADATA_ERR:
+               case LTTNG_VIEWER_METADATA_ERR:
                        fprintf(stderr, "ERR\n");
                        ret = -1;
                        goto end;
@@ -403,7 +447,7 @@ int get_next_index(void)
        int ret;
        int id;
 
-       cmd.cmd = htobe32(VIEWER_GET_NEXT_INDEX);
+       cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
        cmd.data_size = sizeof(rq);
        cmd.cmd_version = 0;
 
@@ -439,20 +483,20 @@ retry:
                rp.flags = be32toh(rp.flags);
 
                switch (be32toh(rp.status)) {
-                       case VIEWER_INDEX_INACTIVE:
+                       case LTTNG_VIEWER_INDEX_INACTIVE:
                                fprintf(stderr, "(INACTIVE)\n");
                                break;
-                       case VIEWER_INDEX_OK:
+                       case LTTNG_VIEWER_INDEX_OK:
                                break;
-                       case VIEWER_INDEX_RETRY:
+                       case LTTNG_VIEWER_INDEX_RETRY:
                                sleep(1);
                                goto retry;
-                       case VIEWER_INDEX_HUP:
+                       case LTTNG_VIEWER_INDEX_HUP:
                                fprintf(stderr, "(HUP)\n");
                                session->streams[id].id = -1ULL;
                                session->streams[id].fd = -1;
                                break;
-                       case VIEWER_INDEX_ERR:
+                       case LTTNG_VIEWER_INDEX_ERR:
                                fprintf(stderr, "(ERR)\n");
                                ret = -1;
                                goto error;
@@ -482,7 +526,7 @@ int get_data_packet(int id, uint64_t offset,
        struct lttng_viewer_trace_packet rp;
        int ret;
 
-       cmd.cmd = htobe32(VIEWER_GET_PACKET);
+       cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
        cmd.data_size = sizeof(rq);
        cmd.cmd_version = 0;
 
@@ -515,13 +559,13 @@ int get_data_packet(int id, uint64_t offset,
        rp.flags = be32toh(rp.flags);
 
        switch (be32toh(rp.status)) {
-       case VIEWER_GET_PACKET_OK:
+       case LTTNG_VIEWER_GET_PACKET_OK:
                break;
-       case VIEWER_GET_PACKET_RETRY:
+       case LTTNG_VIEWER_GET_PACKET_RETRY:
                fprintf(stderr, "RETRY\n");
                ret = -1;
                goto end;
-       case VIEWER_GET_PACKET_ERR:
+       case LTTNG_VIEWER_GET_PACKET_ERR:
                if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
                        fprintf(stderr, "NEW_METADATA\n");
                        ret = 0;
@@ -580,6 +624,9 @@ int main(int argc, char **argv)
        ret = list_sessions(&session_id);
        ok(ret > 0, "List sessions : %d session(s)", ret);
 
+       ret = create_viewer_session();
+       ok(ret == 0, "Create viewer session");
+
        ret = attach_session(session_id);
        ok(ret > 0, "Attach to session, %d streams received", ret);