#include <inttypes.h>
#include <fcntl.h>
#include <sys/mman.h>
+#include <poll.h>
#include <babeltrace/ctf/ctf-index.h>
#include <babeltrace/ctf/events-internal.h>
#include <formats/ctf/events-private.h>
+#include <babeltrace/compat/memstream.h>
+
#include "lttng-live.h"
#include "lttng-viewer-abi.h"
+#define ACTIVE_POLL_DELAY 100 /* ms */
+
/*
* Memory allocation zeroed
*/
static void add_traces(gpointer key, gpointer value, gpointer user_data);
static int del_traces(gpointer key, gpointer value, gpointer user_data);
static int get_new_metadata(struct lttng_live_ctx *ctx,
- struct lttng_live_viewer_stream *viewer_stream);
+ struct lttng_live_viewer_stream *viewer_stream,
+ char **metadata_buf);
+
+static
+ssize_t lttng_live_recv(int fd, void *buf, size_t len)
+{
+ ssize_t ret;
+ size_t copied = 0, to_copy = len;
+
+ do {
+ ret = recv(fd, buf + copied, to_copy, 0);
+ if (ret > 0) {
+ assert(ret <= to_copy);
+ copied += ret;
+ to_copy -= ret;
+ }
+ } while ((ret > 0 && to_copy > 0)
+ || (ret < 0 && errno == EINTR));
+ if (ret > 0)
+ ret = copied;
+ /* ret = 0 means orderly shutdown, ret < 0 is error. */
+ return ret;
+}
+
+static
+ssize_t lttng_live_send(int fd, const void *buf, size_t len)
+{
+ ssize_t ret;
+
+ do {
+ ret = send(fd, buf, len, MSG_NOSIGNAL);
+ } while (ret < 0 && errno == EINTR);
+ return ret;
+}
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
{
connect.minor = htobe32(LTTNG_LIVE_MINOR);
connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND);
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &connect, sizeof(connect), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &connect, sizeof(connect));
if (ret_len < 0) {
perror("[error] Error sending version");
ret = ret_len;
}
assert(ret_len == sizeof(connect));
- do {
- ret_len = recv(ctx->control_sock, &connect, sizeof(connect), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
cmd.data_size = 0;
cmd.cmd_version = 0;
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = recv(ctx->control_sock, &list, sizeof(list), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
sessions_count = be32toh(list.sessions_count);
for (i = 0; i < sessions_count; i++) {
- do {
- ret_len = recv(ctx->control_sock, &lsession, sizeof(lsession), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
return ret;
}
+static
+int open_metadata_fp_write(struct lttng_live_viewer_stream *stream,
+ char **metadata_buf, size_t *size)
+{
+ int ret = 0;
+
+ stream->metadata_fp_write =
+ babeltrace_open_memstream(metadata_buf, size);
+ if (!stream->metadata_fp_write) {
+ perror("Metadata open_memstream");
+ ret = -1;
+ }
+
+ return ret;
+}
+
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
{
struct lttng_viewer_cmd cmd;
// rq.seek = htobe32(LTTNG_VIEWER_SEEK_BEGINNING);
rq.seek = htobe32(LTTNG_VIEWER_SEEK_LAST);
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
if (ret_len < 0) {
perror("[error] Error sending attach request");
ret = ret_len;
}
assert(ret_len == sizeof(rq));
- do {
- ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
ctx->session->streams = g_new0(struct lttng_live_viewer_stream,
ctx->session->stream_count);
for (i = 0; i < be32toh(rp.streams_count); i++) {
- do {
- ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
ctx->session->streams[i].mmap_size = 0;
if (be32toh(stream.metadata_flag)) {
- char *path;
-
- path = strdup(LTTNG_METADATA_PATH_TEMPLATE);
- if (!path) {
- perror("strdup");
- ret = -1;
- goto error;
- }
- if (!mkdtemp(path)) {
- perror("mkdtemp");
- free(path);
- ret = -1;
- goto error;
- }
ctx->session->streams[i].metadata_flag = 1;
- snprintf(ctx->session->streams[i].path,
- sizeof(ctx->session->streams[i].path),
- "%s/%s", path,
- stream.channel_name);
- ret = open(ctx->session->streams[i].path,
- O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
- if (ret < 0) {
- perror("open");
- free(path);
- goto error;
- }
- ctx->session->streams[i].fd = ret;
- free(path);
}
ret = lttng_live_ctf_trace_assign(&ctx->session->streams[i],
be64toh(stream.ctf_trace_id));
return ret;
}
+static
+int append_metadata(struct lttng_live_ctx *ctx,
+ struct lttng_live_viewer_stream *viewer_stream)
+{
+ int ret;
+ struct lttng_live_viewer_stream *metadata;
+ char *metadata_buf = NULL;
+
+ printf_verbose("get_next_index: new metadata needed\n");
+ ret = get_new_metadata(ctx, viewer_stream, &metadata_buf);
+ if (ret < 0) {
+ free(metadata_buf);
+ goto error;
+ }
+
+ metadata = viewer_stream->ctf_trace->metadata_stream;
+ metadata->ctf_trace->metadata_fp =
+ babeltrace_fmemopen(metadata_buf,
+ metadata->metadata_len, "rb");
+ if (!metadata->ctf_trace->metadata_fp) {
+ perror("Metadata fmemopen");
+ free(metadata_buf);
+ ret = -1;
+ goto error;
+ }
+ ret = ctf_append_trace_metadata(
+ viewer_stream->ctf_trace->handle->td,
+ metadata->ctf_trace->metadata_fp);
+ if (ret != 0) {
+ fprintf(stderr, "[error] Appending metadata\n");
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
static
int get_data_packet(struct lttng_live_ctx *ctx,
struct ctf_stream_pos *pos,
ssize_t ret_len;
int ret;
+retry:
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
rq.offset = offset;
rq.len = htobe32(len);
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
}
assert(ret_len == sizeof(rq));
- do {
- ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
case LTTNG_VIEWER_GET_PACKET_ERR:
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
printf_verbose("get_data_packet: new metadata needed\n");
- ret = 0;
- goto end;
+ ret = append_metadata(ctx, stream);
+ if (ret)
+ goto error;
+ goto retry;
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
ret = ask_new_streams(ctx);
stream->mmap_size);
}
- do {
- ret_len = recv(ctx->control_sock,
- mmap_align_addr(pos->base_mma), len,
- MSG_WAITALL);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_recv(ctx->control_sock,
+ mmap_align_addr(pos->base_mma), len);
if (ret_len == 0) {
fprintf(stderr, "[error] Remote side has closed connection\n");
ret = -1;
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
}
assert(ret_len == sizeof(rq));
- do {
- ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
ret = -1;
goto error;
}
- do {
- ret_len = recv(ctx->control_sock, data, len, MSG_WAITALL);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
assert(ret_len == len);
do {
- ret_len = write(metadata_stream->fd, data, len);
+ ret_len = fwrite(data, 1, len,
+ metadata_stream->metadata_fp_write);
} 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;
}
assert(ret_len == len);
+ metadata_stream->metadata_len += len;
ret = len;
free(data);
*/
static
int get_new_metadata(struct lttng_live_ctx *ctx,
- struct lttng_live_viewer_stream *viewer_stream)
+ struct lttng_live_viewer_stream *viewer_stream,
+ char **metadata_buf)
{
int ret = 0;
struct lttng_live_viewer_stream *metadata_stream;
+ size_t size, len_read = 0;;
metadata_stream = viewer_stream->ctf_trace->metadata_stream;
+ if (!metadata_stream) {
+ fprintf(stderr, "[error] No metadata stream\n");
+ ret = -1;
+ goto error;
+ }
+ metadata_stream->metadata_len = 0;
+ ret = open_metadata_fp_write(metadata_stream, metadata_buf, &size);
+ if (ret < 0) {
+ goto error;
+ }
do {
/*
* 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");
+ metadata_stream->metadata_fp_write = NULL;
+error:
return ret;
}
rq.stream_id = htobe64(viewer_stream->id);
retry:
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
}
assert(ret_len == sizeof(rq));
- do {
- ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
index->events_discarded = be64toh(rp.events_discarded);
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
- printf_verbose("get_next_index: new metadata needed\n");
- ret = get_new_metadata(ctx, viewer_stream);
- if (ret < 0) {
+ ret = append_metadata(ctx, viewer_stream);
+ if (ret)
goto error;
- }
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
ret = ask_new_streams(ctx);
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");
viewer_stream->id = -1ULL;
- viewer_stream->fd = -1;
index->offset = EOF;
ctx->session->stream_count--;
break;
cmd.data_size = 0;
cmd.cmd_version = 0;
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = recv(ctx->control_sock, &resp, sizeof(resp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
new_mmap_stream->fd = -1;
bt_list_add(&new_mmap_stream->list, &mmap_list.head);
} else {
+ char *metadata_buf = NULL;
+
/* Get all possible metadata before starting */
- ret = get_new_metadata(ctx, stream);
- if (ret)
+ ret = get_new_metadata(ctx, stream, &metadata_buf);
+ if (ret) {
+ free(metadata_buf);
+ goto end_free;
+ }
+ if (!stream->metadata_len) {
+ fprintf(stderr, "[error] empty metadata\n");
+ ret = -1;
+ free(metadata_buf);
+ goto end_free;
+ }
+
+ trace->metadata_fp = babeltrace_fmemopen(metadata_buf,
+ stream->metadata_len, "rb");
+ if (!trace->metadata_fp) {
+ perror("Metadata fmemopen");
+ ret = -1;
+ free(metadata_buf);
goto end_free;
- trace->metadata_fp = fopen(stream->path, "r");
+ }
}
}
fprintf(stderr, "[error] Error adding trace\n");
goto end_free;
}
+ trace->metadata_stream->metadata_len = 0;
+
handle = (struct bt_trace_handle *) g_hash_table_lookup(
bt_ctx->trace_handles,
(gpointer) (unsigned long) ret);
memset(&rq, 0, sizeof(rq));
rq.session_id = htobe64(id);
- do {
- ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
- } while (ret_len < 0 && errno == EINTR);
+ ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
perror("[error] Error sending cmd");
ret = ret_len;
}
assert(ret_len == sizeof(cmd));
- do {
- ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
}
assert(ret_len == sizeof(rq));
- do {
- ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
ctx->session->streams = g_new0(struct lttng_live_viewer_stream,
ctx->session->stream_count);
for (i = 0; i < stream_count; i++) {
- do {
- ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
- } while (ret_len < 0 && errno == EINTR);
+ 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;
ctx->session->streams[i].mmap_size = 0;
if (be32toh(stream.metadata_flag)) {
- char *path;
-
- path = strdup(LTTNG_METADATA_PATH_TEMPLATE);
- if (!path) {
- perror("strdup");
- ret = -1;
- goto error;
- }
- if (!mkdtemp(path)) {
- perror("mkdtemp");
- free(path);
- ret = -1;
- goto error;
- }
ctx->session->streams[i].metadata_flag = 1;
- snprintf(ctx->session->streams[i].path,
- sizeof(ctx->session->streams[i].path),
- "%s/%s", path,
- stream.channel_name);
- ret = open(ctx->session->streams[i].path,
- O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
- if (ret < 0) {
- perror("open");
- free(path);
- goto error;
- }
- ctx->session->streams[i].fd = ret;
- free(path);
}
ret = lttng_live_ctf_trace_assign(&ctx->session->streams[i],
be64toh(stream.ctf_trace_id));
ret = ask_new_streams(ctx);
if (ret < 0)
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,
projects / babeltrace.git / blobdiff