Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[spetreolle] 41641: Add MIXERCONTROL_CONTROLTYPE_BASS_BOOST and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jun 27 18:41:56 2009 New Revision: 41641 URL: http://svn.reactos.org/svn/reactos?rev=41641&view=rev Log: Add MIXERCONTROL_CONTROLTYPE_BASS_BOOST and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT Modified: trunk/reactos/include/psdk/ksmedia.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Sat Jun 27 18:41:56 2009 @@ -396,10 +396,14 @@ #define KSDATAFORMAT_SUBTYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI) #define STATIC_KSDATAFORMAT_SUBTYPE_PCM\ - 0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} + 0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("00000001-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_PCM); #define KSDATAFORMAT_SUBTYPE_PCM DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_PCM) +#define STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT\ + 0x00000003L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +DEFINE_GUIDSTRUCT("00000003-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); +#define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) #define STATIC_KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\ 0x05589f81L, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Sat Jun 27 18:41:56 2009 @@ -368,6 +368,7 @@ #define MIXERCONTROL_CONTROLTYPE_MONO (MIXERCONTROL_CONTROLTYPE_BOOLEAN+3) #define MIXERCONTROL_CONTROLTYPE_LOUDNESS (MIXERCONTROL_CONTROLTYPE_BOOLEAN+4) #define MIXERCONTROL_CONTROLTYPE_STEREOENH (MIXERCONTROL_CONTROLTYPE_BOOLEAN+5) +#define MIXERCONTROL_CONTROLTYPE_BASS_BOOST (MIXERCONTROL_CONTROLTYPE_BOOLEAN + 0x00002277) #define MIXERCONTROL_CONTROLTYPE_BUTTON (MIXERCONTROL_CT_CLASS_SWITCH|MIXERCONTROL_CT_SC_SWITCH_BUTTON|MIXERCONTROL_CT_UNITS_BOOLEAN) #define MIXERCONTROL_CONTROLTYPE_DECIBELS (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_DECIBELS) #define MIXERCONTROL_CONTROLTYPE_SIGNED (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_SIGNED) Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid-ming… ============================================================================== --- trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c [iso-8859-1] Sat Jun 27 18:41:56 2009 @@ -66,6 +66,7 @@ DEFINE_GUID(IID_IDirectMusicSynthSink,0x09823663,0x5c85,0x11d2,0xaf,0xa6,0x00,0xaa,0x00,0x24,0xd8,0xb6); DEFINE_GUID(IID_IKsFastClock,0xc9902485,0xc180,0x11d2,0x84,0x73,0xd4,0x23,0x94,0x45,0x9e,0x5e); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); /* Match ms dxsdk 2004 dec these guids exist in dxguid, tested by Magnus Olsen */ DEFINE_GUID(CLSID_DirectMusicAudioPathConfig, 0xEE0B9CA0, 0xA81E, 0x11D3, 0x9B, 0xD1, 0x00, 0x80, 0xC7, 0x15, 0x0A, 0x74);

15 years, 4 months

[sginsberg] 41640: - KeDetachProcess & KeUnstackDetachProcess: Fix a typo when swapping back to the original process that would switch _from_ the original process to itself. We now properly swap from the _current_ process.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Jun 27 15:07:58 2009 New Revision: 41640 URL: http://svn.reactos.org/svn/reactos?rev=41640&view=rev Log: - KeDetachProcess & KeUnstackDetachProcess: Fix a typo when swapping back to the original process that would switch _from_ the original process to itself. We now properly swap from the _current_ process. Modified: trunk/reactos/ntoskrnl/ke/procobj.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sat Jun 27 15:07:58 2009 @@ -535,7 +535,7 @@ KiReleaseApcLockFromDpcLevel(&ApcLock); /* Swap Processes */ - KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); + KiSwapProcess(Thread->ApcState.Process, Process); /* Exit the dispatcher */ KiExitDispatcher(ApcLock.OldIrql); @@ -705,7 +705,7 @@ KiReleaseApcLockFromDpcLevel(&ApcLock); /* Swap Processes */ - KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); + KiSwapProcess(Thread->ApcState.Process, Process); /* Exit the dispatcher */ KiExitDispatcher(ApcLock.OldIrql);

15 years, 4 months

[ros-arm-bringup] 41639: - This patch is lets you visually dump the entire ReactOS PFN database, useful for debugging. Surprising nobody had done in this in the past, since it wasn't too hard (but it took a bit long to figure out how to get it in there). - That's what she said.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 27 13:54:56 2009 New Revision: 41639 URL: http://svn.reactos.org/svn/reactos?rev=41639&view=rev Log: - This patch is lets you visually dump the entire ReactOS PFN database, useful for debugging. Surprising nobody had done in this in the past, since it wasn't too hard (but it took a bit long to figure out how to get it in there). - That's what she said. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Sat Jun 27 13:54:56 2009 @@ -342,7 +342,8 @@ KdSpare1 = 0x23, /* h */ KdSpare2 = 0x17, /* i */ KdSpare3 = 0x24, /* j */ - EnterDebugger = 0x25 /* k */ + EnterDebugger = 0x25, /* k */ + ThatsWhatSheSaid = 69 /* FIGURE IT OUT */ } KDP_DEBUG_SERVICE; /* Dispatch Table for Wrapper Functions */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Jun 27 13:54:56 2009 @@ -292,6 +292,12 @@ ULONG PagingRequestsInLastFiveMinutes; ULONG PagingRequestsInLastFifteenMinutes; } MM_STATS; + +// +// These two mappings are actually used by Windows itself, based on the ASSERTS +// +#define StartOfAllocation ReadInProgress +#define EndOfAllocation WriteInProgress typedef struct _MMPFNENTRY { @@ -1120,6 +1126,12 @@ VOID ); +VOID +NTAPI +MmDumpPfnDatabase( + VOID +); + PFN_TYPE NTAPI MmGetContinuousPages( Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Jun 27 13:54:56 2009 @@ -84,6 +84,10 @@ case EnterDebugger: DbgBreakPoint(); + break; + + case ThatsWhatSheSaid: + MmDumpPfnDatabase(); break; default: Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Jun 27 13:54:56 2009 @@ -249,6 +249,94 @@ /* Return it */ return Pfn; +} + +VOID +NTAPI +MmDumpPfnDatabase(VOID) +{ + ULONG i; + PPHYSICAL_PAGE Pfn1; + PCHAR State = "????", Consumer = "Unknown"; + KIRQL OldIrql; + + OldIrql = KfRaiseIrql(HIGH_LEVEL); + + // + // Loop the PFN database + // + for (i = 0; i <= MmHighestPhysicalPage; i++) + { + Pfn1 = MiGetPfnEntry(i); + + // + // Get the consumer + // + switch (Pfn1->Flags.Consumer) + { + case MC_NPPOOL: + + Consumer = "Nonpaged Pool"; + break; + + case MC_PPOOL: + + Consumer = "Paged Pool"; + break; + + case MC_CACHE: + + Consumer = "File System Cache"; + break; + + case MC_USER: + + Consumer = "Process Working Set"; + break; + + case MC_SYSTEM: + + Consumer = "System"; + break; + } + + // + // Get the type + // + switch (Pfn1->Flags.Type) + { + case MM_PHYSICAL_PAGE_USED: + + State = "Used"; + break; + + case MM_PHYSICAL_PAGE_FREE: + + State = "Free"; + Consumer = "Free"; + break; + + case MM_PHYSICAL_PAGE_BIOS: + + State = "BIOS"; + Consumer = "System Reserved"; + break; + } + + // + // Pretty-print the page + // + DbgPrint("0x%08p:\t%04s\t%20s\t(%02d.%02d.%02d) [%08p])\n", + i << PAGE_SHIFT, + State, + Consumer, + Pfn1->ReferenceCount, + Pfn1->MapCount, + Pfn1->LockCount, + Pfn1->RmapListHead); + } + + KeLowerIrql(OldIrql); } VOID

15 years, 4 months

[cgutman] 41638: - Always call the completion handler so we don't leak packet descriptors - Don't remove the NCE if we fail because it may not be ours - Mark the IRPs pending before we insert them into our queue - Check that the addresses match so we don't receive somebody else's packets - Part 1 of 2

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jun 27 12:48:58 2009 New Revision: 41638 URL: http://svn.reactos.org/svn/reactos?rev=41638&view=rev Log: - Always call the completion handler so we don't leak packet descriptors - Don't remove the NCE if we fail because it may not be ours - Mark the IRPs pending before we insert them into our queue - Check that the addresses match so we don't receive somebody else's packets - Part 1 of 2 Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Jun 27 12:48:58 2009 @@ -64,7 +64,6 @@ /* Must be called with table lock acquired */ VOID NBFlushPacketQueue( PNEIGHBOR_CACHE_ENTRY NCE, - BOOLEAN CallComplete, NTSTATUS ErrorCode ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; @@ -81,13 +80,10 @@ ("PacketEntry: %x, NdisPacket %x\n", PacketEntry, Packet->Packet)); - if( CallComplete ) - { - ASSERT_KM_POINTER(Packet->Complete); - Packet->Complete( Packet->Context, - Packet->Packet, - ErrorCode ); - } + ASSERT_KM_POINTER(Packet->Complete); + Packet->Complete( Packet->Context, + Packet->Packet, + ErrorCode ); exFreePool( Packet ); } @@ -117,7 +113,7 @@ so maybe it's not that big a problem */ /* Flush packet queue */ - NBFlushPacketQueue( NCE, TRUE, NDIS_STATUS_REQUEST_ABORTED ); + NBFlushPacketQueue( NCE, NDIS_STATUS_REQUEST_ABORTED ); NCE->EventCount = 0; } else @@ -213,7 +209,7 @@ NextNCE = CurNCE->Next; /* Flush wait queue */ - NBFlushPacketQueue( CurNCE, FALSE, STATUS_SUCCESS ); + NBFlushPacketQueue( CurNCE, NDIS_STATUS_NOT_ACCEPTED ); CurNCE = NextNCE; } @@ -528,7 +524,7 @@ /* Found it, now unlink it from the list */ *PrevNCE = CurNCE->Next; - NBFlushPacketQueue( CurNCE, TRUE, NDIS_STATUS_REQUEST_ABORTED ); + NBFlushPacketQueue( CurNCE, NDIS_STATUS_REQUEST_ABORTED ); exFreePool(CurNCE); break; Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Sat Jun 27 12:48:58 2009 @@ -415,7 +415,6 @@ */ { KIRQL OldIrql; - PFIB_ENTRY FIBE; PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; PFIB_ENTRY Current; @@ -450,13 +449,7 @@ return NULL; } - FIBE = RouterAddRoute(NetworkAddress, Netmask, NCE, Metric); - if (!FIBE) { - /* Not enough free resources */ - NBRemoveNeighbor(NCE); - } - - return FIBE; + return RouterAddRoute(NetworkAddress, Netmask, NCE, Metric); } Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Jun 27 12:48:58 2009 @@ -106,7 +106,10 @@ while((CurrentEntry != &AddrFile->ReceiveQueue) && (!Found)) { Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - if( DstPort == AddrFile->Port ) { + if( DstPort == AddrFile->Port && + (AddrIsEqual(DstAddress, &AddrFile->Address) || + AddrIsUnspecified(&AddrFile->Address) || + AddrIsUnspecified(DstAddress))) { Found = TRUE; /* Remove the request from the queue */ RemoveEntryList(&Current->ListEntry); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Jun 27 12:48:58 2009 @@ -148,6 +148,7 @@ Bucket->AssociatedEndpoint = Connection; Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; + IoMarkIrpPending((PIRP)Context); InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); } else Status = STATUS_NO_MEMORY; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- 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] Sat Jun 27 12:48:58 2009 @@ -643,6 +643,8 @@ Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; + IoMarkIrpPending((PIRP)Context); + InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); } } @@ -767,8 +769,9 @@ Bucket->Request.RequestContext = Context; *BytesReceived = 0; + IoMarkIrpPending((PIRP)Context); + InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); - Status = STATUS_PENDING; TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); @@ -833,6 +836,8 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; *BytesSent = 0; + + IoMarkIrpPending((PIRP)Context); InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n"));

15 years, 4 months

[ros-arm-bringup] 41637: - Remove leftover performance tracing code.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 27 12:43:56 2009 New Revision: 41637 URL: http://svn.reactos.org/svn/reactos?rev=41637&view=rev Log: - Remove leftover performance tracing code. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Jun 27 12:43:56 2009 @@ -16,8 +16,6 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" -ULONG PagesForStacks = 0; - /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -55,7 +53,6 @@ // Nuke it // MmReleasePageMemoryConsumer(MC_NPPOOL, PFN_FROM_PTE(PointerPte)); - PagesForStacks--; } // @@ -161,7 +158,6 @@ // Write it // *PointerPte = TempPte; - PagesForStacks++; } //

15 years, 4 months

[ros-arm-bringup] 41636: - Reimplement kernel stack allocation (MmCreateKernelStack, MmDeleteKernelStack, MmGrowKernelStack, MmGrowKernelStackEx): - Use System PTEs. - Allocate 12KB stacks with a 4KB guard page, and expand them up to 60KB as required. - Previous implementation always allocated 60KB, without any guard page. - The result is that on a minimal ReactOS install, simply booting up now requires an average of 0.5MB less of physical memory than before. - And once again, optimizations to t

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 27 12:41:45 2009 New Revision: 41636 URL: http://svn.reactos.org/svn/reactos?rev=41636&view=rev Log: - Reimplement kernel stack allocation (MmCreateKernelStack, MmDeleteKernelStack, MmGrowKernelStack, MmGrowKernelStackEx): - Use System PTEs. - Allocate 12KB stacks with a 4KB guard page, and expand them up to 60KB as required. - Previous implementation always allocated 60KB, without any guard page. - The result is that on a minimal ReactOS install, simply booting up now requires an average of 0.5MB less of physical memory than before. - And once again, optimizations to the system PTE allocation code should significantly improve performance. - Should also analyze benefits of using a dead stack slist as done on Windows. (Assembla Ticket #39). Added: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c (with props) Modified: trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Jun 27 12:41:45 2009 @@ -1,0 +1,285 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/procsup.c + * PURPOSE: ARM Memory Manager Process Related Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::PROCSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +ULONG PagesForStacks = 0; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MmDeleteKernelStack(IN PVOID StackBase, + IN BOOLEAN GuiStack) +{ + PMMPTE PointerPte; + PFN_NUMBER StackPages; + ULONG i; + + // + // This should be the guard page, so decrement by one + // + PointerPte = MiAddressToPte(StackBase); + PointerPte--; + + // + // Calculate pages used + // + StackPages = BYTES_TO_PAGES(GuiStack ? + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); + + // + // Loop them + // + for (i = 0; i < StackPages; i++) + { + // + // Check if this is a valid PTE + // + if (PointerPte->u.Hard.Valid == 1) + { + // + // Nuke it + // + MmReleasePageMemoryConsumer(MC_NPPOOL, PFN_FROM_PTE(PointerPte)); + PagesForStacks--; + } + + // + // Next one + // + PointerPte--; + } + + // + // We should be at the guard page now + // + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Release the PTEs + // + MiReleaseSystemPtes(PointerPte, StackPages + 1, SystemPteSpace); +} + +PVOID +NTAPI +MmCreateKernelStack(IN BOOLEAN GuiStack, + IN UCHAR Node) +{ + PFN_NUMBER StackPtes, StackPages; + PMMPTE PointerPte, StackPte; + PVOID BaseAddress; + MMPTE TempPte; + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; + ULONG i; + + // + // Calculate pages needed + // + if (GuiStack) + { + // + // We'll allocate 64KB stack, but only commit 12K + // + StackPtes = BYTES_TO_PAGES(KERNEL_LARGE_STACK_SIZE); + StackPages = BYTES_TO_PAGES(KERNEL_LARGE_STACK_COMMIT); + + } + else + { + // + // We'll allocate 12K and that's it + // + StackPtes = BYTES_TO_PAGES(KERNEL_STACK_SIZE); + StackPages = StackPtes; + } + + // + // Reserve stack pages, plus a guard page + // + StackPte = MiReserveSystemPtes(StackPtes + 1, SystemPteSpace); + if (!StackPte) return NULL; + + // + // Get the stack address + // + BaseAddress = MiPteToAddress(StackPte + StackPtes + 1); + + // + // Select the right PTE address where we actually start committing pages + // + PointerPte = StackPte; + if (GuiStack) PointerPte += BYTES_TO_PAGES(KERNEL_LARGE_STACK_SIZE - + KERNEL_LARGE_STACK_COMMIT); + + // + // Setup the template stack PTE + // + TempPte = HyperTemplatePte; + TempPte.u.Hard.Global = FALSE; + TempPte.u.Hard.PageFrameNumber = 0; + TempPte.u.Hard.Dirty = TRUE; + + // + // Acquire the PFN DB lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Loop each stack page + // + for (i = 0; i < StackPages; i++) + { + // + // Next PTE + // + PointerPte++; + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Get a page + // + PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + + // + // Write it + // + *PointerPte = TempPte; + PagesForStacks++; + } + + // + // Release the PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // Return the stack address + // + return BaseAddress; +} + +NTSTATUS +NTAPI +MmGrowKernelStackEx(IN PVOID StackPointer, + IN ULONG GrowSize) +{ + PKTHREAD Thread = KeGetCurrentThread(); + PMMPTE LimitPte, NewLimitPte, LastPte; + PFN_NUMBER StackPages; + KIRQL OldIrql; + MMPTE TempPte; + PFN_NUMBER PageFrameIndex; + + // + // Make sure the stack did not overflow + // + ASSERT(((ULONG_PTR)Thread->StackBase - (ULONG_PTR)Thread->StackLimit) <= + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); + + // + // Get the current stack limit + // + LimitPte = MiAddressToPte(Thread->StackLimit); + ASSERT(LimitPte->u.Hard.Valid == 1); + + // + // Get the new one and make sure this isn't a retarded request + // + NewLimitPte = MiAddressToPte((PVOID)((ULONG_PTR)StackPointer - GrowSize)); + if (NewLimitPte == LimitPte) return STATUS_SUCCESS; + + // + // Now make sure you're not going past the reserved space + // + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)Thread->StackBase - + KERNEL_LARGE_STACK_SIZE)); + if (NewLimitPte < LastPte) + { + // + // Sorry! + // + DPRINT1("Thread wants too much stack\n"); + return STATUS_STACK_OVERFLOW; + } + + // + // Calculate the number of new pages + // + LimitPte--; + StackPages = (LimitPte - NewLimitPte + 1); + + // + // Setup the template stack PTE + // + TempPte = HyperTemplatePte; + TempPte.u.Hard.Global = FALSE; + TempPte.u.Hard.PageFrameNumber = 0; + TempPte.u.Hard.Dirty = TRUE; + + // + // Acquire the PFN DB lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Loop each stack page + // + while (LimitPte >= NewLimitPte) + { + // + // Sanity check + // + ASSERT(LimitPte->u.Hard.Valid == 0); + + // + // Get a page + // + PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + + // + // Write it + // + *LimitPte-- = TempPte; + } + + // + // Release the PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // Set the new limit + // + Thread->StackLimit = (ULONG_PTR)MiPteToAddress(NewLimitPte); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MmGrowKernelStack(IN PVOID StackPointer) +{ + // + // Call the extended version + // + return MmGrowKernelStackEx(StackPointer, KERNEL_LARGE_STACK_COMMIT); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sat Jun 27 12:41:45 2009 @@ -127,38 +127,6 @@ } VOID -MiFreeStackPage(PVOID Context, - MEMORY_AREA* MemoryArea, - PVOID Address, - PFN_TYPE Page, - SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page) MmReleasePageMemoryConsumer(MC_NPPOOL, Page); -} - -VOID -NTAPI -MmDeleteKernelStack(PVOID StackBase, - BOOLEAN GuiStack) -{ - ULONG StackSize = GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE; - - /* Lock the Address Space */ - MmLockAddressSpace(MmGetKernelAddressSpace()); - - /* Delete the Stack */ - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - (PVOID)((ULONG_PTR)StackBase - StackSize), - MiFreeStackPage, - NULL); - - /* Unlock the Address Space */ - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - -VOID NTAPI MmDeleteTeb(PEPROCESS Process, PTEB Teb) @@ -178,106 +146,6 @@ /* Unlock the Address Space */ MmUnlockAddressSpace(ProcessAddressSpace); -} - -PVOID -NTAPI -MmCreateKernelStack(BOOLEAN GuiStack, - UCHAR Node) -{ - PMEMORY_AREA StackArea; - ULONG i; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - ULONG StackSize = GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE; - PFN_TYPE Page[KERNEL_LARGE_STACK_SIZE / PAGE_SIZE]; - PVOID KernelStack = NULL; - NTSTATUS Status; - - /* Initialize the Boundary Address */ - BoundaryAddressMultiple.QuadPart = 0; - - /* Lock the Kernel Address Space */ - MmLockAddressSpace(MmGetKernelAddressSpace()); - - /* Create a MAREA for the Kernel Stack */ - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_KERNEL_STACK, - &KernelStack, - StackSize, - PAGE_READWRITE, - &StackArea, - FALSE, - 0, - BoundaryAddressMultiple); - - /* Unlock the Address Space */ - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - /* Check for Success */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create thread stack\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* - * Mark the Stack in use. - * Note: Currently we mark all 60KB in use for a GUI Thread. - * We should only do this inside MmGrowKernelStack. TODO! - */ - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page[i]); - } - - /* Create a Virtual Mapping for it */ - Status = MmCreateVirtualMapping(NULL, - KernelStack, - PAGE_READWRITE, - Page, - StackSize / PAGE_SIZE); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* Return the stack base */ - return (PVOID)((ULONG_PTR)KernelStack + - (GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE)); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -MmGrowKernelStack(PVOID StackPointer) -{ - PETHREAD Thread = PsGetCurrentThread(); - - /* Make sure the stack did not overflow */ - ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); - - /* Check if we have reserved space for our grow */ - if ((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit + - KERNEL_STACK_SIZE > KERNEL_LARGE_STACK_SIZE) - { - return STATUS_STACK_OVERFLOW; - } - - /* - * We'll give you three more pages. - * NOTE: See note in MmCreateKernelStack. These pages are already being reserved. - * It would be more efficient to only grow them (commit them) here. - */ - Thread->Tcb.StackLimit -= KERNEL_STACK_SIZE; - - /* Return success */ - return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Jun 27 12:41:45 2009 @@ -364,6 +364,7 @@ <file>init.c</file> <file>iosup.c</file> <file>pool.c</file> + <file>procsup.c</file> <file>syspte.c</file> </directory> <file>anonmem.c</file>

15 years, 4 months

[cwittich] 41635: tabs -> spaces use more consistent indentation

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jun 27 11:38:02 2009 New Revision: 41635 URL: http://svn.reactos.org/svn/reactos?rev=41635&view=rev Log: tabs -> spaces use more consistent indentation Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Jun 27 11:38:02 2009 @@ -11,8 +11,8 @@ #include "precomp.h" NTSTATUS TCPServiceListeningSocket( PCONNECTION_ENDPOINT Listener, - PCONNECTION_ENDPOINT Connection, - PTDI_REQUEST_KERNEL Request ) { + PCONNECTION_ENDPOINT Connection, + PTDI_REQUEST_KERNEL Request ) { NTSTATUS Status; SOCKADDR_IN OutAddr; OSK_UINT OutAddrLen; @@ -24,37 +24,37 @@ * by WSAAccept -- The returned address will be passed on to * userland after we complete this irp */ WhoIsConnecting = (PTDI_CONNECTION_INFORMATION) - Request->ReturnConnectionInformation; + Request->ReturnConnectionInformation; Status = TCPTranslateError - ( OskitTCPAccept( Listener->SocketContext, - &Connection->SocketContext, - &OutAddr, - sizeof(OutAddr), - &OutAddrLen, - Request->RequestFlags & TDI_QUERY_ACCEPT ? 0 : 1 ) ); + ( OskitTCPAccept( Listener->SocketContext, + &Connection->SocketContext, + &OutAddr, + sizeof(OutAddr), + &OutAddrLen, + Request->RequestFlags & TDI_QUERY_ACCEPT ? 0 : 1 ) ); TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); if( NT_SUCCESS(Status) && Status != STATUS_PENDING ) { - RequestAddressReturn = WhoIsConnecting->RemoteAddress; + RequestAddressReturn = WhoIsConnecting->RemoteAddress; - TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", - RequestAddressReturn, WhoIsConnecting)); + TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", + RequestAddressReturn, WhoIsConnecting)); RequestAddressReturn->TAAddressCount = 1; - RequestAddressReturn->Address[0].AddressLength = OutAddrLen; + RequestAddressReturn->Address[0].AddressLength = OutAddrLen; /* BSD uses the first byte of the sockaddr struct as a length. * Since windows doesn't do that we strip it */ - RequestAddressReturn->Address[0].AddressType = - (OutAddr.sin_family >> 8) & 0xff; + RequestAddressReturn->Address[0].AddressType = + (OutAddr.sin_family >> 8) & 0xff; - RtlCopyMemory( &RequestAddressReturn->Address[0].Address, - ((PCHAR)&OutAddr) + sizeof(USHORT), - sizeof(RequestAddressReturn->Address[0].Address[0]) ); + RtlCopyMemory( &RequestAddressReturn->Address[0].Address, + ((PCHAR)&OutAddr) + sizeof(USHORT), + sizeof(RequestAddressReturn->Address[0].Address[0]) ); - TI_DbgPrint(DEBUG_TCP,("Done copying\n")); + TI_DbgPrint(DEBUG_TCP,("Done copying\n")); } TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); @@ -71,7 +71,7 @@ TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", - Connection->SocketContext)); + Connection->SocketContext)); ASSERT(Connection); ASSERT_KM_POINTER(Connection->SocketContext); @@ -81,16 +81,16 @@ AddressToBind.sin_family = AF_INET; memcpy( &AddressToBind.sin_addr, - &Connection->AddressFile->Address.Address.IPv4Address, - sizeof(AddressToBind.sin_addr) ); + &Connection->AddressFile->Address.Address.IPv4Address, + sizeof(AddressToBind.sin_addr) ); AddressToBind.sin_port = Connection->AddressFile->Port; TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, - Connection, - &AddressToBind, - sizeof(AddressToBind) ) ); + Connection, + &AddressToBind, + sizeof(AddressToBind) ) ); if (NT_SUCCESS(Status)) Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); @@ -103,7 +103,7 @@ } VOID TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener, - PCONNECTION_ENDPOINT Connection ) { + PCONNECTION_ENDPOINT Connection ) { PLIST_ENTRY ListEntry; PTDI_BUCKET Bucket; @@ -111,50 +111,50 @@ ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { - Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); + Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - if( Bucket->AssociatedEndpoint == Connection ) { - RemoveEntryList( &Bucket->Entry ); - exFreePool( Bucket ); - break; - } + if( Bucket->AssociatedEndpoint == Connection ) { + RemoveEntryList( &Bucket->Entry ); + exFreePool( Bucket ); + break; + } - ListEntry = ListEntry->Flink; + ListEntry = ListEntry->Flink; } TcpipRecursiveMutexLeave( &TCPLock ); } -NTSTATUS TCPAccept -( PTDI_REQUEST Request, - PCONNECTION_ENDPOINT Listener, - PCONNECTION_ENDPOINT Connection, - PTCP_COMPLETION_ROUTINE Complete, - PVOID Context ) { - NTSTATUS Status; - PTDI_BUCKET Bucket; +NTSTATUS TCPAccept ( PTDI_REQUEST Request, + PCONNECTION_ENDPOINT Listener, + PCONNECTION_ENDPOINT Connection, + PTCP_COMPLETION_ROUTINE Complete, + PVOID Context ) +{ + NTSTATUS Status; + PTDI_BUCKET Bucket; - TI_DbgPrint(DEBUG_TCP,("TCPAccept started\n")); + TI_DbgPrint(DEBUG_TCP,("TCPAccept started\n")); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - Status = TCPServiceListeningSocket( Listener, Connection, - (PTDI_REQUEST_KERNEL)Request ); + Status = TCPServiceListeningSocket( Listener, Connection, + (PTDI_REQUEST_KERNEL)Request ); - if( Status == STATUS_PENDING ) { - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( Status == STATUS_PENDING ) { + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( Bucket ) { - Bucket->AssociatedEndpoint = Connection; - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); - } else - Status = STATUS_NO_MEMORY; - } + if( Bucket ) { + Bucket->AssociatedEndpoint = Connection; + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + } else + Status = STATUS_NO_MEMORY; + } - TcpipRecursiveMutexLeave( &TCPLock ); + TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status)); - return Status; + TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status)); + return Status; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Jun 27 11:38:02 2009 @@ -11,46 +11,46 @@ #include "precomp.h" int TCPSocketState(void *ClientData, - void *WhichSocket, - void *WhichConnection, - OSK_UINT NewState ) { + void *WhichSocket, + void *WhichConnection, + OSK_UINT NewState ) { PCONNECTION_ENDPOINT Connection = WhichConnection; TI_DbgPrint(MID_TRACE,("Flags: %c%c%c%c\n", - NewState & SEL_CONNECT ? 'C' : 'c', - NewState & SEL_READ ? 'R' : 'r', - NewState & SEL_FIN ? 'F' : 'f', - NewState & SEL_ACCEPT ? 'A' : 'a')); + NewState & SEL_CONNECT ? 'C' : 'c', + NewState & SEL_READ ? 'R' : 'r', + NewState & SEL_FIN ? 'F' : 'f', + NewState & SEL_ACCEPT ? 'A' : 'a')); TI_DbgPrint(DEBUG_TCP,("Called: NewState %x (Conn %x) (Change %x)\n", - NewState, Connection, - Connection ? Connection->State ^ NewState : - NewState)); + NewState, Connection, + Connection ? Connection->State ^ NewState : + NewState)); if( !Connection ) { - TI_DbgPrint(DEBUG_TCP,("Socket closing.\n")); - Connection = FileFindConnectionByContext( WhichSocket ); - if( !Connection ) - return 0; - else - TI_DbgPrint(DEBUG_TCP,("Found socket %x\n", Connection)); + TI_DbgPrint(DEBUG_TCP,("Socket closing.\n")); + Connection = FileFindConnectionByContext( WhichSocket ); + if( !Connection ) + return 0; + else + TI_DbgPrint(DEBUG_TCP,("Found socket %x\n", Connection)); } TI_DbgPrint(MID_TRACE,("Connection signalled: %d\n", - Connection->Signalled)); + Connection->Signalled)); Connection->SignalState |= NewState; if( !Connection->Signalled ) { - Connection->Signalled = TRUE; - InsertTailList( &SignalledConnections, &Connection->SignalList ); + Connection->Signalled = TRUE; + InsertTailList( &SignalledConnections, &Connection->SignalList ); } return 0; } void TCPPacketSendComplete( PVOID Context, - PNDIS_PACKET NdisPacket, - NDIS_STATUS NdisStatus ) { + PNDIS_PACKET NdisPacket, + NDIS_STATUS NdisStatus ) { TI_DbgPrint(DEBUG_TCP,("called %x\n", NdisPacket)); FreeNdisPacket(NdisPacket); TI_DbgPrint(DEBUG_TCP,("done\n")); @@ -66,32 +66,32 @@ PIPv4_HEADER Header; if( *data == 0x45 ) { /* IPv4 */ - Header = (PIPv4_HEADER)data; - LocalAddress.Type = IP_ADDRESS_V4; - LocalAddress.Address.IPv4Address = Header->SrcAddr; - RemoteAddress.Type = IP_ADDRESS_V4; - RemoteAddress.Address.IPv4Address = Header->DstAddr; + Header = (PIPv4_HEADER)data; + LocalAddress.Type = IP_ADDRESS_V4; + LocalAddress.Address.IPv4Address = Header->SrcAddr; + RemoteAddress.Type = IP_ADDRESS_V4; + RemoteAddress.Address.IPv4Address = Header->DstAddr; } else { - TI_DbgPrint(MIN_TRACE,("Outgoing packet is not IPv4\n")); - OskitDumpBuffer( data, len ); - return OSK_EINVAL; + TI_DbgPrint(MIN_TRACE,("Outgoing packet is not IPv4\n")); + OskitDumpBuffer( data, len ); + return OSK_EINVAL; } if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - TI_DbgPrint(MIN_TRACE,("No route to %s\n", A2S(&RemoteAddress))); - return OSK_EADDRNOTAVAIL; + TI_DbgPrint(MIN_TRACE,("No route to %s\n", A2S(&RemoteAddress))); + return OSK_EADDRNOTAVAIL; } NdisStatus = AllocatePacketWithBuffer( &Packet.NdisPacket, NULL, - MaxLLHeaderSize + len ); + MaxLLHeaderSize + len ); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TI_DbgPrint(DEBUG_TCP, ("Error from NDIS: %08x\n", NdisStatus)); - return OSK_ENOBUFS; + TI_DbgPrint(DEBUG_TCP, ("Error from NDIS: %08x\n", NdisStatus)); + return OSK_ENOBUFS; } GetDataPtr( Packet.NdisPacket, MaxLLHeaderSize, - (PCHAR *)&Packet.Header, &Packet.ContigSize ); + (PCHAR *)&Packet.Header, &Packet.ContigSize ); RtlCopyMemory( Packet.Header, data, len ); @@ -110,44 +110,44 @@ } int TCPSleep( void *ClientData, void *token, int priority, char *msg, - int tmio ) { + int tmio ) { PSLEEPING_THREAD SleepingThread; LARGE_INTEGER Timeout; TI_DbgPrint(DEBUG_TCP, - ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", - token, priority, msg, tmio)); + ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", + token, priority, msg, tmio)); SleepingThread = exAllocatePool( NonPagedPool, sizeof( *SleepingThread ) ); if( SleepingThread ) { - KeInitializeEvent( &SleepingThread->Event, NotificationEvent, FALSE ); - SleepingThread->SleepToken = token; - - /* We're going to sleep and need to release the lock, otherwise + KeInitializeEvent( &SleepingThread->Event, NotificationEvent, FALSE ); + SleepingThread->SleepToken = token; + + /* We're going to sleep and need to release the lock, otherwise it's impossible to re-enter oskittcp to deliver the event that's going to wake us */ - TcpipRecursiveMutexLeave( &TCPLock ); - - TcpipAcquireFastMutex( &SleepingThreadsLock ); - InsertTailList( &SleepingThreadsList, &SleepingThread->Entry ); - TcpipReleaseFastMutex( &SleepingThreadsLock ); + TcpipRecursiveMutexLeave( &TCPLock ); + + TcpipAcquireFastMutex( &SleepingThreadsLock ); + InsertTailList( &SleepingThreadsList, &SleepingThread->Entry ); + TcpipReleaseFastMutex( &SleepingThreadsLock ); Timeout.QuadPart = Int32x32To64(tmio, -10000); - TI_DbgPrint(DEBUG_TCP,("Waiting on %x\n", token)); - KeWaitForSingleObject( &SleepingThread->Event, - Executive, - KernelMode, - TRUE, - (tmio != 0) ? &Timeout : NULL ); - - TcpipAcquireFastMutex( &SleepingThreadsLock ); - RemoveEntryList( &SleepingThread->Entry ); - TcpipReleaseFastMutex( &SleepingThreadsLock ); - - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - - exFreePool( SleepingThread ); + TI_DbgPrint(DEBUG_TCP,("Waiting on %x\n", token)); + KeWaitForSingleObject( &SleepingThread->Event, + Executive, + KernelMode, + TRUE, + (tmio != 0) ? &Timeout : NULL ); + + TcpipAcquireFastMutex( &SleepingThreadsLock ); + RemoveEntryList( &SleepingThread->Entry ); + TcpipReleaseFastMutex( &SleepingThreadsLock ); + + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + + exFreePool( SleepingThread ); } else return OSK_ENOBUFS; @@ -162,13 +162,13 @@ TcpipAcquireFastMutex( &SleepingThreadsLock ); Entry = SleepingThreadsList.Flink; while( Entry != &SleepingThreadsList ) { - SleepingThread = CONTAINING_RECORD(Entry, SLEEPING_THREAD, Entry); - TI_DbgPrint(DEBUG_TCP,("Sleeper @ %x\n", SleepingThread)); - if( SleepingThread->SleepToken == token ) { - TI_DbgPrint(DEBUG_TCP,("Setting event to wake %x\n", token)); - KeSetEvent( &SleepingThread->Event, IO_NETWORK_INCREMENT, FALSE ); - } - Entry = Entry->Flink; + SleepingThread = CONTAINING_RECORD(Entry, SLEEPING_THREAD, Entry); + TI_DbgPrint(DEBUG_TCP,("Sleeper @ %x\n", SleepingThread)); + if( SleepingThread->SleepToken == token ) { + TI_DbgPrint(DEBUG_TCP,("Setting event to wake %x\n", token)); + KeSetEvent( &SleepingThread->Event, IO_NETWORK_INCREMENT, FALSE ); + } + Entry = Entry->Flink; } TcpipReleaseFastMutex( &SleepingThreadsLock ); } @@ -219,7 +219,7 @@ } void *TCPMalloc( void *ClientData, - OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) { + OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) { void *v; ULONG Signature; @@ -231,84 +231,84 @@ Found = 0; for ( i = 0; i < ArrayUsed && ! Found; i++ ) { - Found = ( Sizes[i] == Bytes ); - if ( Found ) { - Counts[i]++; - } + Found = ( Sizes[i] == Bytes ); + if ( Found ) { + Counts[i]++; + } } if ( ! Found ) { - if ( ArrayAllocated <= ArrayUsed ) { - NewSize = ( 0 == ArrayAllocated ? 16 : 2 * ArrayAllocated ); - NewArray = exAllocatePool( NonPagedPool, 2 * NewSize * sizeof( OSK_UINT ) ); - if ( NULL != NewArray ) { - if ( 0 != ArrayAllocated ) { - memcpy( NewArray, Sizes, - ArrayAllocated * sizeof( OSK_UINT ) ); - exFreePool( Sizes ); - memcpy( NewArray + NewSize, Counts, - ArrayAllocated * sizeof( OSK_UINT ) ); - exFreePool( Counts ); - } - Sizes = NewArray; - Counts = NewArray + NewSize; - ArrayAllocated = NewSize; - } else if ( 0 != ArrayAllocated ) { - exFreePool( Sizes ); - exFreePool( Counts ); - ArrayAllocated = 0; - } - } - if ( ArrayUsed < ArrayAllocated ) { - Sizes[ArrayUsed] = Bytes; - Counts[ArrayUsed] = 1; - ArrayUsed++; - } + if ( ArrayAllocated <= ArrayUsed ) { + NewSize = ( 0 == ArrayAllocated ? 16 : 2 * ArrayAllocated ); + NewArray = exAllocatePool( NonPagedPool, 2 * NewSize * sizeof( OSK_UINT ) ); + if ( NULL != NewArray ) { + if ( 0 != ArrayAllocated ) { + memcpy( NewArray, Sizes, + ArrayAllocated * sizeof( OSK_UINT ) ); + exFreePool( Sizes ); + memcpy( NewArray + NewSize, Counts, + ArrayAllocated * sizeof( OSK_UINT ) ); + exFreePool( Counts ); + } + Sizes = NewArray; + Counts = NewArray + NewSize; + ArrayAllocated = NewSize; + } else if ( 0 != ArrayAllocated ) { + exFreePool( Sizes ); + exFreePool( Counts ); + ArrayAllocated = 0; + } + } + if ( ArrayUsed < ArrayAllocated ) { + Sizes[ArrayUsed] = Bytes; + Counts[ArrayUsed] = 1; + ArrayUsed++; + } } if ( 0 == (++AllocationCount % MEM_PROFILE) ) { - TI_DbgPrint(DEBUG_TCP, ("Memory allocation size profile:\n")); - for ( i = 0; i < ArrayUsed; i++ ) { - TI_DbgPrint(DEBUG_TCP, - ("Size %4u Count %5u\n", Sizes[i], Counts[i])); - } - TI_DbgPrint(DEBUG_TCP, ("End of memory allocation size profile\n")); + TI_DbgPrint(DEBUG_TCP, ("Memory allocation size profile:\n")); + for ( i = 0; i < ArrayUsed; i++ ) { + TI_DbgPrint(DEBUG_TCP, + ("Size %4u Count %5u\n", Sizes[i], Counts[i])); + } + TI_DbgPrint(DEBUG_TCP, ("End of memory allocation size profile\n")); } #endif /* MEM_PROFILE */ if ( SMALL_SIZE == Bytes ) { - v = ExAllocateFromNPagedLookasideList( &SmallLookasideList ); - Signature = SIGNATURE_SMALL; + v = ExAllocateFromNPagedLookasideList( &SmallLookasideList ); + Signature = SIGNATURE_SMALL; } else if ( LARGE_SIZE == Bytes ) { - v = ExAllocateFromNPagedLookasideList( &LargeLookasideList ); - Signature = SIGNATURE_LARGE; + v = ExAllocateFromNPagedLookasideList( &LargeLookasideList ); + Signature = SIGNATURE_LARGE; } else { - v = ExAllocatePool( NonPagedPool, Bytes + sizeof(ULONG) ); - Signature = SIGNATURE_OTHER; + v = ExAllocatePool( NonPagedPool, Bytes + sizeof(ULONG) ); + Signature = SIGNATURE_OTHER; } if( v ) { - *((ULONG *) v) = Signature; - v = (void *)((char *) v + sizeof(ULONG)); - TrackWithTag( FOURCC('f','b','s','d'), v, (PCHAR)File, Line ); + *((ULONG *) v) = Signature; + v = (void *)((char *) v + sizeof(ULONG)); + TrackWithTag( FOURCC('f','b','s','d'), v, (PCHAR)File, Line ); } return v; } void TCPFree( void *ClientData, - void *data, OSK_PCHAR File, OSK_UINT Line ) { + void *data, OSK_PCHAR File, OSK_UINT Line ) { ULONG Signature; UntrackFL( (PCHAR)File, Line, data, FOURCC('f','b','s','d') ); data = (void *)((char *) data - sizeof(ULONG)); Signature = *((ULONG *) data); if ( SIGNATURE_SMALL == Signature ) { - ExFreeToNPagedLookasideList( &SmallLookasideList, data ); + ExFreeToNPagedLookasideList( &SmallLookasideList, data ); } else if ( SIGNATURE_LARGE == Signature ) { - ExFreeToNPagedLookasideList( &LargeLookasideList, data ); + ExFreeToNPagedLookasideList( &LargeLookasideList, data ); } else if ( SIGNATURE_OTHER == Signature ) { - ExFreePool( data ); + ExFreePool( data ); } else { - ASSERT( FALSE ); + ASSERT( FALSE ); } } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat Jun 27 11:38:02 2009 @@ -49,13 +49,13 @@ ifaddr->ifa_addr = (struct sockaddr *)addr_in; Status = GetInterfaceIPv4Address( IF, - ADE_UNICAST, - (PULONG)&addr_in->sin_addr.s_addr ); + ADE_UNICAST, + (PULONG)&addr_in->sin_addr.s_addr ); ASSERT(NT_SUCCESS(Status)); TI_DbgPrint(DEBUG_TCPIF,("interface %x : addr %x\n", - IF, addr_in->sin_addr.s_addr)); + IF, addr_in->sin_addr.s_addr)); ifaddr->ifa_flags = 0; /* XXX what goes here? */ ifaddr->ifa_refcnt = 0; /* Anachronistic */ @@ -68,10 +68,10 @@ } POSK_IFADDR TCPFindInterface( void *ClientData, - OSK_UINT AddrType, - OSK_UINT FindType, - OSK_SOCKADDR *ReqAddr, - OSK_IFADDR *Interface ) { + OSK_UINT AddrType, + OSK_UINT FindType, + OSK_SOCKADDR *ReqAddr, + OSK_IFADDR *Interface ) { PIP_INTERFACE IF; IP_ADDRESS Destination; struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; @@ -80,8 +80,8 @@ TI_DbgPrint(DEBUG_TCPIF,("called for type %d\n", FindType)); if( !ReqAddr ) { - TI_DbgPrint(DEBUG_TCPIF,("no addr or no ifaddr (%x)\n", ReqAddr)); - return NULL; + TI_DbgPrint(DEBUG_TCPIF,("no addr or no ifaddr (%x)\n", ReqAddr)); + return NULL; } Destination.Type = IP_ADDRESS_V4; @@ -95,7 +95,7 @@ InterfaceData = TCPGetInterfaceData(IF); addr_in = (struct sockaddr_in *) - InterfaceData->ifa_addr; + InterfaceData->ifa_addr; TI_DbgPrint(DEBUG_TCPIF,("returning addr %x\n", addr_in->sin_addr.s_addr)); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- 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] Sat Jun 27 11:38:02 2009 @@ -22,7 +22,7 @@ PORT_SET TCPPorts; static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection, - ULONG NewState ) { + ULONG NewState ) { NTSTATUS Status = STATUS_SUCCESS; PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; @@ -35,7 +35,7 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { - while( !IsListEmpty( &Connection->ConnectRequest ) ) { + while( !IsListEmpty( &Connection->ConnectRequest ) ) { Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -58,162 +58,162 @@ } if( NewState & SEL_ACCEPT ) { - /* Handle readable on a listening socket -- - * TODO: Implement filtering - */ - - TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", - Connection, - IsListEmpty(&Connection->ListenRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->ListenRequest ) ) { - PIO_STACK_LOCATION IrpSp; - - Entry = RemoveHeadList( &Connection->ListenRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - IrpSp = IoGetCurrentIrpStackLocation( Irp ); - - TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); - Status = TCPServiceListeningSocket - ( Connection->AddressFile->Listener, - Bucket->AssociatedEndpoint, - (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); - - TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); - - if( Status == STATUS_PENDING ) { - InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); - break; - } else { - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + /* Handle readable on a listening socket -- + * TODO: Implement filtering + */ + + TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", + Connection, + IsListEmpty(&Connection->ListenRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->ListenRequest ) ) { + PIO_STACK_LOCATION IrpSp; + + Entry = RemoveHeadList( &Connection->ListenRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); + Status = TCPServiceListeningSocket + ( Connection->AddressFile->Listener, + Bucket->AssociatedEndpoint, + (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); + + TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); + + if( Status == STATUS_PENDING ) { + InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); + break; + } else { + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } /* Things that happen after we're connected */ if( NewState & SEL_READ ) { - TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->ReceiveRequest ) ) { - OSK_UINT RecvLen = 0, Received = 0; - PVOID RecvBuffer = 0; - - Entry = RemoveHeadList( &Connection->ReceiveRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); - - Status = TCPTranslateError - ( OskitTCPRecv( Connection->SocketContext, - RecvBuffer, - RecvLen, - &Received, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); - - if( Status == STATUS_SUCCESS ) { - TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n", - Received, Status)); - - Complete( Bucket->Request.RequestContext, - STATUS_SUCCESS, Received ); - exFreePool( Bucket ); - } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->ReceiveRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Receive request: %x %x\n", - Bucket->Request, Status)); - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->ReceiveRequest ) ) { + OSK_UINT RecvLen = 0, Received = 0; + PVOID RecvBuffer = 0; + + Entry = RemoveHeadList( &Connection->ReceiveRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); + + Status = TCPTranslateError + ( OskitTCPRecv( Connection->SocketContext, + RecvBuffer, + RecvLen, + &Received, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); + + if( Status == STATUS_SUCCESS ) { + TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n", + Received, Status)); + + Complete( Bucket->Request.RequestContext, + STATUS_SUCCESS, Received ); + exFreePool( Bucket ); + } else if( Status == STATUS_PENDING ) { + InsertHeadList + ( &Connection->ReceiveRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Receive request: %x %x\n", + Bucket->Request, Status)); + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } if( NewState & SEL_WRITE ) { - TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", - IsListEmpty(&Connection->SendRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->SendRequest ) ) { - OSK_UINT SendLen = 0, Sent = 0; - PVOID SendBuffer = 0; - - Entry = RemoveHeadList( &Connection->SendRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - - Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - SendBuffer, - SendLen, - &Sent, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); - - if( Status == STATUS_SUCCESS ) { - TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n", - Sent, Status)); - - Complete( Bucket->Request.RequestContext, - STATUS_SUCCESS, Sent ); - exFreePool( Bucket ); - } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->SendRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Send request: %x %x\n", - Bucket->Request, Status)); - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", + IsListEmpty(&Connection->SendRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->SendRequest ) ) { + OSK_UINT SendLen = 0, Sent = 0; + PVOID SendBuffer = 0; + + Entry = RemoveHeadList( &Connection->SendRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); + + if( Status == STATUS_SUCCESS ) { + TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n", + Sent, Status)); + + Complete( Bucket->Request.RequestContext, + STATUS_SUCCESS, Sent ); + exFreePool( Bucket ); + } else if( Status == STATUS_PENDING ) { + InsertHeadList + ( &Connection->SendRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Send request: %x %x\n", + Bucket->Request, Status)); + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } if( NewState & SEL_FIN ) { @@ -230,9 +230,9 @@ /* We have to notify oskittcp of the abortion */ DisType.Type = TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT; - DisType.Context = Connection; - DisType.Irp = (PIRP)Bucket->Request.RequestContext; - DisType.FileObject = IrpSp->FileObject; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; ChewCreate(NULL, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType); @@ -249,9 +249,9 @@ /* We have to notify oskittcp of the abortion */ DisType.Type = TDI_DISCONNECT_RELEASE; - DisType.Context = Connection; - DisType.Irp = (PIRP)Bucket->Request.RequestContext; - DisType.FileObject = IrpSp->FileObject; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; ChewCreate(NULL, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType); @@ -265,7 +265,7 @@ /* We have to notify oskittcp of the abortion */ TCPAbortListenForSocket(Connection->AddressFile->Listener, - Connection); + Connection); Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); } @@ -288,18 +288,18 @@ PLIST_ENTRY ListEntry; while( !IsListEmpty( &SignalledConnections ) ) { - ListEntry = RemoveHeadList( &SignalledConnections ); - Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT, - SignalList ); - HandleSignalledConnection( Connection, Connection->SignalState ); + ListEntry = RemoveHeadList( &SignalledConnections ); + Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT, + SignalList ); + HandleSignalledConnection( Connection, Connection->SignalState ); } } PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { PCONNECTION_ENDPOINT Connection = - exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); + exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); if (!Connection) - return Connection; + return Connection; TI_DbgPrint(DEBUG_CPOINT, ("Connection point file object allocated at (0x%X).\n", Connection)); @@ -319,29 +319,29 @@ } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); + TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); exFreePool( Connection ); } NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, - UINT Family, UINT Type, UINT Proto ) { + UINT Family, UINT Type, UINT Proto ) { NTSTATUS Status; TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, " - "Proto %d\n", - Connection, Family, Type, Proto)); + "Proto %d\n", + Connection, Family, Type, Proto)); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); Status = TCPTranslateError( OskitTCPSocket( Connection, - &Connection->SocketContext, - Family, - Type, - Proto ) ); + &Connection->SocketContext, + Family, + Type, + Proto ) ); ASSERT_KM_POINTER(Connection->SocketContext); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", - Connection->SocketContext)); + Connection->SocketContext)); TcpipRecursiveMutexLeave( &TCPLock ); @@ -358,14 +358,14 @@ */ { TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n", - IPPacket->TotalSize, - IPPacket->HeaderSize)); + IPPacket->TotalSize, + IPPacket->HeaderSize)); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); OskitTCPReceiveDatagram( IPPacket->Header, - IPPacket->TotalSize, - IPPacket->HeaderSize ); + IPPacket->TotalSize, + IPPacket->HeaderSize ); DrainSignals(); @@ -374,28 +374,28 @@ /* event.c */ int TCPSocketState( void *ClientData, - void *WhichSocket, - void *WhichConnection, - OSK_UINT NewState ); + void *WhichSocket, + void *WhichConnection, + OSK_UINT NewState ); int TCPPacketSend( void *ClientData, - OSK_PCHAR Data, - OSK_UINT Len ); + OSK_PCHAR Data, + OSK_UINT Len ); POSK_IFADDR TCPFindInterface( void *ClientData, - OSK_UINT AddrType, - OSK_UINT FindType, - OSK_SOCKADDR *ReqAddr ); + OSK_UINT AddrType, + OSK_UINT FindType, + OSK_SOCKADDR *ReqAddr ); NTSTATUS TCPMemStartup( void ); void *TCPMalloc( void *ClientData, - OSK_UINT bytes, OSK_PCHAR file, OSK_UINT line ); + OSK_UINT bytes, OSK_PCHAR file, OSK_UINT line ); void TCPFree( void *ClientData, - void *data, OSK_PCHAR file, OSK_UINT line ); + void *data, OSK_PCHAR file, OSK_UINT line ); void TCPMemShutdown( void ); int TCPSleep( void *ClientData, void *token, int priority, char *msg, - int tmio ); + int tmio ); void TCPWakeup( void *ClientData, void *token ); @@ -486,13 +486,13 @@ InitializeListHead( &SignalledConnections ); Status = TCPMemStartup(); if ( ! NT_SUCCESS(Status) ) { - return Status; + return Status; } Status = PortsStartup( &TCPPorts, 1, 0xfffe ); if( !NT_SUCCESS(Status) ) { - TCPMemShutdown(); - return Status; + TCPMemShutdown(); + return Status; } RegisterOskitTCPEventHandlers( &EventHandlers ); @@ -502,13 +502,13 @@ IPRegisterProtocol(IPPROTO_TCP, TCPReceive); ExInitializeNPagedLookasideList( - &TCPSegmentList, /* Lookaside list */ - NULL, /* Allocate routine */ - NULL, /* Free routine */ - 0, /* Flags */ - sizeof(TCP_SEGMENT), /* Size of each entry */ - TAG('T','C','P','S'), /* Tag */ - 0); /* Depth */ + &TCPSegmentList, /* Lookaside list */ + NULL, /* Allocate routine */ + NULL, /* Free routine */ + 0, /* Flags */ + sizeof(TCP_SEGMENT), /* Size of each entry */ + TAG('T','C','P','S'), /* Tag */ + 0); /* Depth */ StartTimer(); @@ -528,7 +528,7 @@ LARGE_INTEGER WaitForThread; if (!TCPInitialized) - return STATUS_SUCCESS; + return STATUS_SUCCESS; WaitForThread.QuadPart = -2500000; /* 250 ms */ KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, FALSE); @@ -579,27 +579,27 @@ IP_ADDRESS RemoteAddress; USHORT RemotePort; PTDI_BUCKET Bucket; - PNEIGHBOR_CACHE_ENTRY NCE; + PNEIGHBOR_CACHE_ENTRY NCE; TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); Status = AddrBuildAddress - ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, - &RemoteAddress, - &RemotePort); - - if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) - { - return STATUS_NETWORK_UNREACHABLE; - } + ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, + &RemoteAddress, + &RemotePort); + + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) + { + return STATUS_NETWORK_UNREACHABLE; + } TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - if (Connection->State & SEL_FIN) - { - TcpipRecursiveMutexLeave( &TCPLock ); - return STATUS_REMOTE_DISCONNECT; - } + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_REMOTE_DISCONNECT; + } /* Freed in TCPSocketState */ TI_DbgPrint(DEBUG_TCP, @@ -608,43 +608,43 @@ RemotePort)); if (!NT_SUCCESS(Status)) { - TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return Status; + TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return Status; } AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; - AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; Status = TCPTranslateError ( OskitTCPBind( Connection->SocketContext, - Connection, - &AddressToBind, - sizeof(AddressToBind) ) ); + Connection, + &AddressToBind, + sizeof(AddressToBind) ) ); if (NT_SUCCESS(Status)) { memcpy( &AddressToConnect.sin_addr, - &RemoteAddress.Address.IPv4Address, - sizeof(AddressToConnect.sin_addr) ); + &RemoteAddress.Address.IPv4Address, + sizeof(AddressToConnect.sin_addr) ); AddressToConnect.sin_port = RemotePort; Status = TCPTranslateError - ( OskitTCPConnect( Connection->SocketContext, - Connection, - &AddressToConnect, - sizeof(AddressToConnect) ) ); - - if (Status == STATUS_PENDING) - { - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) return STATUS_NO_MEMORY; - - Bucket->Request.RequestNotifyObject = (PVOID)Complete; - Bucket->Request.RequestContext = Context; - - InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); - } + ( OskitTCPConnect( Connection->SocketContext, + Connection, + &AddressToConnect, + sizeof(AddressToConnect) ) ); + + if (Status == STATUS_PENDING) + { + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) return STATUS_NO_MEMORY; + + Bucket->Request.RequestNotifyObject = (PVOID)Complete; + Bucket->Request.RequestContext = Context; + + InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); + } } TcpipRecursiveMutexLeave( &TCPLock ); @@ -668,20 +668,20 @@ switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { case 0: case TDI_DISCONNECT_ABORT: - Flags = 0; - break; + Flags = 0; + break; case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE: - Flags = 2; - break; + Flags = 2; + break; case TDI_DISCONNECT_RELEASE: - Flags = 1; - break; + Flags = 1; + break; } Status = TCPTranslateError - ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); + ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); TcpipRecursiveMutexLeave( &TCPLock ); @@ -731,48 +731,48 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - /* Closing */ - if (Connection->State & SEL_FIN) - { - TcpipRecursiveMutexLeave( &TCPLock ); - *BytesReceived = 0; - return STATUS_REMOTE_DISCONNECT; - } + /* Closing */ + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + *BytesReceived = 0; + return STATUS_REMOTE_DISCONNECT; + } NdisQueryBuffer( Buffer, &DataBuffer, &DataLen ); TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen)); Status = TCPTranslateError - ( OskitTCPRecv - ( Connection->SocketContext, - DataBuffer, - DataLen, - &Received, - ReceiveFlags ) ); + ( OskitTCPRecv + ( Connection->SocketContext, + DataBuffer, + DataLen, + &Received, + ReceiveFlags ) ); TI_DbgPrint(DEBUG_TCP,("OskitTCPReceive: %x, %d\n", Status, Received)); /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { - /* Freed in TCPSocketState */ - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) { - TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return STATUS_NO_MEMORY; - } - - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - *BytesReceived = 0; - - InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); - Status = STATUS_PENDING; - TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); + /* Freed in TCPSocketState */ + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) { + TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + *BytesReceived = 0; + + InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); + Status = STATUS_PENDING; + TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { - TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); - *BytesReceived = Received; + TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); + *BytesReceived = Received; } TcpipRecursiveMutexLeave( &TCPLock ); @@ -803,46 +803,46 @@ TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", - Connection->SocketContext)); - - /* Closing */ - if (Connection->State & SEL_FIN) - { - TcpipRecursiveMutexLeave( &TCPLock ); - *BytesSent = 0; - return STATUS_REMOTE_DISCONNECT; - } + Connection->SocketContext)); + + /* Closing */ + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + *BytesSent = 0; + return STATUS_REMOTE_DISCONNECT; + } Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - (OSK_PCHAR)BufferData, SendLength, - &Sent, 0 ) ); + ( OskitTCPSend( Connection->SocketContext, + (OSK_PCHAR)BufferData, SendLength, + &Sent, 0 ) ); TI_DbgPrint(DEBUG_TCP,("OskitTCPSend: %x, %d\n", Status, Sent)); /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { - /* Freed in TCPSocketState */ - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) { - TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return STATUS_NO_MEMORY; - } - - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - *BytesSent = 0; - - InsertTailList( &Connection->SendRequest, &Bucket->Entry ); - TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); + /* Freed in TCPSocketState */ + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) { + TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + *BytesSent = 0; + + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); + TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { - TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); - *BytesSent = Sent; - } - + TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); + *BytesSent = Sent; + } + TcpipRecursiveMutexLeave( &TCPLock ); - + TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); return Status; @@ -854,8 +854,8 @@ UINT TCPAllocatePort( UINT HintPort ) { if( HintPort ) { - if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort; - else { + if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort; + else { TI_DbgPrint (MID_TRACE,("We got a hint port but couldn't allocate it\n")); return (UINT)-1; @@ -908,19 +908,19 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); for( i = 0; i < 4; i++ ) - { - for( Entry = ListHead[i]->Flink; - Entry != ListHead[i]; - Entry = Entry->Flink ) - { - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - if( Bucket->Request.RequestContext == Irp ) - { - RemoveEntryList( &Bucket->Entry ); - exFreePool( Bucket ); - break; - } - } + { + for( Entry = ListHead[i]->Flink; + Entry != ListHead[i]; + Entry = Entry->Flink ) + { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + if( Bucket->Request.RequestContext == Irp ) + { + RemoveEntryList( &Bucket->Entry ); + exFreePool( Bucket ); + break; + } + } } TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql );

15 years, 4 months

[ros-arm-bringup] 41634: - Allocate enough space for the ARM3 PFN database, and fixup the calculation of the initial nonpaged pool. - The ARM3 PFN database is more of a "shadow" database not to interfere with the real ReactOS PFN database. It starts at 0xB0000000, which is where the initial nonpaged pool started (which now starts somewhere after the ARM3 PFN database). - No new behavior has been introduced other than additional physical memory consumption for the PFN DB pages, and updated memory

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jun 27 11:14:52 2009 New Revision: 41634 URL: http://svn.reactos.org/svn/reactos?rev=41634&view=rev Log: - Allocate enough space for the ARM3 PFN database, and fixup the calculation of the initial nonpaged pool. - The ARM3 PFN database is more of a "shadow" database not to interfere with the real ReactOS PFN database. It starts at 0xB0000000, which is where the initial nonpaged pool started (which now starts somewhere after the ARM3 PFN database). - No new behavior has been introduced other than additional physical memory consumption for the PFN DB pages, and updated memory layout in the ARM3 world. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sat Jun 27 11:14:52 2009 @@ -52,8 +52,8 @@ // immediately follows the PFN database, typically sharing the same PDE. It is // a very small resource (32MB on a 1GB system), and capped at 128MB. // -// Right now, we call this the "ARM Pool" and it begins at 0xB0000000 since we -// don't want to interefere with the ReactOS memory manager PFN database (yet). +// Right now, we call this the "ARM Pool" and it begins somewhere after the ARM +// PFN database (which starts at 0xB0000000). // // The expansion nonpaged pool, on the other hand, can grow much bigger (400MB // for a 1GB system). On ARMÂ³ however, it is currently capped at 128MB. @@ -101,6 +101,18 @@ // aligned up to a PDE boundary (4MB). // ULONG MmNumberOfSystemPtes; + +// +// This is how many pages the PFN database will take up +// In Windows, this includes the Quark Color Table, but not in ARMÂ³ +// +ULONG MxPfnAllocation; + + +// +// The ARMÂ³ PFN Database +// +PMMPFN MmArmPfnDatabase; /* PRIVATE FUNCTIONS **********************************************************/ @@ -276,6 +288,12 @@ } // + // Calculate the number of bytes, and then convert to pages + // + MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); + MxPfnAllocation >>= PAGE_SHIFT; + + // // Now calculate the nonpaged pool expansion VA region // MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - @@ -315,32 +333,44 @@ MmNumberOfSystemPtes--; ASSERT(MmNumberOfSystemPtes > 1000); } + + // + // Normally, the PFN database should start after the loader images. + // This is already the case in ReactOS, but for now we want to co-exist + // with the old memory manager, so we'll create a "Shadow PFN Database" + // instead, and arbitrarly start it at 0xB0000000. + // + MmArmPfnDatabase = (PVOID)0xB0000000; + ASSERT(((ULONG_PTR)MmArmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); // - // Non paged pool should come after the PFN database, but since we are - // co-existing with the ReactOS NP pool, our "ARM Pool" will instead - // start at this arbitrarly chosen base address. - // When ARM pool becomes non paged pool, this needs to be changed. + // Non paged pool comes after the PFN database // DPRINT1("System PTE VA starts at: %p\n", MmNonPagedSystemStart); DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", MmNonPagedPoolStart, MmNonPagedPoolEnd); - MmNonPagedPoolStart = (PVOID)0xB0000000; + MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmArmPfnDatabase + + (MxPfnAllocation << PAGE_SHIFT)); // // Now we actually need to get these many physical pages. Nonpaged pool // is actually also physically contiguous (but not the expansion) // - PageFrameIndex = MmGetContinuousPages(MmSizeOfNonPagedPoolInBytes, + PageFrameIndex = MmGetContinuousPages(MmSizeOfNonPagedPoolInBytes + + (MxPfnAllocation << PAGE_SHIFT), Low, High, BoundaryAddressMultiple, FALSE); ASSERT(PageFrameIndex != 0); + DPRINT1("PFN DB VA begins at: %p and ends at: %p\n", + MmArmPfnDatabase, + (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); + DPRINT1("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); DPRINT1("NP VA begins at: %p and ends at: %p\n", MmNonPagedPoolStart, (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); - DPRINT1("NP PA PFN begins at: %lx\n", PageFrameIndex); + DPRINT1("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); // // Now we need some pages to create the page tables for the NP system VA @@ -377,7 +407,7 @@ // // Now we need pages for the page tables which will map initial NP // - StartPde = MiAddressToPde(MmNonPagedPoolStart); + StartPde = MiAddressToPde(MmArmPfnDatabase); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); while (StartPde <= EndPde)

15 years, 4 months

[cgutman] 41633: - Use the timeout that the caller gives us if it is nonzero so we don't block forever if nobody wakes us

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jun 27 11:03:45 2009 New Revision: 41633 URL: http://svn.reactos.org/svn/reactos?rev=41633&view=rev Log: - Use the timeout that the caller gives us if it is nonzero so we don't block forever if nobody wakes us Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Jun 27 11:03:45 2009 @@ -112,6 +112,7 @@ int TCPSleep( void *ClientData, void *token, int priority, char *msg, int tmio ) { PSLEEPING_THREAD SleepingThread; + LARGE_INTEGER Timeout; TI_DbgPrint(DEBUG_TCP, ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", @@ -131,12 +132,14 @@ InsertTailList( &SleepingThreadsList, &SleepingThread->Entry ); TcpipReleaseFastMutex( &SleepingThreadsLock ); + Timeout.QuadPart = Int32x32To64(tmio, -10000); + TI_DbgPrint(DEBUG_TCP,("Waiting on %x\n", token)); KeWaitForSingleObject( &SleepingThread->Event, - WrSuspended, + Executive, KernelMode, TRUE, - NULL ); + (tmio != 0) ? &Timeout : NULL ); TcpipAcquireFastMutex( &SleepingThreadsLock ); RemoveEntryList( &SleepingThread->Entry );

15 years, 4 months

[cgutman] 41632: - The timeout value passed to tsleep is in milliseconds and so_linger is in seconds so convert to milliseconds

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jun 27 10:59:22 2009 New Revision: 41632 URL: http://svn.reactos.org/svn/reactos?rev=41632&view=rev Log: - The timeout value passed to tsleep is in milliseconds and so_linger is in seconds so convert to milliseconds Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Sat Jun 27 10:59:22 2009 @@ -190,7 +190,7 @@ goto drop; while (so->so_state & SS_ISCONNECTED) { error = tsleep((caddr_t)&so->so_timeo, - PSOCK | PCATCH, netcls, so->so_linger); + PSOCK | PCATCH, netcls, so->so_linger * 1000); if (error) break; }

15 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009