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 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;
+
+ 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)
{
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));
- return -EINVAL;
- }
len = ustcomm_recv_unix_sock(sock, iter, sizeof(*iter));
if (len != sizeof(*iter)) {
return -EINVAL;