X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-functions.c;h=375a05edeafd52b468a4f1b61709641eb7f99ec5;hp=34612cf7b59f4e2fc5bca704a962d602b313fdc5;hb=992e8cc0c6bf7403301ceeddee347fade28449f2;hpb=4a74436710b248274ffe9e038da0bd41af8a3d8d diff --git a/formats/lttng-live/lttng-live-functions.c b/formats/lttng-live/lttng-live-functions.c index 34612cf7..375a05ed 100644 --- a/formats/lttng-live/lttng-live-functions.c +++ b/formats/lttng-live/lttng-live-functions.c @@ -110,6 +110,7 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx) cmd.data_size = sizeof(connect); cmd.cmd_version = 0; + connect.viewer_session_id = -1ULL; /* will be set on recv */ connect.major = htobe32(LTTNG_LIVE_MAJOR); connect.minor = htobe32(LTTNG_LIVE_MINOR); connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND); @@ -201,6 +202,8 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path) goto error; } assert(ret_len == sizeof(lsession)); + lsession.hostname[LTTNG_VIEWER_HOST_NAME_MAX - 1] = '\0'; + lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0'; fprintf(stdout, "%s/%" PRIu64 " : %s on host %s (timer = %u, " "%u stream(s), %u client(s) connected)\n", @@ -227,11 +230,6 @@ int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream, (gpointer) ctf_trace_id); if (!trace) { trace = g_new0(struct lttng_live_ctf_trace, 1); - if (!trace) { - ret = -1; - fprintf(stderr, "[error] ctf_trace allocation\n"); - goto error; - } trace->ctf_trace_id = ctf_trace_id; trace->streams = g_ptr_array_new(); g_hash_table_insert(stream->session->ctf_traces, @@ -244,7 +242,6 @@ int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream, stream->ctf_trace = trace; g_ptr_array_add(trace->streams, stream); -error: return ret; } @@ -340,11 +337,6 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id) ctx->session->stream_count); ctx->session->streams = g_new0(struct lttng_live_viewer_stream, ctx->session->stream_count); - if (!ctx->session->streams) { - ret = -1; - goto error; - } - for (i = 0; i < be32toh(rp.streams_count); i++) { do { ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0); @@ -355,6 +347,8 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id) goto error; } assert(ret_len == sizeof(stream)); + stream.path_name[LTTNG_VIEWER_PATH_MAX - 1] = '\0'; + stream.channel_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0'; printf_verbose(" stream %" PRIu64 " : %s/%s\n", be64toh(stream.id), stream.path_name, @@ -369,9 +363,18 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id) char *path; path = strdup(LTTNG_METADATA_PATH_TEMPLATE); - path = mkdtemp(path); + 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; - mkdir(path, S_IRWXU | S_IRWXG); snprintf(ctx->session->streams[i].path, sizeof(ctx->session->streams[i].path), "%s/%s", path, @@ -380,9 +383,12 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id) 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)); @@ -448,7 +454,13 @@ int get_data_packet(struct lttng_live_ctx *ctx, ret = ret_len; goto error; } - assert(ret_len == sizeof(rp)); + if (ret_len != sizeof(rp)) { + fprintf(stderr, "[error] get_data_packet: expected %" PRId64 + ", received %" PRId64 "\n", ret_len, + sizeof(rp)); + ret = -1; + goto error; + } rp.flags = be32toh(rp.flags); @@ -710,7 +722,7 @@ retry: case LTTNG_VIEWER_INDEX_INACTIVE: printf_verbose("get_next_index: inactive\n"); memset(index, 0, sizeof(struct packet_index)); - index->timestamp_end = be64toh(rp.timestamp_end); + index->ts_cycles.timestamp_end = be64toh(rp.timestamp_end); break; case LTTNG_VIEWER_INDEX_OK: printf_verbose("get_next_index: Ok, need metadata update : %u\n", @@ -718,8 +730,8 @@ retry: index->offset = be64toh(rp.offset); index->packet_size = be64toh(rp.packet_size); index->content_size = be64toh(rp.content_size); - index->timestamp_begin = be64toh(rp.timestamp_begin); - index->timestamp_end = be64toh(rp.timestamp_end); + index->ts_cycles.timestamp_begin = be64toh(rp.timestamp_begin); + index->ts_cycles.timestamp_end = be64toh(rp.timestamp_end); index->events_discarded = be64toh(rp.events_discarded); if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) { @@ -791,13 +803,13 @@ retry: } if (packet_index.content_size == 0) { - file_stream->parent.cycles_timestamp = packet_index.timestamp_end; + file_stream->parent.cycles_timestamp = packet_index.ts_cycles.timestamp_end; file_stream->parent.real_timestamp = ctf_get_real_timestamp( - &file_stream->parent, packet_index.timestamp_end); + &file_stream->parent, packet_index.ts_cycles.timestamp_end); } else { - file_stream->parent.cycles_timestamp = packet_index.timestamp_begin; + file_stream->parent.cycles_timestamp = packet_index.ts_cycles.timestamp_begin; file_stream->parent.real_timestamp = ctf_get_real_timestamp( - &file_stream->parent, packet_index.timestamp_begin); + &file_stream->parent, packet_index.ts_cycles.timestamp_begin); } if (pos->packet_size == 0 || pos->offset == EOF) { @@ -821,7 +833,8 @@ retry: ", offset %" PRIu64 ", content_size %" PRIu64 ", timestamp_end : %" PRIu64 "\n", packet_index.packet_size, packet_index.offset, - packet_index.content_size, packet_index.timestamp_end); + packet_index.content_size, + packet_index.ts_cycles.timestamp_end); /* update trace_packet_header and stream_packet_context */ if (pos->prot != PROT_WRITE && file_stream->parent.trace_packet_header) {