ports/iperf3
ports/iperf3
1
1
Fork 0
Code Releases Activity

fix: Handle a corner case more gracefully.

Browse Source 
If the buffer happens to be holding exactly a sending chunk size,
we no longer arbitrarily quit.

While here, use equivalent, easier-to-read tests in a couple places.

Discussed with @hanvari

Follow-up to #1115.
This commit is contained in:
Bruce A. Mah 2021-04-16 14:59:31 -07:00
parent f4a114652f
commit 787919c4b3
No known key found for this signature in database
GPG Key ID: 4984910A8CAAEE8A
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/iperf_api.c
View File

@ -4202,21 +4202,22 @@ static int
diskfile_send(struct iperf_stream *sp)
{
int r;
int buffer_left=0; // represents total data in buffer to be sent out
int buffer_left = sp->diskfile_left; // represents total data in buffer to be sent out
static int rtot;
/* if needed, read enough data from the disk to fill up the buffer */
if (sp->diskfile_left < sp->test->settings->blksize && !sp->test->done) {
r = read(sp->diskfile_fd, sp->buffer, sp->test->settings->blksize -
sp->diskfile_left);
buffer_left = r + sp->diskfile_left;
buffer_left += r;
rtot += r;
if (sp->test->debug) {
printf("read %d bytes from file, %d total\n", r, rtot);
}
// a.k.a. buffer_left != sp->test->settings->blksize
if (r != sp->test->settings->blksize - sp->diskfile_left){
// If the buffer doesn't contain a full buffer at this point,
// adjust the size of the data to send.
if (buffer_left != sp->test->settings->blksize) {
if (sp->test->debug)
printf("possible eof\n");
// setting data size to be sent,
@ -4224,10 +4225,9 @@ diskfile_send(struct iperf_stream *sp)
// (to be used by iperf_tcp_send, etc.)
sp->pending_size = buffer_left;
}
if (r == 0 && sp->diskfile_left == 0) {
// a.k.a. buffer_left == 0
// If there's no work left, we're done.
if (buffer_left == 0) {
sp->test->done = 1;
if (sp->test->debug)
printf("done\n");