projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Tests: leaking epoll fd
[lttng-tools.git]
/
tests
/
regression
/
kernel
/
select_poll_epoll.c
diff --git
a/tests/regression/kernel/select_poll_epoll.c
b/tests/regression/kernel/select_poll_epoll.c
index 3c9a4b15d0b8aea3c86dc0cd5ef9b59c55d98307..b1eaf6045f9b3b16dcffc9bee88f61b0d358197b 100644
(file)
--- a/
tests/regression/kernel/select_poll_epoll.c
+++ b/
tests/regression/kernel/select_poll_epoll.c
@@
-280,7
+280,7
@@
void test_epoll(void)
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[epoll] add");
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[epoll] add");
- goto e
nd
;
+ goto e
rror
;
}
if (timeout > 0) {
}
if (timeout > 0) {
@@
-301,6
+301,8
@@
void test_epoll(void)
perror("epoll_wait");
}
perror("epoll_wait");
}
+error:
+ close(epollfd);
end:
return;
}
end:
return;
}
@@
-323,7
+325,7
@@
void test_pepoll(void)
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
- goto e
nd
;
+ goto e
rror
;
}
if (timeout > 0) {
}
if (timeout > 0) {
@@
-344,6
+346,8
@@
void test_pepoll(void)
perror("epoll_pwait");
}
perror("epoll_pwait");
}
+error:
+ close(epollfd);
end:
return;
}
end:
return;
}
@@
-556,7
+560,7
@@
void epoll_pwait_invalid_pointer(void)
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
- goto e
nd
;
+ goto e
rror
;
}
ret = syscall(SYS_epoll_pwait, epollfd,
}
ret = syscall(SYS_epoll_pwait, epollfd,
@@
-574,6
+578,8
@@
void epoll_pwait_invalid_pointer(void)
perror("# epoll_pwait");
}
perror("# epoll_pwait");
}
+error:
+ close(epollfd);
end:
return;
}
end:
return;
}
@@
-600,7
+606,7
@@
void epoll_pwait_int_max(void)
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, wait_fd, &epoll_event);
if (ret < 0) {
perror("[eppoll] add");
- goto e
nd
;
+ goto e
rror
;
}
ret = syscall(SYS_epoll_pwait, epollfd, &epoll_event, INT_MAX, -1,
}
ret = syscall(SYS_epoll_pwait, epollfd, &epoll_event, INT_MAX, -1,
@@
-618,6
+624,8
@@
void epoll_pwait_int_max(void)
perror("# epoll_pwait");
}
perror("# epoll_pwait");
}
+error:
+ close(epollfd);
end:
return;
}
end:
return;
}
@@
-774,7
+782,7
@@
void epoll_pwait_concurrent_munmap(void)
-1, 0);
if (epoll_event == MAP_FAILED) {
perror("mmap");
-1, 0);
if (epoll_event == MAP_FAILED) {
perror("mmap");
- goto e
nd
;
+ goto e
rror
;
}
for (i = 0; i < MAX_FDS; i++) {
}
for (i = 0; i < MAX_FDS; i++) {
@@
-787,7
+795,7
@@
void epoll_pwait_concurrent_munmap(void)
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fds[i], epoll_event);
if (ret < 0) {
perror("[eppoll] add");
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fds[i], epoll_event);
if (ret < 0) {
perror("[eppoll] add");
- goto e
nd
_unmap;
+ goto e
rror
_unmap;
}
}
stop_thread = 0;
}
}
stop_thread = 0;
@@
-795,7
+803,7
@@
void epoll_pwait_concurrent_munmap(void)
(void *) epoll_event);
if (ret != 0) {
fprintf(stderr, "[error] pthread_create\n");
(void *) epoll_event);
if (ret != 0) {
fprintf(stderr, "[error] pthread_create\n");
- goto e
nd
_unmap;
+ goto e
rror
_unmap;
}
ret = epoll_pwait(epollfd, epoll_event, 1, 1, NULL);
}
ret = epoll_pwait(epollfd, epoll_event, 1, 1, NULL);
@@
-816,9
+824,9
@@
void epoll_pwait_concurrent_munmap(void)
ret = pthread_join(writer, NULL);
if (ret) {
fprintf(stderr, "[error] pthread_join\n");
ret = pthread_join(writer, NULL);
if (ret) {
fprintf(stderr, "[error] pthread_join\n");
- goto e
nd
_unmap;
+ goto e
rror
_unmap;
}
}
-e
nd
_unmap:
+e
rror
_unmap:
for (i = 0; i < MAX_FDS; i++) {
ret = close(fds[i]);
if (ret != 0) {
for (i = 0; i < MAX_FDS; i++) {
ret = close(fds[i]);
if (ret != 0) {
@@
-831,6
+839,8
@@
end_unmap:
perror("munmap");
}
perror("munmap");
}
+error:
+ close(epollfd);
end:
return;
}
end:
return;
}
This page took
0.028019 seconds
and
4
git commands to generate.