X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Fstream.c;h=5741a7a520f6fbc4126f50ec031b5be12f269174;hb=7d7fae6d7f0be96112fe30e47715b83f169bff52;hp=16286501d78b35ac80131b4abc247766cc032742;hpb=6441d7acb9747c441bc2d82bb0f923e03c5891dd;p=babeltrace.git diff --git a/lib/ctf-ir/stream.c b/lib/ctf-ir/stream.c index 16286501..5741a7a5 100644 --- a/lib/ctf-ir/stream.c +++ b/lib/ctf-ir/stream.c @@ -360,7 +360,7 @@ int set_packet_context_events_discarded(struct bt_ctf_stream *stream) * discarded events. We do not allow wrapping here. If it's * valid, update the stream's current count. */ - if (bt_ctf_field_is_set(field)) { + if (bt_ctf_field_value_is_set(field)) { uint64_t user_val; ret = bt_ctf_field_unsigned_integer_get_value(field, @@ -667,46 +667,80 @@ int create_stream_file(struct bt_ctf_writer *writer, struct bt_ctf_stream *stream) { int fd; - GString *filename = g_string_new(stream->stream_class->name->str); + GString *filename = g_string_new(NULL); + int64_t stream_class_id; + char *file_path = NULL; BT_LOGD("Creating stream file: writer-addr=%p, stream-addr=%p, " "stream-name=\"%s\", stream-class-addr=%p, stream-class-name=\"%s\"", writer, stream, bt_ctf_stream_get_name(stream), stream->stream_class, stream->stream_class->name->str); - if (stream->stream_class->name->len == 0) { - int64_t ret; - - ret = bt_ctf_stream_class_get_id(stream->stream_class); - if (ret < 0) { - BT_LOGW("Cannot get stream class's ID: " - "stream-class-addr=%p, " - "stream-class-name=\"%s\"", - stream->stream_class, - stream->stream_class->name->str); - fd = -1; - goto end; + if (stream->name && stream->name->len > 0) { + /* Use stream name's base name as prefix */ + gchar *basename = g_path_get_basename(stream->name->str); + + assert(basename); + + if (strcmp(basename, G_DIR_SEPARATOR_S) == 0) { + g_string_assign(filename, "stream"); + } else { + g_string_assign(filename, basename); } - g_string_printf(filename, "stream_%" PRId64, ret); + g_free(basename); + goto append_ids; } - g_string_append_printf(filename, "_%" PRId64, stream->id); - fd = openat(writer->trace_dir_fd, filename->str, + if (stream->stream_class->name && + stream->stream_class->name->len > 0) { + /* Use stream class name's base name as prefix */ + gchar *basename = + g_path_get_basename(stream->stream_class->name->str); + + assert(basename); + + if (strcmp(basename, G_DIR_SEPARATOR_S) == 0) { + g_string_assign(filename, "stream"); + } else { + g_string_assign(filename, basename); + } + + g_free(basename); + goto append_ids; + } + + /* Default to using `stream-` as prefix */ + g_string_assign(filename, "stream"); + +append_ids: + stream_class_id = bt_ctf_stream_class_get_id(stream->stream_class); + assert(stream_class_id >= 0); + assert(stream->id >= 0); + g_string_append_printf(filename, "-%" PRId64 "-%" PRId64, + stream_class_id, stream->id); + + file_path = g_build_filename(writer->path->str, filename->str, NULL); + if (file_path == NULL) { + fd = -1; + goto end; + } + + fd = open(file_path, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + g_free(file_path); if (fd < 0) { - BT_LOGW("Failed to open stream file for writing: %s: " - "writer-trace-dir-fd=%d, filename=\"%s\", " - "ret=%d, errno=%d", strerror(errno), - writer->trace_dir_fd, filename->str, fd, errno); + BT_LOGW_ERRNO("Failed to open stream file for writing", + ": file_path=\"%s\", filename=\"%s\", ret=%d", + file_path, filename->str, fd); goto end; } BT_LOGD("Created stream file for writing: " - "stream-addr=%p, stream-name=\"%s\", writer-trace-dir-fd=%d, " + "stream-addr=%p, stream-name=\"%s\", " "filename=\"%s\", fd=%d", stream, bt_ctf_stream_get_name(stream), - writer->trace_dir_fd, filename->str, fd); + filename->str, fd); end: g_string_free(filename, TRUE); @@ -852,7 +886,7 @@ struct bt_ctf_stream *bt_ctf_stream_create_with_id_no_check( /* Initialize events_discarded */ ret = try_set_structure_field_integer( stream->packet_context, "events_discarded", 0); - if (ret != 1) { + if (ret < 0) { BT_LOGW("Cannot set `events_discarded` field in packet context: " "ret=%d, packet-context-field-addr=%p", ret, stream->packet_context); @@ -1122,10 +1156,14 @@ static int auto_populate_event_header(struct bt_ctf_stream *stream, int ret = 0; struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL; struct bt_ctf_clock_class *mapped_clock_class = NULL; - uint64_t event_class_id; + int64_t event_class_id; assert(event); + if (!event->event_header) { + goto end; + } + if (event->frozen) { BT_LOGW_STR("Cannot populate event header field: event is frozen."); ret = -1; @@ -1137,8 +1175,12 @@ static int auto_populate_event_header(struct bt_ctf_stream *stream, stream, bt_ctf_stream_get_name(stream), event); id_field = bt_ctf_field_structure_get_field(event->event_header, "id"); - event_class_id = (uint64_t) bt_ctf_event_class_get_id(event->event_class); - assert(event_class_id >= 0); + event_class_id = bt_ctf_event_class_get_id(event->event_class); + if (event_class_id < 0) { + BT_LOGE("Event class ID cannot be found"); + ret = -1; + goto end; + } if (id_field && bt_ctf_field_type_is_integer(id_field->type)) { ret = set_integer_field_value(id_field, event_class_id); if (ret) { @@ -1452,7 +1494,7 @@ void reset_structure_field(struct bt_ctf_field *structure, const char *name) member = bt_ctf_field_structure_get_field(structure, name); if (member) { - (void) bt_ctf_field_reset(member); + (void) bt_ctf_field_reset_value(member); bt_put(member); } } @@ -1469,7 +1511,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) if (!stream) { BT_LOGW_STR("Invalid parameter: stream is NULL."); ret = -1; - goto end; + goto end_no_stream; } if (stream->pos.fd < 0) { @@ -1569,13 +1611,15 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) stream->pos.offset, stream->pos.packet_size); /* Write event header */ - BT_LOGV_STR("Serializing event's header field."); - ret = bt_ctf_field_serialize(event->event_header, - &stream->pos, native_byte_order); - if (ret) { - BT_LOGW("Cannot serialize event's header field: " - "field-addr=%p", event->event_header); - goto end; + if (event->event_header) { + BT_LOGV_STR("Serializing event's header field."); + ret = bt_ctf_field_serialize(event->event_header, + &stream->pos, native_byte_order); + if (ret) { + BT_LOGW("Cannot serialize event's header field: " + "field-addr=%p", event->event_header); + goto end; + } } /* Write stream event context */ @@ -1671,16 +1715,6 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) stream->flushed_packet_count++; stream->size += stream->pos.packet_size / CHAR_BIT; - do { - ret = ftruncate(stream->pos.fd, stream->size); - } while (ret == -1 && errno == EINTR); - if (ret == -1) { - BT_LOGE_ERRNO("Cannot ftruncate() stream file to new size", - "size = %" PRIu64 ", name = %s", - stream->size, - stream->name ? stream->name->str : "(null)"); - } - end: /* Reset automatically-set fields. */ if (stream->packet_context) { @@ -1704,6 +1738,8 @@ end: "packet-size=%" PRIu64, stream->pos.offset, stream->pos.packet_size); } + +end_no_stream: return ret; } @@ -1753,16 +1789,14 @@ void bt_ctf_stream_destroy(struct bt_object *obj) ret = ftruncate(stream->pos.fd, stream->size); } while (ret == -1 && errno == EINTR); if (ret) { - BT_LOGE("Failed to truncate stream file: %s: " - "ret=%d, errno=%d, size=%" PRIu64, - strerror(errno), ret, errno, - (uint64_t) stream->size); + BT_LOGE_ERRNO("Failed to truncate stream file", + ": ret=%d, size=%" PRIu64, + ret, (uint64_t) stream->size); } if (close(stream->pos.fd)) { - BT_LOGE("Failed to close stream file: %s: " - "ret=%d, errno=%d", strerror(errno), - ret, errno); + BT_LOGE_ERRNO("Failed to close stream file", + ": ret=%d", ret); } } @@ -1828,7 +1862,7 @@ int _set_structure_field_integer(struct bt_ctf_field *structure, char *name, } /* Make sure the payload has not already been set. */ - if (!force && bt_ctf_field_is_set(integer)) { + if (!force && bt_ctf_field_value_is_set(integer)) { /* Payload already set, not an error */ BT_LOGV("Field's payload is already set: struct-field-addr=%p, " "name=\"%s\", force=%d", structure, name, force);