[lttng-dev] [PATCH lttng-tools] Fix: Mismatch of field name between latest lttng-ust abi and lttng-tools

[David Goulet]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Merged!

Thanks!
David

Christian Babeux:
> The "written" field of the lttng_event_field and
> lttng_ust_field_iter structures has been renamed to "nowrite" in
> the upstream version of lttng-ust.
> 
> Signed-off-by: Christian Babeux <christian.babeux at efficios.com> 
> --- include/lttng/lttng.h                  | 2 +- 
> src/bin/lttng-sessiond/lttng-ust-abi.h | 2 +- 
> src/bin/lttng-sessiond/ust-app.c       | 2 +- 
> src/bin/lttng/commands/list.c          | 2 +- 4 files changed, 4
> insertions(+), 4 deletions(-)
> 
> diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index
> d066728..f92ccb6 100644 --- a/include/lttng/lttng.h +++
> b/include/lttng/lttng.h @@ -261,7 +261,7 @@ struct
> lttng_event_field { enum lttng_event_field_type type; char
> padding[LTTNG_EVENT_FIELD_PADDING]; struct lttng_event event; -	int
> written; +	int nowrite; };
> 
> /* diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h
> b/src/bin/lttng-sessiond/lttng-ust-abi.h index 91639a7..c9be4bd
> 100644 --- a/src/bin/lttng-sessiond/lttng-ust-abi.h +++
> b/src/bin/lttng-sessiond/lttng-ust-abi.h @@ -105,7 +105,7 @@ struct
> lttng_ust_field_iter { char field_name[LTTNG_UST_SYM_NAME_LEN]; 
> enum lttng_ust_field_type type; int loglevel;				/* event loglevel
> */ -	int written; +	int nowrite; char
> padding[LTTNG_UST_FIELD_ITER_PADDING]; };
> 
> diff --git a/src/bin/lttng-sessiond/ust-app.c
> b/src/bin/lttng-sessiond/ust-app.c index 81b1f41..3202cd4 100644 
> --- a/src/bin/lttng-sessiond/ust-app.c +++
> b/src/bin/lttng-sessiond/ust-app.c @@ -1667,7 +1667,7 @@ int
> ust_app_list_event_fields(struct lttng_event_field **fields)
> 
> memcpy(tmp[count].field_name, uiter.field_name,
> LTTNG_UST_SYM_NAME_LEN); tmp[count].type = uiter.type; -
> tmp[count].written = uiter.written; +			tmp[count].nowrite =
> uiter.nowrite;
> 
> memcpy(tmp[count].event.name, uiter.event_name,
> LTTNG_UST_SYM_NAME_LEN); tmp[count].event.loglevel =
> uiter.loglevel; diff --git a/src/bin/lttng/commands/list.c
> b/src/bin/lttng/commands/list.c index eced2b7..0467cc6 100644 ---
> a/src/bin/lttng/commands/list.c +++
> b/src/bin/lttng/commands/list.c @@ -281,7 +281,7 @@ static void
> print_event_field(struct lttng_event_field *field) return; } 
> MSG("%sfield: %s (%s)%s", indent8, field->field_name, -
> field_type(field), field->written ? "" : " [no write]"); +
> field_type(field), field->nowrite ? "" : " [no write]"); }
> 
> /*
-----BEGIN PGP SIGNATURE-----

iQEcBAEBCgAGBQJQV5fsAAoJEELoaioR9I02wi4H/j5LXn7GnA4X32/d18RVjLqK
M64WEz4R1htj3lPC0pM04eCffUQ+qv416aGpFhWwZ9z/4bt0C8xUh1h2zMs046y/
cbjsS5OMWXdPBWcjiBC8kzzLIBC61on0qCT7jYQk3k0NkoJ6YG+w3OOYhxwlMAfR
Cxpwbd6iPizJ1d5dOy5GomXr3WqDYwxmIvHsjLoP4TLgdIxwP/9XG/1yYUzSafZP
RisgbHMy91IsTMDrYKr7LwoSI4HoiHLqqGPnblHfhFjyzm1rtQfKxQcPa487Mn1S
SZOjfaOyUSQg4TyR7CHvuQGmYJihRkIqquphWYf64Ry2glsp8EycfWMxJSHXEWQ=
=hrT3
-----END PGP SIGNATURE-----