X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=2cab469eb7cf0558cfe71be942448a8549fd4267;hb=8c3470eaadb6e01fe65e1b852907467c0527ba05;hp=d7991f19b6098b97f1333f013e332df426c3bf0d;hpb=218deb69baab57ee2f6728eef18e84697f21197b;p=lttng-ust.git diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index d7991f19..2cab469e 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -1,23 +1,10 @@ /* - * Copyright (C) 2011 - David Goulet - * Copyright (C) 2011-2013 - Mathieu Desnoyers + * SPDX-License-Identifier: LGPL-2.1-only * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; only - * version 2.1 of the License. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011-2013 Mathieu Desnoyers */ -#define _GNU_SOURCE #include #include #include @@ -35,12 +22,12 @@ #include #include #include -#include +#include #include -#include -#include +#include #include +#include "../liblttng-ust/ust-events-internal.h" #include "../liblttng-ust/compat.h" #define USTCOMM_CODE_OFFSET(code) \ @@ -77,6 +64,8 @@ static const char *ustcomm_readable_code[] = { [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_INVAL_MAGIC) ] = "Invalid magic number", [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_INVAL_SOCKET_TYPE) ] = "Invalid socket type", [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_UNSUP_MAJOR) ] = "Unsupported major version", + [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_PEERCRED) ] = "Cannot get unix socket peer credentials", + [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_PEERCRED_PID) ] = "Peer credentials PID is invalid. Socket appears to belong to a distinct, non-nested pid namespace.", }; /* @@ -669,6 +658,46 @@ error_check: return len; } +ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock, + int *_event_notifier_notif_fd) +{ + ssize_t nr_fd; + int event_notifier_notif_fd, ret; + + /* Receive event_notifier notification fd */ + lttng_ust_lock_fd_tracker(); + nr_fd = ustcomm_recv_fds_unix_sock(sock, &event_notifier_notif_fd, 1); + if (nr_fd <= 0) { + lttng_ust_unlock_fd_tracker(); + if (nr_fd < 0) { + ret = nr_fd; + goto error; + } else { + ret = -EIO; + goto error; + } + } + + ret = lttng_ust_add_fd_to_tracker(event_notifier_notif_fd); + if (ret < 0) { + ret = close(event_notifier_notif_fd); + if (ret) { + PERROR("close on event_notifier notif fd"); + } + ret = -EIO; + lttng_ust_unlock_fd_tracker(); + goto error; + } + + *_event_notifier_notif_fd = ret; + lttng_ust_unlock_fd_tracker(); + + ret = nr_fd; + +error: + return ret; +} + int ustcomm_recv_stream_from_sessiond(int sock, uint64_t *memory_map_size, int *shm_fd, int *wakeup_fd) @@ -726,6 +755,75 @@ error: return ret; } +ssize_t ustcomm_recv_counter_from_sessiond(int sock, + void **_counter_data, uint64_t var_len) +{ + void *counter_data; + ssize_t len; + + if (var_len > LTTNG_UST_COUNTER_DATA_MAX_LEN) { + len = -EINVAL; + goto error_check; + } + /* Receive variable length data */ + counter_data = zmalloc(var_len); + if (!counter_data) { + len = -ENOMEM; + goto error_alloc; + } + len = ustcomm_recv_unix_sock(sock, counter_data, var_len); + if (len != var_len) { + goto error_recv; + } + *_counter_data = counter_data; + return len; + +error_recv: + free(counter_data); +error_alloc: +error_check: + return len; +} + +int ustcomm_recv_counter_shm_from_sessiond(int sock, + int *shm_fd) +{ + ssize_t len; + int ret; + int fds[1]; + + /* recv shm fd fd */ + lttng_ust_lock_fd_tracker(); + len = ustcomm_recv_fds_unix_sock(sock, fds, 1); + if (len <= 0) { + lttng_ust_unlock_fd_tracker(); + if (len < 0) { + ret = len; + goto error; + } else { + ret = -EIO; + goto error; + } + } + + ret = lttng_ust_add_fd_to_tracker(fds[0]); + if (ret < 0) { + ret = close(fds[0]); + if (ret) { + PERROR("close on received shm_fd"); + } + ret = -EIO; + lttng_ust_unlock_fd_tracker(); + goto error; + } + *shm_fd = ret; + lttng_ust_unlock_fd_tracker(); + return 0; + +error: + return ret; +} + /* * Returns 0 on success, negative error value on error. */ @@ -755,7 +853,7 @@ int ustcomm_send_reg_msg(int sock, reg_msg.uint64_t_alignment = uint64_t_alignment; reg_msg.long_alignment = long_alignment; reg_msg.socket_type = type; - lttng_ust_getprocname(reg_msg.name); + lttng_pthread_getname_np(reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN); memset(reg_msg.padding, 0, sizeof(reg_msg.padding)); len = ustcomm_send_unix_sock(sock, ®_msg, sizeof(reg_msg)); @@ -773,13 +871,7 @@ ssize_t count_one_type(const struct lttng_type *lt) case atype_integer: case atype_float: case atype_string: - case atype_enum: - case atype_array: - case atype_sequence: return 1; - case atype_struct: - return count_fields_recursive(lt->u.legacy._struct.nr_fields, - lt->u.legacy._struct.fields); case atype_enum_nestable: return count_one_type(lt->u.enum_nestable.container_type) + 1; case atype_array_nestable: @@ -788,7 +880,7 @@ ssize_t count_one_type(const struct lttng_type *lt) return count_one_type(lt->u.sequence_nestable.elem_type) + 1; case atype_struct_nestable: return count_fields_recursive(lt->u.struct_nestable.nr_fields, - lt->u.struct_nestable.fields); + lt->u.struct_nestable.fields) + 1; case atype_dynamic: { @@ -801,10 +893,10 @@ ssize_t count_one_type(const struct lttng_type *lt) if (ret) return ret; /* - * One field for enum, one field for variant, and + * Two fields for enum, one field for variant, and * one field per choice. */ - return count_fields_recursive(nr_choices, choices) + 2; + return count_fields_recursive(nr_choices, choices) + 3; } default: @@ -857,114 +949,6 @@ ssize_t count_ctx_fields_recursive(size_t nr_fields, return count; } -static -int serialize_string_encoding(int32_t *ue, - enum lttng_string_encodings le) -{ - switch (le) { - case lttng_encode_none: - *ue = ustctl_encode_none; - break; - case lttng_encode_UTF8: - *ue = ustctl_encode_UTF8; - break; - case lttng_encode_ASCII: - *ue = ustctl_encode_ASCII; - break; - default: - return -EINVAL; - } - return 0; -} - -static -int serialize_integer_type(struct ustctl_integer_type *uit, - const struct lttng_integer_type *lit) -{ - int32_t encoding; - - uit->size = lit->size; - uit->signedness = lit->signedness; - uit->reverse_byte_order = lit->reverse_byte_order; - uit->base = lit->base; - if (serialize_string_encoding(&encoding, lit->encoding)) - return -EINVAL; - uit->encoding = encoding; - uit->alignment = lit->alignment; - return 0; -} - -static -int serialize_basic_type(struct lttng_session *session, - enum ustctl_abstract_types *uatype, - enum lttng_abstract_types atype, - union _ustctl_basic_type *ubt, - const union _lttng_basic_type *lbt) -{ - switch (atype) { - case atype_integer: - { - if (serialize_integer_type(&ubt->integer, &lbt->integer)) - return -EINVAL; - *uatype = ustctl_atype_integer; - break; - } - case atype_string: - { - int32_t encoding; - - if (serialize_string_encoding(&encoding, lbt->string.encoding)) - return -EINVAL; - ubt->string.encoding = encoding; - *uatype = ustctl_atype_string; - break; - } - case atype_float: - { - struct ustctl_float_type *uft; - const struct lttng_float_type *lft; - - uft = &ubt->_float; - lft = &lbt->_float; - uft->exp_dig = lft->exp_dig; - uft->mant_dig = lft->mant_dig; - uft->alignment = lft->alignment; - uft->reverse_byte_order = lft->reverse_byte_order; - *uatype = ustctl_atype_float; - break; - } - case atype_enum: - { - strncpy(ubt->enumeration.name, lbt->enumeration.desc->name, - LTTNG_UST_SYM_NAME_LEN); - ubt->enumeration.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - if (serialize_integer_type(&ubt->enumeration.container_type, - &lbt->enumeration.container_type)) - return -EINVAL; - if (session) { - const struct lttng_enum *_enum; - - _enum = lttng_ust_enum_get_from_desc(session, lbt->enumeration.desc); - if (!_enum) - return -EINVAL; - ubt->enumeration.id = _enum->id; - } else { - ubt->enumeration.id = -1ULL; - } - *uatype = ustctl_atype_enum; - break; - } - case atype_array: - case atype_array_nestable: - case atype_sequence: - case atype_sequence_nestable: - case atype_enum_nestable: - default: - return -EINVAL; - } - return 0; -} - static int serialize_dynamic_type(struct lttng_session *session, struct ustctl_field *fields, size_t *iter_output, @@ -1040,52 +1024,6 @@ int serialize_one_type(struct lttng_session *session, case atype_integer: case atype_float: case atype_string: - case atype_enum: - { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; - enum ustctl_abstract_types atype; - - if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - } else { - uf->name[0] = '\0'; - } - ret = serialize_basic_type(session, &atype, lt->atype, - &ut->u.legacy.basic, <->u.legacy.basic); - if (ret) - return ret; - ut->atype = atype; - (*iter_output)++; - break; - } - case atype_array: - { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; - struct ustctl_basic_type *ubt; - const struct lttng_basic_type *lbt; - enum ustctl_abstract_types atype; - - if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - } else { - uf->name[0] = '\0'; - } - ut->atype = ustctl_atype_array; - ubt = &ut->u.legacy.array.elem_type; - lbt = <->u.legacy.array.elem_type; - ut->u.legacy.array.length = lt->u.legacy.array.length; - ret = serialize_basic_type(session, &atype, lbt->atype, - &ubt->u.basic, &lbt->u.basic); - if (ret) - return -EINVAL; - ubt->atype = atype; - (*iter_output)++; - break; - } case atype_array_nestable: { struct ustctl_field *uf = &fields[*iter_output]; @@ -1108,38 +1046,6 @@ int serialize_one_type(struct lttng_session *session, return -EINVAL; break; } - case atype_sequence: - { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; - struct ustctl_basic_type *ubt; - const struct lttng_basic_type *lbt; - enum ustctl_abstract_types atype; - - if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - } else { - uf->name[0] = '\0'; - } - uf->type.atype = ustctl_atype_sequence; - ubt = &ut->u.legacy.sequence.length_type; - lbt = <->u.legacy.sequence.length_type; - ret = serialize_basic_type(session, &atype, lbt->atype, - &ubt->u.basic, &lbt->u.basic); - if (ret) - return -EINVAL; - ubt->atype = atype; - ubt = &ut->u.legacy.sequence.elem_type; - lbt = <->u.legacy.sequence.elem_type; - ret = serialize_basic_type(session, &atype, lbt->atype, - &ubt->u.basic, &lbt->u.basic); - if (ret) - return -EINVAL; - ubt->atype = atype; - (*iter_output)++; - break; - } case atype_sequence_nestable: { struct ustctl_field *uf = &fields[*iter_output]; @@ -1173,27 +1079,6 @@ int serialize_one_type(struct lttng_session *session, return -EINVAL; break; } - case atype_struct: - { - struct ustctl_field *uf = &fields[*iter_output]; - - if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - } else { - uf->name[0] = '\0'; - } - uf->type.atype = ustctl_atype_struct; - uf->type.u.legacy._struct.nr_fields = lt->u.legacy._struct.nr_fields; - (*iter_output)++; - - ret = serialize_fields(session, fields, iter_output, - lt->u.legacy._struct.nr_fields, - lt->u.legacy._struct.fields); - if (ret) - return -EINVAL; - break; - } case atype_struct_nestable: { struct ustctl_field *uf = &fields[*iter_output];