projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Add missing lttng_live_should_quit checks
[babeltrace.git]
/
formats
/
lttng-live
/
lttng-live-comm.c
diff --git
a/formats/lttng-live/lttng-live-comm.c
b/formats/lttng-live/lttng-live-comm.c
index 785f5f37022609a702cddf3341e20b32611d0d1c..9feb7185c76d0d1cdea4c1e5dfd79dc300849dbc 100644
(file)
--- a/
formats/lttng-live/lttng-live-comm.c
+++ b/
formats/lttng-live/lttng-live-comm.c
@@
-33,6
+33,7
@@
#include <inttypes.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <inttypes.h>
#include <fcntl.h>
#include <sys/mman.h>
+#include <poll.h>
#include <babeltrace/ctf/ctf-index.h>
#include <babeltrace/ctf/ctf-index.h>
@@
-54,6
+55,8
@@
#include "lttng-live.h"
#include "lttng-viewer-abi.h"
#include "lttng-live.h"
#include "lttng-viewer-abi.h"
+#define ACTIVE_POLL_DELAY 100 /* ms */
+
/*
* Memory allocation zeroed
*/
/*
* Memory allocation zeroed
*/
@@
-110,16
+113,21
@@
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
struct sockaddr_in server_addr;
int ret;
struct sockaddr_in server_addr;
int ret;
- host = gethostbyname(ctx->relay_hostname);
- if (!host) {
+ if (lttng_live_should_quit()) {
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+ host = gethostbyname(ctx->relay_hostname);
+ if (!host) {
+ fprintf(stderr, "[error] Cannot lookup hostname %s\n",
+ ctx->relay_hostname);
+ goto error;
+ }
+
if ((ctx->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
perror("Socket");
if ((ctx->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
perror("Socket");
- ret = -1;
- goto end;
+ goto error;
}
server_addr.sin_family = AF_INET;
}
server_addr.sin_family = AF_INET;
@@
-130,14
+138,17
@@
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
if (connect(ctx->control_sock, (struct sockaddr *) &server_addr,
sizeof(struct sockaddr)) == -1) {
perror("Connect");
if (connect(ctx->control_sock, (struct sockaddr *) &server_addr,
sizeof(struct sockaddr)) == -1) {
perror("Connect");
- ret = -1;
- goto end;
+ goto error;
}
ret = 0;
end:
return ret;
}
ret = 0;
end:
return ret;
+
+error:
+ fprintf(stderr, "[error] Connection failed\n");
+ return -1;
}
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
}
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
@@
-147,6
+158,11
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
int ret;
ssize_t ret_len;
int ret;
ssize_t ret_len;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
cmd.data_size = sizeof(connect);
cmd.cmd_version = 0;
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
cmd.data_size = sizeof(connect);
cmd.cmd_version = 0;
@@
-159,7
+175,6
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-167,7
+182,6
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
ret_len = lttng_live_send(ctx->control_sock, &connect, sizeof(connect));
if (ret_len < 0) {
perror("[error] Error sending version");
ret_len = lttng_live_send(ctx->control_sock, &connect, sizeof(connect));
if (ret_len < 0) {
perror("[error] Error sending version");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(connect));
goto error;
}
assert(ret_len == sizeof(connect));
@@
-175,12
+189,10
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
ret_len = lttng_live_recv(ctx->control_sock, &connect, sizeof(connect));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &connect, sizeof(connect));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving version");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving version");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(connect));
goto error;
}
assert(ret_len == sizeof(connect));
@@
-189,11
+201,13
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
be64toh(connect.viewer_session_id));
printf_verbose("Relayd version : %u.%u\n", be32toh(connect.major),
be32toh(connect.minor));
be64toh(connect.viewer_session_id));
printf_verbose("Relayd version : %u.%u\n", be32toh(connect.major),
be32toh(connect.minor));
-
ret = 0;
ret = 0;
+end:
+ return ret;
error:
error:
- return ret;
+ fprintf(stderr, "[error] Unable to establish connection\n");
+ return -1;
}
static
}
static
@@
-268,6
+282,11
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
uint64_t session_id;
GPtrArray *session_list = NULL;
uint64_t session_id;
GPtrArray *session_list = NULL;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
if (strlen(ctx->session_name) == 0) {
print_list = 1;
session_list = g_ptr_array_new();
if (strlen(ctx->session_name) == 0) {
print_list = 1;
session_list = g_ptr_array_new();
@@
-280,7
+299,6
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-288,12
+306,10
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
ret_len = lttng_live_recv(ctx->control_sock, &list, sizeof(list));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &list, sizeof(list));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving session list");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving session list");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(list));
goto error;
}
assert(ret_len == sizeof(list));
@@
-303,12
+319,10
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
ret_len = lttng_live_recv(ctx->control_sock, &lsession, sizeof(lsession));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &lsession, sizeof(lsession));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving session");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving session");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(lsession));
goto error;
}
assert(ret_len == sizeof(lsession));
@@
-339,11
+353,13
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
print_session_list(session_list, path);
free_session_list(session_list);
}
print_session_list(session_list, path);
free_session_list(session_list);
}
-
ret = 0;
ret = 0;
+end:
+ return ret;
error:
error:
- return ret;
+ fprintf(stderr, "[error] Unable to list sessions\n");
+ return -1;
}
int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
}
int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
@@
-396,6
+412,11
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
int ret, i;
ssize_t ret_len;
int ret, i;
ssize_t ret_len;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
@@
-409,7
+430,6
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-417,7
+437,6
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending attach request");
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending attach request");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rq));
goto error;
}
assert(ret_len == sizeof(rq));
@@
-425,12
+444,10
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving attach response");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving attach response");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rp));
goto error;
}
assert(ret_len == sizeof(rp));
@@
-443,25
+460,20
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
goto end;
case LTTNG_VIEWER_ATTACH_ALREADY:
fprintf(stderr, "[error] There is already a viewer attached to this session\n");
goto end;
case LTTNG_VIEWER_ATTACH_ALREADY:
fprintf(stderr, "[error] There is already a viewer attached to this session\n");
- ret = -1;
- goto end;
+ goto error;
case LTTNG_VIEWER_ATTACH_NOT_LIVE:
fprintf(stderr, "[error] Not a live session\n");
case LTTNG_VIEWER_ATTACH_NOT_LIVE:
fprintf(stderr, "[error] Not a live session\n");
- ret = -1;
- goto end;
+ goto error;
case LTTNG_VIEWER_ATTACH_SEEK_ERR:
fprintf(stderr, "[error] Wrong seek parameter\n");
case LTTNG_VIEWER_ATTACH_SEEK_ERR:
fprintf(stderr, "[error] Wrong seek parameter\n");
- ret = -1;
- goto end;
+ goto error;
default:
fprintf(stderr, "[error] Unknown attach return code %u\n",
be32toh(rp.status));
default:
fprintf(stderr, "[error] Unknown attach return code %u\n",
be32toh(rp.status));
- ret = -1;
- goto end;
+ goto error;
}
if (be32toh(rp.status) != LTTNG_VIEWER_ATTACH_OK) {
}
if (be32toh(rp.status) != LTTNG_VIEWER_ATTACH_OK) {
- ret = -1;
- goto end;
+ goto error;
}
ctx->session->stream_count += be32toh(rp.streams_count);
}
ctx->session->stream_count += be32toh(rp.streams_count);
@@
-482,12
+494,10
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving stream");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving stream");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(stream));
goto error;
}
assert(ret_len == sizeof(stream));
@@
-514,10
+524,11
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
}
ret = 0;
}
ret = 0;
-
end:
end:
-error:
return ret;
return ret;
+
+error:
+ return -1;
}
static
}
static
@@
-533,6
+544,9
@@
restart:
printf_verbose("Asking for new streams returns %d\n",
ret);
if (ret < 0) {
printf_verbose("Asking for new streams returns %d\n",
ret);
if (ret < 0) {
+ if (lttng_live_should_quit()) {
+ goto end;
+ }
if (ret == -LTTNG_VIEWER_NEW_STREAMS_HUP) {
printf_verbose("Session %" PRIu64 " closed\n",
id);
if (ret == -LTTNG_VIEWER_NEW_STREAMS_HUP) {
printf_verbose("Session %" PRIu64 " closed\n",
id);
@@
-586,10
+600,12
@@
int append_metadata(struct lttng_live_ctx *ctx,
ret = ctf_append_trace_metadata(
viewer_stream->ctf_trace->handle->td,
metadata->ctf_trace->metadata_fp);
ret = ctf_append_trace_metadata(
viewer_stream->ctf_trace->handle->td,
metadata->ctf_trace->metadata_fp);
- if (ret != 0) {
+ /* We accept empty metadata packets */
+ if (ret != 0 && ret != -ENOENT) {
fprintf(stderr, "[error] Appending metadata\n");
goto error;
}
fprintf(stderr, "[error] Appending metadata\n");
goto error;
}
+ ret = 0;
error:
return ret;
error:
return ret;
@@
-608,20
+624,22
@@
int get_data_packet(struct lttng_live_ctx *ctx,
int ret;
retry:
int ret;
retry:
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(stream->id);
- /* Already in big endian. */
- rq.offset = offset;
+ rq.offset = htobe64(offset);
rq.len = htobe32(len);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
rq.len = htobe32(len);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-629,7
+647,6
@@
retry:
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_data_packet request");
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_data_packet request");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rq));
goto error;
}
assert(ret_len == sizeof(rq));
@@
-637,19
+654,16
@@
retry:
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving data response");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving data response");
- ret = ret_len;
goto error;
}
if (ret_len != sizeof(rp)) {
fprintf(stderr, "[error] get_data_packet: expected %" PRId64
goto error;
}
if (ret_len != sizeof(rp)) {
fprintf(stderr, "[error] get_data_packet: expected %" PRId64
- ", received %" PRId64 "\n", ret_len,
- sizeof(rp));
- ret = -1;
+ ", received %" PRId64 "\n", sizeof(rp),
+ ret_len);
goto error;
}
goto error;
}
@@
-662,40
+676,40
@@
retry:
"\n", len);
break;
case LTTNG_VIEWER_GET_PACKET_RETRY:
"\n", len);
break;
case LTTNG_VIEWER_GET_PACKET_RETRY:
+ /* Unimplemented by relay daemon */
printf_verbose("get_data_packet: retry\n");
printf_verbose("get_data_packet: retry\n");
- ret = -1;
- goto end;
+ goto error;
case LTTNG_VIEWER_GET_PACKET_ERR:
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
printf_verbose("get_data_packet: new metadata needed\n");
ret = append_metadata(ctx, stream);
if (ret)
goto error;
case LTTNG_VIEWER_GET_PACKET_ERR:
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
printf_verbose("get_data_packet: new metadata needed\n");
ret = append_metadata(ctx, stream);
if (ret)
goto error;
- goto retry;
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
+ printf_verbose("get_data_packet: new streams needed\n");
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
- g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
- ctx->bt_ctx);
+ g_hash_table_foreach(ctx->session->ctf_traces,
+ add_traces, ctx->bt_ctx);
+ }
+ if (rp.flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
+ | LTTNG_VIEWER_FLAG_NEW_STREAM)) {
+ goto retry;
}
fprintf(stderr, "[error] get_data_packet: error\n");
}
fprintf(stderr, "[error] get_data_packet: error\n");
- ret = -1;
- goto end;
+ goto error;
case LTTNG_VIEWER_GET_PACKET_EOF:
ret = -2;
case LTTNG_VIEWER_GET_PACKET_EOF:
ret = -2;
- goto e
rror
;
+ goto e
nd
;
default:
printf_verbose("get_data_packet: unknown\n");
default:
printf_verbose("get_data_packet: unknown\n");
- assert(0);
- ret = -1;
- goto end;
+ goto error;
}
}
- if (len <= 0) {
- ret = -1;
- goto end;
+ if (len == 0) {
+ goto error;
}
if (len > stream->mmap_size) {
}
if (len > stream->mmap_size) {
@@
-707,7
+721,6
@@
retry:
ret = munmap_align(pos->base_mma);
if (ret) {
perror("[error] Unable to unmap old base");
ret = munmap_align(pos->base_mma);
if (ret) {
perror("[error] Unable to unmap old base");
- ret = -1;
goto error;
}
pos->base_mma = NULL;
goto error;
}
pos->base_mma = NULL;
@@
-718,7
+731,6
@@
retry:
if (pos->base_mma == MAP_FAILED) {
perror("[error] mmap error");
pos->base_mma = NULL;
if (pos->base_mma == MAP_FAILED) {
perror("[error] mmap error");
pos->base_mma = NULL;
- ret = -1;
goto error;
}
goto error;
}
@@
-731,19
+743,19
@@
retry:
mmap_align_addr(pos->base_mma), len);
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
mmap_align_addr(pos->base_mma), len);
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving trace packet");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving trace packet");
- ret = ret_len;
goto error;
}
assert(ret_len == len);
goto error;
}
assert(ret_len == len);
-
+ ret = 0;
end:
end:
-error:
return ret;
return ret;
+
+error:
+ return -1;
}
static
}
static
@@
-758,6
+770,11
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
char *data = NULL;
ssize_t ret_len;
char *data = NULL;
ssize_t ret_len;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
cmd.data_size = sizeof(rq);
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
cmd.data_size = sizeof(rq);
@@
-766,7
+783,6
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-774,7
+790,6
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_metadata request");
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_metadata request");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rq));
goto error;
}
assert(ret_len == sizeof(rq));
@@
-782,12
+797,10
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving metadata response");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving metadata response");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rp));
goto error;
}
assert(ret_len == sizeof(rp));
@@
-802,39
+815,31
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
goto end;
case LTTNG_VIEWER_METADATA_ERR:
printf_verbose("get_metadata : ERR\n");
goto end;
case LTTNG_VIEWER_METADATA_ERR:
printf_verbose("get_metadata : ERR\n");
- ret = -1;
- goto end;
+ goto error;
default:
printf_verbose("get_metadata : UNKNOWN\n");
default:
printf_verbose("get_metadata : UNKNOWN\n");
- ret = -1;
- goto end;
+ goto error;
}
len = be64toh(rp.len);
printf_verbose("Writing %" PRIu64" bytes to metadata\n", len);
if (len <= 0) {
}
len = be64toh(rp.len);
printf_verbose("Writing %" PRIu64" bytes to metadata\n", len);
if (len <= 0) {
- ret = -1;
- goto end;
+ goto error;
}
data = zmalloc(len);
if (!data) {
perror("relay data zmalloc");
}
data = zmalloc(len);
if (!data) {
perror("relay data zmalloc");
- ret = -1;
goto error;
}
ret_len = lttng_live_recv(ctx->control_sock, data, len);
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
goto error;
}
ret_len = lttng_live_recv(ctx->control_sock, data, len);
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
- free(data);
- goto error;
+ goto error_free_data;
}
if (ret_len < 0) {
perror("[error] Error receiving trace packet");
}
if (ret_len < 0) {
perror("[error] Error receiving trace packet");
- ret = ret_len;
- free(data);
- goto error;
+ goto error_free_data;
}
assert(ret_len == len);
}
assert(ret_len == len);
@@
-844,19
+849,19
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
fprintf(stderr, "[error] Writing in the metadata fp\n");
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
fprintf(stderr, "[error] Writing in the metadata fp\n");
- free(data);
- ret = ret_len;
- goto error;
+ goto error_free_data;
}
assert(ret_len == len);
metadata_stream->metadata_len += len;
}
assert(ret_len == len);
metadata_stream->metadata_len += len;
+ free(data);
ret = len;
ret = len;
+end:
+ return ret;
+error_free_data:
free(data);
free(data);
-
-end:
error:
error:
- return
ret
;
+ return
-1
;
}
/*
}
/*
@@
-869,7
+874,7
@@
int get_new_metadata(struct lttng_live_ctx *ctx,
{
int ret = 0;
struct lttng_live_viewer_stream *metadata_stream;
{
int ret = 0;
struct lttng_live_viewer_stream *metadata_stream;
- size_t size;
+ size_t size
, len_read = 0;
;
metadata_stream = viewer_stream->ctf_trace->metadata_stream;
if (!metadata_stream) {
metadata_stream = viewer_stream->ctf_trace->metadata_stream;
if (!metadata_stream) {
@@
-890,7
+895,13
@@
int get_new_metadata(struct lttng_live_ctx *ctx,
* negative value on error.
*/
ret = get_one_metadata_packet(ctx, metadata_stream);
* negative value on error.
*/
ret = get_one_metadata_packet(ctx, metadata_stream);
- } while (ret > 0);
+ if (ret > 0) {
+ len_read += ret;
+ }
+ if (!len_read) {
+ (void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+ }
+ } while (ret > 0 || !len_read);
if (fclose(metadata_stream->metadata_fp_write))
perror("fclose");
if (fclose(metadata_stream->metadata_fp_write))
perror("fclose");
@@
-924,10
+935,13
@@
int get_next_index(struct lttng_live_ctx *ctx,
rq.stream_id = htobe64(viewer_stream->id);
retry:
rq.stream_id = htobe64(viewer_stream->id);
retry:
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-935,7
+949,6
@@
retry:
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_next_index request");
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_next_index request");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rq));
goto error;
}
assert(ret_len == sizeof(rq));
@@
-943,12
+956,10
@@
retry:
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving index response");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving index response");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rp));
goto error;
}
assert(ret_len == sizeof(rp));
@@
-980,13
+991,13
@@
retry:
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
- g_hash_table_foreach(ctx->session->ctf_traces,
add_traces,
- ctx->bt_ctx);
+ g_hash_table_foreach(ctx->session->ctf_traces,
+
add_traces,
ctx->bt_ctx);
}
break;
case LTTNG_VIEWER_INDEX_RETRY:
printf_verbose("get_next_index: retry\n");
}
break;
case LTTNG_VIEWER_INDEX_RETRY:
printf_verbose("get_next_index: retry\n");
-
sleep(1
);
+
(void) poll(NULL, 0, ACTIVE_POLL_DELAY
);
goto retry;
case LTTNG_VIEWER_INDEX_HUP:
printf_verbose("get_next_index: stream hung up\n");
goto retry;
case LTTNG_VIEWER_INDEX_HUP:
printf_verbose("get_next_index: stream hung up\n");
@@
-996,18
+1007,17
@@
retry:
break;
case LTTNG_VIEWER_INDEX_ERR:
fprintf(stderr, "[error] get_next_index: error\n");
break;
case LTTNG_VIEWER_INDEX_ERR:
fprintf(stderr, "[error] get_next_index: error\n");
- ret = -1;
goto error;
default:
fprintf(stderr, "[error] get_next_index: unkwown value\n");
goto error;
default:
fprintf(stderr, "[error] get_next_index: unkwown value\n");
- ret = -1;
goto error;
}
goto error;
}
-
ret = 0;
ret = 0;
+end:
+ return ret;
error:
error:
- return
ret
;
+ return
-1
;
}
static
}
static
@@
-1058,7
+1068,9
@@
retry:
ret = get_next_index(session->ctx, viewer_stream, cur_index);
if (ret < 0) {
pos->offset = EOF;
ret = get_next_index(session->ctx, viewer_stream, cur_index);
if (ret < 0) {
pos->offset = EOF;
- fprintf(stderr, "[error] get_next_index failed\n");
+ if (!lttng_live_should_quit()) {
+ fprintf(stderr, "[error] get_next_index failed\n");
+ }
return;
}
return;
}
@@
-1102,13
+1114,15
@@
retry:
printf_verbose("get_data_packet for stream %" PRIu64 "\n",
viewer_stream->id);
ret = get_data_packet(session->ctx, pos, viewer_stream,
printf_verbose("get_data_packet for stream %" PRIu64 "\n",
viewer_stream->id);
ret = get_data_packet(session->ctx, pos, viewer_stream,
-
be64toh(cur_index->offset)
,
+
cur_index->offset
,
cur_index->packet_size / CHAR_BIT);
if (ret == -2) {
goto retry;
} else if (ret < 0) {
pos->offset = EOF;
cur_index->packet_size / CHAR_BIT);
if (ret == -2) {
goto retry;
} else if (ret < 0) {
pos->offset = EOF;
- fprintf(stderr, "[error] get_data_packet failed\n");
+ if (!lttng_live_should_quit()) {
+ fprintf(stderr, "[error] get_data_packet failed\n");
+ }
return;
}
return;
}
@@
-1151,6
+1165,11
@@
int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
int ret;
ssize_t ret_len;
int ret;
ssize_t ret_len;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
cmd.data_size = 0;
cmd.cmd_version = 0;
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
cmd.data_size = 0;
cmd.cmd_version = 0;
@@
-1158,7
+1177,6
@@
int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-1166,25
+1184,24
@@
int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
ret_len = lttng_live_recv(ctx->control_sock, &resp, sizeof(resp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &resp, sizeof(resp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving create session reply");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving create session reply");
- 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");
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;
goto error;
}
ret = 0;
+end:
+ return ret;
error:
error:
- return
ret
;
+ return
-1
;
}
static
}
static
@@
-1308,6
+1325,11
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
ssize_t ret_len;
uint32_t stream_count;
ssize_t ret_len;
uint32_t stream_count;
+ if (lttng_live_should_quit()) {
+ ret = -1;
+ goto end;
+ }
+
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
@@
-1318,7
+1340,6
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(cmd));
goto error;
}
assert(ret_len == sizeof(cmd));
@@
-1326,7
+1347,6
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_new_streams request");
ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending get_new_streams request");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rq));
goto error;
}
assert(ret_len == sizeof(rq));
@@
-1334,12
+1354,10
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving get_new_streams response");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving get_new_streams response");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(rp));
goto error;
}
assert(ret_len == sizeof(rp));
@@
-1355,13
+1373,11
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
goto end;
case LTTNG_VIEWER_NEW_STREAMS_ERR:
fprintf(stderr, "[error] get_new_streams error\n");
goto end;
case LTTNG_VIEWER_NEW_STREAMS_ERR:
fprintf(stderr, "[error] get_new_streams error\n");
- ret = -1;
- goto end;
+ goto error;
default:
fprintf(stderr, "[error] Unknown return code %u\n",
be32toh(rp.status));
default:
fprintf(stderr, "[error] Unknown return code %u\n",
be32toh(rp.status));
- ret = -1;
- goto end;
+ goto error;
}
stream_count = be32toh(rp.streams_count);
}
stream_count = be32toh(rp.streams_count);
@@
-1383,12
+1399,10
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
- ret = -1;
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving stream");
goto error;
}
if (ret_len < 0) {
perror("[error] Error receiving stream");
- ret = ret_len;
goto error;
}
assert(ret_len == sizeof(stream));
goto error;
}
assert(ret_len == sizeof(stream));
@@
-1415,15
+1429,17
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
}
ret = 0;
}
ret = 0;
-
end:
end:
-error:
return ret;
return ret;
+
+error:
+ return -1;
}
}
-
void
lttng_live_read(struct lttng_live_ctx *ctx)
+
int
lttng_live_read(struct lttng_live_ctx *ctx)
{
{
- int ret, i;
+ int ret = -1;
+ int i;
struct bt_ctf_iter *iter;
const struct bt_ctf_event *event;
struct bt_iter_pos begin_pos;
struct bt_ctf_iter *iter;
const struct bt_ctf_event *event;
struct bt_iter_pos begin_pos;
@@
-1452,8
+1468,9
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
- if (!sout->parent.event_cb)
+ if (!sout->parent.event_cb)
{
goto end_free;
goto end_free;
+ }
ret = lttng_live_create_viewer_session(ctx);
if (ret < 0) {
ret = lttng_live_create_viewer_session(ctx);
if (ret < 0) {
@@
-1479,12
+1496,24
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
for (;;) {
int flags;
for (;;) {
int flags;
+ if (lttng_live_should_quit()) {
+ ret = 0;
+ goto end_free;
+ }
+
while (!ctx->session->stream_count) {
while (!ctx->session->stream_count) {
- if (ctx->session_ids->len == 0)
+ if (lttng_live_should_quit()
+ || ctx->session_ids->len == 0) {
+ ret = 0;
goto end_free;
goto end_free;
+ }
ret = ask_new_streams(ctx);
ret = ask_new_streams(ctx);
- if (ret < 0)
+ if (ret < 0)
{
goto end_free;
goto end_free;
+ }
+ if (!ctx->session->stream_count) {
+ (void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+ }
}
g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
}
g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
@@
-1493,10
+1522,18
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
begin_pos.type = BT_SEEK_BEGIN;
iter = bt_ctf_iter_create(ctx->bt_ctx, &begin_pos, NULL);
if (!iter) {
begin_pos.type = BT_SEEK_BEGIN;
iter = bt_ctf_iter_create(ctx->bt_ctx, &begin_pos, NULL);
if (!iter) {
+ if (lttng_live_should_quit()) {
+ ret = 0;
+ goto end;
+ }
fprintf(stderr, "[error] Iterator creation error\n");
goto end;
}
for (;;) {
fprintf(stderr, "[error] Iterator creation error\n");
goto end;
}
for (;;) {
+ if (lttng_live_should_quit()) {
+ ret = 0;
+ goto end_free;
+ }
event = bt_ctf_iter_read_event_flags(iter, &flags);
if (!(flags & BT_ITER_FLAG_RETRY)) {
if (!event) {
event = bt_ctf_iter_read_event_flags(iter, &flags);
if (!(flags & BT_ITER_FLAG_RETRY)) {
if (!event) {
@@
-1525,5
+1562,8
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
end_free:
bt_context_put(ctx->bt_ctx);
end:
end_free:
bt_context_put(ctx->bt_ctx);
end:
- return;
+ if (lttng_live_should_quit()) {
+ ret = 0;
+ }
+ return ret;
}
}
This page took
0.035353 seconds
and
4
git commands to generate.