OPT_READ_TIMER,
OPT_USERSPACE,
OPT_LIST_OPTIONS,
+ OPT_TRACEFILE_SIZE,
+ OPT_TRACEFILE_COUNT,
};
static struct lttng_handle *handle;
{"buffers-uid", 0, POPT_ARG_VAL, &opt_buffer_uid, 1, 0, 0},
{"buffers-pid", 0, POPT_ARG_VAL, &opt_buffer_pid, 1, 0, 0},
{"buffers-global", 0, POPT_ARG_VAL, &opt_buffer_global, 1, 0, 0},
+ {"tracefile-size", 'C', POPT_ARG_INT, 0, OPT_TRACEFILE_SIZE, 0, 0},
+ {"tracefile-count", 'W', POPT_ARG_INT, 0, OPT_TRACEFILE_COUNT, 0, 0},
{0, 0, 0, 0, 0, 0, 0}
};
fprintf(ofp, " --buffers-uid Use per UID buffer (-u only)\n");
fprintf(ofp, " --buffers-pid Use per PID buffer (-u only)\n");
fprintf(ofp, " --buffers-global Use shared buffer for the whole system (-k only)\n");
+ fprintf(ofp, " -C, --tracefile-size SIZE\n");
+ fprintf(ofp, " Maximum size of of each tracefile within a stream (in bytes).\n");
+ fprintf(ofp, " -W, --tracefile-count COUNT\n");
+ fprintf(ofp, " Used in conjunction with -C option, this will limit the number\n");
+ fprintf(ofp, " of files created to the specified count.\n");
fprintf(ofp, "\n");
}
if (chan.attr.output == -1) {
chan.attr.output = default_attr.output;
}
+ if (chan.attr.tracefile_count == -1) {
+ chan.attr.tracefile_count = default_attr.tracefile_count;
+ }
+ if (chan.attr.tracefile_size == -1) {
+ chan.attr.tracefile_size = default_attr.tracefile_size;
+ }
}
/*
if (opt_kernel) {
dom.type = LTTNG_DOMAIN_KERNEL;
dom.buf_type = LTTNG_BUFFER_GLOBAL;
+ if (opt_buffer_uid || opt_buffer_pid) {
+ ERR("Buffer type not supported for domain -k");
+ ret = CMD_ERROR;
+ goto error;
+ }
} else if (opt_userspace) {
dom.type = LTTNG_DOMAIN_UST;
if (opt_buffer_uid) {
dom.buf_type = LTTNG_BUFFER_PER_UID;
} else {
+ if (opt_buffer_global) {
+ ERR("Buffer type not supported for domain -u");
+ ret = CMD_ERROR;
+ goto error;
+ }
dom.buf_type = LTTNG_BUFFER_PER_PID;
}
} else {
set_default_attr(&dom);
+ if ((chan.attr.tracefile_size > 0) &&
+ (chan.attr.tracefile_size < chan.attr.subbuf_size)) {
+ ERR("Tracefile_size must be greater than or equal to subbuf_size "
+ "(%" PRIu64 " < %" PRIu64 ")",
+ chan.attr.tracefile_size, chan.attr.subbuf_size);
+ ret = CMD_ERROR;
+ goto error;
+ }
+
/* Setting channel output */
if (opt_output) {
if (!strncmp(output_mmap, opt_output, strlen(output_mmap))) {
switch (-ret) {
case LTTNG_ERR_KERN_CHAN_EXIST:
case LTTNG_ERR_UST_CHAN_EXIST:
- WARN("Channel %s: %s (session %s", channel_name,
+ WARN("Channel %s: %s (session %s)", channel_name,
lttng_strerror(ret), session_name);
goto error;
default:
case OPT_USERSPACE:
opt_userspace = 1;
break;
+ case OPT_TRACEFILE_SIZE:
+ chan.attr.tracefile_size = atoll(poptGetOptArg(pc));
+ DBG("Maximum tracefile size set to %" PRIu64,
+ chan.attr.tracefile_size);
+ break;
+ case OPT_TRACEFILE_COUNT:
+ chan.attr.tracefile_count = atoll(poptGetOptArg(pc));
+ DBG("Maximum tracefile count set to %" PRIu64,
+ chan.attr.tracefile_count);
+ break;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
goto end;