return -errno;
}
- ret = lttcomm_send_unix_sock(socket, ®_msg, sizeof(reg_msg));
+ ret = ustcomm_send_unix_sock(socket, ®_msg, sizeof(reg_msg));
if (ret >= 0 && ret != sizeof(reg_msg))
return -EIO;
return ret;
}
static
-int send_reply(int sock, struct lttcomm_ust_reply *lur)
+int send_reply(int sock, struct ustcomm_ust_reply *lur)
{
ssize_t len;
- len = lttcomm_send_unix_sock(sock, lur, sizeof(*lur));
+ len = ustcomm_send_unix_sock(sock, lur, sizeof(*lur));
switch (len) {
case sizeof(*lur):
DBG("message successfully sent");
static
int handle_message(struct sock_info *sock_info,
- int sock, struct lttcomm_ust_msg *lum)
+ int sock, struct ustcomm_ust_msg *lum)
{
int ret = 0;
const struct objd_ops *ops;
- struct lttcomm_ust_reply lur;
+ struct ustcomm_ust_reply lur;
int shm_fd, wait_fd;
ust_lock();
lur.cmd = lum->cmd;
lur.ret_val = ret;
if (ret >= 0) {
- lur.ret_code = LTTCOMM_OK;
+ lur.ret_code = USTCOMM_OK;
} else {
- //lur.ret_code = LTTCOMM_SESSION_FAIL;
+ //lur.ret_code = USTCOMM_SESSION_FAIL;
lur.ret_code = ret;
}
switch (lum->cmd) {
shm_fd = lum->u.channel.shm_fd;
wait_fd = lum->u.channel.wait_fd;
break;
+ case LTTNG_UST_VERSION:
+ lur.u.version = lum->u.version;
+ break;
}
ret = send_reply(sock, &lur);
if (ret < 0) {
if ((lum->cmd == LTTNG_UST_STREAM
|| lum->cmd == LTTNG_UST_CHANNEL
|| lum->cmd == LTTNG_UST_METADATA)
- && lur.ret_code == LTTCOMM_OK) {
+ && lur.ret_code == USTCOMM_OK) {
/* we also need to send the file descriptors. */
- ret = lttcomm_send_fds_unix_sock(sock,
+ ret = ustcomm_send_fds_unix_sock(sock,
&shm_fd, &shm_fd,
1, sizeof(int));
if (ret < 0) {
perror("send shm_fd");
goto error;
}
- ret = lttcomm_send_fds_unix_sock(sock,
+ ret = ustcomm_send_fds_unix_sock(sock,
&wait_fd, &wait_fd,
1, sizeof(int));
if (ret < 0) {
if (ret < 0) {
if (errno == EFAULT) {
wait_poll_fallback = 1;
- ERR(
+ WARN(
"Linux kernels 2.6.33 to 3.0 (with the exception of stable versions) "
"do not support FUTEX_WAKE on read-only memory mappings correctly. "
"Please upgrade your kernel "
}
/* Register */
- ret = lttcomm_connect_unix_sock(sock_info->sock_path);
+ ret = ustcomm_connect_unix_sock(sock_info->sock_path);
if (ret < 0) {
ERR("Error connecting to %s apps socket", sock_info->name);
prev_connect_failed = 1;
for (;;) {
ssize_t len;
- struct lttcomm_ust_msg lum;
+ struct ustcomm_ust_msg lum;
- len = lttcomm_recv_unix_sock(sock, &lum, sizeof(lum));
+ len = ustcomm_recv_unix_sock(sock, &lum, sizeof(lum));
switch (len) {
case 0: /* orderly shutdown */
DBG("%s ltt-sessiond has performed an orderly shutdown\n", sock_info->name);
cleanup_sock_info(&local_apps);
}
lttng_ust_abi_exit();
- ltt_events_exit();
+ lttng_ust_events_exit();
ltt_ring_buffer_client_discard_exit();
ltt_ring_buffer_client_overwrite_exit();
ltt_ring_buffer_metadata_client_exit();