projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: kernel session closes fd 0 after create
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 0922c3d490918f3a177a48cecd1b5b94772aa8cb..fea51b761c8ea2f0b224f2dfd2dc8589a9c8ad8b 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-491,7
+491,10
@@
int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
lks = trace_kernel_create_stream();
if (lks == NULL) {
while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
lks = trace_kernel_create_stream();
if (lks == NULL) {
- close(ret);
+ ret = close(ret);
+ if (ret) {
+ PERROR("close");
+ }
goto error;
}
goto error;
}
@@
-555,7
+558,7
@@
error:
*/
ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
{
*/
ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
{
- int fd, pos;
+ int fd, pos
, ret
;
char *event;
size_t nbmem, count = 0;
ssize_t size;
char *event;
size_t nbmem, count = 0;
ssize_t size;
@@
-603,11
+606,17
@@
ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
*events = elist;
DBG("Kernel list events done (%zu events)", count);
end:
*events = elist;
DBG("Kernel list events done (%zu events)", count);
end:
- fclose(fp); /* closes both fp and fd */
+ ret = fclose(fp); /* closes both fp and fd */
+ if (ret) {
+ PERROR("fclose");
+ }
return count;
error_fp:
return count;
error_fp:
- close(fd);
+ ret = close(fd);
+ if (ret) {
+ PERROR("close");
+ }
error:
return -1;
}
error:
return -1;
}
@@
-669,8
+678,10
@@
int init_kernel_workarounds(void)
/* Ignore error, we don't really care */
}
}
/* Ignore error, we don't really care */
}
}
- fclose(fp);
+ ret = fclose(fp);
+ if (ret) {
+ PERROR("fclose");
+ }
end_boot_id:
end_boot_id:
-
return 0;
}
return 0;
}
This page took
0.025034 seconds
and
4
git commands to generate.