1
1

Improve debug output for application and fair-queue-based pacing.

Этот коммит содержится в:
Bruce A. Mah 2016-11-30 07:13:28 -08:00
родитель d2202ee3be
Коммит a621cc263f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4984910A8CAAEE8A
2 изменённых файлов: 33 добавлений и 1 удалений

Просмотреть файл

@ -251,6 +251,14 @@ iperf_tcp_listen(struct iperf_test *test)
}
}
#endif /* HAVE_SO_MAX_PACING_RATE */
if (test->no_fq_socket_pacing) {
unsigned int rate = test->settings->rate / 8;
if (rate > 0) {
if (test->debug) {
printf("Setting application pacing to %u\n", rate);
}
}
}
opt = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
saved_errno = errno;
@ -496,7 +504,7 @@ iperf_tcp_connect(struct iperf_test *test)
unsigned int rate = test->settings->rate / 8;
if (rate > 0) {
if (test->debug) {
printf("Socket pacing set to %u\n", rate);
printf("Setting fair-queue socket pacing to %u\n", rate);
}
if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &rate, sizeof(rate)) < 0) {
warning("Unable to set socket pacing, using application pacing instead");
@ -505,6 +513,14 @@ iperf_tcp_connect(struct iperf_test *test)
}
}
#endif /* HAVE_SO_MAX_PACING_RATE */
if (test->no_fq_socket_pacing) {
unsigned int rate = test->settings->rate / 8;
if (rate > 0) {
if (test->debug) {
printf("Setting application pacing to %u\n", rate);
}
}
}
if (connect(s, (struct sockaddr *) server_res->ai_addr, server_res->ai_addrlen) < 0 && errno != EINPROGRESS) {
saved_errno = errno;

Просмотреть файл

@ -290,6 +290,14 @@ iperf_udp_accept(struct iperf_test *test)
}
}
#endif /* HAVE_SO_MAX_PACING_RATE */
if (test->no_fq_socket_pacing) {
unsigned int rate = test->settings->rate / 8;
if (rate > 0) {
if (test->debug) {
printf("Setting application pacing to %u\n", rate);
}
}
}
/*
* Create a new "listening" socket to replace the one we were using before.
@ -418,6 +426,14 @@ iperf_udp_connect(struct iperf_test *test)
}
}
#endif /* HAVE_SO_MAX_PACING_RATE */
if (test->no_fq_socket_pacing) {
unsigned int rate = test->settings->rate / 8;
if (rate > 0) {
if (test->debug) {
printf("Setting application pacing to %u\n", rate);
}
}
}
#ifdef SO_RCVTIMEO
/* 30 sec timeout for a case when there is a network problem. */