ABI update: only send loglevel value to UST: fixed loglevels

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

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 62816cecb89f4423970db66177e7821d025983a1..77888048794c39d2cdd329122eccb3af633da39f 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -393,7 +393,7 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan,
 
        ua_ctx->handle = ua_ctx->obj->handle;
 
-       DBG2("UST app context added to channel %s successfully", ua_chan->name);
+       DBG2("UST app context created successfully for channel %s", ua_chan->name);
 
 error:
        return ret;
@@ -416,7 +416,7 @@ int create_ust_event_context(struct ust_app_event *ua_event,
 
        ua_ctx->handle = ua_ctx->obj->handle;
 
-       DBG2("UST app context added to event %s successfully", ua_event->name);
+       DBG2("UST app context created successfully for event %s", ua_event->name);
 
 error:
        return ret;
@@ -1420,8 +1420,7 @@ int ust_app_list_events(struct lttng_event **events)
                                }
                        }
                        memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
-                       memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN);
-                       tmp[count].loglevel_value = uiter.loglevel_value;
+                       tmp[count].loglevel = uiter.loglevel;
                        tmp[count].type = LTTNG_UST_TRACEPOINT;
                        tmp[count].pid = app->key.pid;
                        tmp[count].enabled = -1;
@@ -2203,11 +2202,12 @@ int ust_app_destroy_trace_all(struct ltt_ust_session *usess)
 void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 {
        int ret = 0;
-       struct lttng_ht_iter iter, uiter;
+       struct lttng_ht_iter iter, uiter, iter_ctx;
        struct ust_app *app;
        struct ust_app_session *ua_sess;
        struct ust_app_channel *ua_chan;
        struct ust_app_event *ua_event;
+       struct ust_app_ctx *ua_ctx;
 
        if (usess == NULL) {
                ERR("No UST session on global update. Returning");
@@ -2247,6 +2247,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
                        continue;
                }
 
+               cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter_ctx.iter, ua_ctx,
+                               node.node) {
+                       ret = create_ust_channel_context(ua_chan, ua_ctx, app);
+                       if (ret < 0) {
+                               /* FIXME: Should we quit here or continue... */
+                               continue;
+                       }
+               }
+
+
                /* For each events */
                cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
                                node.node) {
@@ -2255,6 +2265,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
                                /* FIXME: Should we quit here or continue... */
                                continue;
                        }
+
+                       /* Add context on events. */
+                       cds_lfht_for_each_entry(ua_event->ctx->ht, &iter_ctx.iter,
+                                       ua_ctx, node.node) {
+                               ret = create_ust_event_context(ua_event, ua_ctx, app);
+                               if (ret < 0) {
+                                       /* FIXME: Should we quit here or continue... */
+                                       continue;
+                               }
+                       }
                }
        }
 
@@ -2538,3 +2558,46 @@ error:
        rcu_read_unlock();
        return -1;
 }
+
+/*
+ * Calibrate registered applications.
+ */
+int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
+{
+       int ret = 0;
+       struct lttng_ht_iter iter;
+       struct ust_app *app;
+
+       rcu_read_lock();
+
+       cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+               if (!app->compatible) {
+                       /*
+                        * TODO: In time, we should notice the caller of this error by
+                        * telling him that this is a version error.
+                        */
+                       continue;
+               }
+
+               ret = ustctl_calibrate(app->key.sock, calibrate);
+               if (ret < 0) {
+                       switch (ret) {
+                       case -ENOSYS:
+                               /* Means that it's not implemented on the tracer side. */
+                               ret = 0;
+                               break;
+                       default:
+                               /* TODO: Report error to user */
+                               DBG2("Calibrate app PID %d returned with error %d",
+                                               app->key.pid, ret);
+                               break;
+                       }
+               }
+       }
+
+       DBG("UST app global domain calibration finished");
+
+       rcu_read_unlock();
+
+       return ret;
+}