*
* 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 "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
static char *opt_event_name;
static char *opt_channel_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 pid_t opt_pid;
*
* Add context to channel or event.
*/
-static int add_context(void)
+static int add_context(int type)
{
int ret = CMD_SUCCESS;
- struct lttng_kernel_context context;
+ struct lttng_event_context context;
+ struct lttng_domain dom;
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.ctx = type;
+ if (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,
}
if (opt_kernel) {
- DBG("Adding kernel context\n");
- ret = lttng_kernel_add_context(&context, opt_event_name, opt_channel_name);
+ /* 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 {
*/
int cmd_add_context(int argc, const char **argv)
{
- int opt, ret;
+ int opt, ret = CMD_SUCCESS;
char *tmp;
static poptContext pc;
+ 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;
}
- opt_ctx_type = atoi(tmp);
+ ret = add_context(atoi(tmp));
+ if (ret < 0) {
+ free(tmp);
+ goto end;
+ }
+ free(tmp);
break;
default:
usage(stderr);
}
}
- ret = add_context();
-
end:
return ret;
}