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
/
common
/
sessiond-comm
/
sessiond-comm.h
diff --git
a/src/common/sessiond-comm/sessiond-comm.h
b/src/common/sessiond-comm/sessiond-comm.h
index 41f96d8a4288c355d60df2655bbd04b135102f79..6f75a11132bddb52462d74dc87a6e2d3cb41cbd8 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.h
+++ b/
src/common/sessiond-comm/sessiond-comm.h
@@
-88,7
+88,7
@@
enum lttcomm_sessiond_command {
RELAYD_CLOSE_STREAM,
RELAYD_DATA_PENDING,
RELAYD_QUIESCENT_CONTROL,
RELAYD_CLOSE_STREAM,
RELAYD_DATA_PENDING,
RELAYD_QUIESCENT_CONTROL,
- LTTNG_
SET
_FILTER,
+ LTTNG_
ENABLE_EVENT_WITH
_FILTER,
LTTNG_HEALTH_CHECK,
LTTNG_DATA_PENDING,
};
LTTNG_HEALTH_CHECK,
LTTNG_DATA_PENDING,
};
@@
-178,6
+178,8
@@
struct lttcomm_session_msg {
struct {
char channel_name[LTTNG_SYMBOL_NAME_LEN];
struct lttng_event event;
struct {
char channel_name[LTTNG_SYMBOL_NAME_LEN];
struct lttng_event event;
+ /* Length of following bytecode for filter. */
+ uint32_t bytecode_len;
} enable;
/* Create channel */
struct {
} enable;
/* Create channel */
struct {
@@
-202,12
+204,6
@@
struct lttcomm_session_msg {
/* Number of lttng_uri following */
uint32_t size;
} uri;
/* Number of lttng_uri following */
uint32_t size;
} uri;
- struct {
- char channel_name[LTTNG_SYMBOL_NAME_LEN];
- struct lttng_event event;
- /* Length of following bytecode */
- uint32_t bytecode_len;
- } filter;
} u;
};
} u;
};
@@
-218,10
+214,12
@@
struct lttcomm_session_msg {
* bytecode. It is made of tuples: (uint16_t, var. len. string). It
* starts at reloc_table_offset.
*/
* bytecode. It is made of tuples: (uint16_t, var. len. string). It
* starts at reloc_table_offset.
*/
+#define LTTNG_FILTER_PADDING 32
struct lttng_filter_bytecode {
uint32_t len; /* len of data */
uint32_t reloc_table_offset;
uint64_t seqnum;
struct lttng_filter_bytecode {
uint32_t len; /* len of data */
uint32_t reloc_table_offset;
uint64_t seqnum;
+ char padding[LTTNG_FILTER_PADDING];
char data[0];
};
char data[0];
};
This page took
0.025754 seconds
and
4
git commands to generate.