X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.c;h=151e23fb6eb60089df712efcc51eacba017283af;hp=aa96fc6c3f7ec9ef5b93119bee5928309915324d;hb=44cdb3a261262ebabea3fb0cae9360ac05e66f2c;hpb=e22ba966d8a88a0d7ee447121b85b0c265504921

diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
index aa96fc6c3..151e23fb6 100644
--- a/tests/regression/tools/live/live_test.c
+++ b/tests/regression/tools/live/live_test.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
+#include <common/compat/time.h>
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -36,7 +36,6 @@
 #include <lttng/lttng.h>
 
 #include <urcu/list.h>
-#include <bin/lttng-sessiond/session.h>
 #include <common/common.h>
 
 #include <bin/lttng-relayd/lttng-viewer-abi.h>
@@ -52,9 +51,6 @@
 #define NUM_TESTS 11
 #define mmap_size 524288
 
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
 static int control_sock;
 struct live_session *session;
 
@@ -159,8 +155,8 @@ int establish_connection(void)
 	ssize_t ret_len;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
-	cmd.data_size = sizeof(connect);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(connect));
+	cmd.cmd_version = htobe32(0);
 
 	memset(&connect, 0, sizeof(connect));
 	connect.major = htobe32(VERSION_MAJOR);
@@ -206,8 +202,8 @@ int list_sessions(uint64_t *session_id)
 	int first_session = 0;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
-	cmd.data_size = 0;
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(0);
+	cmd.cmd_version = htobe32(0);
 
 	ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
@@ -250,8 +246,8 @@ int create_viewer_session(void)
 	ssize_t ret_len;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
-	cmd.data_size = 0;
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(0);
+	cmd.cmd_version = htobe32(0);
 
 	ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
@@ -296,8 +292,8 @@ int attach_session(uint64_t id)
 	}
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
-	cmd.data_size = sizeof(rq);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(rq));
+	cmd.cmd_version = htobe32(0);
 
 	memset(&rq, 0, sizeof(rq));
 	rq.session_id = htobe64(id);
@@ -383,8 +379,8 @@ int get_metadata(void)
 	int metadata_stream_id = -1;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
-	cmd.data_size = sizeof(rq);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(rq));
+	cmd.cmd_version = htobe32(0);
 
 	for (i = 0; i < session->stream_count; i++) {
 		if (session->streams[i].metadata_flag) {
@@ -400,6 +396,7 @@ int get_metadata(void)
 
 	rq.stream_id = htobe64(session->streams[metadata_stream_id].id);
 
+retry:
 	ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		diag("Error sending cmd");
@@ -424,8 +421,8 @@ int get_metadata(void)
 		break;
 	case LTTNG_VIEWER_NO_NEW_METADATA:
 		diag("Got LTTNG_VIEWER_NO_NEW_METADATA:");
-		ret = 0;
-		goto end;
+		usleep(50);
+		goto retry;
 	case LTTNG_VIEWER_METADATA_ERR:
 		diag("Got LTTNG_VIEWER_METADATA_ERR:");
 		goto error;
@@ -455,7 +452,7 @@ int get_metadata(void)
 	}
 	free(data);
 	ret = len;
-end:
+
 	return ret;
 
 error_free_data:
@@ -473,8 +470,8 @@ int get_next_index(void)
 	int id;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
-	cmd.data_size = sizeof(rq);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(rq));
+	cmd.cmd_version = htobe32(0);
 
 	for (id = 0; id < session->stream_count; id++) {
 		if (session->streams[id].metadata_flag) {
@@ -556,8 +553,8 @@ int get_data_packet(int id, uint64_t offset,
 	ssize_t ret_len;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
-	cmd.data_size = sizeof(rq);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(rq));
+	cmd.cmd_version = htobe32(0);
 
 	memset(&rq, 0, sizeof(rq));
 	rq.stream_id = htobe64(session->streams[id].id);
@@ -638,8 +635,8 @@ int detach_viewer_session(uint64_t id)
 	ssize_t ret_len;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_DETACH_SESSION);
-	cmd.data_size = sizeof(rq);
-	cmd.cmd_version = 0;
+	cmd.data_size = htobe64(sizeof(rq));
+	cmd.cmd_version = htobe32(0);
 
 	memset(&rq, 0, sizeof(rq));
 	rq.session_id = htobe64(id);
@@ -694,6 +691,9 @@ int main(int argc, char **argv)
 
 	ret = list_sessions(&session_id);
 	ok(ret > 0, "List sessions : %d session(s)", ret);
+	if (ret < 0) {
+		goto end;
+	}
 
 	ret = create_viewer_session();
 	ok(ret == 0, "Create viewer session");
@@ -722,6 +722,6 @@ int main(int argc, char **argv)
 
 	ret = attach_session(session_id);
 	ok(ret > 0, "Attach to session, %d streams received", ret);
-
+end:
 	return exit_status();
 }