size_t index, int whence);
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);
int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
{
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &connect, sizeof(connect), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending version\n");
+ perror("[error] Error sending version");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &connect, sizeof(connect), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving version\n");
+ perror("[error] Error receiving version");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &list, sizeof(list), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving session list\n");
+ perror("[error] Error receiving session list");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &lsession, sizeof(lsession), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving session\n");
+ perror("[error] Error receiving session");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending attach request\n");
+ perror("[error] Error sending attach request");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving attach response\n");
+ perror("[error] Error receiving attach response");
ret = ret_len;
goto error;
}
ret = -LTTNG_VIEWER_ATTACH_UNK;
goto end;
case LTTNG_VIEWER_ATTACH_ALREADY:
- fprintf(stderr, "[error] Already a viewer attached\n");
+ fprintf(stderr, "[error] There is already a viewer attached to this session\n");
ret = -1;
goto end;
case LTTNG_VIEWER_ATTACH_NOT_LIVE:
do {
ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving stream\n");
+ perror("[error] Error receiving stream");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending get_data_packet request\n");
+ perror("[error] Error sending get_data_packet request");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving data response\n");
+ perror("[error] Error receiving data response");
ret = ret_len;
goto error;
}
/* unmap old base */
ret = munmap_align(pos->base_mma);
if (ret) {
- fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
- strerror(errno));
+ perror("[error] Unable to unmap old base");
ret = -1;
goto error;
}
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (pos->base_mma == MAP_FAILED) {
- fprintf(stderr, "[error] mmap error %s.\n",
- strerror(errno));
+ perror("[error] mmap error");
pos->base_mma = NULL;
ret = -1;
goto error;
mmap_align_addr(pos->base_mma), len,
MSG_WAITALL);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving trace packet\n");
+ perror("[error] Error receiving trace packet");
ret = ret_len;
goto error;
}
return ret;
}
-/*
- * Return number of metadata bytes written or a negative value on error.
- */
static
-int get_new_metadata(struct lttng_live_ctx *ctx,
- struct lttng_live_viewer_stream *viewer_stream,
- uint64_t *metadata_len)
+int get_one_metadata_packet(struct lttng_live_ctx *ctx,
+ struct lttng_live_viewer_stream *metadata_stream)
{
uint64_t len = 0;
int ret;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_metadata rq;
struct lttng_viewer_metadata_packet rp;
- struct lttng_live_viewer_stream *metadata_stream;
char *data = NULL;
ssize_t ret_len;
+ rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
cmd.data_size = sizeof(rq);
cmd.cmd_version = 0;
- metadata_stream = viewer_stream->ctf_trace->metadata_stream;
- rq.stream_id = htobe64(metadata_stream->id);
-
do {
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending get_metadata request\n");
+ perror("[error] Error sending get_metadata request");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving metadata response\n");
+ perror("[error] Error receiving metadata response");
ret = ret_len;
goto error;
}
break;
case LTTNG_VIEWER_NO_NEW_METADATA:
printf_verbose("get_metadata : NO NEW\n");
- ret = -1;
+ ret = 0;
goto end;
case LTTNG_VIEWER_METADATA_ERR:
printf_verbose("get_metadata : ERR\n");
do {
ret_len = recv(ctx->control_sock, data, len, MSG_WAITALL);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ free(data);
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving trace packet\n");
+ perror("[error] Error receiving trace packet");
ret = ret_len;
free(data);
goto error;
goto error;
}
assert(ret_len == len);
+ ret = len;
free(data);
- *metadata_len = len;
- ret = 0;
end:
error:
return ret;
}
+/*
+ * Return 0 on success, a negative value on error.
+ */
+static
+int get_new_metadata(struct lttng_live_ctx *ctx,
+ struct lttng_live_viewer_stream *viewer_stream)
+{
+ int ret = 0;
+ struct lttng_live_viewer_stream *metadata_stream;
+
+ metadata_stream = viewer_stream->ctf_trace->metadata_stream;
+
+ do {
+ /*
+ * get_one_metadata_packet returns the number of bytes
+ * received, 0 when we have received everything, a
+ * negative value on error.
+ */
+ ret = get_one_metadata_packet(ctx, metadata_stream);
+ } while (ret > 0);
+
+ return ret;
+}
+
/*
* Get one index for a stream.
*
struct lttng_viewer_get_next_index rq;
struct lttng_viewer_index rp;
int ret;
- uint64_t metadata_len;
ssize_t ret_len;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending get_next_index request\n");
+ perror("[error] Error sending get_next_index request");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving index response\n");
+ perror("[error] Error receiving index response");
ret = ret_len;
goto error;
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
printf_verbose("get_next_index: new metadata needed\n");
- ret = get_new_metadata(ctx, viewer_stream,
- &metadata_len);
+ ret = get_new_metadata(ctx, viewer_stream);
if (ret < 0) {
goto error;
}
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &resp, sizeof(resp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving create session reply\n");
+ perror("[error] Error receiving create session reply");
ret = ret_len;
goto error;
}
static
void add_traces(gpointer key, gpointer value, gpointer user_data)
{
- int i, ret, total_metadata = 0;
- uint64_t metadata_len;
+ int i, ret;
struct bt_context *bt_ctx = user_data;
struct lttng_live_ctf_trace *trace = value;
struct lttng_live_viewer_stream *stream;
struct bt_mmap_stream *new_mmap_stream;
struct bt_mmap_stream_list mmap_list;
struct lttng_live_ctx *ctx = NULL;
+ struct bt_trace_descriptor *td;
+ struct bt_trace_handle *handle;
/*
* We don't know how many streams we will receive for a trace, so
bt_list_add(&new_mmap_stream->list, &mmap_list.head);
} else {
/* Get all possible metadata before starting */
- do {
- ret = get_new_metadata(ctx, stream,
- &metadata_len);
- if (ret == 0) {
- total_metadata += metadata_len;
- }
- } while (ret == 0 || total_metadata == 0);
+ ret = get_new_metadata(ctx, stream);
+ if (ret)
+ goto end_free;
trace->metadata_fp = fopen(stream->path, "r");
}
}
fprintf(stderr, "[error] Error adding trace\n");
goto end_free;
}
-
+ handle = (struct bt_trace_handle *) g_hash_table_lookup(
+ bt_ctx->trace_handles,
+ (gpointer) (unsigned long) ret);
+ td = handle->td;
+ trace->handle = handle;
if (bt_ctx->current_iterator) {
- struct bt_trace_descriptor *td;
- struct bt_trace_handle *handle;
-
- handle = (struct bt_trace_handle *) g_hash_table_lookup(
- bt_ctx->trace_handles,
- (gpointer) (unsigned long) ret);
- td = handle->td;
bt_iter_add_trace(bt_ctx->current_iterator, td);
}
ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending cmd\n");
+ perror("[error] Error sending cmd");
ret = ret_len;
goto error;
}
ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- fprintf(stderr, "[error] Error sending get_new_streams request\n");
+ perror("[error] Error sending get_new_streams request");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving get_new_streams response\n");
+ perror("[error] Error receiving get_new_streams response");
ret = ret_len;
goto error;
}
do {
ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
} while (ret_len < 0 && errno == EINTR);
+ if (ret_len == 0) {
+ fprintf(stderr, "[error] Remote side has closed connection\n");
+ ret = -1;
+ goto error;
+ }
if (ret_len < 0) {
- fprintf(stderr, "[error] Error receiving stream\n");
+ perror("[error] Error receiving stream");
ret = ret_len;
goto error;
}
projects / babeltrace.git / blobdiff