Do not install usterr-signal-safe

[lttng-ust.git] / liblttng-ust-ctl / ustctl.c

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 2d915260c8c522a2ac919b58a1222d48ec0c072c..e285a2d24b7debc2159b760981c044e4663b7d24 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -20,8 +20,11 @@
 #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"
@@ -37,6 +40,10 @@ void init_object(struct lttng_ust_object_data *data)
        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;
@@ -47,11 +54,13 @@ void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
                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);
 }
 
@@ -368,10 +377,39 @@ int ustctl_stop_session(int sock, int handle)
        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)
@@ -420,6 +458,8 @@ struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *ch
        struct lttng_ust_shm_handle *handle;
        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,
@@ -449,6 +489,38 @@ struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *ch
                return NULL;
        }
        memcpy(handle->shadow_chan, chan, chan_size);
+       /*
+        * The callback pointers in the producer are invalid in the
+        * consumer. We need to look them up here.
+        */
+       config = &handle->shadow_chan->backend.config;
+       switch (config->client_type) {
+       case LTTNG_CLIENT_METADATA:
+               memcpy(&config->cb, lttng_client_callbacks_metadata,
+                       sizeof(config->cb));
+               break;
+       case LTTNG_CLIENT_DISCARD:
+               memcpy(&config->cb, lttng_client_callbacks_discard,
+                       sizeof(config->cb));
+               break;
+       case LTTNG_CLIENT_OVERWRITE:
+               memcpy(&config->cb, lttng_client_callbacks_overwrite,
+                       sizeof(config->cb));
+               break;
+       default:
+               ERR("Unknown client type %d", config->client_type);
+               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;
 }
 
@@ -649,12 +721,11 @@ int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
        return 0;
 }
 
-int ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
+void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf,
                int producer_active)
 {
        lib_ring_buffer_switch_slow(buf,
                producer_active ? SWITCH_ACTIVE : SWITCH_FLUSH,
                handle);
-       return 0;
 }