#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>
#define NUM_TESTS 11
#define mmap_size 524288
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
static int control_sock;
struct live_session *session;
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");
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;
}
free(data);
ret = len;
-end:
+
return ret;
error_free_data:
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");
ret = attach_session(session_id);
ok(ret > 0, "Attach to session, %d streams received", ret);
-
+end:
return exit_status();
}