projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add missing padding for UST filter
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
lttng-ust-abi.h
diff --git
a/src/bin/lttng-sessiond/lttng-ust-abi.h
b/src/bin/lttng-sessiond/lttng-ust-abi.h
index 504c0607824b4eb392824d9f192e19b033438329..0a80abe3096f615526731706701ad5312d6f02f4 100644
(file)
--- a/
src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/
src/bin/lttng-sessiond/lttng-ust-abi.h
@@
-4,12
+4,9
@@
/*
* lttng/ust-abi.h
*
/*
* lttng/ust-abi.h
*
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
* LTTng-UST ABI header
*
* LTTng-UST ABI header
*
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@
-26,9
+23,15
@@
#define LTTNG_UST_SYM_NAME_LEN 256
#define LTTNG_UST_SYM_NAME_LEN 256
+/* Version for comm protocol between sessiond and ust */
#define LTTNG_UST_COMM_VERSION_MAJOR 2
#define LTTNG_UST_COMM_VERSION_MINOR 0
#define LTTNG_UST_COMM_VERSION_MAJOR 2
#define LTTNG_UST_COMM_VERSION_MINOR 0
+/* Version for ABI between liblttng-ust, sessiond, consumerd */
+#define LTTNG_UST_INTERNAL_MAJOR_VERSION 3
+#define LTTNG_UST_INTERNAL_MINOR_VERSION 0
+#define LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION 0
+
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
LTTNG_UST_PROBE = 1,
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
LTTNG_UST_PROBE = 1,
@@
-96,12
+99,13
@@
enum lttng_ust_field_type {
LTTNG_UST_FIELD_STRING = 4,
};
LTTNG_UST_FIELD_STRING = 4,
};
-#define LTTNG_UST_FIELD_ITER_PADDING LTTNG_UST_SYM_NAME_LEN +
32
+#define LTTNG_UST_FIELD_ITER_PADDING LTTNG_UST_SYM_NAME_LEN +
28
struct lttng_ust_field_iter {
char event_name[LTTNG_UST_SYM_NAME_LEN];
char field_name[LTTNG_UST_SYM_NAME_LEN];
enum lttng_ust_field_type type;
int loglevel; /* event loglevel */
struct lttng_ust_field_iter {
char event_name[LTTNG_UST_SYM_NAME_LEN];
char field_name[LTTNG_UST_SYM_NAME_LEN];
enum lttng_ust_field_type type;
int loglevel; /* event loglevel */
+ int nowrite;
char padding[LTTNG_UST_FIELD_ITER_PADDING];
};
char padding[LTTNG_UST_FIELD_ITER_PADDING];
};
@@
-169,9
+173,12
@@
struct lttng_ust_calibrate {
};
#define FILTER_BYTECODE_MAX_LEN 65536
};
#define FILTER_BYTECODE_MAX_LEN 65536
+#define LTTNG_UST_FILTER_PADDING 32
struct lttng_ust_filter_bytecode {
uint32_t len;
uint32_t reloc_offset;
struct lttng_ust_filter_bytecode {
uint32_t len;
uint32_t reloc_offset;
+ uint64_t seqnum;
+ char padding[LTTNG_UST_FILTER_PADDING];
char data[0];
};
char data[0];
};
@@
-220,6
+227,9
@@
struct lttng_ust_filter_bytecode {
#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
#define LTTNG_UST_TRACEPOINT_FIELD_LIST_GET _UST_CMD(0x91)
#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
#define LTTNG_UST_TRACEPOINT_FIELD_LIST_GET _UST_CMD(0x91)
+/* Event FD commands */
+#define LTTNG_UST_FILTER _UST_CMD(0xA0)
+
#define LTTNG_UST_ROOT_HANDLE 0
struct lttng_ust_obj;
#define LTTNG_UST_ROOT_HANDLE 0
struct lttng_ust_obj;
This page took
0.0279 seconds
and
4
git commands to generate.