projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: be quiet on filter linker error
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-abi.c
diff --git
a/liblttng-ust/lttng-ust-abi.c
b/liblttng-ust/lttng-ust-abi.c
index dac86c7843494da620c920a7c55c5b3f5c86e4e5..61d37ac8b172fc0f99c3eaef958640b8e1ee0a1a 100644
(file)
--- a/
liblttng-ust/lttng-ust-abi.c
+++ b/
liblttng-ust/lttng-ust-abi.c
@@
-263,9
+263,9
@@
static
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
{
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
{
- v->major = LTTNG_UST_MAJOR_VERSION;
- v->minor = LTTNG_UST_MINOR_VERSION;
- v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
+ v->major = LTTNG_UST_
INTERNAL_
MAJOR_VERSION;
+ v->minor = LTTNG_UST_
INTERNAL_
MINOR_VERSION;
+ v->patchlevel = LTTNG_UST_
INTERNAL_
PATCHLEVEL_VERSION;
return 0;
}
return 0;
}
@@
-361,7
+361,7
@@
void lttng_metadata_create_events(int channel_objd)
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- ret = ltt_event_create(channel, &metadata_params,
NULL,
&event);
+ ret = ltt_event_create(channel, &metadata_params, &event);
if (ret < 0) {
goto create_error;
}
if (ret < 0) {
goto create_error;
}
@@
-753,7
+753,7
@@
int lttng_abi_create_event(int channel_objd,
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- ret = ltt_event_create(channel, event_param,
NULL,
&event);
+ ret = ltt_event_create(channel, event_param, &event);
if (ret < 0) {
goto event_error;
}
if (ret < 0) {
goto event_error;
}
@@
-1035,6
+1035,8
@@
static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops = {
* Enable recording for this event (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for this event (strong disable)
* Enable recording for this event (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for this event (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to an event.
*/
static
long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
*/
static
long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
@@
-1051,6
+1053,17
@@
long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
return ltt_event_enable(event);
case LTTNG_UST_DISABLE:
return ltt_event_disable(event);
return ltt_event_enable(event);
case LTTNG_UST_DISABLE:
return ltt_event_disable(event);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+ ret = lttng_filter_event_attach_bytecode(event,
+ (struct lttng_ust_filter_bytecode *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_event_link_bytecode(event,
+ event->filter_bytecode);
+ return 0;
+ }
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-1088,6
+1101,8
@@
static const struct lttng_ust_objd_ops lttng_event_ops = {
* Enable recording for these wildcard events (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for these wildcard events (strong disable)
* Enable recording for these wildcard events (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for these wildcard events (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to a wildcard.
*/
static
long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
*/
static
long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
@@
-1107,6
+1122,17
@@
long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
return ltt_wildcard_enable(wildcard);
case LTTNG_UST_DISABLE:
return ltt_wildcard_disable(wildcard);
return ltt_wildcard_enable(wildcard);
case LTTNG_UST_DISABLE:
return ltt_wildcard_disable(wildcard);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+
+ ret = lttng_filter_wildcard_attach_bytecode(wildcard,
+ (struct lttng_ust_filter_bytecode *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_wildcard_link_bytecode(wildcard);
+ return 0;
+ }
default:
return -EINVAL;
}
default:
return -EINVAL;
}
This page took
0.026652 seconds
and
4
git commands to generate.