projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build failure with -fno-common
[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 8a884ab6bf68d3b5d8cbc04cfcbfdcf609f70388..151e23fb6eb60089df712efcc51eacba017283af 100644
(file)
--- a/
tests/regression/tools/live/live_test.c
+++ b/
tests/regression/tools/live/live_test.c
@@
-51,9
+51,6
@@
#define NUM_TESTS 11
#define mmap_size 524288
#define NUM_TESTS 11
#define mmap_size 524288
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
static int control_sock;
struct live_session *session;
static int control_sock;
struct live_session *session;
@@
-399,6
+396,7
@@
int get_metadata(void)
rq.stream_id = htobe64(session->streams[metadata_stream_id].id);
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");
ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
diag("Error sending cmd");
@@
-423,8
+421,8
@@
int get_metadata(void)
break;
case LTTNG_VIEWER_NO_NEW_METADATA:
diag("Got LTTNG_VIEWER_NO_NEW_METADATA:");
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;
case LTTNG_VIEWER_METADATA_ERR:
diag("Got LTTNG_VIEWER_METADATA_ERR:");
goto error;
@@
-454,7
+452,7
@@
int get_metadata(void)
}
free(data);
ret = len;
}
free(data);
ret = len;
-end:
+
return ret;
error_free_data:
return ret;
error_free_data:
This page took
0.036673 seconds
and
5
git commands to generate.