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-context without -c apply to all channels
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index e05d72bacb0b9f0ec3278c9c427b6295d7af8347..69bc3a183a9addb3c45b50915a331d743ec13be4 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-1298,11
+1298,17
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
- /* Set socket timeout for both receiving and ending */
+ /*
+ * Set socket timeout for both receiving and ending.
+ * app_socket_timeout is in seconds, whereas
+ * lttcomm_setsockopt_rcv_timeout and
+ * lttcomm_setsockopt_snd_timeout expect msec as
+ * parameter.
+ */
(void) lttcomm_setsockopt_rcv_timeout(sock,
(void) lttcomm_setsockopt_rcv_timeout(sock,
- app_socket_timeout);
+ app_socket_timeout
* 1000
);
(void) lttcomm_setsockopt_snd_timeout(sock,
(void) lttcomm_setsockopt_snd_timeout(sock,
- app_socket_timeout);
+ app_socket_timeout
* 1000
);
DBG("Apps with sock %d added to poll set", sock);
DBG("Apps with sock %d added to poll set", sock);
@@
-4069,12
+4075,12
@@
static int set_permissions(char *rundir)
ret = allowed_group();
if (ret < 0) {
WARN("No tracing group detected");
ret = allowed_group();
if (ret < 0) {
WARN("No tracing group detected");
- ret = 0;
- goto end;
+ /* Setting gid to 0 if no tracing group is found */
+ gid = 0;
+ } else {
+ gid = ret;
}
}
- gid = ret;
-
/* Set lttng run dir */
ret = chown(rundir, 0, gid);
if (ret < 0) {
/* Set lttng run dir */
ret = chown(rundir, 0, gid);
if (ret < 0) {
@@
-4082,7
+4088,7
@@
static int set_permissions(char *rundir)
PERROR("chown");
}
PERROR("chown");
}
- /* Ensure tracing group can search the run dir */
+ /* Ensure
all applications and
tracing group can search the run dir */
ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
if (ret < 0) {
ERR("Unable to set permissions on %s", rundir);
ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
if (ret < 0) {
ERR("Unable to set permissions on %s", rundir);
@@
-4119,7
+4125,6
@@
static int set_permissions(char *rundir)
DBG("All permissions are set");
DBG("All permissions are set");
-end:
return ret;
}
return ret;
}
This page took
0.026307 seconds
and
4
git commands to generate.