#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;
}
-void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
+/*
+ * If sock is negative, it means we don't have to notify the other side
+ * (e.g. application has already vanished).
+ */
+int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
{
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
int ret;
- if (data->shm_fd >= 0)
- 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);
- free(data);
+ if (data->shm_fd >= 0) {
+ ret = close(data->shm_fd);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+ if (data->wait_fd >= 0) {
+ ret = close(data->wait_fd);
+ if (ret < 0) {
+ return 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);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+ return 0;
}
/*
return 0;
error:
- ustctl_release_object(sock, metadata_data);
+ (void) ustctl_release_object(sock, metadata_data);
+ free(metadata_data);
return -EINVAL;
}
return 0;
error:
- ustctl_release_object(sock, channel_data);
+ (void) ustctl_release_object(sock, channel_data);
+ free(channel_data);
return -EINVAL;
}
return ret;
error:
- ustctl_release_object(sock, stream_data);
+ (void) ustctl_release_object(sock, stream_data);
+ free(stream_data);
return -EINVAL;
}
}
int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
- char iter[LTTNG_UST_SYM_NAME_LEN])
+ struct lttng_ust_tracepoint_iter *iter)
{
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
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);
+ DBG("received tracepoint list entry name %s loglevel %s loglevel_value %lld",
+ lur.u.tracepoint.name,
+ lur.u.tracepoint.loglevel,
+ (unsigned long long) lur.u.tracepoint.loglevel_value);
+ memcpy(iter, &lur.u.tracepoint, sizeof(*iter));
return 0;
}