X-Git-Url: https://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=src%2Fcommon%2Fustcomm.c;h=319e84ac923530d790de9afd22ba595849399e31;hp=d65889926c5114d9a32bc548f7e081fb7e1f5f94;hb=c117e9884c3acc65408d8f65b2cd86a8511df1cc;hpb=6339062a5bbe886493d0691d13e28e37a7206362 diff --git a/src/common/ustcomm.c b/src/common/ustcomm.c index d6588992..319e84ac 100644 --- a/src/common/ustcomm.c +++ b/src/common/ustcomm.c @@ -23,67 +23,27 @@ #include "common/ustcomm.h" #include "common/ust-fd.h" #include "common/macros.h" -#include #include "common/dynamic-type.h" #include "common/logging.h" -#include "lib/lttng-ust/ust-events-internal.h" +#include "common/events.h" #include "common/compat/pthread.h" -#define USTCOMM_CODE_OFFSET(code) \ - (code == LTTNG_UST_OK ? 0 : (code - LTTNG_UST_ERR + 1)) - #define USTCOMM_MAX_SEND_FDS 4 static ssize_t count_fields_recursive(size_t nr_fields, - const struct lttng_ust_event_field **lttng_fields); + const struct lttng_ust_event_field * const *lttng_fields); static int serialize_one_field(struct lttng_ust_session *session, - struct ustctl_field *fields, size_t *iter_output, - const struct lttng_ust_event_field *lf); + struct lttng_ust_ctl_field *fields, size_t *iter_output, + const struct lttng_ust_event_field *lf, + const char **prev_field_name); static int serialize_fields(struct lttng_ust_session *session, - struct ustctl_field *ustctl_fields, + struct lttng_ust_ctl_field *lttng_ust_ctl_fields, size_t *iter_output, size_t nr_lttng_fields, - const struct lttng_ust_event_field **lttng_fields); - -/* - * Human readable error message. - */ -static const char *ustcomm_readable_code[] = { - [ USTCOMM_CODE_OFFSET(LTTNG_UST_OK) ] = "Success", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR) ] = "Unknown error", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_NOENT) ] = "No entry", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_EXIST) ] = "Object already exists", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_INVAL) ] = "Invalid argument", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_PERM) ] = "Permission denied", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_NOSYS) ] = "Not implemented", - [ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_EXITING) ] = "Process is exiting", - - [ 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.", -}; - -/* - * lttng_ust_strerror - * @code: must be a negative value of enum lttng_ust_error_code (or 0). - * - * Returns a ptr to a string representing a human readable error code from the - * ustcomm_return_code enum. - */ -const char *lttng_ust_strerror(int code) -{ - code = -code; - - if (code < LTTNG_UST_OK || code >= LTTNG_UST_ERR_NR) - code = LTTNG_UST_ERR; - - return ustcomm_readable_code[USTCOMM_CODE_OFFSET(code)]; -} + const struct lttng_ust_event_field * const *lttng_fields); /* * ustcomm_connect_unix_sock @@ -254,7 +214,7 @@ int ustcomm_listen_unix_sock(int sock) /* * ustcomm_close_unix_sock * - * Shutdown cleanly a unix socket. + * Close unix socket. * * Handles fd tracker internally. */ @@ -275,6 +235,24 @@ int ustcomm_close_unix_sock(int sock) return ret; } +/* + * ustcomm_shutdown_unix_sock + * + * Shutdown unix socket. Keeps the file descriptor open, but shutdown + * communication. + */ +int ustcomm_shutdown_unix_sock(int sock) +{ + int ret; + + ret = shutdown(sock, SHUT_RDWR); + if (ret) { + PERROR("Socket shutdown error"); + ret = -errno; + } + return ret; +} + /* * ustcomm_recv_unix_sock * @@ -308,17 +286,13 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len) } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); if (ret < 0) { - int shutret; - if (errno != EPIPE && errno != ECONNRESET && errno != ECONNREFUSED) PERROR("recvmsg"); ret = -errno; if (ret == -ECONNRESET || ret == -ECONNREFUSED) ret = -EPIPE; - shutret = shutdown(sock, SHUT_RDWR); - if (shutret) - ERR("Socket shutdown error"); + (void) ustcomm_shutdown_unix_sock(sock); } else if (ret > 0) { ret = len; } @@ -358,17 +332,13 @@ ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len) } while (ret < 0 && errno == EINTR); if (ret < 0) { - int shutret; - if (errno != EPIPE && errno != ECONNRESET) PERROR("sendmsg"); ret = -errno; if (ret == -ECONNRESET) ret = -EPIPE; - shutret = shutdown(sock, SHUT_RDWR); - if (shutret) - ERR("Socket shutdown error"); + (void) ustcomm_shutdown_unix_sock(sock); } return ret; @@ -827,16 +797,17 @@ error: * Returns 0 on success, negative error value on error. */ int ustcomm_send_reg_msg(int sock, - enum ustctl_socket_type type, + enum lttng_ust_ctl_socket_type type, uint32_t bits_per_long, uint32_t uint8_t_alignment, uint32_t uint16_t_alignment, uint32_t uint32_t_alignment, uint32_t uint64_t_alignment, - uint32_t long_alignment) + uint32_t long_alignment, + const char *procname) { ssize_t len; - struct ustctl_reg_msg reg_msg; + struct lttng_ust_ctl_reg_msg reg_msg; reg_msg.magic = LTTNG_UST_ABI_COMM_MAGIC; reg_msg.major = LTTNG_UST_ABI_MAJOR_VERSION; @@ -852,7 +823,8 @@ 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_pthread_getname_np(reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN); + memset(reg_msg.name, 0, sizeof(reg_msg.name)); + strncpy(reg_msg.name, procname, sizeof(reg_msg.name) - 1); memset(reg_msg.padding, 0, sizeof(reg_msg.padding)); len = ustcomm_send_unix_sock(sock, ®_msg, sizeof(reg_msg)); @@ -883,7 +855,7 @@ ssize_t count_one_type(const struct lttng_ust_type_common *lt) case lttng_ust_type_dynamic: { - const struct lttng_ust_event_field **choices; + const struct lttng_ust_event_field * const *choices; size_t nr_choices; int ret; @@ -906,7 +878,7 @@ ssize_t count_one_type(const struct lttng_ust_type_common *lt) static ssize_t count_fields_recursive(size_t nr_fields, - const struct lttng_ust_event_field **lttng_fields) + const struct lttng_ust_event_field * const *lttng_fields) { int i; ssize_t ret, count = 0; @@ -954,13 +926,13 @@ int serialize_string_encoding(int32_t *ue, { switch (le) { case lttng_ust_string_encoding_none: - *ue = ustctl_encode_none; + *ue = lttng_ust_ctl_encode_none; break; case lttng_ust_string_encoding_UTF8: - *ue = ustctl_encode_UTF8; + *ue = lttng_ust_ctl_encode_UTF8; break; case lttng_ust_string_encoding_ASCII: - *ue = ustctl_encode_ASCII; + *ue = lttng_ust_ctl_encode_ASCII; break; default: return -EINVAL; @@ -969,7 +941,7 @@ int serialize_string_encoding(int32_t *ue, } static -int serialize_integer_type(struct ustctl_integer_type *uit, +int serialize_integer_type(struct lttng_ust_ctl_integer_type *uit, const struct lttng_ust_type_integer *lit, enum lttng_ust_string_encoding lencoding) { @@ -988,10 +960,10 @@ int serialize_integer_type(struct ustctl_integer_type *uit, static int serialize_dynamic_type(struct lttng_ust_session *session, - struct ustctl_field *fields, size_t *iter_output, + struct lttng_ust_ctl_field *fields, size_t *iter_output, const char *field_name) { - const struct lttng_ust_event_field **choices; + const struct lttng_ust_event_field * const *choices; char tag_field_name[LTTNG_UST_ABI_SYM_NAME_LEN]; const struct lttng_ust_type_common *tag_type; const struct lttng_ust_event_field *tag_field_generic; @@ -999,7 +971,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session, .name = tag_field_name, .nowrite = 0, }; - struct ustctl_field *uf; + struct lttng_ust_ctl_field *uf; size_t nr_choices, i; int ret; @@ -1014,7 +986,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session, LTTNG_UST_ABI_SYM_NAME_LEN - strlen(tag_field_name) - 1); tag_field.type = tag_type; ret = serialize_one_field(session, fields, iter_output, - &tag_field); + &tag_field, NULL); if (ret) return ret; @@ -1026,7 +998,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session, strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; - uf->type.atype = ustctl_atype_variant; + uf->type.atype = lttng_ust_ctl_atype_variant; uf->type.u.variant_nestable.nr_choices = nr_choices; strncpy(uf->type.u.variant_nestable.tag_name, tag_field_name, @@ -1038,7 +1010,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session, /* Serialize choice fields after variant. */ for (i = 0; i < nr_choices; i++) { ret = serialize_one_field(session, fields, - iter_output, choices[i]); + iter_output, choices[i], NULL); if (ret) return ret; } @@ -1047,22 +1019,23 @@ int serialize_dynamic_type(struct lttng_ust_session *session, static int serialize_one_type(struct lttng_ust_session *session, - struct ustctl_field *fields, size_t *iter_output, + struct lttng_ust_ctl_field *fields, size_t *iter_output, const char *field_name, const struct lttng_ust_type_common *lt, - enum lttng_ust_string_encoding parent_encoding) + enum lttng_ust_string_encoding parent_encoding, + const char *prev_field_name) { int ret; /* - * Serializing a type (rather than a field) generates a ustctl_field + * Serializing a type (rather than a field) generates a lttng_ust_ctl_field * entry with 0-length name. */ switch (lt->type) { case lttng_ust_type_integer: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; if (field_name) { strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1074,15 +1047,15 @@ int serialize_one_type(struct lttng_ust_session *session, parent_encoding); if (ret) return ret; - ut->atype = ustctl_atype_integer; + ut->atype = lttng_ust_ctl_atype_integer; (*iter_output)++; break; } case lttng_ust_type_float: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; - struct ustctl_float_type *uft; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; + struct lttng_ust_ctl_float_type *uft; const struct lttng_ust_type_float *lft; if (field_name) { @@ -1097,14 +1070,14 @@ int serialize_one_type(struct lttng_ust_session *session, uft->mant_dig = lft->mant_dig; uft->alignment = lft->alignment; uft->reverse_byte_order = lft->reverse_byte_order; - ut->atype = ustctl_atype_float; + ut->atype = lttng_ust_ctl_atype_float; (*iter_output)++; break; } case lttng_ust_type_string: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; int32_t encoding; if (field_name) { @@ -1117,14 +1090,14 @@ int serialize_one_type(struct lttng_ust_session *session, if (ret) return ret; ut->u.string.encoding = encoding; - ut->atype = ustctl_atype_string; + ut->atype = lttng_ust_ctl_atype_string; (*iter_output)++; break; } case lttng_ust_type_array: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; if (field_name) { strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1132,22 +1105,23 @@ int serialize_one_type(struct lttng_ust_session *session, } else { uf->name[0] = '\0'; } - ut->atype = ustctl_atype_array_nestable; + ut->atype = lttng_ust_ctl_atype_array_nestable; ut->u.array_nestable.length = lttng_ust_get_type_array(lt)->length; ut->u.array_nestable.alignment = lttng_ust_get_type_array(lt)->alignment; (*iter_output)++; ret = serialize_one_type(session, fields, iter_output, NULL, lttng_ust_get_type_array(lt)->elem_type, - lttng_ust_get_type_array(lt)->encoding); + lttng_ust_get_type_array(lt)->encoding, NULL); if (ret) return -EINVAL; break; } case lttng_ust_type_sequence: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; + const char *length_name = lttng_ust_get_type_sequence(lt)->length_name; if (field_name) { strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1155,17 +1129,24 @@ int serialize_one_type(struct lttng_ust_session *session, } else { uf->name[0] = '\0'; } - ut->atype = ustctl_atype_sequence_nestable; + ut->atype = lttng_ust_ctl_atype_sequence_nestable; + /* + * If length_name field is NULL, use the previous field + * as length. + */ + if (!length_name) + length_name = prev_field_name; + if (!length_name) + return -EINVAL; strncpy(ut->u.sequence_nestable.length_name, - lttng_ust_get_type_sequence(lt)->length_name, - LTTNG_UST_ABI_SYM_NAME_LEN); + length_name, LTTNG_UST_ABI_SYM_NAME_LEN); ut->u.sequence_nestable.length_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; ut->u.sequence_nestable.alignment = lttng_ust_get_type_sequence(lt)->alignment; (*iter_output)++; ret = serialize_one_type(session, fields, iter_output, NULL, lttng_ust_get_type_sequence(lt)->elem_type, - lttng_ust_get_type_sequence(lt)->encoding); + lttng_ust_get_type_sequence(lt)->encoding, NULL); if (ret) return -EINVAL; break; @@ -1180,7 +1161,7 @@ int serialize_one_type(struct lttng_ust_session *session, } case lttng_ust_type_struct: { - struct ustctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; if (field_name) { strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1188,7 +1169,7 @@ int serialize_one_type(struct lttng_ust_session *session, } else { uf->name[0] = '\0'; } - uf->type.atype = ustctl_atype_struct_nestable; + uf->type.atype = lttng_ust_ctl_atype_struct_nestable; uf->type.u.struct_nestable.nr_fields = lttng_ust_get_type_struct(lt)->nr_fields; uf->type.u.struct_nestable.alignment = lttng_ust_get_type_struct(lt)->alignment; (*iter_output)++; @@ -1202,8 +1183,8 @@ int serialize_one_type(struct lttng_ust_session *session, } case lttng_ust_type_enum: { - struct ustctl_field *uf = &fields[*iter_output]; - struct ustctl_type *ut = &uf->type; + struct lttng_ust_ctl_field *uf = &fields[*iter_output]; + struct lttng_ust_ctl_type *ut = &uf->type; if (field_name) { strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1214,12 +1195,12 @@ int serialize_one_type(struct lttng_ust_session *session, strncpy(ut->u.enum_nestable.name, lttng_ust_get_type_enum(lt)->desc->name, LTTNG_UST_ABI_SYM_NAME_LEN); ut->u.enum_nestable.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; - ut->atype = ustctl_atype_enum_nestable; + ut->atype = lttng_ust_ctl_atype_enum_nestable; (*iter_output)++; ret = serialize_one_type(session, fields, iter_output, NULL, lttng_ust_get_type_enum(lt)->container_type, - lttng_ust_string_encoding_none); + lttng_ust_string_encoding_none, NULL); if (ret) return -EINVAL; if (session) { @@ -1242,28 +1223,40 @@ int serialize_one_type(struct lttng_ust_session *session, static int serialize_one_field(struct lttng_ust_session *session, - struct ustctl_field *fields, size_t *iter_output, - const struct lttng_ust_event_field *lf) + struct lttng_ust_ctl_field *fields, size_t *iter_output, + const struct lttng_ust_event_field *lf, + const char **prev_field_name_p) { + const char *prev_field_name = NULL; + int ret; + /* skip 'nowrite' fields */ if (lf->nowrite) return 0; - return serialize_one_type(session, fields, iter_output, lf->name, lf->type, lttng_ust_string_encoding_none); + if (prev_field_name_p) + prev_field_name = *prev_field_name_p; + ret = serialize_one_type(session, fields, iter_output, lf->name, lf->type, + lttng_ust_string_encoding_none, prev_field_name); + if (prev_field_name_p) + *prev_field_name_p = lf->name; + return ret; } static int serialize_fields(struct lttng_ust_session *session, - struct ustctl_field *ustctl_fields, + struct lttng_ust_ctl_field *lttng_ust_ctl_fields, size_t *iter_output, size_t nr_lttng_fields, - const struct lttng_ust_event_field **lttng_fields) + const struct lttng_ust_event_field * const *lttng_fields) { + const char *prev_field_name = NULL; int ret; size_t i; for (i = 0; i < nr_lttng_fields; i++) { - ret = serialize_one_field(session, ustctl_fields, - iter_output, lttng_fields[i]); + ret = serialize_one_field(session, lttng_ust_ctl_fields, + iter_output, lttng_fields[i], + &prev_field_name); if (ret) return ret; } @@ -1273,11 +1266,11 @@ int serialize_fields(struct lttng_ust_session *session, static int alloc_serialize_fields(struct lttng_ust_session *session, size_t *_nr_write_fields, - struct ustctl_field **ustctl_fields, + struct lttng_ust_ctl_field **lttng_ust_ctl_fields, size_t nr_fields, - const struct lttng_ust_event_field **lttng_fields) + const struct lttng_ust_event_field * const *lttng_fields) { - struct ustctl_field *fields; + struct lttng_ust_ctl_field *fields; int ret; size_t iter_output = 0; ssize_t nr_write_fields; @@ -1297,7 +1290,7 @@ int alloc_serialize_fields(struct lttng_ust_session *session, goto error_type; *_nr_write_fields = nr_write_fields; - *ustctl_fields = fields; + *lttng_ust_ctl_fields = fields; return 0; error_type: @@ -1306,11 +1299,11 @@ error_type: } static -int serialize_entries(struct ustctl_enum_entry **_entries, +int serialize_entries(struct lttng_ust_ctl_enum_entry **_entries, size_t nr_entries, - const struct lttng_ust_enum_entry **lttng_entries) + const struct lttng_ust_enum_entry * const *lttng_entries) { - struct ustctl_enum_entry *entries; + struct lttng_ust_ctl_enum_entry *entries; int i; /* Serialize the entries */ @@ -1318,7 +1311,7 @@ int serialize_entries(struct ustctl_enum_entry **_entries, if (!entries) return -ENOMEM; for (i = 0; i < nr_entries; i++) { - struct ustctl_enum_entry *uentry; + struct lttng_ust_ctl_enum_entry *uentry; const struct lttng_ust_enum_entry *lentry; uentry = &entries[i]; @@ -1333,7 +1326,7 @@ int serialize_entries(struct ustctl_enum_entry **_entries, if (lentry->options & LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO) { uentry->u.extra.options |= - USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO; + LTTNG_UST_CTL_UST_ENUM_ENTRY_OPTION_IS_AUTO; } } *_entries = entries; @@ -1343,14 +1336,15 @@ int serialize_entries(struct ustctl_enum_entry **_entries, static int serialize_ctx_fields(struct lttng_ust_session *session, size_t *_nr_write_fields, - struct ustctl_field **ustctl_fields, + struct lttng_ust_ctl_field **lttng_ust_ctl_fields, size_t nr_fields, struct lttng_ust_ctx_field *lttng_fields) { - struct ustctl_field *fields; - int ret; + struct lttng_ust_ctl_field *fields; + const char *prev_field_name = NULL; size_t i, iter_output = 0; ssize_t nr_write_fields; + int ret; nr_write_fields = count_ctx_fields_recursive(nr_fields, lttng_fields); @@ -1364,13 +1358,13 @@ int serialize_ctx_fields(struct lttng_ust_session *session, for (i = 0; i < nr_fields; i++) { ret = serialize_one_field(session, fields, &iter_output, - lttng_fields[i].event_field); + lttng_fields[i].event_field, &prev_field_name); if (ret) goto error_type; } *_nr_write_fields = nr_write_fields; - *ustctl_fields = fields; + *lttng_ust_ctl_fields = fields; return 0; error_type: @@ -1389,7 +1383,7 @@ int ustcomm_register_event(int sock, int loglevel, const char *signature, /* event signature (input) */ size_t nr_fields, /* fields */ - const struct lttng_ust_event_field **lttng_fields, + const struct lttng_ust_event_field * const *lttng_fields, const char *model_emf_uri, uint32_t *id) /* event id (output) */ { @@ -1403,12 +1397,12 @@ int ustcomm_register_event(int sock, struct ustcomm_notify_event_reply r; } reply; size_t signature_len, fields_len, model_emf_uri_len; - struct ustctl_field *fields = NULL; + struct lttng_ust_ctl_field *fields = NULL; size_t nr_write_fields = 0; int ret; memset(&msg, 0, sizeof(msg)); - msg.header.notify_cmd = USTCTL_NOTIFY_CMD_EVENT; + msg.header.notify_cmd = LTTNG_UST_CTL_NOTIFY_CMD_EVENT; msg.m.session_objd = session_objd; msg.m.channel_objd = channel_objd; strncpy(msg.m.event_name, event_name, LTTNG_UST_ABI_SYM_NAME_LEN); @@ -1528,7 +1522,7 @@ int ustcomm_register_enum(int sock, int session_objd, /* session descriptor */ const char *enum_name, /* enum name (input) */ size_t nr_entries, /* entries */ - const struct lttng_ust_enum_entry **lttng_entries, + const struct lttng_ust_enum_entry * const *lttng_entries, uint64_t *id) { ssize_t len; @@ -1541,11 +1535,11 @@ int ustcomm_register_enum(int sock, struct ustcomm_notify_enum_reply r; } reply; size_t entries_len; - struct ustctl_enum_entry *entries = NULL; + struct lttng_ust_ctl_enum_entry *entries = NULL; int ret; memset(&msg, 0, sizeof(msg)); - msg.header.notify_cmd = USTCTL_NOTIFY_CMD_ENUM; + msg.header.notify_cmd = LTTNG_UST_CTL_NOTIFY_CMD_ENUM; msg.m.session_objd = session_objd; strncpy(msg.m.enum_name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN); msg.m.enum_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; @@ -1647,12 +1641,12 @@ int ustcomm_register_channel(int sock, struct ustcomm_notify_channel_reply r; } reply; size_t fields_len; - struct ustctl_field *fields = NULL; + struct lttng_ust_ctl_field *fields = NULL; int ret; size_t nr_write_fields = 0; memset(&msg, 0, sizeof(msg)); - msg.header.notify_cmd = USTCTL_NOTIFY_CMD_CHANNEL; + msg.header.notify_cmd = LTTNG_UST_CTL_NOTIFY_CMD_CHANNEL; msg.m.session_objd = session_objd; msg.m.channel_objd = channel_objd;