kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup of aio logic

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@592 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Kallden 2004-02-02 07:06:55 +00:00
parent f8b90aeb7b
commit a8e3ab697b
1 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
rdpdr.c
View File

@ -49,7 +49,9 @@ struct async_iorequest
DEVICE_FNS *fns; DEVICE_FNS *fns;
struct async_iorequest *next; /* next element in list */ struct async_iorequest *next; /* next element in list */
} g_iorequest; };
struct async_iorequest *g_iorequest;
/* Return device_id for a given handle */ /* Return device_id for a given handle */
int int
@ -83,42 +85,27 @@ add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32
{ {
struct async_iorequest *iorq; struct async_iorequest *iorq;
iorq = &g_iorequest; if (g_iorequest == NULL)
{
g_iorequest = (struct async_iorequest *) xmalloc(sizeof(struct async_iorequest));
g_iorequest->fd = 0;
g_iorequest->next = NULL;
}
iorq = g_iorequest;
while (iorq->fd != 0) while (iorq->fd != 0)
{ {
// create new element if needed // create new element if needed
if (iorq->next == NULL) if (iorq->next == NULL)
{
iorq->next = iorq->next =
(struct async_iorequest *) xmalloc(sizeof(struct async_iorequest)); (struct async_iorequest *) xmalloc(sizeof(struct async_iorequest));
iorq->next->fd = 0;
iorq->next->next = NULL;
}
iorq = iorq->next; iorq = iorq->next;
} }
/* first element is special since it doesn't get deleted */
/* don't want to get io out of order */
if (g_iorequest.fd == 0)
{
iorq = &g_iorequest;
/* look for first occurrence of fd */
while (iorq->next != NULL)
{
if (iorq->fd == file)
break;
iorq = iorq->next;
}
/* if same create new link at end of chain instead */
if (iorq->fd == file)
{
while (iorq->next != NULL)
iorq = iorq->next;
iorq->next =
(struct async_iorequest *) xmalloc(sizeof(struct async_iorequest));
iorq = iorq->next;
}
else
iorq = &g_iorequest; /* didn't find fs use first entry */
}
iorq->device = device; iorq->device = device;
iorq->fd = file; iorq->fd = file;
iorq->id = id; iorq->id = id;
@ -329,8 +316,8 @@ rdpdr_process_irp(STREAM s)
case DEVICE_TYPE_DISK: case DEVICE_TYPE_DISK:
/*rw_blocking = False; */
fns = &disk_fns; fns = &disk_fns;
/*rw_blocking = False; */
break; break;
case DEVICE_TYPE_SCARD: case DEVICE_TYPE_SCARD:
@ -702,7 +689,7 @@ rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * t
long select_timeout = 0; // Timeout value to be used for select() (in millisecons). long select_timeout = 0; // Timeout value to be used for select() (in millisecons).
struct async_iorequest *iorq; struct async_iorequest *iorq;
iorq = &g_iorequest; iorq = g_iorequest;
while (iorq != NULL) while (iorq != NULL)
{ {
if (iorq->fd != 0) if (iorq->fd != 0)
@ -756,7 +743,7 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
return; return;
} }
iorq = &g_iorequest; iorq = g_iorequest;
prev = NULL; prev = NULL;
while (iorq != NULL) while (iorq != NULL)
{ {
@ -770,10 +757,16 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
{ {
/* Read the data */ /* Read the data */
fns = iorq->fns; fns = iorq->fns;
/* never read larger chunks than 8k - chances are that it will block */
status = fns->read(iorq->fd, status = fns->read(iorq->fd,
iorq->buffer + iorq->partial_len, iorq->buffer + iorq->partial_len,
iorq->length - iorq->partial_len, (iorq->length -
0, &result); iorq->partial_len) >
8192 ? 8192 : (iorq->length -
iorq->
partial_len), 0,
&result);
iorq->partial_len += result; iorq->partial_len += result;
#if WITH_DEBUG_RDP5 #if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data read\n", result)); DEBUG(("RDPDR: %d bytes of data read\n", result));
@ -795,6 +788,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
prev->next = iorq->next; prev->next = iorq->next;
xfree(iorq); xfree(iorq);
} }
else
{
// Even if NULL
g_iorequest = iorq->next;
xfree(iorq);
}
} }
} }
break; break;
@ -803,11 +802,17 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
{ {
/* Write data. */ /* Write data. */
fns = iorq->fns; fns = iorq->fns;
/* never write larger chunks than 8k - chances are that it will block */
status = fns->write(iorq->fd, status = fns->write(iorq->fd,
iorq->buffer + iorq->buffer +
iorq->partial_len, iorq->partial_len,
iorq->length - (iorq->length -
iorq->partial_len, 0, &result); iorq->partial_len) >
8192 ? 8192 : (iorq->length -
iorq->
partial_len), 0,
&result);
iorq->partial_len += result; iorq->partial_len += result;
#if WITH_DEBUG_RDP5 #if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data written\n", DEBUG(("RDPDR: %d bytes of data written\n",
@ -829,6 +834,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
prev->next = iorq->next; prev->next = iorq->next;
xfree(iorq); xfree(iorq);
} }
else
{
// Even if NULL
g_iorequest = iorq->next;
xfree(iorq);
}
} }
} }
break; break;
@ -866,6 +877,12 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
prev->next = iorq->next; prev->next = iorq->next;
xfree(iorq); xfree(iorq);
} }
else
{
// Even if NULL
g_iorequest = iorq->next;
xfree(iorq);
}
return True; return True;
} }