#include <stdint.h>
#include <unistd.h>
#include <errno.h>
-#include <uuid/uuid.h>
#include <string.h>
-#include <endian.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
#define USEC_PER_SEC 1000000UL
static char *s_outputname;
static int s_timestamp;
static int s_help;
-static uuid_t s_uuid;
+static unsigned char s_uuid[BABELTRACE_UUID_LEN];
/* Metadata format string */
static const char metadata_fmt[] =
}
static
-void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid)
+void write_packet_header(struct ctf_stream_pos *pos, unsigned char *uuid)
{
struct ctf_stream_pos dummy;
assert(!ctf_pos_packet(&dummy));
ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
- memcpy(ctf_get_pos_addr(pos), uuid, 16);
- ctf_move_pos(pos, 16 * CHAR_BIT);
+ memcpy(ctf_get_pos_addr(pos), uuid, BABELTRACE_UUID_LEN);
+ ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT);
}
static
goto error_closemetadatafd;
}
- uuid_generate(s_uuid);
+ babeltrace_uuid_generate(s_uuid);
print_metadata(metadata_fp);
trace_text(stdin, fd);
#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
#include <inttypes.h>
#include <stdio.h>
-#include <uuid/uuid.h>
#include <sys/mman.h>
#include <errno.h>
-#include <endian.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
*/
#define MAX_PACKET_HEADER_LEN (getpagesize() * CHAR_BIT)
#define WRITE_PACKET_LEN (getpagesize() * 8 * CHAR_BIT)
-#define UUID_LEN 16 /* uuid by value len */
#ifndef min
#define min(a, b) (((a) < (b)) ? (a) : (b))
memcpy(td->uuid, header.uuid, sizeof(header.uuid));
CTF_TRACE_SET_FIELD(td, uuid);
} else {
- if (uuid_compare(header.uuid, td->uuid))
+ if (babeltrace_uuid_compare(header.uuid, td->uuid))
return -EINVAL;
}
struct definition_array *defarray;
struct definition *field;
uint64_t i;
- uint8_t uuidval[UUID_LEN];
+ uint8_t uuidval[BABELTRACE_UUID_LEN];
field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
assert(field->declaration->id == CTF_TYPE_ARRAY);
defarray = container_of(field, struct definition_array, p);
- assert(array_len(defarray) == UUID_LEN);
+ assert(array_len(defarray) == BABELTRACE_UUID_LEN);
- for (i = 0; i < UUID_LEN; i++) {
+ for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
struct definition *elem;
elem = array_index(defarray, i);
uuidval[i] = get_unsigned_int(elem);
}
- ret = uuid_compare(td->uuid, uuidval);
+ ret = babeltrace_uuid_compare(td->uuid, uuidval);
if (ret) {
fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;