X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=e0b7d73bf9c33e763e6c2232eb31fd6e8a70e9e5;hb=25cff019d711338b8a7efe1cc54e4b1870157348;hp=8a35d9f7a4a3d3512cde25a6588e67b404f39001;hpb=ae4b659d95f8dab9f2aa4b890d6937d7d5375f07;p=lttng-ust.git diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index 8a35d9f7..e0b7d73b 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -22,12 +22,12 @@ #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) \ @@ -37,16 +37,16 @@ static ssize_t count_fields_recursive(size_t nr_fields, - const struct lttng_event_field *lttng_fields); + const struct lttng_ust_event_field **lttng_fields); static int serialize_one_field(struct lttng_session *session, struct ustctl_field *fields, size_t *iter_output, - const struct lttng_event_field *lf); + const struct lttng_ust_event_field *lf); static int serialize_fields(struct lttng_session *session, struct ustctl_field *ustctl_fields, size_t *iter_output, size_t nr_lttng_fields, - const struct lttng_event_field *lttng_fields); + const struct lttng_ust_event_field **lttng_fields); /* * Human readable error message. @@ -606,7 +606,7 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock, ssize_t len, nr_fd; int wakeup_fd, ret; - if (var_len > LTTNG_UST_CHANNEL_DATA_MAX_LEN) { + if (var_len > LTTNG_UST_ABI_CHANNEL_DATA_MAX_LEN) { len = -EINVAL; goto error_check; } @@ -761,7 +761,7 @@ ssize_t ustcomm_recv_counter_from_sessiond(int sock, void *counter_data; ssize_t len; - if (var_len > LTTNG_UST_COUNTER_DATA_MAX_LEN) { + if (var_len > LTTNG_UST_ABI_COUNTER_DATA_MAX_LEN) { len = -EINVAL; goto error_check; } @@ -839,7 +839,7 @@ int ustcomm_send_reg_msg(int sock, ssize_t len; struct ustctl_reg_msg reg_msg; - reg_msg.magic = LTTNG_UST_COMM_MAGIC; + reg_msg.magic = LTTNG_UST_ABI_COMM_MAGIC; reg_msg.major = LTTNG_UST_ABI_MAJOR_VERSION; reg_msg.minor = LTTNG_UST_ABI_MINOR_VERSION; reg_msg.pid = getpid(); @@ -871,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) + 1; case atype_enum_nestable: return count_one_type(lt->u.enum_nestable.container_type) + 1; case atype_array_nestable: @@ -890,7 +884,7 @@ ssize_t count_one_type(const struct lttng_type *lt) case atype_dynamic: { - const struct lttng_event_field *choices; + const struct lttng_ust_event_field **choices; size_t nr_choices; int ret; @@ -913,15 +907,15 @@ ssize_t count_one_type(const struct lttng_type *lt) static ssize_t count_fields_recursive(size_t nr_fields, - const struct lttng_event_field *lttng_fields) + const struct lttng_ust_event_field **lttng_fields) { int i; ssize_t ret, count = 0; for (i = 0; i < nr_fields; i++) { - const struct lttng_event_field *lf; + const struct lttng_ust_event_field *lf; - lf = <tng_fields[i]; + lf = lttng_fields[i]; /* skip 'nowrite' fields */ if (lf->nowrite) continue; @@ -941,7 +935,7 @@ ssize_t count_ctx_fields_recursive(size_t nr_fields, ssize_t ret, count = 0; for (i = 0; i < nr_fields; i++) { - const struct lttng_event_field *lf; + const struct lttng_ust_event_field *lf; lf = <tng_fields[i].event_field; /* skip 'nowrite' fields */ @@ -992,87 +986,16 @@ int serialize_integer_type(struct ustctl_integer_type *uit, 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, const char *field_name) { - const struct lttng_event_field *choices; - char tag_field_name[LTTNG_UST_SYM_NAME_LEN]; + const struct lttng_ust_event_field **choices; + char tag_field_name[LTTNG_UST_ABI_SYM_NAME_LEN]; const struct lttng_type *tag_type; - const struct lttng_event_field *tag_field_generic; - struct lttng_event_field tag_field = { + const struct lttng_ust_event_field *tag_field_generic; + struct lttng_ust_event_field tag_field = { .name = tag_field_name, .nowrite = 0, }; @@ -1084,11 +1007,11 @@ int serialize_dynamic_type(struct lttng_session *session, tag_type = &tag_field_generic->type; /* Serialize enum field. */ - strncpy(tag_field_name, field_name, LTTNG_UST_SYM_NAME_LEN); - tag_field_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(tag_field_name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + tag_field_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; strncat(tag_field_name, "_tag", - LTTNG_UST_SYM_NAME_LEN - strlen(tag_field_name) - 1); + 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); @@ -1101,21 +1024,21 @@ int serialize_dynamic_type(struct lttng_session *session, if (ret) return ret; - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + 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.u.variant_nestable.nr_choices = nr_choices; strncpy(uf->type.u.variant_nestable.tag_name, tag_field_name, - LTTNG_UST_SYM_NAME_LEN); - uf->type.u.variant_nestable.tag_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + uf->type.u.variant_nestable.tag_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; uf->type.u.variant_nestable.alignment = 0; (*iter_output)++; /* 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]); if (ret) return ret; } @@ -1136,106 +1059,86 @@ int serialize_one_type(struct lttng_session *session, switch (lt->atype) { 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'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_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); + ret = serialize_integer_type(&ut->u.integer, <->u.integer); if (ret) return ret; - ut->atype = atype; + ut->atype = ustctl_atype_integer; (*iter_output)++; break; } - case atype_array: + case atype_float: { 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; + struct ustctl_float_type *uft; + const struct lttng_float_type *lft; if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_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; + uft = &ut->u._float; + lft = <->u._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; + ut->atype = ustctl_atype_float; (*iter_output)++; break; } - case atype_array_nestable: + case atype_string: { struct ustctl_field *uf = &fields[*iter_output]; struct ustctl_type *ut = &uf->type; + int32_t encoding; if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; } else { uf->name[0] = '\0'; } - ut->atype = ustctl_atype_array_nestable; - ut->u.array_nestable.length = lt->u.array_nestable.length; - ut->u.array_nestable.alignment = lt->u.array_nestable.alignment; - (*iter_output)++; - - ret = serialize_one_type(session, fields, iter_output, NULL, - lt->u.array_nestable.elem_type); + ret = serialize_string_encoding(&encoding, lt->u.string.encoding); if (ret) - return -EINVAL; + return ret; + ut->u.string.encoding = encoding; + ut->atype = ustctl_atype_string; + (*iter_output)++; break; } - case atype_sequence: + case atype_array_nestable: { 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'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_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); + ut->atype = ustctl_atype_array_nestable; + ut->u.array_nestable.length = lt->u.array_nestable.length; + ut->u.array_nestable.alignment = lt->u.array_nestable.alignment; + (*iter_output)++; + + ret = serialize_one_type(session, fields, iter_output, NULL, + lt->u.array_nestable.elem_type); if (ret) return -EINVAL; - ubt->atype = atype; - (*iter_output)++; break; } case atype_sequence_nestable: @@ -1244,16 +1147,16 @@ int serialize_one_type(struct lttng_session *session, struct ustctl_type *ut = &uf->type; if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; } else { uf->name[0] = '\0'; } ut->atype = ustctl_atype_sequence_nestable; strncpy(ut->u.sequence_nestable.length_name, lt->u.sequence_nestable.length_name, - LTTNG_UST_SYM_NAME_LEN); - ut->u.sequence_nestable.length_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + 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 = lt->u.sequence_nestable.alignment; (*iter_output)++; @@ -1271,34 +1174,13 @@ 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]; if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; } else { uf->name[0] = '\0'; } @@ -1320,14 +1202,14 @@ int serialize_one_type(struct lttng_session *session, struct ustctl_type *ut = &uf->type; if (field_name) { - strncpy(uf->name, field_name, LTTNG_UST_SYM_NAME_LEN); - uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN); + uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; } else { uf->name[0] = '\0'; } strncpy(ut->u.enum_nestable.name, lt->u.enum_nestable.desc->name, - LTTNG_UST_SYM_NAME_LEN); - ut->u.enum_nestable.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + 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; (*iter_output)++; @@ -1356,7 +1238,7 @@ int serialize_one_type(struct lttng_session *session, static int serialize_one_field(struct lttng_session *session, struct ustctl_field *fields, size_t *iter_output, - const struct lttng_event_field *lf) + const struct lttng_ust_event_field *lf) { /* skip 'nowrite' fields */ if (lf->nowrite) @@ -1369,14 +1251,14 @@ static int serialize_fields(struct lttng_session *session, struct ustctl_field *ustctl_fields, size_t *iter_output, size_t nr_lttng_fields, - const struct lttng_event_field *lttng_fields) + const struct lttng_ust_event_field **lttng_fields) { int ret; size_t i; for (i = 0; i < nr_lttng_fields; i++) { ret = serialize_one_field(session, ustctl_fields, - iter_output, <tng_fields[i]); + iter_output, lttng_fields[i]); if (ret) return ret; } @@ -1388,7 +1270,7 @@ int alloc_serialize_fields(struct lttng_session *session, size_t *_nr_write_fields, struct ustctl_field **ustctl_fields, size_t nr_fields, - const struct lttng_event_field *lttng_fields) + const struct lttng_ust_event_field **lttng_fields) { struct ustctl_field *fields; int ret; @@ -1441,8 +1323,8 @@ int serialize_entries(struct ustctl_enum_entry **_entries, uentry->start.signedness = lentry->start.signedness; uentry->end.value = lentry->end.value; uentry->end.signedness = lentry->end.signedness; - strncpy(uentry->string, lentry->string, LTTNG_UST_SYM_NAME_LEN); - uentry->string[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(uentry->string, lentry->string, LTTNG_UST_ABI_SYM_NAME_LEN); + uentry->string[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; if (lentry->u.extra.options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) { uentry->u.extra.options |= @@ -1502,7 +1384,7 @@ int ustcomm_register_event(int sock, int loglevel, const char *signature, /* event signature (input) */ size_t nr_fields, /* fields */ - const struct lttng_event_field *lttng_fields, + const struct lttng_ust_event_field **lttng_fields, const char *model_emf_uri, uint32_t *id) /* event id (output) */ { @@ -1524,8 +1406,8 @@ int ustcomm_register_event(int sock, msg.header.notify_cmd = USTCTL_NOTIFY_CMD_EVENT; msg.m.session_objd = session_objd; msg.m.channel_objd = channel_objd; - strncpy(msg.m.event_name, event_name, LTTNG_UST_SYM_NAME_LEN); - msg.m.event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(msg.m.event_name, event_name, LTTNG_UST_ABI_SYM_NAME_LEN); + msg.m.event_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; msg.m.loglevel = loglevel; signature_len = strlen(signature) + 1; msg.m.signature_len = signature_len; @@ -1660,8 +1542,8 @@ int ustcomm_register_enum(int sock, memset(&msg, 0, sizeof(msg)); msg.header.notify_cmd = USTCTL_NOTIFY_CMD_ENUM; msg.m.session_objd = session_objd; - strncpy(msg.m.enum_name, enum_name, LTTNG_UST_SYM_NAME_LEN); - msg.m.enum_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + 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'; /* Calculate entries len, serialize entries. */ if (nr_entries > 0) {