Skip to content

Fixed online2-tcp-nnet3-decode-faster.cc poll_ret checks #3611

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

Merged
danpovey merged 1 commit into from
Sep 29, 2019
Merged

Fixed online2-tcp-nnet3-decode-faster.cc poll_ret checks #3611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/online2bin/online2-tcp-nnet3-decode-faster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ bool TcpServer::ReadChunk(size_t len) {
KALDI_WARN << "Socket timeout! Disconnecting...";
break;
}
if (client_set_[0].revents != POLLIN) {
Copy link
Contributor

@danpovey danpovey Sep 23, 2019

Choose a reason for hiding this comment

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

@hhadian what do you think about this?

Copy link
Contributor

@hhadian hhadian Sep 23, 2019

Choose a reason for hiding this comment

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

It seems good to me. At least AFAIK revents is a bit mask and should not be compared like this (e.g. other bits in addition to POLLIN might be set). Maybe it's better to keep this if-block too but like this: if (!(client_set_[0].revents & POLLIN)).
Babak, can you please see if this will work too in your tests?
Anyway more checks might be needed, I don't remember all details right now (see http://man7.org/linux/man-pages/man2/poll.2.html)

Copy link
Contributor Author

@babakrkb babakrkb Sep 23, 2019

Choose a reason for hiding this comment

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

@hhadian Yes it works too.

if (poll_ret < 0) {
KALDI_WARN << "Socket error! Disconnecting...";
break;
}
Expand Down