Skip to content

Disable Nagle for testing (TCP_NODELAY), allow to change message size for socket tests #23

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Disable Nagle for testing (TCP_NODELAY), allow to change message size for socket tests #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8164383
Actually use -m (msg_size) parameter for TCP latency and B/W tests in…
vitalif May 27, 2020
3ed9c07
Set TCP_NODELAY (disable Nagle)
vitalif May 27, 2020
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
20 changes: 17 additions & 3 deletions src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <netinet/tcp.h>
#include "qperf.h"


Expand Down Expand Up @@ -563,10 +564,15 @@ datagram_server_lat(KIND kind)
* Set default IP parameters and ensure that any that are set are being used.
*/
static void
ip_parameters(long msgSize)
ip_parameters(long defaultSize)
{
setp_u32(0, L_MSG_SIZE, msgSize);
setp_u32(0, R_MSG_SIZE, msgSize);
int size = Req.msg_size;
if (!size)
size = defaultSize;
setp_u32(0, L_MSG_SIZE, size);
setp_u32(0, R_MSG_SIZE, size);
par_use(L_MSG_SIZE);
par_use(R_MSG_SIZE);
par_use(L_PORT);
par_use(R_PORT);
par_use(L_SOCK_BUF_SIZE);
Expand All @@ -592,6 +598,10 @@ client_init(int *fd, KIND kind)
if (!ai->ai_family)
continue;
*fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
{
int one = 1;
setsockopt(*fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
}
setsockopt_one(*fd, SO_REUSEADDR);
if (connect(*fd, ai->ai_addr, ai->ai_addrlen) == SUCCESS0)
break;
Expand Down Expand Up @@ -625,6 +635,10 @@ stream_server_init(int *fd, KIND kind)
listenFD = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (listenFD < 0)
continue;
{
int one = 1;
setsockopt(listenFD, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
}
setsockopt_one(listenFD, SO_REUSEADDR);
if (bind(listenFD, ai->ai_addr, ai->ai_addrlen) == SUCCESS0)
break;
Expand Down