X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=656e170b100a8f0694b1ff3c37d2b324079204f2;hb=06e646e04714e0e0f7537841107ab0528ef33a52;hp=cfd4ddf6da1a2790b4370034ee447f70c6a4e411;hpb=fd17d7cecd427479c035cd99cb2b2fb622bb3a38;p=lttng-ust.git diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index cfd4ddf6..656e170b 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -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. @@ -884,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; @@ -907,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; @@ -935,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 */ @@ -991,11 +991,11 @@ 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; + 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, }; @@ -1038,7 +1038,7 @@ int serialize_dynamic_type(struct lttng_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]); if (ret) return ret; } @@ -1238,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) @@ -1251,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; } @@ -1270,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; @@ -1303,7 +1303,7 @@ error_type: static int serialize_entries(struct ustctl_enum_entry **_entries, size_t nr_entries, - const struct lttng_enum_entry *lttng_entries) + const struct lttng_ust_enum_entry **lttng_entries) { struct ustctl_enum_entry *entries; int i; @@ -1314,10 +1314,10 @@ int serialize_entries(struct ustctl_enum_entry **_entries, return -ENOMEM; for (i = 0; i < nr_entries; i++) { struct ustctl_enum_entry *uentry; - const struct lttng_enum_entry *lentry; + const struct lttng_ust_enum_entry *lentry; uentry = &entries[i]; - lentry = <tng_entries[i]; + lentry = lttng_entries[i]; uentry->start.value = lentry->start.value; uentry->start.signedness = lentry->start.signedness; @@ -1326,7 +1326,7 @@ int serialize_entries(struct ustctl_enum_entry **_entries, 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) { + if (lentry->options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) { uentry->u.extra.options |= USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO; } @@ -1384,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) */ { @@ -1523,7 +1523,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_enum_entry *lttng_entries, + const struct lttng_ust_enum_entry **lttng_entries, uint64_t *id) { ssize_t len;