summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
919e300)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* The structures should be initialized to zero before use.
*/
*
* The structures should be initialized to zero before use.
*/
-#define LTTNG_EVENT_PADDING1 16
+#define LTTNG_EVENT_PADDING1 15
#define LTTNG_EVENT_PADDING2 LTTNG_SYMBOL_NAME_LEN + 32
struct lttng_event {
enum lttng_event_type type;
#define LTTNG_EVENT_PADDING2 LTTNG_SYMBOL_NAME_LEN + 32
struct lttng_event {
enum lttng_event_type type;
int32_t enabled; /* Does not apply: -1 */
pid_t pid;
int32_t enabled; /* Does not apply: -1 */
pid_t pid;
+ unsigned char filter; /* filter enabled ? */
char padding[LTTNG_EVENT_PADDING1];
char padding[LTTNG_EVENT_PADDING1];
tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
break;
}
tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
break;
}
+ if (uevent->filter) {
+ tmp[i].filter = 1;
+ }
+static
+const char *filter_string(int value)
+{
+ switch (value) {
+ case 1: return " [with filter]";
+ default: return "";
+ }
+}
+
static const char *loglevel_string(int value)
{
switch (value) {
static const char *loglevel_string(int value)
{
switch (value) {
case LTTNG_EVENT_TRACEPOINT:
{
if (event->loglevel != -1) {
case LTTNG_EVENT_TRACEPOINT:
{
if (event->loglevel != -1) {
- MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s",
+ MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s%s",
indent6,
event->name,
loglevel_string(event->loglevel),
event->loglevel,
indent6,
event->name,
loglevel_string(event->loglevel),
event->loglevel,
- enabled_string(event->enabled));
+ enabled_string(event->enabled),
+ filter_string(event->filter));
- MSG("%s%s (type: tracepoint)%s",
+ MSG("%s%s (type: tracepoint)%s%s",
- enabled_string(event->enabled));
+ enabled_string(event->enabled),
+ filter_string(event->filter));
}
break;
}
case LTTNG_EVENT_PROBE:
}
break;
}
case LTTNG_EVENT_PROBE:
- MSG("%s%s (type: probe)%s", indent6,
- event->name, enabled_string(event->enabled));
+ MSG("%s%s (type: probe)%s%s", indent6,
+ event->name, enabled_string(event->enabled),
+ filter_string(event->filter));
if (event->attr.probe.addr != 0) {
MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
} else {
if (event->attr.probe.addr != 0) {
MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
} else {
break;
case LTTNG_EVENT_FUNCTION:
case LTTNG_EVENT_FUNCTION_ENTRY:
break;
case LTTNG_EVENT_FUNCTION:
case LTTNG_EVENT_FUNCTION_ENTRY:
- MSG("%s%s (type: function)%s", indent6,
- event->name, enabled_string(event->enabled));
+ MSG("%s%s (type: function)%s%s", indent6,
+ event->name, enabled_string(event->enabled),
+ filter_string(event->filter));
MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
break;
case LTTNG_EVENT_SYSCALL:
MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
break;
case LTTNG_EVENT_SYSCALL:
- MSG("%ssyscalls (type: syscall)%s", indent6,
- enabled_string(event->enabled));
+ MSG("%ssyscalls (type: syscall)%s%s", indent6,
+ enabled_string(event->enabled),
+ filter_string(event->filter));
break;
case LTTNG_EVENT_NOOP:
break;
case LTTNG_EVENT_NOOP:
- MSG("%s (type: noop)%s", indent6,
- enabled_string(event->enabled));
+ MSG("%s (type: noop)%s%s", indent6,
+ enabled_string(event->enabled),
+ filter_string(event->filter));
break;
case LTTNG_EVENT_ALL:
/* We should never have "all" events in list. */
break;
case LTTNG_EVENT_ALL:
/* We should never have "all" events in list. */