projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: standardise include path
[lttng-ust.git]
/
liblttng-ust
/
lttng-clock.c
diff --git
a/liblttng-ust/lttng-clock.c
b/liblttng-ust/lttng-clock.c
index e8391e6dd49f87e0efed2e99b3569c150bca8636..2dad376194113509f4c29c0aae562973916a6df4 100644
(file)
--- a/
liblttng-ust/lttng-clock.c
+++ b/
liblttng-ust/lttng-clock.c
@@
-16,10
+16,11
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define _
GNU
_SOURCE
+#define _
LGPL
_SOURCE
#include <error.h>
#include <dlfcn.h>
#include <stdlib.h>
#include <error.h>
#include <dlfcn.h>
#include <stdlib.h>
+#include <stdint.h>
#include <usterr-signal-safe.h>
#include <lttng/ust-clock.h>
#include <urcu/system.h>
#include <usterr-signal-safe.h>
#include <lttng/ust-clock.h>
#include <urcu/system.h>
@@
-33,6
+34,9
@@
struct lttng_trace_clock *lttng_trace_clock;
static
struct lttng_trace_clock user_tc;
static
struct lttng_trace_clock user_tc;
+static
+void *clock_handle;
+
int lttng_ust_trace_clock_set_read64_cb(uint64_t (*read64)(void))
{
if (CMM_LOAD_SHARED(lttng_trace_clock))
int lttng_ust_trace_clock_set_read64_cb(uint64_t (*read64)(void))
{
if (CMM_LOAD_SHARED(lttng_trace_clock))
@@
-94,21
+98,21
@@
int lttng_ust_enable_trace_clock_override(void)
void lttng_ust_clock_init(void)
{
const char *libname;
void lttng_ust_clock_init(void)
{
const char *libname;
- void *handle;
void (*libinit)(void);
void (*libinit)(void);
-
- libname = lttng_secure_getenv("LTTNG_UST_CLOCK_PLUGIN");
+ if (clock_handle)
+ return;
+ libname = lttng_getenv("LTTNG_UST_CLOCK_PLUGIN");
if (!libname)
return;
if (!libname)
return;
- handle = dlopen(libname, RTLD_NOW);
- if (!handle) {
+
clock_
handle = dlopen(libname, RTLD_NOW);
+ if (!
clock_
handle) {
PERROR("Cannot load LTTng UST clock override library %s",
libname);
return;
}
dlerror();
PERROR("Cannot load LTTng UST clock override library %s",
libname);
return;
}
dlerror();
- libinit = (void (*)(void)) dlsym(handle,
+ 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()",
"lttng_ust_clock_plugin_init");
if (!libinit) {
PERROR("Cannot find LTTng UST clock override library %s initialization function lttng_ust_clock_plugin_init()",
This page took
0.023835 seconds
and
4
git commands to generate.