projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: HT must not be destroyed with a rcu_read_lock held
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
utils.c
diff --git
a/src/bin/lttng-sessiond/utils.c
b/src/bin/lttng-sessiond/utils.c
index 358e407e9c326cf038024b570f4c9209a724e2ca..c9c51ede5abcb2ada1ffa7253b946e1ca646467c 100644
(file)
--- a/
src/bin/lttng-sessiond/utils.c
+++ b/
src/bin/lttng-sessiond/utils.c
@@
-32,44
+32,33
@@
int ht_cleanup_pipe[2] = { -1, -1 };
*/
int notify_thread_pipe(int wpipe)
{
*/
int notify_thread_pipe(int wpipe)
{
-
in
t ret;
+
ssize_
t ret;
/* Ignore if the pipe is invalid. */
if (wpipe < 0) {
return 0;
}
/* Ignore if the pipe is invalid. */
if (wpipe < 0) {
return 0;
}
- do {
- ret = write(wpipe, "!", 1);
- } while (ret < 0 && errno == EINTR);
- if (ret < 0) {
+ ret = lttng_write(wpipe, "!", 1);
+ if (ret < 1) {
PERROR("write poll pipe");
}
PERROR("write poll pipe");
}
- return ret;
-}
-
-/*
- * Return pointer to home directory path using the env variable HOME.
- *
- * No home, NULL is returned.
- */
-const char *get_home_dir(void)
-{
- return ((const char *) getenv("HOME"));
+ return (int) ret;
}
void ht_cleanup_push(struct lttng_ht *ht)
{
}
void ht_cleanup_push(struct lttng_ht *ht)
{
-
in
t ret;
+
ssize_
t ret;
int fd = ht_cleanup_pipe[1];
int fd = ht_cleanup_pipe[1];
+ if (!ht) {
+ return;
+ }
if (fd < 0)
return;
if (fd < 0)
return;
- do {
- ret = write(fd, &ht, sizeof(ht));
- } while (ret < 0 && errno == EINTR);
- if (ret < 0 || ret != sizeof(ht)) {
+ ret = lttng_write(fd, &ht, sizeof(ht));
+ if (ret < sizeof(ht)) {
PERROR("write ht cleanup pipe %d", fd);
if (ret < 0) {
ret = -errno;
PERROR("write ht cleanup pipe %d", fd);
if (ret < 0) {
ret = -errno;
This page took
0.025665 seconds
and
4
git commands to generate.