*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <sys/types.h>
#include <unistd.h>
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include <urcu/list.h>
+
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
static char *opt_event_name;
static char *opt_channel_name;
static char *opt_perf_name;
+static char *opt_session_name;
static int *opt_kernel;
static int opt_pid_all;
static int opt_userspace;
-static int opt_ctx_type;
-static int opt_perf_type;
-static int opt_perf_id;
+static int opt_perf_type = -1;
+static int opt_perf_id = -1;
static pid_t opt_pid;
enum {
OPT_TYPE,
};
+struct ctx_type_list {
+ struct cds_list_head head;
+};
+
+struct ctx_type {
+ int type;
+ struct cds_list_head list;
+};
+
+static struct ctx_type_list ctx_type_list = {
+ .head = CDS_LIST_HEAD_INIT(ctx_type_list.head),
+};
+
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
{"event", 'e', POPT_ARG_STRING, &opt_event_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{
fprintf(ofp, "usage: lttng add-context [options] [context_options]\n");
fprintf(ofp, "\n");
+
+ fprintf(ofp, "If no event name is given (-e), the context will be added to "
+ "all events in the channel.\n");
+ fprintf(ofp, "If no channel and no event is given (-c/-e), the context "
+ "will be added to all events in all channels\n");
+ fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel NAME Apply on channel\n");
fprintf(ofp, " -e, --event NAME Apply on event\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
static int add_context(void)
{
int ret = CMD_SUCCESS;
- struct lttng_kernel_context context;
+ struct lttng_event_context context;
+ struct lttng_domain dom;
+ struct ctx_type *type;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
- context.ctx = opt_ctx_type;
- if (opt_ctx_type == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
- context.u.perf_counter.type = opt_perf_type;
- context.u.perf_counter.config = opt_perf_id;
- strncpy(context.u.perf_counter.name, opt_perf_name,
- LTTNG_SYMBOL_NAME_LEN);
- }
+ /* Iterate over all context type given */
+ cds_list_for_each_entry(type, &ctx_type_list.head, list) {
+ context.ctx = type->type;
+ if (type->type == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
+ /* Not defined */
+ if (opt_perf_type == -1) {
+ ERR("No perf event type given. Please use --perf-type TYPE.");
+ goto error;
+ }
+ context.u.perf_counter.type = opt_perf_type;
+ if (opt_perf_id == -1) {
+ ERR("No perf event id given. Please use --perf-id ID.");
+ goto error;
+ }
+ context.u.perf_counter.config = opt_perf_id;
+ if (opt_perf_name == NULL) {
+ ERR("No perf name given. Please use --perf-name NAME.");
+ goto error;
+ }
+ strncpy(context.u.perf_counter.name, opt_perf_name,
+ LTTNG_SYMBOL_NAME_LEN);
+ }
- if (opt_kernel) {
- DBG("Adding kernel context\n");
- ret = lttng_kernel_add_context(&context, opt_event_name, opt_channel_name);
- if (ret < 0) {
+ if (opt_kernel) {
+ /* Create kernel domain */
+ dom.type = LTTNG_DOMAIN_KERNEL;
+
+ DBG("Adding kernel context");
+ ret = lttng_add_context(&dom, &context, opt_event_name,
+ opt_channel_name);
+ if (ret < 0) {
+ goto error;
+ } else {
+ if (type->type == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
+ MSG("Perf counter context added");
+ } else {
+ MSG("Kernel context %d added", type->type);
+ }
+ }
+ } else if (opt_userspace) { /* User-space tracer action */
+ /*
+ * TODO: Waiting on lttng UST 2.0
+ */
+ if (opt_pid_all) {
+ } else if (opt_pid != 0) {
+ }
+ ret = CMD_NOT_IMPLEMENTED;
goto error;
} else {
- MSG("Kernel context added");
- }
- } else if (opt_userspace) { /* User-space tracer action */
- /*
- * TODO: Waiting on lttng UST 2.0
- */
- if (opt_pid_all) {
- } else if (opt_pid != 0) {
+ ERR("Please specify a tracer (kernel or user-space)");
+ goto error;
}
- ret = CMD_NOT_IMPLEMENTED;
- goto error;
- } else {
- ERR("Please specify a tracer (kernel or user-space)");
- goto error;
}
error:
*/
int cmd_add_context(int argc, const char **argv)
{
- int opt, ret;
+ int opt, ret = CMD_SUCCESS;
char *tmp;
static poptContext pc;
+ struct ctx_type *type;
+
+ if (argc < 2) {
+ usage(stderr);
+ goto end;
+ }
pc = poptGetContext(NULL, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
if (tmp == NULL) {
usage(stderr);
ret = CMD_ERROR;
+ free(tmp);
+ goto end;
+ }
+ type = malloc(sizeof(struct ctx_type));
+ if (type == NULL) {
+ perror("malloc ctx_type");
+ ret = -1;
goto end;
}
- opt_ctx_type = atoi(tmp);
+ type->type = atoi(tmp);
+ cds_list_add(&type->list, &ctx_type_list.head);
+ free(tmp);
break;
default:
usage(stderr);
ret = add_context();
+ /* Cleanup allocated memory */
+ cds_list_for_each_entry(type, &ctx_type_list.head, list) {
+ free(type);
+ }
+
end:
return ret;
}
projects / lttng-tools.git / blobdiff