Merge branch 'master' into compat-freebsd

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index 34b2f90a9cffe13a542f8e6cb90ea13e54420362..827c63c18132433028c7e165dcef400ed5736905 100644 (file)
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
@@ -309,7 +309,7 @@ file.
 \-c, \-\-channel
         Apply on channel name
 \-a, \-\-all
-        Enable all tracepoints
+        Enable all tracepoints and syscalls
 \-k, \-\-kernel
         Apply for the kernel tracer
 \-u, \-\-userspace

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 9727258bf130b0f8912a9edb67f0c6a77f3aa4f8..402da2fd19f48c31ba5fcb6ec8e08f1c615a63d9 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -337,7 +337,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
                struct lttng_event_context *ctx, char *event_name,
                char *channel_name)
 {
-       int ret = LTTCOMM_OK, have_event = 0, no_chan = 1;
+       int ret = LTTCOMM_OK, have_event = 0;
        struct lttng_ht_iter iter;
        struct lttng_ht *chan_ht;
        struct ltt_ust_channel *uchan = NULL;
@@ -409,7 +409,6 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
        } else if (!uchan && !have_event) {     /* Add ctx all events, all channels */
                /* For all channels */
                cds_lfht_for_each_entry(chan_ht->ht, &iter.iter, uchan, node.node) {
-                       no_chan = 0;
                        ret = add_uctx_to_channel(usess, domain, uchan, ctx);
                        if (ret < 0) {
                                ERR("Context failed for channel %s", uchan->name);
@@ -437,10 +436,6 @@ end:
                break;
        }
 
-       if (no_chan) {
-               ret = LTTCOMM_UST_CHAN_NOT_FOUND;
-       }
-
 error:
        return ret;
 }

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 26ebfac496c30ed9aa33d53028f36f8cd0495a92..d758c8821cdb295ac4fa31cebad3aef13993ac3a 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -182,6 +182,14 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
        rcu_read_lock();
        cds_lfht_for_each_entry(usess->channels->ht, &iter.iter, ua_chan,
                        node.node) {
+               /*
+                * Indicate that the channel was not created on the tracer side so skip
+                * sending unexisting streams.
+                */
+               if (ua_chan->obj == NULL) {
+                       continue;
+               }
+
                ret = send_channel_streams(sock, ua_chan, usess->uid, usess->gid);
                if (ret < 0) {
                        rcu_read_unlock();

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 3d2b41c02c6cac1c2afe986722b097e58e07d579..b5b46fb36f373fdbd3b8bcc611d0583e68522c4d 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -104,7 +104,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "      --list-options       Simple listing of options\n");
        fprintf(ofp, "  -s, --session            Apply to session name\n");
        fprintf(ofp, "  -c, --channel            Apply to this channel\n");
-       fprintf(ofp, "  -a, --all                Enable all tracepoints\n");
+       fprintf(ofp, "  -a, --all                Enable all tracepoints and syscalls\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
 #if 0
        fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer\n");