projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng.h API update: set filter becomes enable event with filter
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
lttng-ctl.c
diff --git
a/src/lib/lttng-ctl/lttng-ctl.c
b/src/lib/lttng-ctl/lttng-ctl.c
index c9fb293be1ed74411d20238ec7f94663a613041e..6238d9a00749865e23e390c2ac87b9e8799a09af 100644
(file)
--- a/
src/lib/lttng-ctl/lttng-ctl.c
+++ b/
src/lib/lttng-ctl/lttng-ctl.c
@@
-827,12
+827,12
@@
int lttng_enable_event(struct lttng_handle *handle,
}
/*
}
/*
- *
Set filter for an event
+ *
Create or enable an event with a filter expression.
*
* Return negative error value on error.
* Return size of returned session payload data if OK.
*/
*
* Return negative error value on error.
* Return size of returned session payload data if OK.
*/
-int lttng_
set_event
_filter(struct lttng_handle *handle,
+int lttng_
enable_event_with
_filter(struct lttng_handle *handle,
struct lttng_event *event, const char *channel_name,
const char *filter_expression)
{
struct lttng_event *event, const char *channel_name,
const char *filter_expression)
{
@@
-842,14
+842,10
@@
int lttng_set_event_filter(struct lttng_handle *handle,
int ret = 0;
/* Safety check. */
int ret = 0;
/* Safety check. */
- if (handle == NULL) {
+ if (handle == NULL
|| !filter_expression
) {
return -LTTNG_ERR_INVALID;
}
return -LTTNG_ERR_INVALID;
}
- if (!filter_expression) {
- return 0;
- }
-
/*
* casting const to non-const, as the underlying function will
* use it in read-only mode.
/*
* casting const to non-const, as the underlying function will
* use it in read-only mode.
@@
-921,17
+917,17
@@
int lttng_set_event_filter(struct lttng_handle *handle,
memset(&lsm, 0, sizeof(lsm));
memset(&lsm, 0, sizeof(lsm));
- lsm.cmd_type = LTTNG_
SET
_FILTER;
+ lsm.cmd_type = LTTNG_
ENABLE_EVENT_WITH
_FILTER;
/* Copy channel name */
/* Copy channel name */
- copy_string(lsm.u.
filter
.channel_name, channel_name,
- sizeof(lsm.u.
filter
.channel_name));
+ copy_string(lsm.u.
enable
.channel_name, channel_name,
+ sizeof(lsm.u.
enable
.channel_name));
/* Copy event name */
if (event) {
memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event));
}
/* Copy event name */
if (event) {
memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event));
}
- lsm.u.
filter
.bytecode_len = sizeof(ctx->bytecode->b)
+ lsm.u.
enable
.bytecode_len = sizeof(ctx->bytecode->b)
+ bytecode_get_len(&ctx->bytecode->b);
copy_lttng_domain(&lsm.domain, &handle->domain);
+ bytecode_get_len(&ctx->bytecode->b);
copy_lttng_domain(&lsm.domain, &handle->domain);
@@
-940,7
+936,7
@@
int lttng_set_event_filter(struct lttng_handle *handle,
sizeof(lsm.session.name));
ret = ask_sessiond_varlen(&lsm, &ctx->bytecode->b,
sizeof(lsm.session.name));
ret = ask_sessiond_varlen(&lsm, &ctx->bytecode->b,
- lsm.u.
filter
.bytecode_len, NULL);
+ lsm.u.
enable
.bytecode_len, NULL);
filter_bytecode_free(ctx);
filter_ir_free(ctx);
filter_bytecode_free(ctx);
filter_ir_free(ctx);
This page took
0.023615 seconds
and
4
git commands to generate.