From 590b9e3c8fdaf2912d5919244a475f0e2f32f1b5 Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Mon, 17 Sep 2012 17:32:03 -0400 Subject: [PATCH] Fix: Mismatch of field name between ust and tools 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 Signed-off-by: David Goulet --- 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 d06672852..f92ccb6fd 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 91639a7c6..c9be4bd9d 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 81b1f418a..3202cd4e0 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 eced2b716..0467cc6ba 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]"); } /* -- 2.34.1