empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace the per-iop input_timeout by per-function timeouts

Browse source 
Commit 08b94556 (v4.3.20) added io_open() parameter input_timeout.  It
applies to io_input() and, since commit 904822e3, to io_close().  Add
timeout parameters to these functions instead.
This commit is contained in:
Markus Armbruster 2012-03-10 13:27:34 +01:00
parent 0513ec136b
commit a96b400da3
5 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/player/recvclient.c
View file

@ -36,6 +36,7 @@
#include "empio.h"
#include "journal.h"
#include "optlist.h"
#include "player.h"
#include "prototypes.h"
@ -60,6 +61,7 @@ int
recvclient(char *cmd, int size)
{
int count, res;
struct timeval timeout;
count = -1;
while (!player->aborted) {
@ -90,7 +92,9 @@ recvclient(char *cmd, int size)
if (player->aborted)
break;
res = io_input(player->iop, 1);
timeout.tv_sec = minutes(max_idle);
timeout.tv_usec = 0;
res = io_input(player->iop, &timeout);
if (res > 0)
;
else if (res < 0)