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 <christian.babeux@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index d066728528e419c1014be3a12e32cef4f33b1c84..f92ccb6fdb3615266bb86c06dc465accb01ded9b 100644 (file)
--- 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 91639a7c6d43279ab60f85b0098d2bced8484d0b..c9be4bd9d29fda9d8268a8d3531774d253f6e791 100644 (file)
--- 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 81b1f418a97b78a5a01ed7300f50fd2d38f0413d..3202cd4e04c12a49a8c6db284def42ae8a08a77f 100644 (file)
--- 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 eced2b7165f1836098e415aad4768c772a581240..0467cc6ba32d6afc828bcaeec34e31c0b58ed416 100644 (file)
--- 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]");
 }
 
 /*