#include <string.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
-#include <lttng/usterr-signal-safe.h>
-#include <lttng/ust-comm.h>
#include <lttng/ust-events.h>
+#include <sys/mman.h>
+
+#include <usterr-signal-safe.h>
+#include <ust-comm.h>
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
data->memory_map_size = 0;
}
+/*
+ * If sock is negative, it means we don't have to notify the other side
+ * (e.g. application has already vanished).
+ */
void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
{
struct ustcomm_ust_msg lum;
close(data->shm_fd);
if (data->wait_fd >= 0)
close(data->wait_fd);
- memset(&lum, 0, sizeof(lum));
- lum.handle = data->handle;
- lum.cmd = LTTNG_UST_RELEASE;
- ret = ustcomm_send_app_cmd(sock, &lum, &lur);
- assert(!ret);
+ if (sock >= 0) {
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = data->handle;
+ lum.cmd = LTTNG_UST_RELEASE;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ assert(!ret);
+ }
free(data);
}
return ustctl_disable(sock, &obj);
}
-
int ustctl_tracepoint_list(int sock)
{
- return -ENOSYS; /* not implemented */
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret, tp_list_handle;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = LTTNG_UST_ROOT_HANDLE;
+ lum.cmd = LTTNG_UST_TRACEPOINT_LIST;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ if (ret)
+ return ret;
+ tp_list_handle = lur.ret_val;
+ DBG("received tracepoint list handle %u", tp_list_handle);
+ return tp_list_handle;
+}
+
+int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
+ char iter[LTTNG_UST_SYM_NAME_LEN])
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = tp_list_handle;
+ lum.cmd = LTTNG_UST_TRACEPOINT_LIST_GET;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ if (ret)
+ return ret;
+ DBG("received tracepoint list entry %s", lur.u.tracepoint_list_entry);
+ memcpy(iter, lur.u.tracepoint_list_entry, LTTNG_UST_SYM_NAME_LEN);
+ return 0;
}
int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)
struct channel *chan;
size_t chan_size;
struct lttng_ust_lib_ring_buffer_config *config;
+ int ret;
handle = channel_handle_create(chan_data->shm_fd,
chan_data->wait_fd,
channel_destroy(chan, handle, 1);
return NULL;
}
+ /* Replace the object table pointer. */
+ ret = munmap(handle->table->objects[0].memory_map,
+ handle->table->objects[0].memory_map_size);
+ if (ret) {
+ perror("munmap");
+ assert(0);
+ }
+ handle->table->objects[0].memory_map = (char *) handle->shadow_chan;
+ handle->table->objects[0].is_shadow = 1;
return handle;
}