projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
liblttng-ust-fd doesn't use the internal logging system
[lttng-ust.git]
/
liblttng-ust-ctl
/
ustctl.c
diff --git
a/liblttng-ust-ctl/ustctl.c
b/liblttng-ust-ctl/ustctl.c
index cfe2cc960a8e52c580982c09815b8ac681204ac1..14299b23fd344613dd707d0aedd709b51cce909a 100644
(file)
--- a/
liblttng-ust-ctl/ustctl.c
+++ b/
liblttng-ust-ctl/ustctl.c
@@
-15,14
+15,16
@@
#include <lttng/ust-config.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-config.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
-#include <lttng/ust-events.h>
#include <lttng/ust-endian.h>
#include <lttng/ust-endian.h>
+
#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include <usterr-signal-safe.h>
#include <ust-comm.h>
-#include <helper.h>
+#include <ust-helper.h>
+#include "ust-compat.h"
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
+#include "../liblttng-ust/ust-events-internal.h"
#include "../liblttng-ust/wait.h"
#include "../liblttng-ust/lttng-rb-clients.h"
#include "../liblttng-ust/clock.h"
#include "../liblttng-ust/wait.h"
#include "../liblttng-ust/lttng-rb-clients.h"
#include "../liblttng-ust/clock.h"
@@
-1997,7
+1999,7
@@
int ustctl_get_instance_id(struct ustctl_consumer_stream *stream,
return client_cb->instance_id(buf, handle, id);
}
return client_cb->instance_id(buf, handle, id);
}
-#ifdef
LTTNG_UST_
HAVE_PERF_EVENT
+#ifdef HAVE_PERF_EVENT
int ustctl_has_perf_counters(void)
{
int ustctl_has_perf_counters(void)
{
@@
-2920,8
+2922,8
@@
int ustctl_counter_clear(struct ustctl_daemon_counter *counter,
static __attribute__((constructor))
void ustctl_init(void)
{
static __attribute__((constructor))
void ustctl_init(void)
{
-
init_usterr
();
- lttng_ust_getenv_init(); /* Needs
init_usterr
() to be completed. */
+
ust_err_init
();
+ lttng_ust_getenv_init(); /* Needs
ust_err_init
() to be completed. */
lttng_ust_clock_init();
lttng_ring_buffer_metadata_client_init();
lttng_ring_buffer_client_overwrite_init();
lttng_ust_clock_init();
lttng_ring_buffer_metadata_client_init();
lttng_ring_buffer_client_overwrite_init();
This page took
0.025045 seconds
and
4
git commands to generate.