#include <babeltrace/ctf-writer/event.h>
#include <babeltrace/ctf-writer/event-types.h>
#include <babeltrace/ctf-writer/event-fields.h>
-#include <babeltrace/ctf-ir/stream-class.h>
+#include <babeltrace/ctf-writer/stream-class.h>
+#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/ctf-ir/clock-class.h>
#include <babeltrace/ref.h>
#include <babeltrace/ctf/events.h>
#include <babeltrace/values.h>
#include <stdio.h>
#include <sys/utsname.h>
#include <babeltrace/compat/limits.h>
+#include <babeltrace/compat/stdio.h>
#include <string.h>
#include <assert.h>
#include <sys/wait.h>
#include "tap/tap.h"
#include <math.h>
#include <float.h>
-#include <sys/stat.h>
+#include "common.h"
#define METADATA_LINE_SIZE 512
#define SEQUENCE_TEST_LENGTH 10
#define DEFAULT_CLOCK_OFFSET_S 0
#define DEFAULT_CLOCK_IS_ABSOLUTE 0
#define DEFAULT_CLOCK_TIME 0
+#define DEFAULT_CLOCK_VALUE 0
-static uint64_t current_time = 42;
+#define NR_TESTS 602
+
+static int64_t current_time = 42;
/* Return 1 if uuids match, zero if different. */
+static
int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b)
{
int ret = 0;
return ret;
}
+static
void validate_metadata(char *parser_path, char *metadata_path)
{
int ret = 0;
rewind(metadata_fp);
/* Output the metadata and parser output as diagnostic */
- while (getline(&line, &len, metadata_fp) > 0) {
+ while (bt_getline(&line, &len, metadata_fp) > 0) {
fprintf(stderr, "# %s", line);
}
rewind(parser_output_fp);
- while (getline(&line, &len, parser_output_fp) > 0) {
+ while (bt_getline(&line, &len, parser_output_fp) > 0) {
fprintf(stderr, "# %s", line);
}
}
}
+static
void validate_trace(char *parser_path, char *trace_path)
{
int ret = 0;
diag("malloc error");
}
rewind(babeltrace_output_fp);
- while (getline(&line, &len, babeltrace_output_fp) > 0) {
+ while (bt_getline(&line, &len, babeltrace_output_fp) > 0) {
diag("%s", line);
}
}
}
-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);
-}
-
+static
void append_simple_event(struct bt_ctf_stream_class *stream_class,
struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
{
bt_ctf_field_type_enumeration_create(uint_12_type);
struct bt_ctf_field_type *event_context_type =
bt_ctf_field_type_structure_create();
+ struct bt_ctf_field_type *event_payload_type = NULL;
struct bt_ctf_field_type *returned_type;
struct bt_ctf_event *simple_event;
struct bt_ctf_field *integer_field;
double ret_double;
int64_t ret_range_start_int64_t, ret_range_end_int64_t;
uint64_t ret_range_start_uint64_t, ret_range_end_uint64_t;
- struct bt_ctf_clock *ret_clock;
struct bt_ctf_event_class *ret_event_class;
struct bt_ctf_field *packet_context;
struct bt_ctf_field *packet_context_field;
struct bt_ctf_field *stream_event_context_field;
struct bt_ctf_field *event_context;
struct bt_ctf_field *event_context_field;
+ struct bt_ctf_field_type *ep_integer_field_type = NULL;
+ struct bt_ctf_field_type *ep_enum_field_type = NULL;
+ struct bt_ctf_field_type *ep_enum_field_unsigned_type = NULL;
+ struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
+ int ret;
ok(uint_12_type, "Create an unsigned integer type");
- bt_ctf_field_type_integer_set_signed(int_64_type, 1);
+ ok(!bt_ctf_field_type_integer_set_signed(int_64_type, 1),
+ "Set signed 64 bit integer signedness to true");
ok(int_64_type, "Create a signed integer type");
enum_type = bt_ctf_field_type_enumeration_create(int_64_type);
bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
42, 42);
ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
- 43, 51), "bt_ctf_field_type_enumeration_add_mapping rejects duplicate mapping names");
+ 43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts duplicate mapping names");
ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, "something",
- -500, -400), "bt_ctf_field_type_enumeration_add_mapping rejects overlapping enum entries");
+ -500, -400) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts overlapping enum entries");
ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
-54, -55), "bt_ctf_field_type_enumeration_add_mapping rejects mapping where end < start");
bt_ctf_field_type_enumeration_add_mapping(enum_type, "another entry", -42000, -13000);
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(NULL, -42) < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles a NULL field type correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, 1000000) < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles invalid values correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, -55) == 1,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_value returns the correct index");
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(NULL, -42);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value handles a NULL field type correctly");
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, -4200000);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value rejects non-mapped values");
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, 3);
+ ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value succeeds with mapped value");
+ ok(bt_ctf_field_type_enumeration_mapping_iterator_get_signed(iter, NULL, NULL, NULL) == 0,
+ "bt_ctf_field_type_enumeration_mapping_iterator_get_signed handles mapped values correctly");
+ BT_PUT(iter);
ok(bt_ctf_event_class_add_field(simple_event_class, enum_type,
"enum_field") == 0, "Add signed enumeration field to event");
- ok(bt_ctf_field_type_enumeration_get_mapping(NULL, 0, &ret_char,
+ ok(bt_ctf_field_type_enumeration_get_mapping_signed(NULL, 0, &ret_char,
&ret_range_start_int64_t, &ret_range_end_int64_t) < 0,
- "bt_ctf_field_type_enumeration_get_mapping handles a NULL enumeration correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, NULL,
- &ret_range_start_int64_t, &ret_range_end_int64_t) < 0,
- "bt_ctf_field_type_enumeration_get_mapping handles a NULL string correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char,
- NULL, &ret_range_end_int64_t) < 0,
- "bt_ctf_field_type_enumeration_get_mapping handles a NULL start correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char,
- &ret_range_start_int64_t, NULL) < 0,
- "bt_ctf_field_type_enumeration_get_mapping handles a NULL end correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 5, &ret_char,
+ "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL enumeration correctly");
+ ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, NULL,
+ &ret_range_start_int64_t, &ret_range_end_int64_t) == 0,
+ "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL string correctly");
+ ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char,
+ NULL, &ret_range_end_int64_t) == 0,
+ "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL start correctly");
+ ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char,
+ &ret_range_start_int64_t, NULL) == 0,
+ "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL end correctly");
+ /* Assumes entries are sorted by range_start values. */
+ ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 6, &ret_char,
&ret_range_start_int64_t, &ret_range_end_int64_t) == 0,
- "bt_ctf_field_type_enumeration_get_mapping returns a value");
+ "bt_ctf_field_type_enumeration_get_mapping_signed returns a value");
ok(!strcmp(ret_char, mapping_name_test),
- "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping name");
+ "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping name");
ok(ret_range_start_int64_t == 42,
- "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping start");
+ "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping start");
ok(ret_range_end_int64_t == 42,
- "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping end");
+ "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping end");
ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned,
"escaping; \"test\"", 0, 0) == 0,
bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
42, 42);
ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
- 43, 51), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects duplicate mapping names");
+ 43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts duplicate mapping names");
ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, "something",
- 7, 8), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects overlapping enum entries");
+ 7, 8) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts overlapping enum entries");
ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
55, 54), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects mapping where end < start");
ok(bt_ctf_event_class_add_field(simple_event_class, enum_type_unsigned,
ok(bt_ctf_field_type_enumeration_get_mapping_count(NULL) < 0,
"bt_ctf_field_type_enumeration_get_mapping_count handles NULL correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 4,
+ ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 6,
"bt_ctf_field_type_enumeration_get_mapping_count returns the correct value");
ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(NULL, 0, &ret_char,
&ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0,
"bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL enumeration correctly");
ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, NULL,
- &ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0,
+ &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0,
"bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL string correctly");
ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char,
- NULL, &ret_range_end_uint64_t) < 0,
+ NULL, &ret_range_end_uint64_t) == 0,
"bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL start correctly");
ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char,
- &ret_range_start_uint64_t, NULL) < 0,
+ &ret_range_start_uint64_t, NULL) == 0,
"bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL end correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 3, &ret_char,
+ ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 4, &ret_char,
&ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0,
"bt_ctf_field_type_enumeration_get_mapping_unsigned returns a value");
ok(!strcmp(ret_char, mapping_name_test),
assert(!bt_ctf_event_class_set_id(simple_event_class, 13));
- /* Set an event context type which will contain a single integer*/
+ /* Set an event context type which will contain a single integer. */
ok(!bt_ctf_field_type_structure_add_field(event_context_type, uint_12_type,
"event_specific_context"),
"Add event specific context field");
ok(bt_ctf_event_class_get_context_type(simple_event_class) == NULL,
"bt_ctf_event_class_get_context_type returns NULL when no event context type is set");
- ok(bt_ctf_event_class_set_context_type(simple_event_class, NULL) < 0,
- "bt_ctf_event_class_set_context_type handles a NULL context type correctly");
ok(bt_ctf_event_class_set_context_type(NULL, event_context_type) < 0,
"bt_ctf_event_class_set_context_type handles a NULL event class correctly");
ok(!bt_ctf_event_class_set_context_type(simple_event_class, event_context_type),
"bt_ctf_event_class_get_context_type returns the appropriate type");
bt_put(returned_type);
- bt_ctf_stream_class_add_event_class(stream_class, simple_event_class);
+ ok(!bt_ctf_stream_class_add_event_class(stream_class, simple_event_class),
+ "Adding simple event class to stream class");
+
+ /*
+ * bt_ctf_stream_class_add_event_class() copies the field types
+ * of simple_event_class, so we retrieve the new ones to create
+ * the appropriate fields.
+ */
+ BT_PUT(event_context_type);
+ BT_PUT(event_payload_type);
+ event_payload_type = bt_ctf_event_class_get_payload_type(
+ simple_event_class);
+ assert(event_payload_type);
+ event_context_type = bt_ctf_event_class_get_context_type(
+ simple_event_class);
+ assert(event_context_type);
+ ep_integer_field_type =
+ bt_ctf_field_type_structure_get_field_type_by_name(
+ event_payload_type, "integer_field");
+ assert(ep_integer_field_type);
+ ep_enum_field_type =
+ bt_ctf_field_type_structure_get_field_type_by_name(
+ event_payload_type, "enum_field");
+ assert(ep_enum_field_type);
+ ep_enum_field_unsigned_type =
+ bt_ctf_field_type_structure_get_field_type_by_name(
+ event_payload_type, "enum_field_unsigned");
+ assert(ep_enum_field_unsigned_type);
ok(bt_ctf_stream_class_get_event_class_count(NULL) < 0,
"bt_ctf_stream_class_get_event_class_count handles NULL correctly");
ok(simple_event,
"Instantiate an event containing a single integer field");
- ok(bt_ctf_event_get_clock(NULL) == NULL,
- "bt_ctf_event_get_clock handles NULL correctly");
- ret_clock = bt_ctf_event_get_clock(simple_event);
- ok(ret_clock == clock,
- "bt_ctf_event_get_clock returns a correct clock");
- bt_put(clock);
-
- integer_field = bt_ctf_field_create(uint_12_type);
+ integer_field = bt_ctf_field_create(ep_integer_field_type);
bt_ctf_field_unsigned_integer_set_value(integer_field, 42);
ok(bt_ctf_event_set_payload(simple_event, "integer_field",
integer_field) == 0, "Use bt_ctf_event_set_payload to set a manually allocated field");
ok(fabs(ret_double - double_test_value) <= DBL_EPSILON,
"bt_ctf_field_floating_point_get_value returns a correct value");
- enum_field = bt_ctf_field_create(enum_type);
- ret_char = bt_ctf_field_enumeration_get_mapping_name(NULL);
- ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name handles NULL correctly");
- ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field);
- ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name returns NULL if the enumeration's container field is unset");
+ enum_field = bt_ctf_field_create(ep_enum_field_type);
+ assert(enum_field);
+
+ iter = bt_ctf_field_enumeration_get_mappings(NULL);
+ ok(!iter, "bt_ctf_field_enumeration_get_mappings handles NULL correctly");
+ iter = bt_ctf_field_enumeration_get_mappings(enum_field);
+ ok(!iter, "bt_ctf_field_enumeration_get_mappings returns NULL if the enumeration's container field is unset");
enum_container_field = bt_ctf_field_enumeration_get_container(
enum_field);
ok(bt_ctf_field_signed_integer_set_value(
enum_container_field, -42) == 0,
"Set signed enumeration container value");
- ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field);
+ iter = bt_ctf_field_enumeration_get_mappings(enum_field);
+ ok(iter, "bt_ctf_field_enumeration_get_mappings returns an iterator to matching mappings");
+ ret = bt_ctf_field_type_enumeration_mapping_iterator_get_signed(iter, &ret_char, NULL, NULL);
+ ok(!ret && ret_char, "bt_ctf_field_type_enumeration_mapping_iterator_get_signed return a mapping name");
ok(!strcmp(ret_char, mapping_name_negative_test),
- "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an signed container");
- bt_ctf_event_set_payload(simple_event, "enum_field", enum_field);
+ "bt_ctf_field_enumeration_get_single_mapping_name returns the correct mapping name with an signed container");
+ ret = bt_ctf_event_set_payload(simple_event, "enum_field", enum_field);
+ assert(!ret);
+ BT_PUT(iter);
- enum_field_unsigned = bt_ctf_field_create(enum_type_unsigned);
+ enum_field_unsigned = bt_ctf_field_create(ep_enum_field_unsigned_type);
+ assert(enum_field_unsigned);
enum_container_field_unsigned = bt_ctf_field_enumeration_get_container(
enum_field_unsigned);
ok(bt_ctf_field_unsigned_integer_set_value(
enum_container_field_unsigned, 42) == 0,
"Set unsigned enumeration container value");
- bt_ctf_event_set_payload(simple_event, "enum_field_unsigned",
+ ret = bt_ctf_event_set_payload(simple_event, "enum_field_unsigned",
enum_field_unsigned);
- ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned);
+ assert(!ret);
+ iter = bt_ctf_field_enumeration_get_mappings(enum_field_unsigned);
+ assert(iter);
+ (void) bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, &ret_char, NULL, NULL);
ok(ret_char && !strcmp(ret_char, mapping_name_test),
- "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an unsigned container");
+ "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned returns the correct mapping name with an unsigned container");
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");
bt_put(stream_event_context_field);
bt_put(event_context);
bt_put(event_context_field);
+ bt_put(event_payload_type);
+ bt_put(ep_integer_field_type);
+ bt_put(ep_enum_field_type);
+ bt_put(ep_enum_field_unsigned_type);
+ bt_put(iter);
}
+static
void append_complex_event(struct bt_ctf_stream_class *stream_class,
struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
{
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;
struct bt_ctf_stream_class *ret_stream_class;
struct bt_ctf_event_class *ret_event_class;
struct bt_ctf_field *packet_context, *packet_context_field;
+ struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
struct bt_value *obj;
ok(bt_ctf_field_type_set_alignment(int_16_type, 0),
"bt_ctf_field_type_set_alignment handles wrong alignment correctly (24)");
ok(!bt_ctf_field_type_set_alignment(int_16_type, 4),
"bt_ctf_field_type_set_alignment handles correct alignment correctly (4)");
- bt_ctf_field_type_set_alignment(int_16_type, 32);
- bt_ctf_field_type_integer_set_signed(int_16_type, 1);
- bt_ctf_field_type_integer_set_base(uint_35_type,
- BT_CTF_INTEGER_BASE_HEXADECIMAL);
+ ok(!bt_ctf_field_type_set_alignment(int_16_type, 32),
+ "Set alignment of signed 16 bit integer to 32");
+ ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1),
+ "Set integer signedness to true");
+ ok(!bt_ctf_field_type_integer_set_base(uint_35_type,
+ BT_CTF_INTEGER_BASE_HEXADECIMAL),
+ "Set signed 16 bit integer base to hexadecimal");
array_type = bt_ctf_field_type_array_create(int_16_type, ARRAY_TEST_LENGTH);
sequence_type = bt_ctf_field_type_sequence_create(int_16_type,
ok(bt_ctf_field_type_array_get_length(array_type) == ARRAY_TEST_LENGTH,
"bt_ctf_field_type_array_get_length returns the correct length");
- bt_ctf_field_type_structure_add_field(inner_structure_type,
- uint_35_type, "seq_len");
- bt_ctf_field_type_structure_add_field(inner_structure_type,
- sequence_type, "a_sequence");
- bt_ctf_field_type_structure_add_field(inner_structure_type,
- array_type, "an_array");
+ ok(bt_ctf_field_type_structure_add_field(inner_structure_type,
+ inner_structure_type, "yes"), "Cannot add self to structure");
+ ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+ uint_35_type, "seq_len"), "Add seq_len field to inner structure");
+ ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+ sequence_type, "a_sequence"), "Add a_sequence field to inner structure");
+ ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+ array_type, "an_array"), "Add an_array field to inner structure");
bt_ctf_field_type_enumeration_add_mapping(enum_variant_type,
"UINT3_TYPE", 0, 0);
bt_ctf_field_type_enumeration_add_mapping(enum_variant_type,
"UINT35_TYPE", 2, 7);
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(NULL,
- "INT16_TYPE") < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL field type correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(
- enum_variant_type, NULL) < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL name correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(
- enum_variant_type, "INT16_TYPE") == 1,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_name returns the correct index");
-
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(NULL, 1) < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles a NULL field type correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, -42) < 0,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles invalid values correctly");
- ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, 5) == 2,
- "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value returns the correct index");
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_name(NULL, "INT16_TYPE");
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL field type correctly");
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, "INT16_TYPE");
+ ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles an existing mapping correctly");
+ ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0,
+ "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles mapped values correctly");
+ BT_PUT(iter);
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, NULL);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL name correctly");
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(NULL, 1);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles a NULL field type correctly");
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, -42);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles invalid values correctly");
+ ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) != 0,
+ "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles invalid values correctly");
+ BT_PUT(iter);
+
+ iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, 5);
+ ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles valid values correctly");
+ ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0,
+ "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles valid values correctly");
+ BT_PUT(iter);
ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type,
"An unknown entry"), "Reject a variant field based on an unknown tag value");
ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type,
"UINT3_TYPE") == 0, "Add a field to a variant");
- bt_ctf_field_type_variant_add_field(variant_type, int_16_type,
- "INT16_TYPE");
- bt_ctf_field_type_variant_add_field(variant_type, uint_35_type,
- "UINT35_TYPE");
+ ok(!bt_ctf_field_type_variant_add_field(variant_type, int_16_type,
+ "INT16_TYPE"), "Add INT16_TYPE field to variant");
+ ok(!bt_ctf_field_type_variant_add_field(variant_type, uint_35_type,
+ "UINT35_TYPE"), "Add UINT35_TYPE field to variant");
ok(bt_ctf_field_type_variant_get_tag_type(NULL) == NULL,
"bt_ctf_field_type_variant_get_tag_type handles NULL correctly");
"bt_ctf_field_type_variant_get_field returns a correct field type");
bt_put(ret_field_type);
- bt_ctf_field_type_structure_add_field(complex_structure_type,
- enum_variant_type, "variant_selector");
- bt_ctf_field_type_structure_add_field(complex_structure_type,
- string_type, "a_string");
- bt_ctf_field_type_structure_add_field(complex_structure_type,
- variant_type, "variant_value");
- bt_ctf_field_type_structure_add_field(complex_structure_type,
- inner_structure_type, "inner_structure");
+ ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+ enum_variant_type, "variant_selector"),
+ "Add variant_selector field to complex structure");
+ ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+ string_type, "a_string"), "Add a_string field to complex structure");
+ ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+ variant_type, "variant_value"),
+ "Add variant_value field to complex structure");
+ ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+ inner_structure_type, "inner_structure"),
+ "Add inner_structure field to complex structure");
ok(bt_ctf_event_class_create("clock") == NULL,
"Reject creation of an event class with an illegal name");
ok(bt_ctf_event_class_get_field(event_class, &ret_string,
&ret_field_type, 0) == 0,
"bt_ctf_event_class_get_field returns a field");
- ok(ret_field_type == uint_35_type,
+ ok(bt_ctf_field_type_compare(ret_field_type, uint_35_type) == 0,
"bt_ctf_event_class_get_field returns a correct field type");
bt_put(ret_field_type);
ok(!strcmp(ret_string, "uint_35"),
"bt_ctf_event_class_get_field_by_name handles an invalid field name correctly");
ret_field_type = bt_ctf_event_class_get_field_by_name(event_class,
"complex_structure");
- ok(ret_field_type == complex_structure_type,
+ ok(bt_ctf_field_type_compare(ret_field_type, complex_structure_type) == 0,
"bt_ctf_event_class_get_field_by_name returns a correct field type");
bt_put(ret_field_type);
complex_structure_field, 3);
ret_field_type = bt_ctf_field_get_type(inner_structure_field);
bt_put(inner_structure_field);
- ok(ret_field_type == inner_structure_type,
+ ok(bt_ctf_field_type_compare(ret_field_type, inner_structure_type) == 0,
"bt_ctf_field_structure_get_field_by_index returns a correct field");
bt_put(ret_field_type);
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");
bt_put(event);
}
-static void field_copy_tests_validate_same_type(struct bt_ctf_field *field,
- struct bt_ctf_field_type *expected_type, const char *name)
+static
+void field_copy_tests_validate_same_type(struct bt_ctf_field *field,
+ struct bt_ctf_field_type *expected_type, const char *name)
{
struct bt_ctf_field_type *copy_type;
bt_put(copy_type);
}
-static void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a,
- struct bt_ctf_field *field_b, const char *name)
+static
+void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a,
+ struct bt_ctf_field *field_b, const char *name)
{
ok(field_a != field_b,
"bt_ctf_field_copy creates different pointers (%s)", name);
}
+static
void field_copy_tests()
{
struct bt_ctf_field_type *len_type = NULL;
struct bt_ctf_field *a_3_copy = NULL;
struct bt_ctf_field *a_4_copy = NULL;
struct bt_ctf_field *strct_copy = NULL;
+ struct bt_ctf_field_type_enumeration_mapping_iterator *e_iter = NULL;
uint64_t uint64_t_val;
const char *str_val;
double double_val;
"bt_ctf_field_copy creates a valid enum's integer field copy");
/* validate e copy */
- str_val = bt_ctf_field_enumeration_get_mapping_name(e_copy);
+ e_iter = bt_ctf_field_enumeration_get_mappings(e_copy);
+ (void) bt_ctf_field_type_enumeration_mapping_iterator_get_signed(e_iter,
+ &str_val, NULL, NULL);
ok(str_val && !strcmp(str_val, "LABEL2"),
"bt_ctf_field_copy creates a valid enum field copy");
bt_put(a_3_copy);
bt_put(a_4_copy);
bt_put(strct_copy);
+ bt_put(e_iter);
}
+static
void type_field_tests()
{
struct bt_ctf_field *uint_12;
struct bt_ctf_field_type *uint_12_type =
bt_ctf_field_type_integer_create(12);
struct bt_ctf_field_type *enumeration_type;
- struct bt_ctf_field_type *enumeration_sequence_type;
- struct bt_ctf_field_type *enumeration_array_type;
struct bt_ctf_field_type *returned_type;
const char *ret_string;
"bt_ctf_field_type_get_byte_order handles NULL correctly");
ok(bt_ctf_field_type_get_type_id(NULL) ==
- CTF_TYPE_UNKNOWN,
+ BT_CTF_TYPE_ID_UNKNOWN,
"bt_ctf_field_type_get_type_id handles NULL correctly");
ok(bt_ctf_field_type_get_type_id(uint_12_type) ==
- CTF_TYPE_INTEGER,
+ BT_CTF_TYPE_ID_INTEGER,
"bt_ctf_field_type_get_type_id returns a correct value with an integer type");
ok(bt_ctf_field_type_integer_get_base(NULL) ==
BT_CTF_INTEGER_BASE_HEXADECIMAL,
"bt_ctf_field_type_integer_get_base returns a correct value");
- ok(bt_ctf_field_type_integer_set_encoding(NULL, CTF_STRING_ASCII) < 0,
+ ok(bt_ctf_field_type_integer_set_encoding(NULL,
+ BT_CTF_STRING_ENCODING_ASCII) < 0,
"bt_ctf_field_type_integer_set_encoding handles NULL correctly");
ok(bt_ctf_field_type_integer_set_encoding(uint_12_type,
- (enum ctf_string_encoding) 123) < 0,
+ (enum bt_ctf_string_encoding) 123) < 0,
"bt_ctf_field_type_integer_set_encoding handles invalid encodings correctly");
ok(bt_ctf_field_type_integer_set_encoding(uint_12_type,
- CTF_STRING_UTF8) == 0,
+ BT_CTF_STRING_ENCODING_UTF8) == 0,
"Set integer type encoding to UTF8");
- ok(bt_ctf_field_type_integer_get_encoding(NULL) == CTF_STRING_UNKNOWN,
+ ok(bt_ctf_field_type_integer_get_encoding(NULL) ==
+ BT_CTF_STRING_ENCODING_UNKNOWN,
"bt_ctf_field_type_integer_get_encoding handles NULL correctly");
- ok(bt_ctf_field_type_integer_get_encoding(uint_12_type) == CTF_STRING_UTF8,
+ ok(bt_ctf_field_type_integer_get_encoding(uint_12_type) ==
+ BT_CTF_STRING_ENCODING_UTF8,
"bt_ctf_field_type_integer_get_encoding returns a correct value");
int_16_type = bt_ctf_field_type_integer_create(16);
- bt_ctf_field_type_integer_set_signed(int_16_type, 1);
+ assert(int_16_type);
+ ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1),
+ "Set signedness of 16 bit integer to true");
ok(bt_ctf_field_type_integer_get_signed(int_16_type) == 1,
"bt_ctf_field_type_integer_get_signed returns a correct value for signed types");
uint_8_type = bt_ctf_field_type_integer_create(8);
bt_ctf_field_type_sequence_create(int_16_type, "seq_len");
ok(sequence_type, "Create a sequence of int16_t type");
ok(bt_ctf_field_type_get_type_id(sequence_type) ==
- CTF_TYPE_SEQUENCE,
+ BT_CTF_TYPE_ID_SEQUENCE,
"bt_ctf_field_type_get_type_id returns a correct value with a sequence type");
ok(bt_ctf_field_type_sequence_get_length_field_name(NULL) == NULL,
string_type = bt_ctf_field_type_string_create();
ok(string_type, "Create a string type");
ok(bt_ctf_field_type_string_set_encoding(string_type,
- CTF_STRING_NONE),
+ BT_CTF_STRING_ENCODING_NONE),
"Reject invalid \"None\" string encoding");
ok(bt_ctf_field_type_string_set_encoding(string_type,
42),
"Reject invalid string encoding");
ok(bt_ctf_field_type_string_set_encoding(string_type,
- CTF_STRING_ASCII) == 0,
+ BT_CTF_STRING_ENCODING_ASCII) == 0,
"Set string encoding to ASCII");
ok(bt_ctf_field_type_string_get_encoding(NULL) ==
- CTF_STRING_UNKNOWN,
+ BT_CTF_STRING_ENCODING_UNKNOWN,
"bt_ctf_field_type_string_get_encoding handles NULL correctly");
ok(bt_ctf_field_type_string_get_encoding(string_type) ==
- CTF_STRING_ASCII,
+ BT_CTF_STRING_ENCODING_ASCII,
"bt_ctf_field_type_string_get_encoding returns the correct value");
structure_seq_type = bt_ctf_field_type_structure_create();
ok(bt_ctf_field_type_get_type_id(structure_seq_type) ==
- CTF_TYPE_STRUCT,
+ BT_CTF_TYPE_ID_STRUCT,
"bt_ctf_field_type_get_type_id returns a correct value with a structure type");
ok(structure_seq_type, "Create a structure type");
ok(bt_ctf_field_type_structure_add_field(structure_seq_type,
enumeration_type = bt_ctf_field_type_enumeration_create(uint_12_type);
ok(enumeration_type,
"Create an enumeration type with an unsigned 12-bit integer as container");
- enumeration_sequence_type = bt_ctf_field_type_sequence_create(
- enumeration_type, "count");
- ok(!enumeration_sequence_type,
- "Check enumeration types are validated when creating a sequence");
- enumeration_array_type = bt_ctf_field_type_array_create(
- enumeration_type, 10);
- ok(!enumeration_array_type,
- "Check enumeration types are validated when creating an array");
- ok(bt_ctf_field_type_structure_add_field(composite_structure_type,
- enumeration_type, "enumeration"),
- "Check enumeration types are validated when adding them as structure members");
enumeration = bt_ctf_field_create(enumeration_type);
ok(!enumeration,
"Check enumeration types are validated before instantiation");
bt_put(int_16_type);
bt_put(uint_12_type);
bt_put(enumeration_type);
- bt_put(enumeration_sequence_type);
- bt_put(enumeration_array_type);
bt_put(returned_type);
}
+static
void packet_resize_test(struct bt_ctf_stream_class *stream_class,
struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
{
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;
ret |= bt_ctf_event_class_add_field(event_class, integer_type,
"field_1");
goto end;
}
+ /*
+ * bt_ctf_stream_class_add_event_class() copies the field types
+ * of event_class, so we retrieve the new ones to create the
+ * appropriate fields.
+ */
+ ep_type = bt_ctf_event_class_get_payload_type(event_class);
+ assert(ep_type);
+ ep_field_1_type = bt_ctf_field_type_structure_get_field_type_by_name(
+ ep_type, "field_1");
+ assert(ep_field_1_type);
+ ep_a_string_type = bt_ctf_field_type_structure_get_field_type_by_name(
+ ep_type, "a_string");
+ assert(ep_a_string_type);
+
event = bt_ctf_event_create(event_class);
ret_field = bt_ctf_event_get_payload_by_index(event, 0);
ret_field_type = bt_ctf_field_get_type(ret_field);
- ok(ret_field_type == integer_type,
+ ok(bt_ctf_field_type_compare(ret_field_type, integer_type) == 0,
"bt_ctf_event_get_payload_by_index returns a correct field");
bt_put(ret_field_type);
bt_put(ret_field);
"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(integer_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_ctf_field_create(integer_type);
+ bt_ctf_field_create(ep_field_1_type);
struct bt_ctf_field *string =
- bt_ctf_field_create(string_type);
+ bt_ctf_field_create(ep_a_string_type);
ret |= bt_ctf_clock_set_time(clock, ++current_time);
ret |= bt_ctf_field_unsigned_integer_set_value(integer, i);
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(ep_type);
}
+static
void test_empty_stream(struct bt_ctf_writer *writer)
{
int ret = 0;
bt_put(stream_class);
}
-void test_custom_event_header_stream(struct bt_ctf_writer *writer)
+static
+void test_custom_event_header_stream(struct bt_ctf_writer *writer,
+ struct bt_ctf_clock *clock)
{
int i, ret;
- struct bt_ctf_trace *trace = NULL;
- struct bt_ctf_clock *clock = NULL;
struct bt_ctf_stream_class *stream_class = NULL;
struct bt_ctf_stream *stream = NULL;
struct bt_ctf_field_type *integer_type = NULL,
struct bt_ctf_event_class *event_class = NULL;
struct bt_ctf_event *event = NULL;
- trace = bt_ctf_writer_get_trace(writer);
- if (!trace) {
- fail("Failed to get trace from writer");
- goto end;
- }
-
- clock = bt_ctf_trace_get_clock(trace, 0);
- if (!clock) {
- fail("Failed to get clock from trace");
- goto end;
- }
-
stream_class = bt_ctf_stream_class_create("custom_event_header_stream");
if (!stream_class) {
fail("Failed to create stream class");
fail("Failed to flush custom_event_header stream");
}
end:
- bt_put(clock);
- bt_put(trace);
bt_put(stream);
bt_put(stream_class);
bt_put(event_class);
bt_put(event_header_type);
}
-void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
+static
+void test_instanciate_event_before_stream(struct bt_ctf_writer *writer,
+ struct bt_ctf_clock *clock)
{
int ret = 0;
- struct bt_ctf_trace *trace = NULL;
- struct bt_ctf_clock *clock = NULL;
struct bt_ctf_stream_class *stream_class = NULL;
struct bt_ctf_stream *stream = NULL,
*ret_stream = NULL;
struct bt_ctf_field_type *integer_type = NULL;
struct bt_ctf_field *integer = NULL;
- trace = bt_ctf_writer_get_trace(writer);
- if (!trace) {
- diag("Failed to get trace from writer");
- ret = -1;
- goto end;
- }
-
- clock = bt_ctf_trace_get_clock(trace, 0);
- if (!clock) {
- diag("Failed to get clock from trace");
- ret = -1;
- goto end;
- }
-
stream_class = bt_ctf_stream_class_create("event_before_stream_test");
if (!stream_class) {
diag("Failed to create stream class");
end:
ok(ret == 0,
"Create an event before instanciating its associated stream");
- bt_put(trace);
bt_put(stream);
bt_put(ret_stream);
bt_put(stream_class);
bt_put(event);
bt_put(integer_type);
bt_put(integer);
- bt_put(clock);
}
+static
void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
{
struct bt_ctf_event_class *event_class;
bt_put(event_class);
}
+static
+struct bt_ctf_event_class *create_minimal_event_class(void)
+{
+ struct bt_ctf_event_class *ec = NULL;
+ struct bt_ctf_field_type *int_ft = NULL;
+ int ret;
+
+ int_ft = bt_ctf_field_type_integer_create(23);
+ assert(int_ft);
+ ec = bt_ctf_event_class_create("minimal");
+ assert(ec);
+ ret = bt_ctf_event_class_add_field(ec, int_ft, "field");
+ assert(!ret);
+ BT_PUT(int_ft);
+
+ return ec;
+}
+
+static
+void test_create_writer_vs_non_writer_mode(void)
+{
+ int ret;
+ char trace_path[] = "/tmp/ctfwriter_XXXXXX";
+ const char *writer_stream_name = "writer stream instance";
+ struct bt_ctf_writer *writer = NULL;
+ struct bt_ctf_trace *writer_trace = NULL;
+ struct bt_ctf_stream_class *writer_sc = NULL;
+ struct bt_ctf_stream *writer_stream = NULL;
+ struct bt_ctf_stream *writer_stream2 = NULL;
+ struct bt_ctf_stream *packet_stream = NULL;
+ struct bt_ctf_trace *non_writer_trace = NULL;
+ struct bt_ctf_stream_class *non_writer_sc = NULL;
+ struct bt_ctf_stream *non_writer_stream = NULL;
+ struct bt_ctf_stream *non_writer_stream2 = NULL;
+ struct bt_ctf_event_class *writer_ec = NULL;
+ struct bt_ctf_event_class *non_writer_ec = NULL;
+ struct bt_ctf_event *event = NULL;
+ struct bt_ctf_event *event2 = NULL;
+ struct bt_ctf_field_type *empty_struct_ft = NULL;
+ struct bt_ctf_field *int_field = NULL;
+ struct bt_ctf_clock *writer_clock = NULL;
+ struct bt_ctf_clock_class *non_writer_clock_class = NULL;
+ struct bt_ctf_packet *packet = NULL;
+ struct bt_ctf_packet *packet2 = NULL;
+
+ if (!bt_mkdtemp(trace_path)) {
+ perror("# perror");
+ }
+
+ /* Create empty structure field type (event header) */
+ empty_struct_ft = bt_ctf_field_type_structure_create();
+ assert(empty_struct_ft);
+
+ /* Create writer, writer stream class, stream, and clock */
+ writer = bt_ctf_writer_create(trace_path);
+ assert(writer);
+ writer_trace = bt_ctf_writer_get_trace(writer);
+ ok(writer_trace, "bt_ctf_writer_get_trace() returns a trace");
+ writer_sc = bt_ctf_stream_class_create("writer_sc");
+ assert(writer_sc);
+ ret = bt_ctf_stream_class_set_event_header_type(writer_sc,
+ empty_struct_ft);
+ assert(!ret);
+ ret = bt_ctf_trace_add_stream_class(writer_trace, writer_sc);
+ assert(!ret);
+ writer_stream = bt_ctf_stream_create(writer_sc, writer_stream_name);
+ assert(writer_stream);
+ ok(!strcmp(bt_ctf_stream_get_name(writer_stream), writer_stream_name),
+ "bt_ctf_stream_get_name() returns the stream's name");
+ writer_clock = bt_ctf_clock_create("writer_clock");
+ assert(writer_clock);
+ ret = bt_ctf_writer_add_clock(writer, writer_clock);
+ assert(!ret);
+
+ /* Create non-writer trace, stream class, stream, and clock */
+ non_writer_trace = bt_ctf_trace_create();
+ assert(non_writer_trace);
+ non_writer_sc = bt_ctf_stream_class_create("nonwriter_sc");
+ assert(non_writer_sc);
+ ret = bt_ctf_stream_class_set_event_header_type(non_writer_sc,
+ empty_struct_ft);
+ assert(!ret);
+ ret = bt_ctf_trace_add_stream_class(non_writer_trace, non_writer_sc);
+ assert(!ret);
+ non_writer_stream = bt_ctf_stream_create(non_writer_sc, NULL);
+ assert(non_writer_stream);
+ non_writer_clock_class =
+ bt_ctf_clock_class_create("non_writer_clock_class");
+ assert(non_writer_clock_class);
+ ret = bt_ctf_trace_add_clock_class(non_writer_trace,
+ non_writer_clock_class);
+ assert(!ret);
+
+ /* Create event class and event */
+ writer_ec = create_minimal_event_class();
+ assert(writer_ec);
+ ret = bt_ctf_stream_class_add_event_class(writer_sc, writer_ec);
+ assert(!ret);
+ event = bt_ctf_event_create(writer_ec);
+ assert(event);
+ int_field = bt_ctf_event_get_payload_by_index(event, 0);
+ assert(int_field);
+ bt_ctf_field_unsigned_integer_set_value(int_field, 17);
+
+ /*
+ * Verify non-writer stream: it should be impossible to append
+ * an event to it.
+ */
+ ok(bt_ctf_stream_append_event(non_writer_stream, event),
+ "bt_ctf_stream_append_event() fails with a non-writer stream");
+
+ /*
+ * Verify writer stream: it should be possible to append an
+ * event to it.
+ */
+ ok(!bt_ctf_stream_append_event(writer_stream, event),
+ "bt_ctf_stream_append_event() succeeds with a writer stream");
+
+ /*
+ * It should be possible to create a packet from a non-writer
+ * stream, but not from a writer stream.
+ */
+ packet = bt_ctf_packet_create(writer_stream);
+ ok(!packet, "bt_ctf_packet_create() fails with a writer stream");
+ packet = bt_ctf_packet_create(non_writer_stream);
+ ok(packet, "bt_ctf_packet_create() succeeds with a non-writer stream");
+ packet_stream = bt_ctf_packet_get_stream(packet);
+ ok(packet_stream == non_writer_stream,
+ "bt_ctf_packet_get_stream() returns the correct stream");
+
+ /*
+ * It should not be possible to append an event associated to
+ * a stream to a different stream.
+ */
+ writer_stream2 = bt_ctf_stream_create(writer_sc, "zoo");
+ assert(writer_stream2);
+ ok(bt_ctf_stream_append_event(writer_stream2, event),
+ "bt_ctf_stream_append_event() fails with an event associated to another stream");
+
+ /*
+ * It should not be possible to set the packet of an event
+ * associated to a given stream to a packet associated with
+ * a different stream.
+ */
+ ok(bt_ctf_event_set_packet(event, packet),
+ "bt_ctf_event_set_packet() fails with a packet not sharing the event's stream");
+
+ /*
+ * It should be possible to set the packet of a fresh event, as
+ * long as the originating stream classes are the same.
+ */
+ event2 = bt_ctf_event_create(writer_ec);
+ assert(event2);
+ ok(bt_ctf_event_set_packet(event2, packet),
+ "bt_ctf_event_set_packet() fails when the event's and the packet's stream class differ");
+ non_writer_ec = create_minimal_event_class();
+ assert(non_writer_ec);
+ ret = bt_ctf_stream_class_add_event_class(non_writer_sc, non_writer_ec);
+ assert(!ret);
+ BT_PUT(event2);
+ event2 = bt_ctf_event_create(non_writer_ec);
+ assert(event2);
+ ok(!bt_ctf_event_set_packet(event2, packet),
+ "bt_ctf_event_set_packet() succeeds when the event's and the packet's stream class are the same");
+
+ /*
+ * It should be possible to set a packet created from the same
+ * stream to an event with an existing packet.
+ */
+ packet2 = bt_ctf_packet_create(non_writer_stream);
+ assert(packet2);
+ ok(!bt_ctf_event_set_packet(event2, packet2),
+ "bt_ctf_event_set_packet() succeeds when the event's current packet has the same stream");
+ BT_PUT(packet2);
+
+ /*
+ * It should not be possible to set a packet created from a
+ * different stream to an event with an existing packet.
+ */
+ non_writer_stream2 = bt_ctf_stream_create(non_writer_sc, "rj45");
+ assert(non_writer_stream2);
+ packet2 = bt_ctf_packet_create(non_writer_stream);
+ assert(packet2);
+ ok(!bt_ctf_event_set_packet(event2, packet2),
+ "bt_ctf_event_set_packet() fails when the event's current packet does not have the same stream");
+
+ bt_put(writer);
+ bt_put(writer_trace);
+ bt_put(writer_sc);
+ bt_put(writer_stream);
+ bt_put(writer_stream2);
+ bt_put(non_writer_trace);
+ bt_put(non_writer_sc);
+ bt_put(non_writer_stream);
+ bt_put(non_writer_stream2);
+ bt_put(packet_stream);
+ bt_put(writer_ec);
+ bt_put(non_writer_ec);
+ bt_put(event);
+ bt_put(event2);
+ bt_put(int_field);
+ bt_put(empty_struct_ft);
+ bt_put(writer_clock);
+ bt_put(non_writer_clock_class);
+ bt_put(packet);
+ bt_put(packet2);
+ recursive_rmdir(trace_path);
+}
+
+static
+void test_clock_utils(void)
+{
+ int ret;
+ struct bt_ctf_clock *clock = NULL;
+
+ clock = bt_ctf_clock_create("water");
+ assert(clock);
+ ret = bt_ctf_clock_set_offset_s(clock, 1234);
+ assert(!ret);
+ ret = bt_ctf_clock_set_offset(clock, 1000);
+ assert(!ret);
+ ret = bt_ctf_clock_set_frequency(clock, 1000000000);
+ assert(!ret);
+ ret = bt_ctf_clock_set_frequency(clock, 1534);
+ assert(!ret);
+
+ BT_PUT(clock);
+}
+
+void test_set_clock_non_writer_stream_class(void)
+{
+ struct bt_ctf_clock *clock;
+ struct bt_ctf_trace *trace;
+ struct bt_ctf_stream_class *sc;
+ int ret;
+
+ clock = bt_ctf_clock_create("the_clock");
+ assert(clock);
+
+ trace = bt_ctf_trace_create();
+ assert(trace);
+
+ sc = bt_ctf_stream_class_create(NULL);
+ assert(sc);
+
+ ret = bt_ctf_stream_class_set_clock(sc, clock);
+ assert(ret == 0);
+
+ ret = bt_ctf_trace_add_stream_class(trace, sc);
+ ok(ret < 0,
+ "bt_ctf_trace_add_stream_class() fails with a stream class with a registered clock");
+
+ bt_put(clock);
+ bt_put(trace);
+ bt_put(sc);
+}
+
int main(int argc, char **argv)
{
char trace_path[] = "/tmp/ctfwriter_XXXXXX";
const char *returned_clock_name;
const char *returned_clock_description;
const uint64_t frequency = 1123456789;
- const uint64_t offset_s = 1351530929945824323;
- const uint64_t offset = 1234567;
+ const int64_t offset_s = 1351530929945824323;
+ const int64_t offset = 1234567;
+ int64_t get_offset_s,
+ get_offset;
const uint64_t precision = 10;
const int is_absolute = 0xFF;
char *metadata_string;
struct utsname name;
char hostname[BABELTRACE_HOST_NAME_MAX];
struct bt_ctf_clock *clock, *ret_clock;
+ struct bt_ctf_clock_class *ret_clock_class;
struct bt_ctf_stream_class *stream_class, *ret_stream_class;
struct bt_ctf_stream *stream1;
const char *ret_string;
return -1;
}
- plan_no_plan();
+ plan_tests(NR_TESTS);
if (!bt_mkdtemp(trace_path)) {
perror("# perror");
/* Define a clock and add it to the trace */
ok(bt_ctf_clock_create("signed") == NULL,
"Illegal clock name rejected");
- ok(bt_ctf_clock_create(NULL) == NULL, "NULL clock name rejected");
clock = bt_ctf_clock_create(clock_name);
ok(clock, "Clock created sucessfully");
returned_clock_name = bt_ctf_clock_get_name(clock);
ok(bt_ctf_clock_get_frequency(clock) == frequency,
"bt_ctf_clock_get_frequency returns the correct frequency once it is set");
- ok(bt_ctf_clock_get_offset_s(clock) == DEFAULT_CLOCK_OFFSET_S,
+ ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0,
+ "bt_ctf_clock_get_offset_s succeeds");
+ ok(get_offset_s == DEFAULT_CLOCK_OFFSET_S,
"bt_ctf_clock_get_offset_s returns the correct default offset (in seconds)");
ok(bt_ctf_clock_set_offset_s(clock, offset_s) == 0,
"Set clock offset (seconds)");
- ok(bt_ctf_clock_get_offset_s(clock) == offset_s,
+ ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0,
+ "bt_ctf_clock_get_offset_s succeeds");
+ ok(get_offset_s == offset_s,
"bt_ctf_clock_get_offset_s returns the correct default offset (in seconds) once it is set");
- ok(bt_ctf_clock_get_offset(clock) == DEFAULT_CLOCK_OFFSET,
- "bt_ctf_clock_get_frequency returns the correct default offset (in ticks)");
+ ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0,
+ "bt_ctf_clock_get_offset succeeds");
+ ok(get_offset == DEFAULT_CLOCK_OFFSET,
+ "bt_ctf_clock_get_offset returns the correct default offset (in ticks)");
ok(bt_ctf_clock_set_offset(clock, offset) == 0, "Set clock offset");
- ok(bt_ctf_clock_get_offset(clock) == offset,
- "bt_ctf_clock_get_frequency returns the correct default offset (in ticks) once it is set");
+ ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0,
+ "bt_ctf_clock_get_offset succeeds");
+ ok(get_offset == offset,
+ "bt_ctf_clock_get_offset returns the correct default offset (in ticks) once it is set");
ok(bt_ctf_clock_get_precision(clock) == DEFAULT_CLOCK_PRECISION,
"bt_ctf_clock_get_precision returns the correct default precision");
ok(bt_ctf_clock_get_is_absolute(clock) == !!is_absolute,
"bt_ctf_clock_get_precision returns the correct is_absolute attribute once it is set");
- ok(bt_ctf_clock_get_time(clock) == DEFAULT_CLOCK_TIME,
- "bt_ctf_clock_get_time returns the correct default time");
ok(bt_ctf_clock_set_time(clock, current_time) == 0,
"Set clock time");
- ok(bt_ctf_clock_get_time(clock) == current_time,
- "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");
"bt_ctf_clock_get_frequency correctly handles NULL");
ok(bt_ctf_clock_get_precision(NULL) == -1ULL,
"bt_ctf_clock_get_precision correctly handles NULL");
- ok(bt_ctf_clock_get_offset_s(NULL) == -1ULL,
- "bt_ctf_clock_get_offset_s correctly handles NULL");
- ok(bt_ctf_clock_get_offset(NULL) == -1ULL,
- "bt_ctf_clock_get_offset correctly handles NULL");
+ ok(bt_ctf_clock_get_offset_s(NULL, &get_offset_s) < 0,
+ "bt_ctf_clock_get_offset_s correctly handles NULL clock");
+ ok(bt_ctf_clock_get_offset_s(clock, NULL) < 0,
+ "bt_ctf_clock_get_offset_s correctly handles NULL output");
+ ok(bt_ctf_clock_get_offset(NULL, &get_offset) < 0,
+ "bt_ctf_clock_get_offset correctly handles NULL clock");
+ ok(bt_ctf_clock_get_offset(clock, NULL) < 0,
+ "bt_ctf_clock_get_offset correctly handles NULL output");
ok(bt_ctf_clock_get_is_absolute(NULL) < 0,
"bt_ctf_clock_get_is_absolute correctly handles NULL");
- ok(bt_ctf_clock_get_time(NULL) == -1ULL,
- "bt_ctf_clock_get_time correctly handles NULL");
ok(bt_ctf_clock_set_description(NULL, NULL) < 0,
"bt_ctf_clock_set_description correctly handles NULL clock");
ok(bt_ctf_clock_set_uuid(clock, NULL) < 0,
"bt_ctf_clock_set_uuid correctly handles a NULL UUID");
ok(bt_ctf_clock_set_uuid(clock, tmp_uuid) == 0,
- "bt_ctf_clock_set_uuid sets a new uuid succesfully");
+ "bt_ctf_clock_set_uuid sets a new uuid successfully");
ret_uuid = bt_ctf_clock_get_uuid(clock);
ok(ret_uuid,
"bt_ctf_clock_get_uuid returns a UUID after setting a new one");
stream_class);
ok(ret_field_type,
"bt_ctf_stream_class_get_event_header_type returns an event header type");
- ok(bt_ctf_field_type_get_type_id(ret_field_type) == CTF_TYPE_STRUCT,
+ ok(bt_ctf_field_type_get_type_id(ret_field_type) == BT_CTF_TYPE_ID_STRUCT,
"Default event header type is a structure");
event_header_field_type =
bt_ctf_field_type_structure_get_field_type_by_name(
ok(event_header_field_type,
"Default event header type contains an \"id\" field");
ok(bt_ctf_field_type_get_type_id(
- event_header_field_type) == CTF_TYPE_INTEGER,
+ event_header_field_type) == BT_CTF_TYPE_ID_INTEGER,
"Default event header \"id\" field is an integer");
bt_put(event_header_field_type);
event_header_field_type =
ok(event_header_field_type,
"Default event header type contains a \"timestamp\" field");
ok(bt_ctf_field_type_get_type_id(
- event_header_field_type) == CTF_TYPE_INTEGER,
+ event_header_field_type) == BT_CTF_TYPE_ID_INTEGER,
"Default event header \"timestamp\" field is an integer");
bt_put(event_header_field_type);
bt_put(ret_field_type);
packet_header_type = bt_ctf_trace_get_packet_header_type(trace);
ok(packet_header_type,
"bt_ctf_trace_get_packet_header_type returns a packet header");
- ok(bt_ctf_field_type_get_type_id(packet_header_type) == CTF_TYPE_STRUCT,
+ ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_TYPE_ID_STRUCT,
"bt_ctf_trace_get_packet_header_type returns a packet header of type struct");
ret_field_type = bt_ctf_field_type_structure_get_field_type_by_name(
packet_header_type, "magic");
ok(bt_ctf_trace_set_packet_header_type(NULL, packet_header_type) < 0,
"bt_ctf_trace_set_packet_header_type handles a NULL trace correctly");
- ok(bt_ctf_trace_set_packet_header_type(trace, NULL) < 0,
- "bt_ctf_trace_set_packet_header_type handles a NULL packet_header_type correctly");
ok(!bt_ctf_trace_set_packet_header_type(trace, packet_header_type),
"Set a trace packet_header_type successfully");
packet_context_type = bt_ctf_stream_class_get_packet_context_type(stream_class);
ok(packet_context_type,
"bt_ctf_stream_class_get_packet_context_type returns a packet context type.");
- ok(bt_ctf_field_type_get_type_id(packet_context_type) == CTF_TYPE_STRUCT,
+ ok(bt_ctf_field_type_get_type_id(packet_context_type) == BT_CTF_TYPE_ID_STRUCT,
"Packet context is a structure");
ok(bt_ctf_stream_class_set_packet_context_type(NULL, packet_context_type),
"bt_ctf_stream_class_set_packet_context_type handles a NULL stream class correctly");
- ok(bt_ctf_stream_class_set_packet_context_type(stream_class, NULL),
- "bt_ctf_stream_class_set_packet_context_type handles a NULL packet context type correctly");
integer_type = bt_ctf_field_type_integer_create(32);
ok(bt_ctf_stream_class_set_packet_context_type(stream_class,
ok(bt_ctf_stream_class_set_event_context_type(NULL,
stream_event_context_type) < 0,
"bt_ctf_stream_class_set_event_context_type handles a NULL stream_class correctly");
- ok(bt_ctf_stream_class_set_event_context_type(stream_class,
- NULL) < 0,
- "bt_ctf_stream_class_set_event_context_type handles a NULL event_context correctly");
ok(bt_ctf_stream_class_set_event_context_type(stream_class,
integer_type) < 0,
"bt_ctf_stream_class_set_event_context_type validates that the event context os a structure");
bt_put(ret_field_type);
/* Instantiate a stream and append events */
+ ret = bt_ctf_writer_add_clock(writer, clock);
+ assert(ret == 0);
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_class_count(NULL) < 0,
+ "bt_ctf_trace_get_clock_class_count correctly handles NULL");
+ ok(bt_ctf_trace_get_clock_class_count(trace) == 1,
+ "bt_ctf_trace_get_clock_class_count returns the correct number of clocks");
+ ok(!bt_ctf_trace_get_clock_class(NULL, 0),
+ "bt_ctf_trace_get_clock_class correctly handles NULL");
+ ok(!bt_ctf_trace_get_clock_class(trace, -1),
+ "bt_ctf_trace_get_clock_class correctly handles negative indexes");
+ ok(!bt_ctf_trace_get_clock_class(trace, 1),
+ "bt_ctf_trace_get_clock_class correctly handles out of bound accesses");
+ ret_clock_class = bt_ctf_trace_get_clock_class(trace, 0);
+ ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class),
+ bt_ctf_clock_get_name(clock)) == 0,
+ "bt_ctf_trace_get_clock_class returns the right clock instance");
+ bt_put(ret_clock_class);
+ ok(!bt_ctf_trace_get_clock_class_by_name(trace, NULL),
+ "bt_ctf_trace_get_clock_class_by_name correctly handles NULL (trace)");
+ ok(!bt_ctf_trace_get_clock_class_by_name(NULL, clock_name),
+ "bt_ctf_trace_get_clock_by_name correctly handles NULL (clock name)");
+ ok(!bt_ctf_trace_get_clock_class_by_name(NULL, NULL),
+ "bt_ctf_trace_get_clock_by_name correctly handles NULL (both)");
+ ret_clock_class = bt_ctf_trace_get_clock_class_by_name(trace, clock_name);
+ ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class),
+ bt_ctf_clock_get_name(clock)) == 0,
+ "bt_ctf_trace_get_clock_class returns the right clock instance");
+ bt_put(ret_clock_class);
+ ok(!bt_ctf_trace_get_clock_class_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(ret_stream_class == stream_class,
"Returned stream class is of the correct type");
+ /*
+ * Packet header, packet context, event header, and stream
+ * event context types were copied for the resolving
+ * process
+ */
+ BT_PUT(packet_header_type);
+ BT_PUT(packet_context_type);
+ BT_PUT(stream_event_context_type);
+ packet_header_type = bt_ctf_trace_get_packet_header_type(trace);
+ assert(packet_header_type);
+ packet_context_type =
+ bt_ctf_stream_class_get_packet_context_type(stream_class);
+ assert(packet_context_type);
+ stream_event_context_type =
+ bt_ctf_stream_class_get_event_context_type(stream_class);
+ assert(stream_event_context_type);
+
/*
* Try to modify the packet context type after a stream has been
* created.
ok(packet_header_field,
"Packet header structure contains a custom field with the appropriate name");
ret_field_type = bt_ctf_field_get_type(packet_header_field);
- ok(ret_field_type == packet_header_field_type,
+ ok(bt_ctf_field_type_compare(ret_field_type, packet_header_field_type) == 0,
"Custom packet header field is of the expected type");
ok(!bt_ctf_field_unsigned_integer_set_value(packet_header_field,
54321), "Set custom packet header value successfully");
ok(bt_ctf_writer_add_environment_field(writer, "new_field", "test") == 0,
"Add environment field to writer after stream creation");
- test_instanciate_event_before_stream(writer);
+ test_clock_utils();
+
+ test_create_writer_vs_non_writer_mode();
+
+ test_set_clock_non_writer_stream_class();
+
+ test_instanciate_event_before_stream(writer, clock);
append_simple_event(stream_class, stream1, clock);
test_empty_stream(writer);
- test_custom_event_header_stream(writer);
+ test_custom_event_header_stream(writer, clock);
metadata_string = bt_ctf_writer_get_metadata_string(writer);
ok(metadata_string, "Get metadata string");
bt_put(packet_header_field);
bt_put(trace);
free(metadata_string);
-
- ok(bt_ctf_stream_class_get_trace(stream_class) == NULL,
- "bt_ctf_stream_class_get_trace returns NULL after its trace has been reclaimed");
bt_put(stream_class);
- /* Remove all trace files and delete temporary trace directory */
- DIR *trace_dir = opendir(trace_path);
- if (!trace_dir) {
- perror("# opendir");
- return -1;
- }
-
- struct dirent *entry;
- while ((entry = readdir(trace_dir))) {
- struct stat st;
- char filename[PATH_MAX];
-
- if (snprintf(filename, sizeof(filename), "%s/%s",
- trace_path, entry->d_name) <= 0) {
- continue;
- }
-
- if (stat(entry->d_name, &st)) {
- continue;
- }
-
- if (S_ISREG(st.st_mode)) {
- unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
- }
- }
-
- rmdir(trace_path);
- closedir(trace_dir);
+ recursive_rmdir(trace_path);
return 0;
}