#define DEFAULT_CLOCK_TIME 0
#define DEFAULT_CLOCK_VALUE 0
-#define NR_TESTS 597
+#define NR_TESTS 586
static int64_t current_time = 42;
}
}
-void event_copy_tests(struct bt_ctf_event *event)
-{
- struct bt_ctf_event *copy;
- struct bt_ctf_event_class *orig_event_class;
- struct bt_ctf_event_class *copy_event_class;
- struct bt_ctf_stream *orig_stream;
- struct bt_ctf_stream *copy_stream;
- struct bt_ctf_field *orig_field;
- struct bt_ctf_field *copy_field;
-
- /* copy */
- ok(!bt_ctf_event_copy(NULL),
- "bt_ctf_event_copy handles NULL correctly");
- copy = bt_ctf_event_copy(event);
- ok(copy, "bt_ctf_event_copy returns a valid pointer");
-
- /* validate event class */
- orig_event_class = bt_ctf_event_get_class(event);
- assert(orig_event_class);
- copy_event_class = bt_ctf_event_get_class(copy);
- ok(orig_event_class == copy_event_class,
- "original and copied events share the same event class pointer");
- bt_put(orig_event_class);
- bt_put(copy_event_class);
-
- /* validate stream */
- orig_stream = bt_ctf_event_get_stream(event);
- copy_stream = bt_ctf_event_get_stream(copy);
-
- if (!orig_stream) {
- ok(!copy_stream, "original and copied events have no stream");
- } else {
- ok(orig_stream == copy_stream,
- "original and copied events share the same stream pointer");
- }
- bt_put(orig_stream);
- bt_put(copy_stream);
-
- /* header */
- orig_field = bt_ctf_event_get_header(event);
- copy_field = bt_ctf_event_get_header(copy);
-
- if (!orig_field) {
- ok(!copy_field, "original and copied events have no header");
- } else {
- ok(orig_field != copy_field,
- "original and copied events headers are different pointers");
- }
-
- bt_put(orig_field);
- bt_put(copy_field);
-
- /* context */
- orig_field = bt_ctf_event_get_event_context(event);
- copy_field = bt_ctf_event_get_event_context(copy);
-
- if (!orig_field) {
- ok(!copy_field, "original and copied events have no context");
- } else {
- ok(orig_field != copy_field,
- "original and copied events contexts are different pointers");
- }
-
- bt_put(orig_field);
- bt_put(copy_field);
-
- /* payload */
- orig_field = bt_ctf_event_get_payload_field(event);
- copy_field = bt_ctf_event_get_payload_field(copy);
-
- if (!orig_field) {
- ok(!copy_field, "original and copied events have no payload");
- } else {
- ok(orig_field != copy_field,
- "original and copied events payloads are different pointers");
- }
-
- bt_put(orig_field);
- bt_put(copy_field);
-
- bt_put(copy);
-}
-
void append_simple_event(struct bt_ctf_stream_class *stream_class,
struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
{
ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time");
/* Populate stream event context */
- stream_event_context = bt_ctf_stream_get_event_context(stream);
+ stream_event_context =
+ bt_ctf_event_get_stream_event_context(simple_event);
+ assert(stream_event_context);
stream_event_context_field = bt_ctf_field_structure_get_field(
stream_event_context, "common_event_context");
bt_ctf_field_unsigned_integer_set_value(stream_event_context_field, 42);
ok(!bt_ctf_event_set_event_context(simple_event, event_context),
"Set an event context successfully");
- event_copy_tests(simple_event);
ok(bt_ctf_stream_append_event(stream, simple_event) == 0,
"Append simple event to trace stream");
struct bt_ctf_field *uint_35_field, *int_16_field, *a_string_field,
*inner_structure_field, *complex_structure_field,
*a_sequence_field, *enum_variant_field, *enum_container_field,
- *variant_field, *an_array_field, *ret_field;
+ *variant_field, *an_array_field, *stream_event_ctx_field,
+ *stream_event_ctx_int_field, *ret_field;
uint64_t ret_unsigned_int;
int64_t ret_signed_int;
const char *ret_string;
bt_put(int_16_field);
}
+ stream_event_ctx_field = bt_ctf_event_get_stream_event_context(event);
+ assert(stream_event_ctx_field);
+ stream_event_ctx_int_field = bt_ctf_field_structure_get_field(
+ stream_event_ctx_field, "common_event_context");
+ BT_PUT(stream_event_ctx_field);
+ bt_ctf_field_unsigned_integer_set_value(stream_event_ctx_int_field, 17);
+ BT_PUT(stream_event_ctx_int_field);
+
bt_ctf_clock_set_time(clock, ++current_time);
ok(bt_ctf_stream_append_event(stream, event) == 0,
"Append a complex event to a stream");
uint64_t ret_uint64;
int events_appended = 0;
struct bt_ctf_field *packet_context = NULL,
- *packet_context_field = NULL, *event_context = NULL;
+ *packet_context_field = NULL, *stream_event_context = NULL;
struct bt_ctf_field_type *ep_field_1_type = NULL;
struct bt_ctf_field_type *ep_a_string_type = NULL;
struct bt_ctf_field_type *ep_type = NULL;
"bt_ctf_event_get_payload_by_index handles an invalid index correctly");
bt_put(event);
- ok(bt_ctf_stream_get_event_context(NULL) == NULL,
- "bt_ctf_stream_get_event_context handles NULL correctly");
- event_context = bt_ctf_stream_get_event_context(stream);
- ok(event_context,
- "bt_ctf_stream_get_event_context returns a stream event context");
- ok(bt_ctf_stream_set_event_context(NULL, event_context) < 0,
- "bt_ctf_stream_set_event_context handles a NULL stream correctly");
- ok(bt_ctf_stream_set_event_context(stream, NULL) < 0,
- "bt_ctf_stream_set_event_context handles a NULL stream event context correctly");
- ok(!bt_ctf_stream_set_event_context(stream, event_context),
- "bt_ctf_stream_set_event_context correctly set a stream event context");
- ret_field = bt_ctf_field_create(ep_field_1_type);
- ok(bt_ctf_stream_set_event_context(stream, ret_field) < 0,
- "bt_ctf_stream_set_event_context rejects an event context of incorrect type");
- bt_put(ret_field);
-
for (i = 0; i < PACKET_RESIZE_TEST_LENGTH; i++) {
event = bt_ctf_event_create(event_class);
struct bt_ctf_field *integer =
bt_put(string);
/* Populate stream event context */
- integer = bt_ctf_field_structure_get_field(event_context,
+ stream_event_context =
+ bt_ctf_event_get_stream_event_context(event);
+ integer = bt_ctf_field_structure_get_field(stream_event_context,
"common_event_context");
+ BT_PUT(stream_event_context);
ret |= bt_ctf_field_unsigned_integer_set_value(integer,
i % 42);
bt_put(integer);
bt_put(string_type);
bt_put(packet_context);
bt_put(packet_context_field);
- bt_put(event_context);
+ bt_put(stream_event_context);
bt_put(event_class);
bt_put(ep_field_1_type);
bt_put(ep_a_string_type);
bt_put(event_class);
}
+void test_trace_stream_class_clock(void)
+{
+ struct bt_ctf_trace *trace = NULL;
+ struct bt_ctf_stream_class *sc1 = NULL;
+ struct bt_ctf_stream_class *sc2 = NULL;
+ struct bt_ctf_clock *sc1_clock = NULL;
+ struct bt_ctf_clock *sc2_clock = NULL;
+ const char *clock_name = "hello";
+
+ trace = bt_ctf_trace_create();
+ assert(trace);
+ sc1 = bt_ctf_stream_class_create(NULL);
+ assert(sc1);
+ sc2 = bt_ctf_stream_class_create(NULL);
+ assert(sc2);
+ sc1_clock = bt_ctf_clock_create(clock_name);
+ assert(sc1_clock);
+ sc2_clock = bt_ctf_clock_create(clock_name);
+ assert(sc2_clock);
+
+ ok(!bt_ctf_stream_class_set_clock(sc1, sc1_clock),
+ "bt_ctf_stream_class_set_clock() succeeds for sc1");
+ ok(!bt_ctf_stream_class_set_clock(sc2, sc2_clock),
+ "bt_ctf_stream_class_set_clock() succeeds for sc2");
+ ok(!bt_ctf_trace_add_stream_class(trace, sc1),
+ "bt_ctf_trace_add_stream_class() succeeds with sc1");
+ ok(bt_ctf_trace_add_stream_class(trace, sc2),
+ "bt_ctf_trace_add_stream_class() fails with sc2 (different clock, same name)");
+
+ BT_PUT(trace);
+ BT_PUT(sc1);
+ BT_PUT(sc2);
+ BT_PUT(sc1_clock);
+ BT_PUT(sc2_clock);
+}
+
int main(int argc, char **argv)
{
char trace_path[] = "/tmp/ctfwriter_XXXXXX";
ok(get_time >= current_time - 1 && get_time <= current_time + 1,
"bt_ctf_clock_get_time returns the correct time once it is set");
- ok(bt_ctf_writer_add_clock(writer, clock) == 0,
- "Add clock to writer instance");
- ok(bt_ctf_writer_add_clock(writer, clock),
- "Verify a clock can't be added twice to a writer instance");
-
- ok(bt_ctf_trace_get_clock_count(NULL) < 0,
- "bt_ctf_trace_get_clock_count correctly handles NULL");
- ok(bt_ctf_trace_get_clock_count(trace) == 1,
- "bt_ctf_trace_get_clock_count returns the correct number of clocks");
- ok(!bt_ctf_trace_get_clock(NULL, 0),
- "bt_ctf_trace_get_clock correctly handles NULL");
- ok(!bt_ctf_trace_get_clock(trace, -1),
- "bt_ctf_trace_get_clock correctly handles negative indexes");
- ok(!bt_ctf_trace_get_clock(trace, 1),
- "bt_ctf_trace_get_clock correctly handles out of bound accesses");
- ret_clock = bt_ctf_trace_get_clock(trace, 0);
- ok(ret_clock == clock,
- "bt_ctf_trace_get_clock returns the right clock instance");
- bt_put(ret_clock);
- ok(!bt_ctf_trace_get_clock_by_name(trace, NULL),
- "bt_ctf_trace_get_clock_by_name correctly handles NULL (trace)");
- ok(!bt_ctf_trace_get_clock_by_name(NULL, clock_name),
- "bt_ctf_trace_get_clock_by_name correctly handles NULL (clock name)");
- ok(!bt_ctf_trace_get_clock_by_name(NULL, NULL),
- "bt_ctf_trace_get_clock_by_name correctly handles NULL (both)");
- ret_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name);
- ok(ret_clock == clock,
- "bt_ctf_trace_get_clock_by_name returns the right clock instance");
- bt_put(ret_clock);
- ok(!bt_ctf_trace_get_clock_by_name(trace, "random"),
- "bt_ctf_trace_get_clock_by_name fails when the requested clock doesn't exist");
-
ok(!bt_ctf_clock_get_name(NULL),
"bt_ctf_clock_get_name correctly handles NULL");
ok(!bt_ctf_clock_get_description(NULL),
stream1 = bt_ctf_writer_create_stream(writer, stream_class);
ok(stream1, "Instanciate a stream class from writer");
+ /*
+ * Creating a stream through a writer adds the given stream
+ * class to the writer's trace, thus registering the stream
+ * class's clock to the trace.
+ */
+ ok(bt_ctf_trace_get_clock_count(NULL) < 0,
+ "bt_ctf_trace_get_clock_count correctly handles NULL");
+ ok(bt_ctf_trace_get_clock_count(trace) == 1,
+ "bt_ctf_trace_get_clock_count returns the correct number of clocks");
+ ok(!bt_ctf_trace_get_clock(NULL, 0),
+ "bt_ctf_trace_get_clock correctly handles NULL");
+ ok(!bt_ctf_trace_get_clock(trace, -1),
+ "bt_ctf_trace_get_clock correctly handles negative indexes");
+ ok(!bt_ctf_trace_get_clock(trace, 1),
+ "bt_ctf_trace_get_clock correctly handles out of bound accesses");
+ ret_clock = bt_ctf_trace_get_clock(trace, 0);
+ ok(ret_clock == clock,
+ "bt_ctf_trace_get_clock returns the right clock instance");
+ bt_put(ret_clock);
+ ok(!bt_ctf_trace_get_clock_by_name(trace, NULL),
+ "bt_ctf_trace_get_clock_by_name correctly handles NULL (trace)");
+ ok(!bt_ctf_trace_get_clock_by_name(NULL, clock_name),
+ "bt_ctf_trace_get_clock_by_name correctly handles NULL (clock name)");
+ ok(!bt_ctf_trace_get_clock_by_name(NULL, NULL),
+ "bt_ctf_trace_get_clock_by_name correctly handles NULL (both)");
+ ret_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name);
+ ok(ret_clock == clock,
+ "bt_ctf_trace_get_clock_by_name returns the right clock instance");
+ bt_put(ret_clock);
+ ok(!bt_ctf_trace_get_clock_by_name(trace, "random"),
+ "bt_ctf_trace_get_clock_by_name fails when the requested clock doesn't exist");
+
ok(bt_ctf_stream_get_class(NULL) == NULL,
"bt_ctf_stream_get_class correctly handles NULL");
ret_stream_class = bt_ctf_stream_get_class(stream1);
ok(bt_ctf_writer_add_environment_field(writer, "new_field", "test") == 0,
"Add environment field to writer after stream creation");
+ test_trace_stream_class_clock();
+
test_instanciate_event_before_stream(writer);
append_simple_event(stream_class, stream1, clock);