#ifndef _UST_COMMON_CLOCK_H
#define _UST_COMMON_CLOCK_H
+#include <time.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include <urcu/system.h>
+#include <urcu/arch.h>
+#include <lttng/ust-clock.h>
+
+struct lttng_ust_trace_clock {
+ uint64_t (*read64)(void);
+ uint64_t (*freq)(void);
+ int (*uuid)(char *uuid);
+ const char *(*name)(void);
+ const char *(*description)(void);
+};
+
/*
- * Part of the private ABI between liblttng-ust and liblttng-ust-ctl.
+ * The trace clock is a public symbol of liblttng-ust-common accessed by other
+ * libraries through the trace_clock_read64 static inline function. It is
+ * initialised in the liblttng-ust-common constructor.
*/
-void lttng_ust_clock_init(void);
+extern struct lttng_ust_trace_clock *lttng_ust_trace_clock;
+
+/* Use the kernel MONOTONIC clock. */
+
+static __inline__
+uint64_t trace_clock_read64_monotonic(void)
+{
+ struct timespec ts;
+
+ if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts))) {
+ ts.tv_sec = 0;
+ ts.tv_nsec = 0;
+ }
+ return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
+}
+
+static __inline__
+uint64_t trace_clock_read64(void)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ return trace_clock_read64_monotonic();
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ return ltc->read64();
+ }
+}
#endif /* _UST_COMMON_CLOCK_H */
lib_LTLIBRARIES = liblttng-ust-common.la
liblttng_ust_common_la_SOURCES = \
+ clock.c \
+ clock.h \
fd-tracker.c \
fd-tracker.h \
ust-common.c \
lttng-ust-urcu-pointer.c
liblttng_ust_common_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/libcommon.la \
+ $(DL_LIBS)
liblttng_ust_common_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
--- /dev/null
+/*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#define _LGPL_SOURCE
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include <lttng/ust-clock.h>
+#include <lttng/ust-events.h>
+#include <urcu/system.h>
+#include <urcu/arch.h>
+
+#include "common/logging.h"
+#include "common/getenv.h"
+
+#include "lib/lttng-ust-common/clock.h"
+
+struct lttng_ust_trace_clock *lttng_ust_trace_clock;
+
+static
+struct lttng_ust_trace_clock user_tc;
+
+static
+void *clock_handle;
+
+static
+uint64_t trace_clock_freq_monotonic(void)
+{
+ return 1000000000ULL;
+}
+
+static
+int trace_clock_uuid_monotonic(char *uuid)
+{
+ int ret = 0;
+ size_t len;
+ FILE *fp;
+
+ /*
+ * boot_id needs to be read once before being used concurrently
+ * to deal with a Linux kernel race. A fix is proposed for
+ * upstream, but the work-around is needed for older kernels.
+ */
+ fp = fopen("/proc/sys/kernel/random/boot_id", "r");
+ if (!fp) {
+ return -ENOENT;
+ }
+ len = fread(uuid, 1, LTTNG_UST_UUID_STR_LEN - 1, fp);
+ if (len < LTTNG_UST_UUID_STR_LEN - 1) {
+ ret = -EINVAL;
+ goto end;
+ }
+ uuid[LTTNG_UST_UUID_STR_LEN - 1] = '\0';
+end:
+ fclose(fp);
+ return ret;
+}
+
+static
+const char *trace_clock_name_monotonic(void)
+{
+ return "monotonic";
+}
+
+static
+const char *trace_clock_description_monotonic(void)
+{
+ return "Monotonic Clock";
+}
+
+int lttng_ust_trace_clock_set_read64_cb(lttng_ust_clock_read64_function read64_cb)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ user_tc.read64 = read64_cb;
+ return 0;
+}
+
+int lttng_ust_trace_clock_get_read64_cb(lttng_ust_clock_read64_function *read64_cb)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ *read64_cb = &trace_clock_read64_monotonic;
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ *read64_cb = ltc->read64;
+ }
+ return 0;
+}
+
+int lttng_ust_trace_clock_set_freq_cb(lttng_ust_clock_freq_function freq_cb)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ user_tc.freq = freq_cb;
+ return 0;
+}
+
+int lttng_ust_trace_clock_get_freq_cb(lttng_ust_clock_freq_function *freq_cb)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ *freq_cb = &trace_clock_freq_monotonic;
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ *freq_cb = ltc->freq;
+ }
+ return 0;
+}
+
+int lttng_ust_trace_clock_set_uuid_cb(lttng_ust_clock_uuid_function uuid_cb)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ user_tc.uuid = uuid_cb;
+ return 0;
+}
+
+int lttng_ust_trace_clock_get_uuid_cb(lttng_ust_clock_uuid_function *uuid_cb)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ *uuid_cb = &trace_clock_uuid_monotonic;
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ *uuid_cb = ltc->uuid;
+ }
+ return 0;
+}
+
+int lttng_ust_trace_clock_set_name_cb(lttng_ust_clock_name_function name_cb)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ user_tc.name = name_cb;
+ return 0;
+}
+
+int lttng_ust_trace_clock_get_name_cb(lttng_ust_clock_name_function *name_cb)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ *name_cb = &trace_clock_name_monotonic;
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ *name_cb = ltc->name;
+ }
+ return 0;
+}
+
+int lttng_ust_trace_clock_set_description_cb(lttng_ust_clock_description_function description_cb)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ user_tc.description = description_cb;
+ return 0;
+}
+
+int lttng_ust_trace_clock_get_description_cb(lttng_ust_clock_description_function *description_cb)
+{
+ struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
+
+ if (caa_likely(!ltc)) {
+ *description_cb = &trace_clock_description_monotonic;
+ } else {
+ cmm_read_barrier_depends(); /* load ltc before content */
+ *description_cb = ltc->description;
+ }
+ return 0;
+}
+
+int lttng_ust_enable_trace_clock_override(void)
+{
+ if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
+ return -EBUSY;
+ if (!user_tc.read64)
+ return -EINVAL;
+ if (!user_tc.freq)
+ return -EINVAL;
+ if (!user_tc.name)
+ return -EINVAL;
+ if (!user_tc.description)
+ return -EINVAL;
+ /* Use default uuid cb when NULL */
+ cmm_smp_mb(); /* Store callbacks before trace clock */
+ CMM_STORE_SHARED(lttng_ust_trace_clock, &user_tc);
+ return 0;
+}
+
+void lttng_ust_clock_init(void)
+{
+ const char *libname;
+ void (*libinit)(void);
+
+ if (clock_handle)
+ return;
+ libname = lttng_ust_getenv("LTTNG_UST_CLOCK_PLUGIN");
+ if (!libname)
+ return;
+ clock_handle = dlopen(libname, RTLD_NOW);
+ if (!clock_handle) {
+ PERROR("Cannot load LTTng UST clock override library %s",
+ libname);
+ return;
+ }
+ dlerror();
+ libinit = (void (*)(void)) dlsym(clock_handle,
+ "lttng_ust_clock_plugin_init");
+ if (!libinit) {
+ PERROR("Cannot find LTTng UST clock override library %s initialization function lttng_ust_clock_plugin_init()",
+ libname);
+ return;
+ }
+ libinit();
+}
--- /dev/null
+/*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2010 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_UST_COMMON_CLOCK_H
+#define _LTTNG_UST_COMMON_CLOCK_H
+
+#include "common/clock.h"
+
+void lttng_ust_clock_init(void)
+ __attribute__((visibility("hidden")));
+
+#endif /* _LTTNG_UST_COMMON_CLOCK_H */
#include "common/getenv.h"
#include "lib/lttng-ust-common/fd-tracker.h"
+#include "lib/lttng-ust-common/clock.h"
/*
* The liblttng-ust-common constructor, initialize the internal shared state.
* Initialize the shared state of the fd tracker.
*/
lttng_ust_fd_tracker_init();
+
+ /*
+ * Initialize the potential user-provided clock plugin.
+ */
+ lttng_ust_clock_init();
}
void lttng_ust_common_alloc_tls(void)
#include "common/events.h"
#include "common/wait.h"
#include "lib/lttng-ust/lttng-rb-clients.h"
-#include "common/clock.h"
#include "common/getenv.h"
#include "lib/lttng-ust/lttng-tracer-core.h"
#include "lib/lttng-ust/lttng-counter-client.h"
*/
lttng_ust_common_ctor();
- lttng_ust_clock_init();
lttng_ust_ring_buffer_clients_init();
lttng_ust_counter_clients_init();
lib_ringbuffer_signal_init();
context-internal.h \
context-provider-internal.h \
events.h \
- clock.h \
- lttng-ust-uuid.h \
tracef.c \
lttng-ust-tracef-provider.h \
tracelog.c \
lttng-counter-client.h \
lttng-counter-client-percpu-32-modular.c \
lttng-counter-client-percpu-64-modular.c \
- lttng-clock.c \
getcpu.c getcpu.h
liblttng_ust_la_SOURCES =
+++ /dev/null
-/*
- * SPDX-License-Identifier: LGPL-2.1-only
- *
- * Copyright (C) 2010 Pierre-Marc Fournier
- * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _UST_CLOCK_H
-#define _UST_CLOCK_H
-
-#include <time.h>
-#include <sys/time.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <urcu/system.h>
-#include <urcu/arch.h>
-#include <lttng/ust-clock.h>
-
-#include "common/clock.h"
-#include "lttng-ust-uuid.h"
-
-struct lttng_ust_trace_clock {
- uint64_t (*read64)(void);
- uint64_t (*freq)(void);
- int (*uuid)(char *uuid);
- const char *(*name)(void);
- const char *(*description)(void);
-};
-
-extern struct lttng_ust_trace_clock *lttng_ust_trace_clock
- __attribute__((visibility("hidden")));
-
-/* Use the kernel MONOTONIC clock. */
-
-static __inline__
-uint64_t trace_clock_read64_monotonic(void)
-{
- struct timespec ts;
-
- if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts))) {
- ts.tv_sec = 0;
- ts.tv_nsec = 0;
- }
- return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
-}
-
-static __inline__
-uint64_t trace_clock_read64(void)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- return trace_clock_read64_monotonic();
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- return ltc->read64();
- }
-}
-
-#endif /* _UST_CLOCK_H */
+++ /dev/null
-/*
- * SPDX-License-Identifier: LGPL-2.1-only
- *
- * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#define _LGPL_SOURCE
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <lttng/ust-clock.h>
-#include <urcu/system.h>
-#include <urcu/arch.h>
-
-#include "common/logging.h"
-
-#include "clock.h"
-#include "common/getenv.h"
-
-struct lttng_ust_trace_clock *lttng_ust_trace_clock;
-
-static
-struct lttng_ust_trace_clock user_tc;
-
-static
-void *clock_handle;
-
-static
-uint64_t trace_clock_freq_monotonic(void)
-{
- return 1000000000ULL;
-}
-
-static
-int trace_clock_uuid_monotonic(char *uuid)
-{
- int ret = 0;
- size_t len;
- FILE *fp;
-
- /*
- * boot_id needs to be read once before being used concurrently
- * to deal with a Linux kernel race. A fix is proposed for
- * upstream, but the work-around is needed for older kernels.
- */
- fp = fopen("/proc/sys/kernel/random/boot_id", "r");
- if (!fp) {
- return -ENOENT;
- }
- len = fread(uuid, 1, LTTNG_UST_UUID_STR_LEN - 1, fp);
- if (len < LTTNG_UST_UUID_STR_LEN - 1) {
- ret = -EINVAL;
- goto end;
- }
- uuid[LTTNG_UST_UUID_STR_LEN - 1] = '\0';
-end:
- fclose(fp);
- return ret;
-}
-
-static
-const char *trace_clock_name_monotonic(void)
-{
- return "monotonic";
-}
-
-static
-const char *trace_clock_description_monotonic(void)
-{
- return "Monotonic Clock";
-}
-
-int lttng_ust_trace_clock_set_read64_cb(lttng_ust_clock_read64_function read64_cb)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- user_tc.read64 = read64_cb;
- return 0;
-}
-
-int lttng_ust_trace_clock_get_read64_cb(lttng_ust_clock_read64_function *read64_cb)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- *read64_cb = &trace_clock_read64_monotonic;
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- *read64_cb = ltc->read64;
- }
- return 0;
-}
-
-int lttng_ust_trace_clock_set_freq_cb(lttng_ust_clock_freq_function freq_cb)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- user_tc.freq = freq_cb;
- return 0;
-}
-
-int lttng_ust_trace_clock_get_freq_cb(lttng_ust_clock_freq_function *freq_cb)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- *freq_cb = &trace_clock_freq_monotonic;
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- *freq_cb = ltc->freq;
- }
- return 0;
-}
-
-int lttng_ust_trace_clock_set_uuid_cb(lttng_ust_clock_uuid_function uuid_cb)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- user_tc.uuid = uuid_cb;
- return 0;
-}
-
-int lttng_ust_trace_clock_get_uuid_cb(lttng_ust_clock_uuid_function *uuid_cb)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- *uuid_cb = &trace_clock_uuid_monotonic;
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- *uuid_cb = ltc->uuid;
- }
- return 0;
-}
-
-int lttng_ust_trace_clock_set_name_cb(lttng_ust_clock_name_function name_cb)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- user_tc.name = name_cb;
- return 0;
-}
-
-int lttng_ust_trace_clock_get_name_cb(lttng_ust_clock_name_function *name_cb)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- *name_cb = &trace_clock_name_monotonic;
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- *name_cb = ltc->name;
- }
- return 0;
-}
-
-int lttng_ust_trace_clock_set_description_cb(lttng_ust_clock_description_function description_cb)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- user_tc.description = description_cb;
- return 0;
-}
-
-int lttng_ust_trace_clock_get_description_cb(lttng_ust_clock_description_function *description_cb)
-{
- struct lttng_ust_trace_clock *ltc = CMM_LOAD_SHARED(lttng_ust_trace_clock);
-
- if (caa_likely(!ltc)) {
- *description_cb = &trace_clock_description_monotonic;
- } else {
- cmm_read_barrier_depends(); /* load ltc before content */
- *description_cb = ltc->description;
- }
- return 0;
-}
-
-int lttng_ust_enable_trace_clock_override(void)
-{
- if (CMM_LOAD_SHARED(lttng_ust_trace_clock))
- return -EBUSY;
- if (!user_tc.read64)
- return -EINVAL;
- if (!user_tc.freq)
- return -EINVAL;
- if (!user_tc.name)
- return -EINVAL;
- if (!user_tc.description)
- return -EINVAL;
- /* Use default uuid cb when NULL */
- cmm_smp_mb(); /* Store callbacks before trace clock */
- CMM_STORE_SHARED(lttng_ust_trace_clock, &user_tc);
- return 0;
-}
-
-void lttng_ust_clock_init(void)
-{
- const char *libname;
- void (*libinit)(void);
-
- if (clock_handle)
- return;
- libname = lttng_ust_getenv("LTTNG_UST_CLOCK_PLUGIN");
- if (!libname)
- return;
- clock_handle = dlopen(libname, RTLD_NOW);
- if (!clock_handle) {
- PERROR("Cannot load LTTng UST clock override library %s",
- libname);
- return;
- }
- dlerror();
- libinit = (void (*)(void)) dlsym(clock_handle,
- "lttng_ust_clock_plugin_init");
- if (!libinit) {
- PERROR("Cannot find LTTng UST clock override library %s initialization function lttng_ust_clock_plugin_init()",
- libname);
- return;
- }
- libinit();
-}
#include "common/ust-fd.h"
#include "common/dynamic-type.h"
#include "common/ust-context-provider.h"
-#include "lttng-ust-uuid.h"
#include "common/tracepoint.h"
#include "common/strutils.h"
#include <lttng/urcu/pointer.h>
#include "common/bitfield.h"
#include "common/align.h"
-#include "clock.h"
+#include "common/clock.h"
#include "context-internal.h"
#include "lttng-tracer.h"
#include "common/ringbuffer/frontend_types.h"
#include "common/procname.h"
#include "common/ringbuffer/rb-init.h"
#include "lttng-ust-statedump.h"
-#include "clock.h"
+#include "common/clock.h"
#include "lib/lttng-ust/getcpu.h"
#include "common/getenv.h"
#include "lib/lttng-ust/events.h"
lttng_ust_common_ctor();
lttng_ust_tp_init();
- lttng_ust_clock_init();
lttng_ust_getcpu_plugin_init();
lttng_ust_statedump_init();
lttng_ust_ring_buffer_clients_init();
+++ /dev/null
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_UST_UUID_H
-#define _LTTNG_UST_UUID_H
-
-#include <lttng/ust-events.h> /* For LTTNG_UST_UUID_LEN */
-#include <lttng/ust-clock.h>
-
-#endif /* _LTTNG_UST_UUID_H */
projects / lttng-ust.git / commitdiff
