projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: trigger: run trigger actions through an action executor
[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 cca48d6abafdb6150fa06048e0f1610e26c904d6..c15a26f889bc83bcd682103abb4ab079622dab18 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.h
+++ b/
src/common/sessiond-comm/sessiond-comm.h
@@
-41,7
+41,12
@@
#define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
/* Maximum number of FDs that can be sent over a Unix socket */
#define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
/* Maximum number of FDs that can be sent over a Unix socket */
-#define LTTCOMM_MAX_SEND_FDS 4
+#if defined(__linux__)
+/* Based on the kernel's SCM_MAX_FD which is 253 since 2.6.38 (255 before) */
+#define LTTCOMM_MAX_SEND_FDS 253
+#else
+#define LTTCOMM_MAX_SEND_FDS 16
+#endif
/*
* Get the error code index from 0 since LTTCOMM_OK start at 1000
/*
* Get the error code index from 0 since LTTCOMM_OK start at 1000
@@
-411,6
+416,8
@@
struct lttcomm_session_msg {
/* An lttng_session_descriptor follows. */
} LTTNG_PACKED create_session;
} u;
/* An lttng_session_descriptor follows. */
} LTTNG_PACKED create_session;
} u;
+ /* Count of fds sent. */
+ uint32_t fd_count;
} LTTNG_PACKED;
#define LTTNG_FILTER_MAX_LEN 65536
} LTTNG_PACKED;
#define LTTNG_FILTER_MAX_LEN 65536
@@
-502,6
+509,7
@@
struct lttcomm_lttng_msg {
uint32_t pid; /* pid_t */
uint32_t cmd_header_size;
uint32_t data_size;
uint32_t pid; /* pid_t */
uint32_t cmd_header_size;
uint32_t data_size;
+ uint32_t fd_count;
} LTTNG_PACKED;
struct lttcomm_lttng_output_id {
} LTTNG_PACKED;
struct lttcomm_lttng_output_id {
This page took
0.024027 seconds
and
5
git commands to generate.