[ros-diffs] [cgutman] 52416: [TCPIP/IP] - Wait until the all pending sends are serviced before shutting down the socket on a graceful disconnect - Cancel pending sends and receives on abortive disconnect - Rem...
cgutman at svn.reactos.org
cgutman at svn.reactos.org
Wed Jun 22 00:41:41 UTC 2011
Author: cgutman
Date: Wed Jun 22 00:41:40 2011
New Revision: 52416
URL: http://svn.reactos.org/svn/reactos?rev=52416&view=rev
Log:
[TCPIP/IP]
- Wait until the all pending sends are serviced before shutting down the socket on a graceful disconnect
- Cancel pending sends and receives on abortive disconnect
- Remove the nasty hack that was the completion queue and replace it with async completions like the lwIP implementation does
- There is a bug with the graceful disconnects which occurs if the graceful disconnect cannot be serviced immediately (a very rare case in my testing) and results in the shutdown() call stalling forever because oskittcp never indicates that send is possible again (which would allow pending send IRPs to be serviced and the shutdown IRP to be completed)
Modified:
trunk/reactos/drivers/network/tcpip/include/titypes.h
trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c
trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/titypes.h?rev=52416&r1=52415&r2=52416&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Wed Jun 22 00:41:40 2011
@@ -266,7 +266,7 @@
LIST_ENTRY ListenRequest; /* Queued listen requests */
LIST_ENTRY ReceiveRequest; /* Queued receive requests */
LIST_ENTRY SendRequest; /* Queued send requests */
- LIST_ENTRY CompletionQueue;/* Completed requests to finish */
+ LIST_ENTRY ShutdownRequest;/* Queued shutdown requests */
/* Signals */
UINT SignalState; /* Active signals from oskit */
Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c?rev=52416&r1=52415&r2=52416&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Jun 22 00:41:40 2011
@@ -169,6 +169,10 @@
break;
case TDI_CONNECT:
+ DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp);
+ break;
+
+ case TDI_DISCONNECT:
DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp);
break;
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c?rev=52416&r1=52415&r2=52416&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Jun 22 00:41:40 2011
@@ -18,6 +18,33 @@
PORT_SET TCPPorts;
CLIENT_DATA ClientInfo;
+VOID
+CompleteBucketWorker(PVOID Context)
+{
+ PTDI_BUCKET Bucket = Context;
+ PCONNECTION_ENDPOINT Connection;
+ PTCP_COMPLETION_ROUTINE Complete;
+
+ ASSERT(Bucket);
+
+ Connection = Bucket->AssociatedEndpoint;
+ Complete = Bucket->Request.RequestNotifyObject;
+
+ Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information);
+
+ ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG);
+
+ DereferenceObject(Connection);
+}
+
+VOID
+CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket)
+{
+ Bucket->AssociatedEndpoint = Connection;
+ ReferenceObject(Connection);
+ ChewCreate(CompleteBucketWorker, Bucket);
+}
+
VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
{
PTDI_BUCKET Bucket;
@@ -25,8 +52,6 @@
NTSTATUS Status;
PIRP Irp;
PMDL Mdl;
- KIRQL OldIrql;
- PTCP_COMPLETION_ROUTINE Complete;
if (ClientInfo.Unlocked)
LockObjectAtDpcLevel(Connection);
@@ -44,7 +69,7 @@
Bucket->Status = (Connection->SignalState & SEL_CONNECT) ? STATUS_SUCCESS : STATUS_CANCELLED;
Bucket->Information = 0;
- InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+ CompleteBucket(Connection, Bucket);
}
}
@@ -91,7 +116,7 @@
Bucket->Information = 0;
DereferenceObject(Bucket->AssociatedEndpoint);
- InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+ CompleteBucket(Connection, Bucket);
}
}
}
@@ -155,7 +180,7 @@
Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status;
Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0;
- InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+ CompleteBucket(Connection, Bucket);
}
}
}
@@ -216,49 +241,60 @@
Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status;
Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0;
- InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+ CompleteBucket(Connection, Bucket);
}
}
}
-
- ReferenceObject(Connection);
- if (ClientInfo.Unlocked)
- {
- UnlockObjectFromDpcLevel(Connection);
- KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql);
+ if( Connection->SignalState & (SEL_WRITE | SEL_FIN) ) {
+ while (!IsListEmpty(&Connection->ShutdownRequest)) {
+ Entry = RemoveHeadList( &Connection->ShutdownRequest );
+
+ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+
+ if (!(Connection->SignalState & SEL_FIN))
+ {
+ /* See if we can satisfy this after the events */
+ if (IsListEmpty(&Connection->SendRequest))
+ {
+ /* Send queue is empty so we're good to go */
+ Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE));
+ }
+ else
+ {
+ /* We still have to wait */
+ Status = STATUS_PENDING;
+ }
+ }
+ else
+ {
+ /* We were cancelled by a FIN */
+ Status = STATUS_CANCELLED;
+ }
+
+ if( Status == STATUS_PENDING ) {
+ InsertHeadList( &Connection->ShutdownRequest, &Bucket->Entry );
+ break;
+ } else {
+ TI_DbgPrint(DEBUG_TCP,
+ ("Completing shutdown request: %x %x\n",
+ Bucket->Request, Status));
+
+ Bucket->Status = Status;
+ Bucket->Information = 0;
+
+ CompleteBucket(Connection, Bucket);
+ }
+ }
}
- else
- {
- UnlockObject(Connection, Connection->OldIrql);
- }
-
- while ((Entry = ExInterlockedRemoveHeadList(&Connection->CompletionQueue,
- &Connection->Lock)))
- {
- Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
- Complete = Bucket->Request.RequestNotifyObject;
-
- Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information);
-
- ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG);
- }
-
- if (!ClientInfo.Unlocked)
- {
- LockObject(Connection, &OldIrql);
- }
- else
- {
- KeAcquireSpinLock(&ClientInfo.Lock, &ClientInfo.OldIrql);
- }
- DereferenceObject(Connection);
-
- /* If the socket is dead, remove the reference we added for oskit */
+
if (Connection->SignalState & SEL_FIN)
{
Connection->SocketContext = NULL;
DereferenceObject(Connection);
}
+
+ if (ClientInfo.Unlocked)
+ UnlockObjectFromDpcLevel(Connection);
}
VOID ConnectionFree(PVOID Object) {
@@ -291,12 +327,12 @@
InitializeListHead(&Connection->ListenRequest);
InitializeListHead(&Connection->ReceiveRequest);
InitializeListHead(&Connection->SendRequest);
- InitializeListHead(&Connection->CompletionQueue);
+ InitializeListHead(&Connection->ShutdownRequest);
/* Save client context pointer */
Connection->ClientContext = ClientContext;
- /* Add an extra reference for oskit */
+
Connection->RefCount = 2;
Connection->Free = ConnectionFree;
@@ -662,23 +698,96 @@
PTCP_COMPLETION_ROUTINE Complete,
PVOID Context ) {
NTSTATUS Status = STATUS_INVALID_PARAMETER;
+ PTDI_BUCKET Bucket;
KIRQL OldIrql;
+ PLIST_ENTRY Entry;
TI_DbgPrint(DEBUG_TCP,("started\n"));
LockObject(Connection, &OldIrql);
if (Flags & TDI_DISCONNECT_RELEASE)
- Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE));
+ {
+ /* See if we can satisfy this right now */
+ if (IsListEmpty(&Connection->SendRequest))
+ {
+ /* Send queue is empty so we're good to go */
+ Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE));
+
+ UnlockObject(Connection, OldIrql);
+
+ return Status;
+ }
+
+ /* Otherwise we wait for the send queue to be empty */
+ }
if ((Flags & TDI_DISCONNECT_ABORT) || !Flags)
+ {
+ /* This request overrides any pending graceful disconnects */
+ while (!IsListEmpty(&Connection->ShutdownRequest))
+ {
+ Entry = RemoveHeadList(&Connection->ShutdownRequest);
+
+ Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
+
+ Bucket->Information = 0;
+ Bucket->Status = STATUS_FILE_CLOSED;
+
+ CompleteBucket(Connection, Bucket);
+ }
+
+ /* Also kill any pending reads and writes */
+ while (!IsListEmpty(&Connection->SendRequest))
+ {
+ Entry = RemoveHeadList(&Connection->SendRequest);
+
+ Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
+
+ Bucket->Information = 0;
+ Bucket->Status = STATUS_FILE_CLOSED;
+
+ CompleteBucket(Connection, Bucket);
+ }
+
+ while (!IsListEmpty(&Connection->ReceiveRequest))
+ {
+ Entry = RemoveHeadList(&Connection->ReceiveRequest);
+
+ Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
+
+ Bucket->Information = 0;
+ Bucket->Status = STATUS_FILE_CLOSED;
+
+ CompleteBucket(Connection, Bucket);
+ }
+
+ /* An abort never pends; we just drop everything and complete */
Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD));
+
+ UnlockObject(Connection, OldIrql);
+
+ return Status;
+ }
+
+ /* We couldn't complete the request now because we need to wait for outstanding I/O */
+ Bucket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG);
+ if (!Bucket)
+ {
+ UnlockObject(Connection, OldIrql);
+ return STATUS_NO_MEMORY;
+ }
+
+ Bucket->Request.RequestNotifyObject = (PVOID)Complete;
+ Bucket->Request.RequestContext = Context;
+
+ InsertTailList(&Connection->ShutdownRequest, &Bucket->Entry);
UnlockObject(Connection, OldIrql);
TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));
- return Status;
+ return STATUS_PENDING;
}
NTSTATUS TCPClose
@@ -887,7 +996,7 @@
BOOLEAN TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) {
PLIST_ENTRY Entry;
- PLIST_ENTRY ListHead[4];
+ PLIST_ENTRY ListHead[5];
KIRQL OldIrql;
PTDI_BUCKET Bucket;
UINT i = 0;
@@ -897,10 +1006,11 @@
ListHead[1] = &Endpoint->ReceiveRequest;
ListHead[2] = &Endpoint->ConnectRequest;
ListHead[3] = &Endpoint->ListenRequest;
+ ListHead[4] = &Endpoint->ShutdownRequest;
LockObject(Endpoint, &OldIrql);
- for( i = 0; i < 4; i++ )
+ for( i = 0; i < 5; i++ )
{
for( Entry = ListHead[i]->Flink;
Entry != ListHead[i];
More information about the Ros-diffs
mailing list