X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.c;h=4c56deece91321b8d07db210665481acbb46269b;hp=8a884ab6bf68d3b5d8cbc04cfcbfdcf609f70388;hb=edf4b93e2f5c849cbec49e987990b3705ea49f6a;hpb=8674c9bffaabd99472c684286b8da9e0d01517f7

diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
index 8a884ab6b..4c56deece 100644
--- a/tests/regression/tools/live/live_test.c
+++ b/tests/regression/tools/live/live_test.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (c) - 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by as
- * published by the Free Software Foundation; only version 2 of the License.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +30,7 @@
 #include <bin/lttng-relayd/lttng-viewer-abi.h>
 #include <common/index/ctf-index.h>
 
+#include <common/compat/errno.h>
 #include <common/compat/endian.h>
 
 #define SESSION1 "test1"
@@ -51,9 +41,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;
 
@@ -110,7 +97,7 @@ ssize_t lttng_live_send(int fd, const void *buf, size_t len)
 }
 
 static
-int connect_viewer(char *hostname)
+int connect_viewer(const char *hostname)
 {
 	struct hostent *host;
 	struct sockaddr_in server_addr;
@@ -151,6 +138,7 @@ end:
 	return ret;
 }
 
+static
 int establish_connection(void)
 {
 	struct lttng_viewer_cmd cmd;
@@ -195,6 +183,7 @@ error:
 /*
  * Returns the number of sessions, should be 1 during the unit test.
  */
+static
 int list_sessions(uint64_t *session_id)
 {
 	struct lttng_viewer_cmd cmd;
@@ -242,6 +231,7 @@ error:
 	return -1;
 }
 
+static
 int create_viewer_session(void)
 {
 	struct lttng_viewer_cmd cmd;
@@ -280,6 +270,7 @@ error:
 	return -1;
 }
 
+static
 int attach_session(uint64_t id)
 {
 	struct lttng_viewer_cmd cmd;
@@ -369,6 +360,7 @@ error:
 	return -1;
 }
 
+static
 int get_metadata(void)
 {
 	struct lttng_viewer_cmd cmd;
@@ -399,6 +391,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");
@@ -423,8 +416,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;
@@ -454,7 +447,7 @@ int get_metadata(void)
 	}
 	free(data);
 	ret = len;
-end:
+
 	return ret;
 
 error_free_data:
@@ -463,6 +456,7 @@ error:
 	return -1;
 }
 
+static
 int get_next_index(void)
 {
 	struct lttng_viewer_cmd cmd;
@@ -628,6 +622,7 @@ error:
 	return -1;
 }
 
+static
 int detach_viewer_session(uint64_t id)
 {
 	struct lttng_viewer_cmd cmd;