* 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
#include <string.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
{
int ret;
+ if (!data)
+ return -EINVAL;
+
if (data->shm_fd >= 0) {
ret = close(data->shm_fd);
if (ret < 0) {
struct lttng_ust_object_data *metadata_data;
int ret, err = 0;
+ if (!chops || !_metadata_data)
+ return -EINVAL;
+
metadata_data = malloc(sizeof(*metadata_data));
if (!metadata_data)
return -ENOMEM;
struct lttng_ust_object_data *channel_data;
int ret, err = 0;
+ if (!chops || !_channel_data)
+ return -EINVAL;
+
channel_data = malloc(sizeof(*channel_data));
if (!channel_data)
return -ENOMEM;
struct lttng_ust_object_data *stream_data;
int ret, fd, err = 0;
+ if (!channel_data || !_stream_data)
+ return -EINVAL;
+
stream_data = malloc(sizeof(*stream_data));
if (!stream_data)
return -ENOMEM;
struct lttng_ust_object_data *event_data;
int ret;
+ if (!channel_data || !_event_data)
+ return -EINVAL;
+
event_data = malloc(sizeof(*event_data));
if (!event_data)
return -ENOMEM;
strncpy(lum.u.event.name, ev->name,
LTTNG_UST_SYM_NAME_LEN);
lum.u.event.instrumentation = ev->instrumentation;
+ lum.u.event.loglevel_type = ev->loglevel_type;
+ lum.u.event.loglevel = ev->loglevel;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
if (ret) {
free(event_data);
struct lttng_ust_object_data *context_data;
int ret;
+ if (!obj_data || !_context_data)
+ return -EINVAL;
+
context_data = malloc(sizeof(*context_data));
if (!context_data)
return -ENOMEM;
struct ustcomm_ust_reply lur;
int ret;
+ if (!object)
+ return -EINVAL;
+
memset(&lum, 0, sizeof(lum));
lum.handle = object->handle;
lum.cmd = LTTNG_UST_ENABLE;
struct ustcomm_ust_reply lur;
int ret;
+ if (!object)
+ return -EINVAL;
+
memset(&lum, 0, sizeof(lum));
lum.handle = object->handle;
lum.cmd = LTTNG_UST_DISABLE;
struct ustcomm_ust_reply lur;
int ret;
+ if (!iter)
+ return -EINVAL;
+
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 name %s loglevel %s loglevel_value %lld",
+ DBG("received tracepoint list entry name %s loglevel %d",
lur.u.tracepoint.name,
- lur.u.tracepoint.loglevel,
- (unsigned long long) lur.u.tracepoint.loglevel_value);
+ lur.u.tracepoint.loglevel);
memcpy(iter, &lur.u.tracepoint, sizeof(*iter));
return 0;
}
struct ustcomm_ust_reply lur;
int ret;
+ if (!v)
+ return -EINVAL;
+
memset(&lum, 0, sizeof(lum));
lum.handle = LTTNG_UST_ROOT_HANDLE;
lum.cmd = LTTNG_UST_TRACER_VERSION;
int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
{
+ if (!calibrate)
+ return -EINVAL;
+
return -ENOSYS;
}
struct ustcomm_ust_reply lur;
int ret;
+ if (!object)
+ return -EINVAL;
+
memset(&lum, 0, sizeof(lum));
lum.handle = object->handle;
lum.cmd = LTTNG_UST_FLUSH_BUFFER;
struct lttng_ust_lib_ring_buffer_config *config;
int ret;
+ if (!chan_data)
+ return NULL;
+
handle = channel_handle_create(chan_data->shm_fd,
chan_data->wait_fd,
chan_data->memory_map_size);
{
int ret;
+ if (!handle || !stream_data)
+ return -EINVAL;
+
if (!stream_data->handle)
return -ENOENT;
/* map stream */
{
struct channel *chan;
+ assert(handle);
chan = shmp(handle, handle->chan);
channel_destroy(chan, handle, 1);
}
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;
int ret;
+ 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)
void ustctl_close_stream_read(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ assert(handle && buf);
lib_ring_buffer_release_read(buf, handle, 1);
}
void *ustctl_get_mmap_base(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ if (!handle || !buf)
+ return NULL;
return shmp(handle, buf->backend.memory_map);
}
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);
int ustctl_get_next_subbuf(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ if (!handle || !buf)
+ return -EINVAL;
+
return lib_ring_buffer_get_next_subbuf(buf, handle);
}
int ustctl_put_next_subbuf(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ if (!handle || !buf)
+ return -EINVAL;
+
lib_ring_buffer_put_next_subbuf(buf, handle);
return 0;
}
int ustctl_snapshot(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ if (!handle || !buf)
+ return -EINVAL;
+
return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
&buf->prod_snapshot, handle);
}
int ustctl_snapshot_get_consumed(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
{
+ if (!handle || !buf || !pos)
+ return -EINVAL;
+
*pos = buf->cons_snapshot;
return 0;
}
int ustctl_snapshot_get_produced(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
{
+ if (!handle || !buf || !pos)
+ return -EINVAL;
+
*pos = buf->prod_snapshot;
return 0;
}
int ustctl_get_subbuf(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
{
+ if (!handle || !buf || !pos)
+ return -EINVAL;
+
return lib_ring_buffer_get_subbuf(buf, *pos, handle);
}
int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf)
{
+ if (!handle || !buf)
+ return -EINVAL;
+
lib_ring_buffer_put_subbuf(buf, handle);
return 0;
}
struct lttng_ust_lib_ring_buffer *buf,
int producer_active)
{
+ assert(handle && buf);
lib_ring_buffer_switch_slow(buf,
producer_active ? SWITCH_ACTIVE : SWITCH_FLUSH,
handle);