#include <urcu/uatomic.h>
#include <urcu/futex.h>
-#include <lttng-ust-comm.h>
-#include <ust/lttng-events.h>
-#include <ust/usterr-signal-safe.h>
-#include <ust/lttng-ust-abi.h>
-#include <ust/tracepoint.h>
-#include <ust/tracepoint-internal.h>
-#include <ust/ust.h>
+#include <lttng/ust-comm.h>
+#include <lttng/ust-events.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ust-abi.h>
+#include <lttng/tracepoint.h>
+#include <lttng/tracepoint-internal.h>
+#include <lttng/ust.h>
#include "ltt-tracer-core.h"
/*
int sock, struct ustcomm_ust_msg *lum)
{
int ret = 0;
- const struct objd_ops *ops;
+ const struct lttng_ust_objd_ops *ops;
struct ustcomm_ust_reply lur;
int shm_fd, wait_fd;
if (lum->handle == LTTNG_UST_ROOT_HANDLE)
ret = -EPERM;
else
- ret = objd_unref(lum->handle);
+ ret = lttng_ust_objd_unref(lum->handle);
break;
default:
if (ops->cmd)
sock_info->socket = -1;
}
if (sock_info->root_handle != -1) {
- ret = objd_unref(sock_info->root_handle);
+ ret = lttng_ust_objd_unref(sock_info->root_handle);
if (ret) {
ERR("Error unref root handle");
}
if (ret < 0) {
if (errno == EFAULT) {
wait_poll_fallback = 1;
- ERR(
+ WARN(
"Linux kernels 2.6.33 to 3.0 (with the exception of stable versions) "
"do not support FUTEX_WAKE on read-only memory mappings correctly. "
"Please upgrade your kernel "
cleanup_sock_info(&local_apps);
}
lttng_ust_abi_exit();
- ltt_events_exit();
+ lttng_ust_events_exit();
ltt_ring_buffer_client_discard_exit();
ltt_ring_buffer_client_overwrite_exit();
ltt_ring_buffer_metadata_client_exit();