Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor file descriptor handling in openFileDescriptors() #13955

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Refactor file descriptor handling in openFileDescriptors() #13955

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4451b84
Refactor file descriptor handling in openFileDescriptors()
Java4ye Apr 6, 2024
1427e6e
code style
Java4ye Apr 6, 2024
51000a1
code style
Java4ye Apr 8, 2024
fdecd0b
Merge branch 'netty:4.1' into 4.1-clean-code
Java4ye Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 12 additions & 21 deletions transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,31 +137,22 @@ public void openFileDescriptors() {
success = true;
} finally {
if (!success) {
if (epollFd != null) {
try {
epollFd.close();
} catch (Exception e) {
// ignore
}
}
if (eventFd != null) {
try {
eventFd.close();
} catch (Exception e) {
// ignore
}
}
if (timerFd != null) {
try {
timerFd.close();
} catch (Exception e) {
// ignore
}
}
closeFileDescriptor(epollFd);
closeFileDescriptor(eventFd);
closeFileDescriptor(timerFd);
}
}
}

private static void closeFileDescriptor(FileDescriptor fd) {
if (fd != null) {
try {
fd.close();
} catch (Exception e) {
// ignore
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a line break between this and the next method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok，I made it up in the second commit

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also between this one and newTaskQueue below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry，my carelessness

private static Queue<Runnable> newTaskQueue(
EventLoopTaskQueueFactory queueFactory) {
if (queueFactory == null) {
Expand Down