From e1986656f8267fb64f5ac67c0d464d157b8a050b Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 11 Jul 2013 14:51:35 -0400 Subject: [PATCH] Fix: support temporary snapshot max size and name Signed-off-by: David Goulet --- src/bin/lttng-sessiond/cmd.c | 65 +++++++++++++++++++++++-------- src/bin/lttng-sessiond/snapshot.c | 4 ++ src/bin/lttng-sessiond/ust-app.c | 3 +- src/bin/lttng/commands/snapshot.c | 12 +++--- src/lib/lttng-ctl/snapshot.c | 12 +++++- 5 files changed, 71 insertions(+), 25 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index c522d51c2..6000d198c 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -2576,7 +2576,8 @@ int cmd_snapshot_record(struct ltt_session *session, struct lttng_snapshot_output *output, int wait) { int ret = LTTNG_OK; - struct snapshot_output *tmp_sout = NULL; + unsigned int use_tmp_output = 0; + struct snapshot_output tmp_output; unsigned int nb_streams; assert(session); @@ -2600,15 +2601,9 @@ int cmd_snapshot_record(struct ltt_session *session, /* Use temporary output for the session. */ if (output && *output->ctrl_url != '\0') { - tmp_sout = snapshot_output_alloc(); - if (!tmp_sout) { - ret = LTTNG_ERR_NOMEM; - goto error; - } - ret = snapshot_output_init(output->max_size, output->name, output->ctrl_url, output->data_url, session->consumer, - tmp_sout, NULL); + &tmp_output, NULL); if (ret < 0) { if (ret == -ENOMEM) { ret = LTTNG_ERR_NOMEM; @@ -2617,6 +2612,7 @@ int cmd_snapshot_record(struct ltt_session *session, } goto error; } + use_tmp_output = 1; } /* @@ -2628,8 +2624,8 @@ int cmd_snapshot_record(struct ltt_session *session, if (session->kernel_session) { struct ltt_kernel_session *ksess = session->kernel_session; - if (tmp_sout) { - ret = record_kernel_snapshot(ksess, tmp_sout, session, + if (use_tmp_output) { + ret = record_kernel_snapshot(ksess, &tmp_output, session, wait, nb_streams); if (ret < 0) { goto error; @@ -2641,7 +2637,25 @@ int cmd_snapshot_record(struct ltt_session *session, rcu_read_lock(); cds_lfht_for_each_entry(session->snapshot.output_ht->ht, &iter.iter, sout, node.node) { - ret = record_kernel_snapshot(ksess, sout, + /* + * Make a local copy of the output and assign the possible + * temporary value given by the caller. + */ + memset(&tmp_output, 0, sizeof(tmp_output)); + memcpy(&tmp_output, sout, sizeof(tmp_output)); + + /* Use temporary max size. */ + if (output->max_size != (uint64_t) -1ULL) { + tmp_output.max_size = output->max_size; + } + + /* Use temporary name. */ + if (*output->name != '\0') { + strncpy(tmp_output.name, output->name, + sizeof(tmp_output.name)); + } + + ret = record_kernel_snapshot(ksess, &tmp_output, session, wait, nb_streams); if (ret < 0) { rcu_read_unlock(); @@ -2655,8 +2669,8 @@ int cmd_snapshot_record(struct ltt_session *session, if (session->ust_session) { struct ltt_ust_session *usess = session->ust_session; - if (tmp_sout) { - ret = record_ust_snapshot(usess, tmp_sout, session, + if (use_tmp_output) { + ret = record_ust_snapshot(usess, &tmp_output, session, wait, nb_streams); if (ret < 0) { goto error; @@ -2668,7 +2682,27 @@ int cmd_snapshot_record(struct ltt_session *session, rcu_read_lock(); cds_lfht_for_each_entry(session->snapshot.output_ht->ht, &iter.iter, sout, node.node) { - ret = record_ust_snapshot(usess, sout, session, + /* + * Make a local copy of the output and assign the possible + * temporary value given by the caller. + */ + memset(&tmp_output, 0, sizeof(tmp_output)); + memcpy(&tmp_output, sout, sizeof(tmp_output)); + + fprintf(stderr, "Name: %s\n", output->name); + + /* Use temporary max size. */ + if (output->max_size != (uint64_t) -1ULL) { + tmp_output.max_size = output->max_size; + } + + /* Use temporary name. */ + if (*output->name != '\0') { + strncpy(tmp_output.name, output->name, + sizeof(tmp_output.name)); + } + + ret = record_ust_snapshot(usess, &tmp_output, session, wait, nb_streams); if (ret < 0) { rcu_read_unlock(); @@ -2680,9 +2714,6 @@ int cmd_snapshot_record(struct ltt_session *session, } error: - if (tmp_sout) { - snapshot_output_destroy(tmp_sout); - } return ret; } diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c index 28364bbc7..d2fc8ca69 100644 --- a/src/bin/lttng-sessiond/snapshot.c +++ b/src/bin/lttng-sessiond/snapshot.c @@ -47,7 +47,11 @@ static int output_init(uint64_t max_size, const char *name, assert(output); + if (max_size == (uint64_t) -1ULL) { + max_size = 0; + } output->max_size = max_size; + if (snapshot) { output->id = get_next_output_id(snapshot); } diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 223fb77c0..9863bf75d 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -4929,7 +4929,8 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess, * subbuffer size or else it's an error since we won't be able to * snapshot anything. */ - if (ua_chan->attr.subbuf_size > max_stream_size) { + if (max_stream_size && + ua_chan->attr.subbuf_size > max_stream_size) { ret = -EINVAL; DBG3("UST app snapshot record maximum stream size %" PRIu64 " is smaller than subbuffer size of %" PRIu64, diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c index 0c15dbb70..be28511b3 100644 --- a/src/bin/lttng/commands/snapshot.c +++ b/src/bin/lttng/commands/snapshot.c @@ -323,12 +323,10 @@ static int record(const char *url) int ret; struct lttng_snapshot_output *output = NULL; - if (url || (opt_ctrl_url && opt_data_url)) { - output = create_output_from_args(url); - if (!output) { - ret = CMD_FATAL; - goto error; - } + output = create_output_from_args(url); + if (!output) { + ret = CMD_FATAL; + goto error; } ret = lttng_snapshot_record(current_session_name, output, 0); @@ -422,6 +420,8 @@ int cmd_snapshot(int argc, const char **argv) char *endptr; const char *opt = poptGetOptArg(pc); + /* Documented by the man page of strtoll(3). */ + errno = 0; val = strtoll(opt, &endptr, 10); if ((errno == ERANGE && (val == LLONG_MAX || val == LONG_MIN)) || (errno != 0 && val == 0)) { diff --git a/src/lib/lttng-ctl/snapshot.c b/src/lib/lttng-ctl/snapshot.c index 9dc2c679b..6b7b8a9fc 100644 --- a/src/lib/lttng-ctl/snapshot.c +++ b/src/lib/lttng-ctl/snapshot.c @@ -221,7 +221,17 @@ int lttng_snapshot_record(const char *session_name, */ struct lttng_snapshot_output *lttng_snapshot_output_create(void) { - return zmalloc(sizeof(struct lttng_snapshot_output)); + struct lttng_snapshot_output *output; + + output = zmalloc(sizeof(struct lttng_snapshot_output)); + if (!output) { + goto error; + } + + output->max_size = (uint64_t) -1ULL; + +error: + return output; } /* -- 2.34.1