Rename filter string to filter expression in liblttng-ctl

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 6c10c910d8207be651e41e7c720be9a679e1972c..fe0527d425b0e32e86b75d6b415a0e2aebf5e65b 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -1694,10 +1694,15 @@ int lttng_list_channels(struct lttng_handle *handle,
                struct lttng_channel **channels)
 {
        int ret;
+       size_t channel_count, i;
+       const size_t channel_size = sizeof(struct lttng_channel) +
+                       sizeof(struct lttcomm_channel_extended);
        struct lttcomm_session_msg lsm;
+       void *extended_at;
 
        if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
        }
 
        memset(&lsm, 0, sizeof(lsm));
@@ -1709,10 +1714,30 @@ int lttng_list_channels(struct lttng_handle *handle,
 
        ret = lttng_ctl_ask_sessiond(&lsm, (void**) channels);
        if (ret < 0) {
-               return ret;
+               goto end;
        }
 
-       return ret / sizeof(struct lttng_channel);
+       if (ret % channel_size) {
+               ret = -LTTNG_ERR_UNK;
+               free(*channels);
+               *channels = NULL;
+               goto end;
+       }
+       channel_count = (size_t) ret / channel_size;
+
+       /* Set extended info pointers */
+       extended_at = ((void *) *channels) +
+                       channel_count * sizeof(struct lttng_channel);
+       for (i = 0; i < channel_count; i++) {
+               struct lttng_channel *chan = &(*channels)[i];
+
+               chan->attr.extended.ptr = extended_at;
+               extended_at += sizeof(struct lttcomm_channel_extended);
+       }
+
+       ret = (int) channel_count;
+end:
+       return ret;
 }
 
 /*
@@ -1784,13 +1809,13 @@ error:
        return ret;
 }
 
-int lttng_event_get_filter_string(struct lttng_event *event,
-       const char **filter_string)
+int lttng_event_get_filter_expression(struct lttng_event *event,
+       const char **filter_expression)
 {
        int ret = 0;
        struct lttcomm_event_extended_header *ext_header;
 
-       if (!event || !filter_string) {
+       if (!event || !filter_expression) {
                ret = -LTTNG_ERR_INVALID;
                goto end;
        }
@@ -1802,15 +1827,15 @@ int lttng_event_get_filter_string(struct lttng_event *event,
                 * This can happen since the lttng_event structure is
                 * used for other tasks where this pointer is never set.
                 */
-               *filter_string = NULL;
+               *filter_expression = NULL;
                goto end;
        }
 
        if (ext_header->filter_len) {
-               *filter_string = ((const char *) (ext_header)) +
-                       sizeof(*ext_header);
+               *filter_expression = ((const char *) (ext_header)) +
+                               sizeof(*ext_header);
        } else {
-               *filter_string = NULL;
+               *filter_expression = NULL;
        }
 
 end: