Cleanup: Replace all perror() uses by the PERROR macro

[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 864f6702bebc7d3cabea7f20d8f7eea30e423465..e30c3915232e2de44bd7ba23d450129eeaa66f99 100644 (file)
--- a/tests/regression/tools/live/live_test.c
+++ b/tests/regression/tools/live/live_test.c
@@ -43,12 +43,14 @@
 #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;
@@ -91,7 +93,7 @@ int connect_viewer(char *hostname)
        }
 
        if ((control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-               perror("Socket");
+               PERROR("Socket");
                ret = -1;
                goto end;
        }
@@ -103,7 +105,7 @@ int connect_viewer(char *hostname)
 
        if (connect(control_sock, (struct sockaddr *) &server_addr,
                                sizeof(struct sockaddr)) == -1) {
-               perror("Connect");
+               PERROR("Connect");
                ret = -1;
                goto end;
        }
@@ -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;
@@ -376,7 +420,7 @@ int get_metadata(void)
 
        data = zmalloc(len);
        if (!data) {
-               perror("relay data zmalloc");
+               PERROR("relay data zmalloc");
                goto error;
        }
        do {
@@ -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);