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

Fix busy polling in startup phase #1524

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix busy polling in startup phase #1524

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
6 changes: 4 additions & 2 deletions src/iperf_client_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ iperf_run_client(struct iperf_test * test)
{
int startup;
int result = 0;
fd_set read_set, write_set;
fd_set startup_read_set, read_set, write_set;
struct iperf_time now;
struct timeval* timeout = NULL;
struct iperf_stream *sp;
Expand Down Expand Up @@ -563,6 +563,8 @@ iperf_run_client(struct iperf_test * test)
rcv_timeout_us = 0;

startup = 1;
FD_ZERO(&startup_read_set);
memcpy(&startup_read_set, &test->read_set, sizeof(fd_set));
while (test->state != IPERF_DONE) {
memcpy(&read_set, &test->read_set, sizeof(fd_set));
memcpy(&write_set, &test->write_set, sizeof(fd_set));
Expand All @@ -584,7 +586,7 @@ iperf_run_client(struct iperf_test * test)
timeout = &used_timeout;
}

result = select(test->max_fd + 1, &read_set, &write_set, NULL, timeout);
result = select(test->max_fd + 1, (startup)? &startup_read_set : &read_set, (startup)? NULL : &write_set, NULL, timeout);
if (result < 0 && errno != EINTR) {
i_errno = IESELECT;
goto cleanup_and_fail;
Expand Down