Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- tcpip locking rewrite (part 1 of x)

Browse source 
- Use ExInterlocked list functions to manipulate the request lists
 - Fix usage of the wrong lock to protect the listen request list
 - Next step: Optimize usage of TCPLock

svn path=/trunk/; revision=41737
This commit is contained in:
Cameron Gutman 2009-07-02 07:16:50 +00:00
parent 661d9e889c
commit 21929c948e
2 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/lib/drivers/ip/transport/tcp/accept.c
View file

@ -106,8 +106,9 @@ VOID TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener,
PCONNECTION_ENDPOINT Connection ) { PCONNECTION_ENDPOINT Connection ) {
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
PTDI_BUCKET Bucket; PTDI_BUCKET Bucket;
KIRQL OldIrql;
TcpipRecursiveMutexEnter( &TCPLock, TRUE ); KeAcquireSpinLock(&Listener->Lock, &OldIrql);
ListEntry = Listener->ListenRequest.Flink; ListEntry = Listener->ListenRequest.Flink;
while ( ListEntry != &Listener->ListenRequest ) { while ( ListEntry != &Listener->ListenRequest ) {
@ -122,7 +123,7 @@ VOID TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener,
ListEntry = ListEntry->Flink; ListEntry = ListEntry->Flink;
} }
TcpipRecursiveMutexLeave( &TCPLock ); KeReleaseSpinLock(&Listener->Lock, OldIrql);
} }
NTSTATUS TCPAccept ( PTDI_REQUEST Request, NTSTATUS TCPAccept ( PTDI_REQUEST Request,
@ -149,7 +150,7 @@ NTSTATUS TCPAccept ( PTDI_REQUEST Request,
Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestNotifyObject = Complete;
Bucket->Request.RequestContext = Context; Bucket->Request.RequestContext = Context;
IoMarkIrpPending((PIRP)Context); IoMarkIrpPending((PIRP)Context);
InsertTailList( &Listener->ListenRequest, &Bucket->Entry ); ExInterlockedInsertTailList( &Listener->ListenRequest, &Bucket->Entry, &Listener->Lock );
} else } else
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
} }

49
reactos/lib/drivers/ip/transport/tcp/tcp.c
View file

@ -35,8 +35,9 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
/* Things that can happen when we try the initial connection */ /* Things that can happen when we try the initial connection */
if( NewState & SEL_CONNECT ) { if( NewState & SEL_CONNECT ) {
while( !IsListEmpty( &Connection->ConnectRequest ) ) { while( (Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest,
Entry = RemoveHeadList( &Connection->ConnectRequest ); &Connection->Lock )) != NULL ) {
TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n"));
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
@ -67,10 +68,10 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
IsListEmpty(&Connection->ListenRequest) ? IsListEmpty(&Connection->ListenRequest) ?
"empty" : "nonempty")); "empty" : "nonempty"));
while( !IsListEmpty( &Connection->ListenRequest ) ) { while( (Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest,
&Connection->Lock )) != NULL ) {
PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION IrpSp;
Entry = RemoveHeadList( &Connection->ListenRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
@ -86,7 +87,7 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
if( Status == STATUS_PENDING ) { if( Status == STATUS_PENDING ) {
InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); ExInterlockedInsertHeadList( &Connection->ListenRequest, &Bucket->Entry, &Connection->Lock );
break; break;
} else { } else {
Complete( Bucket->Request.RequestContext, Status, 0 ); Complete( Bucket->Request.RequestContext, Status, 0 );
@ -101,11 +102,11 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
IsListEmpty(&Connection->ReceiveRequest) ? IsListEmpty(&Connection->ReceiveRequest) ?
"empty" : "nonempty")); "empty" : "nonempty"));
while( !IsListEmpty( &Connection->ReceiveRequest ) ) { while( (Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest,
&Connection->Lock )) != NULL ) {
OSK_UINT RecvLen = 0, Received = 0; OSK_UINT RecvLen = 0, Received = 0;
PVOID RecvBuffer = 0; PVOID RecvBuffer = 0;
Entry = RemoveHeadList( &Connection->ReceiveRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
@ -144,8 +145,8 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
STATUS_SUCCESS, Received ); STATUS_SUCCESS, Received );
exFreePool( Bucket ); exFreePool( Bucket );
} else if( Status == STATUS_PENDING ) { } else if( Status == STATUS_PENDING ) {
InsertHeadList ExInterlockedInsertHeadList
( &Connection->ReceiveRequest, &Bucket->Entry ); ( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock );
break; break;
} else { } else {
TI_DbgPrint(DEBUG_TCP, TI_DbgPrint(DEBUG_TCP,
@ -161,11 +162,11 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
IsListEmpty(&Connection->SendRequest) ? IsListEmpty(&Connection->SendRequest) ?
"empty" : "nonempty")); "empty" : "nonempty"));
while( !IsListEmpty( &Connection->SendRequest ) ) { while( (Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest,
&Connection->Lock )) != NULL ) {
OSK_UINT SendLen = 0, Sent = 0; OSK_UINT SendLen = 0, Sent = 0;
PVOID SendBuffer = 0; PVOID SendBuffer = 0;
Entry = RemoveHeadList( &Connection->SendRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
@ -203,8 +204,8 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
STATUS_SUCCESS, Sent ); STATUS_SUCCESS, Sent );
exFreePool( Bucket ); exFreePool( Bucket );
} else if( Status == STATUS_PENDING ) { } else if( Status == STATUS_PENDING ) {
InsertHeadList ExInterlockedInsertHeadList
( &Connection->SendRequest, &Bucket->Entry ); ( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock );
break; break;
} else { } else {
TI_DbgPrint(DEBUG_TCP, TI_DbgPrint(DEBUG_TCP,
@ -219,11 +220,11 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
if( NewState & SEL_FIN ) { if( NewState & SEL_FIN ) {
TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
while (!IsListEmpty(&Connection->ReceiveRequest)) while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest,
&Connection->Lock )) != NULL)
{ {
DISCONNECT_TYPE DisType; DISCONNECT_TYPE DisType;
PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION IrpSp;
Entry = RemoveHeadList(&Connection->ReceiveRequest);
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext);
@ -238,11 +239,11 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
DispDoDisconnect, &DisType); DispDoDisconnect, &DisType);
} }
while (!IsListEmpty(&Connection->SendRequest)) while ((Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest,
&Connection->Lock )) != NULL)
{ {
DISCONNECT_TYPE DisType; DISCONNECT_TYPE DisType;
PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION IrpSp;
Entry = RemoveHeadList(&Connection->SendRequest);
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext);
@ -257,9 +258,9 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
DispDoDisconnect, &DisType); DispDoDisconnect, &DisType);
} }
while (!IsListEmpty(&Connection->ListenRequest)) while ((Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest,
&Connection->Lock )) != NULL)
{ {
Entry = RemoveHeadList(&Connection->ListenRequest);
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
@ -270,9 +271,9 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 );
} }
while (!IsListEmpty(&Connection->ConnectRequest)) while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest,
&Connection->Lock )) != NULL)
{ {
Entry = RemoveHeadList(&Connection->ConnectRequest);
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Complete = Bucket->Request.RequestNotifyObject; Complete = Bucket->Request.RequestNotifyObject;
@ -644,7 +645,7 @@ NTSTATUS TCPConnect
IoMarkIrpPending((PIRP)Context); IoMarkIrpPending((PIRP)Context);
InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); ExInterlockedInsertTailList( &Connection->ConnectRequest, &Bucket->Entry, &Connection->Lock );
} }
} }
@ -770,7 +771,7 @@ NTSTATUS TCPReceiveData
IoMarkIrpPending((PIRP)Context); IoMarkIrpPending((PIRP)Context);
InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); ExInterlockedInsertTailList( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock );
TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); TI_DbgPrint(DEBUG_TCP,("Queued read irp\n"));
} else { } else {
TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received));
@ -838,7 +839,7 @@ NTSTATUS TCPSendData
IoMarkIrpPending((PIRP)Context); IoMarkIrpPending((PIRP)Context);
InsertTailList( &Connection->SendRequest, &Bucket->Entry ); ExInterlockedInsertTailList( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock );
TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n"));
} else { } else {
TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent));