listing and activation of loglevel by number

[lttng-tools.git] / lttng-sessiond / ust-app.c

diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c
index 69164126beafbe15e276a7f694bc5dc2045cd7b9..bd4160b9abcf2642903aeff217b35981b267282a 100644 (file)
--- a/lttng-sessiond/ust-app.c
+++ b/lttng-sessiond/ust-app.c
@@ -1383,12 +1383,10 @@ int ust_app_list_events(struct lttng_event **events)
 
                while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle,
                                                &iter)) != -ENOENT) {
 
                while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle,
                                                &iter)) != -ENOENT) {

-                       memcpy(tmp[count].name, iter.name, LTTNG_UST_SYM_NAME_LEN);
-                       /* TODO : get loglevel too */
-                       if (count > nbmem) {
-                               DBG2("Reallocating event list from %zu to %zu bytes", nbmem,
-                                               nbmem + UST_APP_EVENT_LIST_SIZE);
-                               nbmem += UST_APP_EVENT_LIST_SIZE;
+                       if (count >= nbmem) {
+                               DBG2("Reallocating event list from %zu to %zu entries", nbmem,
+                                               2 * nbmem);
+                               nbmem *= 2;

                                tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
                                if (tmp == NULL) {
                                        PERROR("realloc ust app events");
                                tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
                                if (tmp == NULL) {
                                        PERROR("realloc ust app events");


@@ -1396,7 +1394,9 @@ int ust_app_list_events(struct lttng_event **events)
                                        goto rcu_error;
                                }
                        }
                                        goto rcu_error;
                                }
                        }

-
+                       memcpy(tmp[count].name, iter.name, LTTNG_UST_SYM_NAME_LEN);
+                       memcpy(tmp[count].loglevel, iter.loglevel, LTTNG_UST_SYM_NAME_LEN);
+                       tmp[count].loglevel_value = iter.loglevel_value;

                        tmp[count].type = LTTNG_UST_TRACEPOINT;
                        tmp[count].pid = app->key.pid;
                        tmp[count].enabled = -1;
                        tmp[count].type = LTTNG_UST_TRACEPOINT;
                        tmp[count].pid = app->key.pid;
                        tmp[count].enabled = -1;