projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unix: receive pid on non-linux platforms
[lttng-tools.git]
/
src
/
common
/
runas.c
diff --git
a/src/common/runas.c
b/src/common/runas.c
index 21c1a91adde55648238359d736c8e7e820009de6..04aedc3e69a00b14a5ffa0d24798d51d0d0c602e 100644
(file)
--- a/
src/common/runas.c
+++ b/
src/common/runas.c
@@
-124,7
+124,7
@@
struct run_as_extract_elf_symbol_offset_ret {
struct run_as_extract_sdt_probe_offsets_ret {
uint32_t num_offset;
struct run_as_extract_sdt_probe_offsets_ret {
uint32_t num_offset;
- uint64_t offsets[LTTNG_KERNEL_MAX_UPROBE_NUM];
+ uint64_t offsets[LTTNG_KERNEL_
ABI_
MAX_UPROBE_NUM];
} LTTNG_PACKED;
struct run_as_generate_filter_bytecode_ret {
} LTTNG_PACKED;
struct run_as_generate_filter_bytecode_ret {
@@
-607,7
+607,7
@@
int _extract_sdt_probe_offsets(struct run_as_data *data,
goto end;
}
goto end;
}
- if (num_offset <= 0 || num_offset > LTTNG_KERNEL_MAX_UPROBE_NUM) {
+ if (num_offset <= 0 || num_offset > LTTNG_KERNEL_
ABI_
MAX_UPROBE_NUM) {
DBG("Wrong number of probes.");
ret = -1;
ret_value->_error = true;
DBG("Wrong number of probes.");
ret = -1;
ret_value->_error = true;
@@
-730,7
+730,7
@@
int do_send_fds(int sock, const int *fds, unsigned int fd_count)
for (i = 0; i < fd_count; i++) {
if (fds[i] < 0) {
for (i = 0; i < fd_count; i++) {
if (fds[i] < 0) {
-
ERR("Attempt to send invalid file descriptor to maste
r (fd = %i)",
+
DBG("Attempt to send invalid file descripto
r (fd = %i)",
fds[i]);
/* Return 0 as this is not a fatal error. */
return 0;
fds[i]);
/* Return 0 as this is not a fatal error. */
return 0;
@@
-818,10
+818,14
@@
int send_fds_to_master(struct run_as_worker *worker, enum run_as_cmd cmd,
}
for (i = 0; i < COMMAND_OUT_FD_COUNT(cmd); i++) {
}
for (i = 0; i < COMMAND_OUT_FD_COUNT(cmd); i++) {
- int ret_close = close(COMMAND_OUT_FDS(cmd, run_as_ret)[i]);
+ int fd = COMMAND_OUT_FDS(cmd, run_as_ret)[i];
+ if (fd >= 0) {
+ int ret_close = close(fd);
- if (ret_close < 0) {
- PERROR("Failed to close result file descriptor");
+ if (ret_close < 0) {
+ PERROR("Failed to close result file descriptor (fd = %i)",
+ fd);
+ }
}
}
end:
}
}
end:
@@
-1299,6
+1303,9
@@
int run_as_create_worker_no_lock(const char *procname,
reset_sighandler();
set_worker_sighandlers();
reset_sighandler();
set_worker_sighandlers();
+
+ logger_set_thread_name("Run-as worker", true);
+
if (clean_up_func) {
if (clean_up_func(clean_up_user_data) < 0) {
ERR("Run-as post-fork clean-up failed, exiting.");
if (clean_up_func) {
if (clean_up_func(clean_up_user_data) < 0) {
ERR("Run-as post-fork clean-up failed, exiting.");
@@
-1800,13
+1807,13
@@
error:
LTTNG_HIDDEN
int run_as_generate_filter_bytecode(const char *filter_expression,
const struct lttng_credentials *creds,
LTTNG_HIDDEN
int run_as_generate_filter_bytecode(const char *filter_expression,
const struct lttng_credentials *creds,
- struct lttng_
filter_
bytecode **bytecode)
+ struct lttng_bytecode **bytecode)
{
int ret;
struct run_as_data data = {};
struct run_as_ret run_as_ret = {};
{
int ret;
struct run_as_data data = {};
struct run_as_ret run_as_ret = {};
- const struct lttng_
filter_
bytecode *view_bytecode = NULL;
- struct lttng_
filter_
bytecode *local_bytecode = NULL;
+ const struct lttng_bytecode *view_bytecode = NULL;
+ struct lttng_bytecode *local_bytecode = NULL;
const uid_t uid = lttng_credentials_get_uid(creds);
const gid_t gid = lttng_credentials_get_gid(creds);
const uid_t uid = lttng_credentials_get_uid(creds);
const gid_t gid = lttng_credentials_get_gid(creds);
@@
-1826,7
+1833,7
@@
int run_as_generate_filter_bytecode(const char *filter_expression,
goto error;
}
goto error;
}
- view_bytecode = (const struct lttng_
filter_
bytecode *) run_as_ret.u.generate_filter_bytecode.bytecode;
+ view_bytecode = (const struct lttng_bytecode *) run_as_ret.u.generate_filter_bytecode.bytecode;
local_bytecode = zmalloc(sizeof(*local_bytecode) + view_bytecode->len);
if (!local_bytecode) {
local_bytecode = zmalloc(sizeof(*local_bytecode) + view_bytecode->len);
if (!local_bytecode) {
This page took
0.02537 seconds
and
5
git commands to generate.