* Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
* Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License only.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
lum.handle = handle;
lum.cmd = LTTNG_UST_RELEASE;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
- if (ret < 0) {
+ if (ret)
return ret;
- }
}
return 0;
}
if (data->shm_fd >= 0) {
ret = close(data->shm_fd);
if (ret < 0) {
+ ret = -errno;
return ret;
}
}
if (data->wait_fd >= 0) {
ret = close(data->wait_fd);
if (ret < 0) {
+ ret = -errno;
return ret;
}
}
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
if (ret)
return ret;
- if (lur.ret_code != USTCOMM_OK) {
- DBG("Return code: %s", ustcomm_get_readable_code(lur.ret_code));
- goto error;
- }
return 0;
-
-error:
- return -1;
}
/*
free(metadata_data);
return ret;
}
- if (lur.ret_code != USTCOMM_OK) {
- free(metadata_data);
- return lur.ret_code;
- }
metadata_data->handle = lur.ret_val;
DBG("received metadata handle %u", metadata_data->handle);
metadata_data->memory_map_size = lur.u.channel.memory_map_size;
/* get shm fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- err = 1;
+ err = ret;
else
metadata_data->shm_fd = ret;
/*
/* get wait fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- err = 1;
+ err = ret;
else
metadata_data->wait_fd = ret;
if (err)
error:
(void) ustctl_release_object(sock, metadata_data);
free(metadata_data);
- return -EINVAL;
+ return err;
}
int ustctl_create_channel(int sock, int session_handle,
free(channel_data);
return ret;
}
- if (lur.ret_code != USTCOMM_OK) {
- free(channel_data);
- return lur.ret_code;
- }
channel_data->handle = lur.ret_val;
DBG("received channel handle %u", channel_data->handle);
channel_data->memory_map_size = lur.u.channel.memory_map_size;
/* get shm fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- err = 1;
+ err = ret;
else
channel_data->shm_fd = ret;
/*
/* get wait fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- err = 1;
+ err = ret;
else
channel_data->wait_fd = ret;
if (err)
error:
(void) ustctl_release_object(sock, channel_data);
free(channel_data);
- return -EINVAL;
+ return err;
}
/*
- * Return -ENOENT if no more stream is available for creation.
+ * Return -LTTNG_UST_ERR_NOENT if no more stream is available for creation.
* Return 0 on success.
- * Return negative error value on error.
+ * Return negative error value on system error.
+ * Return positive error value on UST error.
*/
int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
struct lttng_ust_object_data **_stream_data)
free(stream_data);
return ret;
}
- if (lur.ret_code != USTCOMM_OK) {
- free(stream_data);
- return lur.ret_code;
- }
-
stream_data->handle = lur.ret_val;
DBG("received stream handle %u", stream_data->handle);
stream_data->memory_map_size = lur.u.stream.memory_map_size;
/* get shm fd */
fd = ustcomm_recv_fd(sock);
if (fd < 0)
- err = 1;
+ err = fd;
else
stream_data->shm_fd = fd;
/*
/* get wait fd */
fd = ustcomm_recv_fd(sock);
if (fd < 0)
- err = 1;
+ err = fd;
else
stream_data->wait_fd = fd;
if (err)
error:
(void) ustctl_release_object(sock, stream_data);
free(stream_data);
- return -EINVAL;
+ return err;
}
int ustctl_create_event(int sock, struct lttng_ust_event *ev,
return ret;
}
+int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
+ struct lttng_ust_object_data *obj_data)
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret;
+
+ if (!obj_data)
+ return -EINVAL;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = obj_data->handle;
+ lum.cmd = LTTNG_UST_FILTER;
+ lum.u.filter.data_size = bytecode->len;
+ lum.u.filter.reloc_offset = bytecode->reloc_offset;
+ lum.u.filter.seqnum = bytecode->seqnum;
+
+ ret = ustcomm_send_app_msg(sock, &lum);
+ if (ret)
+ return ret;
+ /* send var len bytecode */
+ ret = ustcomm_send_unix_sock(sock, bytecode->data,
+ bytecode->len);
+ if (ret < 0) {
+ if (ret == -ECONNRESET)
+ fprintf(stderr, "remote end closed connection\n");
+ return ret;
+ }
+ if (ret != bytecode->len)
+ return -EINVAL;
+ return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
/* Enable event, channel and session ioctl */
int ustctl_enable(int sock, struct lttng_ust_object_data *object)
{
return 0;
}
+int ustctl_tracepoint_field_list(int sock)
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret, tp_field_list_handle;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = LTTNG_UST_ROOT_HANDLE;
+ lum.cmd = LTTNG_UST_TRACEPOINT_FIELD_LIST;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ if (ret)
+ return ret;
+ tp_field_list_handle = lur.ret_val;
+ DBG("received tracepoint field list handle %u", tp_field_list_handle);
+ return tp_field_list_handle;
+}
+
+int ustctl_tracepoint_field_list_get(int sock, int tp_field_list_handle,
+ struct lttng_ust_field_iter *iter)
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret;
+ ssize_t len;
+
+ if (!iter)
+ return -EINVAL;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = tp_field_list_handle;
+ lum.cmd = LTTNG_UST_TRACEPOINT_FIELD_LIST_GET;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ if (ret)
+ return ret;
+ len = ustcomm_recv_unix_sock(sock, iter, sizeof(*iter));
+ if (len != sizeof(*iter)) {
+ return -EINVAL;
+ }
+ DBG("received tracepoint field list entry event_name %s event_loglevel %d field_name %s field_type %d",
+ iter->event_name,
+ iter->loglevel,
+ iter->field_name,
+ iter->type);
+ return 0;
+}
+
int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)
{
struct ustcomm_ust_msg lum;
default:
ERR("Unknown client type %d", config->client_type);
channel_destroy(chan, handle, 1);
+ free(handle->shadow_chan);
return NULL;
}
/* Replace the object table pointer. */
assert(handle);
chan = shmp(handle, handle->chan);
channel_destroy(chan, handle, 1);
+ free(handle->shadow_chan);
}
/*
struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
int cpu)
{
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
int *shm_fd, *wait_fd;
uint64_t *memory_map_size;
struct lttng_ust_lib_ring_buffer *buf;
if (!handle)
return NULL;
+ chan = handle->shadow_chan;
buf = channel_get_ring_buffer(&chan->backend.config,
chan, cpu, handle, &shm_fd, &wait_fd, &memory_map_size);
if (!buf)
unsigned long *len)
{
unsigned long mmap_buf_len;
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
if (!handle || !buf || !len)
return -EINVAL;
+ chan = handle->shadow_chan;
if (chan->backend.config.output != RING_BUFFER_MMAP)
return -EINVAL;
mmap_buf_len = chan->backend.buf_size;
struct lttng_ust_lib_ring_buffer *buf,
unsigned long *len)
{
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
if (!handle || !buf || !len)
return -EINVAL;
+ chan = handle->shadow_chan;
*len = chan->backend.subbuf_size;
return 0;
}
int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *off)
{
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
unsigned long sb_bindex;
if (!handle || !buf || !off)
return -EINVAL;
+ chan = handle->shadow_chan;
if (chan->backend.config.output != RING_BUFFER_MMAP)
return -EINVAL;
sb_bindex = subbuffer_id_get_index(&chan->backend.config,
int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
{
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
if (!handle || !buf || !len)
return -EINVAL;
+ chan = handle->shadow_chan;
*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
handle);
return 0;
int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
{
- struct channel *chan = handle->shadow_chan;
+ struct channel *chan;
if (!handle || !buf || !len)
return -EINVAL;
+ chan = handle->shadow_chan;
*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
handle);
*len = PAGE_ALIGN(*len);
projects / lttng-ust.git / blobdiff