From 578ce73a104b847b78790041bf30aa9aaa310dd0 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 22 Feb 2012 17:10:26 -0500 Subject: [PATCH] Revert "Create libuuid/libc uuid wrapper" This reverts commit 67107619135ff344f0de2783ec2d48e558deaf9a. Signed-off-by: Mathieu Desnoyers --- configure.ac | 4 -- include/lttng/ust-events.h | 7 ++- liblttng-ust/Makefile.am | 11 +--- liblttng-ust/clock.h | 12 +++-- liblttng-ust/ltt-events.c | 11 ++-- liblttng-ust/ltt-ring-buffer-client.h | 3 +- .../ltt-ring-buffer-metadata-client.h | 2 +- liblttng-ust/uuid.h | 54 ------------------- 8 files changed, 18 insertions(+), 86 deletions(-) delete mode 100644 liblttng-ust/uuid.h diff --git a/configure.ac b/configure.ac index aa0fac34..f9738a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -49,22 +49,18 @@ AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([uuid], [uuid_generate], [ AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBUUID], 1, [Has libuuid support.]) - have_libuuid=yes ], [ # libuuid not found, check for uuid_create in libc. AC_CHECK_LIB([c], [uuid_create], [ AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) - have_libc_uuid=yes ], [ AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify its location.]) ]) ] ) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) # Checks for header files. #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 2049e535..2bbe785e 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -20,14 +20,13 @@ #include #include +#include #include #include #include #include #include -#define LTTNG_UST_UUID_LEN 16 - struct ltt_channel; struct ltt_session; struct lttng_ust_lib_ring_buffer_ctx; @@ -324,7 +323,7 @@ struct ltt_channel { /* Channel ID, available for consumer too */ unsigned int id; /* Copy of session UUID for consumer (availability through shm) */ - unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ + uuid_t uuid; /* Trace session unique ID */ }; struct ltt_session { @@ -337,7 +336,7 @@ struct ltt_session { struct cds_list_head wildcards; /* Wildcard list head */ struct cds_list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ - unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ + uuid_t uuid; /* Trace session unique ID */ unsigned int metadata_dumped:1; }; diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am index 628e56fb..9d9477b9 100644 --- a/liblttng-ust/Makefile.am +++ b/liblttng-ust/Makefile.am @@ -33,8 +33,7 @@ liblttng_ust_runtime_la_SOURCES = \ compat.h \ wait.h \ jhash.h \ - error.h \ - uuid.h + error.h liblttng_ust_support_la_SOURCES = \ ltt-tracer.h \ @@ -56,16 +55,10 @@ liblttng_ust_support_la_LIBADD = \ liblttng_ust_la_LIBADD = \ -lpthread \ -lrt \ + -luuid \ -llttng-ust-tracepoint \ $(top_builddir)/snprintf/libustsnprintf.la \ $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ liblttng-ust-runtime.la liblttng-ust-support.la -if LTTNG_UST_BUILD_WITH_LIBUUID -liblttng_ust_la_LIBADD += -luuid -endif -if LTTNG_UST_BUILD_WITH_LIBC_UUID -liblttng_ust_la_LIBADD += -lc -endif - liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h index b4d17e78..82a7b45c 100644 --- a/liblttng-ust/clock.h +++ b/liblttng-ust/clock.h @@ -25,7 +25,11 @@ #include #include #include -#include "uuid.h" + +/* + * Includes final \0. + */ +#define CLOCK_UUID_LEN 37 /* TRACE CLOCK */ @@ -67,12 +71,12 @@ const int trace_clock_uuid(char *uuid) if (!fp) { return -ENOENT; } - len = fread(uuid, 1, LTTNG_UST_UUID_STR_LEN - 1, fp); - if (len < LTTNG_UST_UUID_STR_LEN - 1) { + len = fread(uuid, 1, CLOCK_UUID_LEN - 1, fp); + if (len < CLOCK_UUID_LEN - 1) { ret = -EINVAL; goto end; } - uuid[LTTNG_UST_UUID_STR_LEN - 1] = '\0'; + uuid[CLOCK_UUID_LEN - 1] = '\0'; end: fclose(fp); return ret; diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c index b79eea51..c9d35dde 100644 --- a/liblttng-ust/ltt-events.c +++ b/liblttng-ust/ltt-events.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include "error.h" #include "compat.h" -#include "uuid.h" #include "tracepoint-internal.h" #include "ltt-tracer.h" @@ -295,7 +295,6 @@ void synchronize_trace(void) struct ltt_session *ltt_session_create(void) { struct ltt_session *session; - int ret; session = zmalloc(sizeof(struct ltt_session)); if (!session) @@ -303,10 +302,7 @@ struct ltt_session *ltt_session_create(void) CDS_INIT_LIST_HEAD(&session->chan); CDS_INIT_LIST_HEAD(&session->events); CDS_INIT_LIST_HEAD(&session->wildcards); - ret = lttng_ust_uuid_generate(session->uuid); - if (ret != 0) { - session->uuid[0] = '\0'; - } + uuid_generate(session->uuid); cds_list_add(&session->list, &sessions); return session; } @@ -1091,8 +1087,7 @@ static int _ltt_session_metadata_statedump(struct ltt_session *session) { unsigned char *uuid_c = session->uuid; - char uuid_s[LTTNG_UST_UUID_STR_LEN], - clock_uuid_s[LTTNG_UST_UUID_STR_LEN]; + char uuid_s[37], clock_uuid_s[CLOCK_UUID_LEN]; struct ltt_channel *chan; struct ltt_event *event; int ret = 0; diff --git a/liblttng-ust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h index 825db712..ce9d263c 100644 --- a/liblttng-ust/ltt-ring-buffer-client.h +++ b/liblttng-ust/ltt-ring-buffer-client.h @@ -12,7 +12,6 @@ #include #include "lttng/bitfield.h" #include "clock.h" -#include "uuid.h" #include "ltt-tracer.h" #include "../libringbuffer/frontend_types.h" @@ -32,7 +31,7 @@ struct packet_header { * Trace magic number. * contains endianness information. */ - uint8_t uuid[LTTNG_UST_UUID_LEN]; + uint8_t uuid[16]; uint32_t stream_id; struct { diff --git a/liblttng-ust/ltt-ring-buffer-metadata-client.h b/liblttng-ust/ltt-ring-buffer-metadata-client.h index dcbaacb6..7e79b116 100644 --- a/liblttng-ust/ltt-ring-buffer-metadata-client.h +++ b/liblttng-ust/ltt-ring-buffer-metadata-client.h @@ -16,7 +16,7 @@ struct metadata_packet_header { uint32_t magic; /* 0x75D11D57 */ - uint8_t uuid[LTTNG_UST_UUID_LEN]; /* Unique Universal Identifier */ + uint8_t uuid[16]; /* Unique Universal Identifier */ uint32_t checksum; /* 0 if unused */ uint32_t content_size; /* in bits */ uint32_t packet_size; /* in bits */ diff --git a/liblttng-ust/uuid.h b/liblttng-ust/uuid.h deleted file mode 100644 index 1027acbe..00000000 --- a/liblttng-ust/uuid.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _LTTNG_UST_UUID_H -#define _LTTNG_UST_UUID_H - -/* - * Copyright (C) 2011 Mathieu Desnoyers - * - * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED - * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. - * - * Permission is hereby granted to use or copy this program - * for any purpose, provided the above notices are retained on all copies. - * Permission to modify the code and to distribute modified code is granted, - * provided the above notices are retained, and a notice that the code was - * modified is included with the above copyright notice. - */ - -#include -#include /* For LTTNG_UST_UUID_LEN */ -/* - * Includes final \0. - */ -#define LTTNG_UST_UUID_STR_LEN 37 - -#include - -#ifdef LTTNG_UST_HAVE_LIBUUID -static inline -int lttng_ust_uuid_generate(unsigned char *uuid_out) -{ - uuid_generate(uuid_out); - return 0; -} - -#elif defined(LTTNG_UST_HAVE_LIBC_UUID) -#include -#include - -static inline -int lttng_ust_uuid_generate(unsigned char *uuid_out) -{ - uint32_t status; - - uuid_create(uuid_out, &status); - if (status == uuid_s_ok) - return 0; - else - return -1; -} - -#else -#error "LTTng-UST needs to have a UUID generator configured." -#endif - -#endif /* _LTTNG_UST_UUID_H */ -- 2.34.1