*/
#define BT_LOG_TAG "STREAM-CLASS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/field-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/trace-const.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/resolve-field-path-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/align-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/property-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/clock-class-internal.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/trace-const.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/trace-ir/field-wrapper-internal.h>
+#include <babeltrace2/trace-ir/resolve-field-path-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/align-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/property-internal.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
stream_class->name.value = NULL;
}
- BT_LOGD_STR("Putting event header field class.");
- BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc);
BT_LOGD_STR("Putting packet context field class.");
BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc);
BT_LOGD_STR("Putting event common context field class.");
BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_common_context_fc);
- bt_object_pool_finalize(&stream_class->event_header_field_pool);
bt_object_pool_finalize(&stream_class->packet_context_field_pool);
g_free(stream_class);
}
goto error;
}
- ret = bt_object_pool_initialize(&stream_class->event_header_field_pool,
- (bt_object_pool_new_object_func) bt_field_wrapper_new,
- (bt_object_pool_destroy_object_func) free_field_wrapper,
- stream_class);
- if (ret) {
- BT_LOGE("Failed to initialize event header field pool: ret=%d",
- ret);
- goto error;
- }
-
ret = bt_object_pool_initialize(&stream_class->packet_context_field_pool,
(bt_object_pool_new_object_func) bt_field_wrapper_new,
(bt_object_pool_destroy_object_func) free_field_wrapper,
return stream_class->packet_context_fc;
}
+struct bt_field_class *
+bt_stream_class_borrow_packet_context_field_class(
+ struct bt_stream_class *stream_class)
+{
+ BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+ return stream_class->packet_context_fc;
+}
+
enum bt_stream_class_status bt_stream_class_set_packet_context_field_class(
struct bt_stream_class *stream_class,
struct bt_field_class *field_class)
{
int ret;
struct bt_resolve_field_path_context resolve_ctx = {
- .packet_header = NULL,
.packet_context = field_class,
- .event_header = NULL,
.event_common_context = NULL,
.event_specific_context = NULL,
.event_payload = NULL,
BT_FIELD_CLASS_TYPE_STRUCTURE,
"Packet context field class is not a structure field class: %!+F",
field_class);
- resolve_ctx.packet_header =
- bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
ret = bt_resolve_field_paths(field_class, &resolve_ctx);
if (ret) {
/*
return ret;
}
-const struct bt_field_class *bt_stream_class_borrow_event_header_field_class_const(
+const struct bt_field_class *
+bt_stream_class_borrow_event_common_context_field_class_const(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return stream_class->event_header_fc;
-}
-
-enum bt_stream_class_status bt_stream_class_set_event_header_field_class(
- struct bt_stream_class *stream_class,
- struct bt_field_class *field_class)
-{
- int ret;
- struct bt_resolve_field_path_context resolve_ctx = {
- .packet_header = NULL,
- .packet_context = NULL,
- .event_header = field_class,
- .event_common_context = NULL,
- .event_specific_context = NULL,
- .event_payload = NULL,
- };
-
- BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
- BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
- BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Event header field class is not a structure field class: %!+F",
- field_class);
- resolve_ctx.packet_header =
- bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
- resolve_ctx.packet_context = stream_class->packet_context_fc;
- ret = bt_resolve_field_paths(field_class, &resolve_ctx);
- if (ret) {
- /*
- * This is the only reason for which
- * bt_resolve_field_paths() can fail: anything else
- * would be because a precondition is not satisfied.
- */
- ret = BT_STREAM_CLASS_STATUS_NOMEM;
- goto end;
- }
-
- bt_field_class_make_part_of_trace_class(field_class);
- bt_object_put_ref(stream_class->event_header_fc);
- stream_class->event_header_fc = field_class;
- bt_object_get_no_null_check(stream_class->event_header_fc);
- bt_field_class_freeze(field_class);
- BT_LIB_LOGV("Set stream class's event header field class: %!+S",
- stream_class);
-
-end:
- return ret;
+ return stream_class->event_common_context_fc;
}
-const struct bt_field_class *
-bt_stream_class_borrow_event_common_context_field_class_const(
- const struct bt_stream_class *stream_class)
+struct bt_field_class *
+bt_stream_class_borrow_event_common_context_field_class(
+ struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
return stream_class->event_common_context_fc;
{
int ret;
struct bt_resolve_field_path_context resolve_ctx = {
- .packet_header = NULL,
.packet_context = NULL,
- .event_header = NULL,
.event_common_context = field_class,
.event_specific_context = NULL,
.event_payload = NULL,
BT_FIELD_CLASS_TYPE_STRUCTURE,
"Event common context field class is not a structure field class: %!+F",
field_class);
- resolve_ctx.packet_header =
- bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
resolve_ctx.packet_context = stream_class->packet_context_fc;
- resolve_ctx.event_header = stream_class->event_header_fc;
ret = bt_resolve_field_paths(field_class, &resolve_ctx);
if (ret) {
/*
"assignment property: %!+S", stream_class);
}
-bt_bool bt_stream_class_assigns_automatic_stream_id(
+bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return (bt_bool) stream_class->assigns_automatic_stream_id;
+ return (bt_bool) stream_class->packets_have_beginning_default_clock_snapshot;
}
-void bt_stream_class_set_assigns_automatic_stream_id(
- struct bt_stream_class *stream_class,
- bt_bool value)
+void bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
+ struct bt_stream_class *stream_class, bt_bool value)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- stream_class->assigns_automatic_stream_id = (bool) value;
- BT_LIB_LOGV("Set stream class's automatic stream ID "
- "assignment property: %!+S", stream_class);
+ BT_ASSERT_PRE(!value || stream_class->default_clock_class,
+ "Stream class has no default clock class: %!+S", stream_class);
+ stream_class->packets_have_beginning_default_clock_snapshot =
+ (bool) value;
+ BT_LIB_LOGV("Set stream class's \"packets have default beginning "
+ "clock snapshot\" property: %!+S", stream_class);
}
-bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot(
+bt_bool bt_stream_class_packets_have_end_default_clock_snapshot(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return (bt_bool) stream_class->packets_have_discarded_event_counter_snapshot;
+ return (bt_bool) stream_class->packets_have_end_default_clock_snapshot;
}
-void bt_stream_class_set_packets_have_discarded_event_counter_snapshot(
- struct bt_stream_class *stream_class,
- bt_bool value)
+void bt_stream_class_set_packets_have_end_default_clock_snapshot(
+ struct bt_stream_class *stream_class, bt_bool value)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- stream_class->packets_have_discarded_event_counter_snapshot =
+ BT_ASSERT_PRE(!value || stream_class->default_clock_class,
+ "Stream class has no default clock class: %!+S", stream_class);
+ stream_class->packets_have_end_default_clock_snapshot =
(bool) value;
- BT_LIB_LOGV("Set stream class's "
- "\"packets have discarded event counter snapshot\" property: "
- "%!+S", stream_class);
+ BT_LIB_LOGV("Set stream class's \"packets have default end "
+ "clock snapshot\" property: %!+S", stream_class);
}
-bt_bool bt_stream_class_packets_have_packet_counter_snapshot(
+bt_bool bt_stream_class_assigns_automatic_stream_id(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return (bt_bool) stream_class->packets_have_packet_counter_snapshot;
+ return (bt_bool) stream_class->assigns_automatic_stream_id;
}
-void bt_stream_class_set_packets_have_packet_counter_snapshot(
+void bt_stream_class_set_supports_discarded_events(
struct bt_stream_class *stream_class,
- bt_bool value)
+ bt_bool supports_discarded_events,
+ bt_bool with_default_clock_snapshots)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- stream_class->packets_have_packet_counter_snapshot =
- (bool) value;
- BT_LIB_LOGV("Set stream class's "
- "\"packets have packet counter snapshot\" property: "
+ BT_ASSERT_PRE(supports_discarded_events ||
+ !with_default_clock_snapshots,
+ "Discarded events cannot have default clock snapshots when "
+ "not supported: %!+S", stream_class);
+ BT_ASSERT_PRE(!with_default_clock_snapshots ||
+ stream_class->default_clock_class,
+ "Stream class has no default clock class: %!+S", stream_class);
+ stream_class->supports_discarded_events =
+ (bool) supports_discarded_events;
+ stream_class->discarded_events_have_default_clock_snapshots =
+ (bool) with_default_clock_snapshots;
+ BT_LIB_LOGV("Set stream class's discarded events support property: "
"%!+S", stream_class);
}
-bt_bool bt_stream_class_packets_have_default_beginning_clock_snapshot(
+bt_bool bt_stream_class_supports_discarded_events(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return (bt_bool) stream_class->packets_have_default_beginning_cs;
+ return (bt_bool) stream_class->supports_discarded_events;
}
-void bt_stream_class_set_packets_have_default_beginning_clock_snapshot(
+bt_bool bt_stream_class_discarded_events_have_default_clock_snapshots(
+ const struct bt_stream_class *stream_class)
+{
+ BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+ return (bt_bool) stream_class->discarded_events_have_default_clock_snapshots;
+}
+
+void bt_stream_class_set_supports_discarded_packets(
struct bt_stream_class *stream_class,
- bt_bool value)
+ bt_bool supports_discarded_packets,
+ bt_bool with_default_clock_snapshots)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- BT_ASSERT_PRE(!value || stream_class->default_clock_class,
- "Stream class does not have a default clock class: %!+S",
- stream_class);
- stream_class->packets_have_default_beginning_cs = (bool) value;
- BT_LIB_LOGV("Set stream class's "
- "\"packets have default beginning clock snapshot\" property: "
+ BT_ASSERT_PRE(supports_discarded_packets ||
+ !with_default_clock_snapshots,
+ "Discarded packets cannot have default clock snapshots when "
+ "not supported: %!+S", stream_class);
+ BT_ASSERT_PRE(!with_default_clock_snapshots ||
+ stream_class->default_clock_class,
+ "Stream class has no default clock class: %!+S", stream_class);
+ stream_class->supports_discarded_packets =
+ (bool) supports_discarded_packets;
+ stream_class->discarded_packets_have_default_clock_snapshots =
+ (bool) with_default_clock_snapshots;
+ BT_LIB_LOGV("Set stream class's discarded packets support property: "
"%!+S", stream_class);
}
-bt_bool bt_stream_class_packets_have_default_end_clock_snapshot(
+bt_bool bt_stream_class_supports_discarded_packets(
const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- return (bt_bool) stream_class->packets_have_default_end_cs;
+ return (bt_bool) stream_class->supports_discarded_packets;
}
-void bt_stream_class_set_packets_have_default_end_clock_snapshot(
- struct bt_stream_class *stream_class,
- bt_bool value)
+bt_bool bt_stream_class_discarded_packets_have_default_clock_snapshots(
+ const struct bt_stream_class *stream_class)
{
BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
- BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
- BT_ASSERT_PRE(!value || stream_class->default_clock_class,
- "Stream class does not have a default clock class: %!+S",
- stream_class);
- stream_class->packets_have_default_end_cs = (bool) value;
- BT_LIB_LOGV("Set stream class's "
- "\"packets have default end clock snapshot\" property: "
- "%!+S", stream_class);
+ return (bt_bool) stream_class->discarded_packets_have_default_clock_snapshots;
}
-bt_bool bt_stream_class_default_clock_is_always_known(
- const struct bt_stream_class *stream_class)
+void bt_stream_class_set_assigns_automatic_stream_id(
+ struct bt_stream_class *stream_class,
+ bt_bool value)
{
- /* BT_CLOCK_SNAPSHOT_STATE_UNKNOWN is not supported as of 2.0 */
- return BT_TRUE;
+ BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+ BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+ stream_class->assigns_automatic_stream_id = (bool) value;
+ BT_LIB_LOGV("Set stream class's automatic stream ID "
+ "assignment property: %!+S", stream_class);
}
void bt_stream_class_get_ref(const struct bt_stream_class *stream_class)
projects / babeltrace.git / blobdiff