rpitx/csdr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nmux: rearranged read() code for fixing EAGAINs

Browse source
This commit is contained in:
ha7ilm 2017-01-12 18:57:23 +01:00
parent 8b4323237f
commit 795a77e7ee
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
nmux.cpp
View file

@ -232,22 +232,26 @@ int main(int argc, char* argv[])
// client->wait_condition). // client->wait_condition).
index_in_current_write_buffer = 0; index_in_current_write_buffer = 0;
} }
if(NMUX_DEBUG) fprintf(stderr, "mainfor: reading...\n"); for(;;)
int retval = read(input_fd, current_write_buffer + index_in_current_write_buffer, bufsize - index_in_current_write_buffer);
if(NMUX_DEBUG) fprintf(stderr, "read %d\n", retval);
if(retval>0)
{ {
index_in_current_write_buffer += retval; if(NMUX_DEBUG) fprintf(stderr, "mainfor: reading...\n");
} int retval = read(input_fd, current_write_buffer + index_in_current_write_buffer, bufsize - index_in_current_write_buffer);
else if(retval==0) if(NMUX_DEBUG) fprintf(stderr, "read %d\n", retval);
{ if(retval>0)
//End of input stream, close clients and exit {
print_exit(MSG_START "(main thread/for) end input stream, exiting.\n"); index_in_current_write_buffer += retval;
} break;
else if(retval==-1) }
{ else if(retval==0)
if(errno == EAGAIN) { if(NMUX_DEBUG) fprintf(stderr, "mainfor: read %d\n", retval); } {
else error_exit(MSG_START "(main thread/for) error in read(), exiting.\n"); //End of input stream, close clients and exit
print_exit(MSG_START "(main thread/for) end input stream, exiting.\n");
}
else if(retval==-1)
{
if(errno == EAGAIN) { if(NMUX_DEBUG) fprintf(stderr, "mainfor: read EAGAIN\n"); /* seems like select would block forever, so we just read again */ break; }
else error_exit(MSG_START "(main thread/for) error in read(), exiting.\n");
}
} }
} }
} }