summaryrefslogtreecommitdiff
path: root/os/io.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-10-23 17:33:52 -0400
committerAdam Jackson <ajax@redhat.com>2008-10-23 17:37:46 -0400
commit40f9b6bf0dc62098680235a958e0733770902cca (patch)
treeda7a7da5ab95066b1290d191d4f32045c6308766 /os/io.c
parent8b3c278fe7502f9343355f09213837622b0d9ca0 (diff)
Argh, macros.
Diffstat (limited to 'os/io.c')
-rw-r--r--os/io.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/os/io.c b/os/io.c
index e25a79ce8..f07993e5a 100644
--- a/os/io.c
+++ b/os/io.c
@@ -179,7 +179,7 @@ YieldControl(void)
}
static void
-YieldControlNoInput(void)
+YieldControlNoInput(int fd)
{
YieldControl();
FD_CLR(fd, &ClientsWithInput);
@@ -346,7 +346,7 @@ ReadRequestFromClient(ClientPtr client)
if (0)
#endif
{
- YieldControlNoInput();
+ YieldControlNoInput(fd);
return 0;
}
}
@@ -388,7 +388,7 @@ ReadRequestFromClient(ClientPtr client)
if (gotnow < needed)
{
/* Still don't have enough; punt. */
- YieldControlNoInput();
+ YieldControlNoInput(fd);
return 0;
}
}
@@ -425,7 +425,7 @@ ReadRequestFromClient(ClientPtr client)
if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput);
else
- YieldControlNoInput();
+ YieldControlNoInput(fd);
}
}
else
@@ -435,7 +435,7 @@ ReadRequestFromClient(ClientPtr client)
if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput);
else
- YieldControlNoInput();
+ YieldControlNoInput(fd);
}
if (SmartScheduleDisable)
if (++timesThisConnection >= MAX_TIMES_PER)
@@ -529,7 +529,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
(gotnow >= (int)(get_req_len((xReq *)oci->bufptr, client) << 2)))
FD_SET(fd, &ClientsWithInput);
else
- YieldControlNoInput();
+ YieldControlNoInput(fd);
return(TRUE);
}
@@ -553,7 +553,7 @@ ResetCurrentRequest(ClientPtr client)
gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if (gotnow < sizeof(xReq))
{
- YieldControlNoInput();
+ YieldControlNoInput(fd);
}
else
{
@@ -583,7 +583,7 @@ ResetCurrentRequest(ClientPtr client)
YieldControl();
}
else
- YieldControlNoInput();
+ YieldControlNoInput(fd);
}
}