projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version to 2.0-pre2
[lttng-tools.git]
/
lttng
/
commands
/
disable_events.c
diff --git
a/lttng/commands/disable_events.c
b/lttng/commands/disable_events.c
index 04a8c0a62f97ad1afaa7ad0e263eac8916586b94..952b2b65c7a9ae82b57c2ca9e1b695abec7d4e5e 100644
(file)
--- a/
lttng/commands/disable_events.c
+++ b/
lttng/commands/disable_events.c
@@
-3,8
+3,8
@@
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,9
+25,9
@@
#include <sys/types.h>
#include <unistd.h>
#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_list;
static char *opt_kernel;
static char *opt_event_list;
static char *opt_kernel;
@@
-83,8
+83,9
@@
static void usage(FILE *ofp)
static int disable_events(void)
{
int err, ret = CMD_SUCCESS;
static int disable_events(void)
{
int err, ret = CMD_SUCCESS;
- char *event_name, *channel_name;
+ char *event_name, *channel_name
= NULL
;
struct lttng_event ev;
struct lttng_event ev;
+ struct lttng_domain dom;
if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
@@
-101,9
+102,13
@@
static int disable_events(void)
channel_name = opt_channel_name;
}
channel_name = opt_channel_name;
}
+ if (opt_kernel) {
+ dom.type = LTTNG_DOMAIN_KERNEL;
+ }
+
if (opt_disable_all) {
if (opt_kernel) {
if (opt_disable_all) {
if (opt_kernel) {
- ret = lttng_
kernel_disable_event(
NULL, channel_name);
+ ret = lttng_
disable_event(&dom,
NULL, channel_name);
goto error;
}
goto error;
}
@@
-120,7
+125,7
@@
static int disable_events(void)
/* Copy name and type of the event */
strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
/* Copy name and type of the event */
strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
- ret = lttng_
kernel_disable_event(
event_name, channel_name);
+ ret = lttng_
disable_event(&dom,
event_name, channel_name);
if (ret < 0) {
MSG("Unable to disable event %s for channel %s",
event_name, channel_name);
if (ret < 0) {
MSG("Unable to disable event %s for channel %s",
event_name, channel_name);
@@
-147,6
+152,9
@@
static int disable_events(void)
}
error:
}
error:
+ if (opt_channel_name == NULL) {
+ free(channel_name);
+ }
return ret;
}
return ret;
}
This page took
0.024676 seconds
and
4
git commands to generate.