Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68861: [NDK][NTOS] - Move KeProfileInterrupt[WithSource] declarations to NDK since they're exported - NtCreateProfile's fourth parameter is SIZE_T - Add NtCreateProfileEx prototype CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 15:04:01 2015 New Revision: 68861 URL: http://svn.reactos.org/svn/reactos?rev=68861&view=rev Log: [NDK][NTOS] - Move KeProfileInterrupt[WithSource] declarations to NDK since they're exported - NtCreateProfile's fourth parameter is SIZE_T - Add NtCreateProfileEx prototype CORE-10066 Modified: trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -287,6 +287,19 @@ VOID NTAPI +KeProfileInterrupt( + _In_ PKTRAP_FRAME TrapFrame +); + +VOID +NTAPI +KeProfileInterruptWithSource( + _In_ PKTRAP_FRAME TrapFrame, + _In_ KPROFILE_SOURCE Source +); + +VOID +NTAPI KeSetProfileIrql( _In_ KIRQL ProfileIrql ); @@ -353,12 +366,28 @@ _Out_ PHANDLE ProfileHandle, _In_ HANDLE ProcessHandle, _In_ PVOID ImageBase, - _In_ ULONG ImageSize, + _In_ SIZE_T ImageSize, _In_ ULONG Granularity, _Out_ PVOID Buffer, _In_ ULONG ProfilingSize, _In_ KPROFILE_SOURCE Source, _In_ KAFFINITY ProcessorMask +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateProfileEx( + _Out_ PHANDLE ProfileHandle, + _In_ HANDLE ProcessHandle, + _In_ PVOID ImageBase, + _In_ SIZE_T ImageSize, + _In_ ULONG Granularity, + _Out_ PVOID Buffer, + _In_ ULONG ProfilingSize, + _In_ KPROFILE_SOURCE Source, + _In_ USHORT GroupCount, + _In_reads_(GroupCount) PGROUP_AFFINITY Affinity ); NTSYSCALLAPI Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -95,7 +95,7 @@ NtCreateProfile(OUT PHANDLE ProfileHandle, IN HANDLE Process OPTIONAL, IN PVOID RangeBase, - IN ULONG RangeSize, + IN SIZE_T RangeSize, IN ULONG BucketSize, IN PVOID Buffer, IN ULONG BufferSize, Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -405,19 +405,6 @@ VOID NTAPI -KeProfileInterrupt( - PKTRAP_FRAME TrapFrame -); - -VOID -NTAPI -KeProfileInterruptWithSource( - IN PKTRAP_FRAME TrapFrame, - IN KPROFILE_SOURCE Source -); - -VOID -NTAPI KeUpdateRunTime( PKTRAP_FRAME TrapFrame, KIRQL Irql

1 0

[tfaber] 68860: [NTOS] - Fix GCC build
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:35:02 2015 New Revision: 68860 URL: http://svn.reactos.org/svn/reactos?rev=68860&view=rev Log: [NTOS] - Fix GCC build Modified: trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 29 14:35:02 2015 @@ -331,8 +331,8 @@ /* Get the Pointer to the Bucket Value representing this Program Counter */ BucketValue = (PULONG)((ULONG_PTR)Profile->Buffer + - ((ProgramCounter - (ULONG_PTR)Profile->RangeBase) - >> Profile->BucketShift) &~ 0x3); + (((ProgramCounter - (ULONG_PTR)Profile->RangeBase) + >> Profile->BucketShift) &~ 0x3)); /* Increment the value */ (*BucketValue)++;

1 0

[tfaber] 68859: [NTOS:KE] - Fix swapped parameters of KeSetIntervalProfile - Calculate the correct bucket pointer in KiParseProfileList, and actually increment the counter CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:30:29 2015 New Revision: 68859 URL: http://svn.reactos.org/svn/reactos?rev=68859&view=rev Log: [NTOS:KE] - Fix swapped parameters of KeSetIntervalProfile - Calculate the correct bucket pointer in KiParseProfileList, and actually increment the counter CORE-10066 Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Aug 29 14:30:29 2015 @@ -399,8 +399,8 @@ VOID NTAPI KeSetIntervalProfile( - KPROFILE_SOURCE ProfileSource, - ULONG Interval + ULONG Interval, + KPROFILE_SOURCE ProfileSource ); VOID Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 29 14:30:29 2015 @@ -261,8 +261,8 @@ VOID NTAPI -KeSetIntervalProfile(IN KPROFILE_SOURCE ProfileSource, - IN ULONG Interval) +KeSetIntervalProfile(IN ULONG Interval, + IN KPROFILE_SOURCE ProfileSource) { HAL_PROFILE_SOURCE_INTERVAL ProfileSourceInterval; @@ -330,12 +330,12 @@ } /* Get the Pointer to the Bucket Value representing this Program Counter */ - BucketValue = (PULONG)((((ULONG_PTR)Profile->Buffer + - (ProgramCounter - (ULONG_PTR)Profile->RangeBase)) + BucketValue = (PULONG)((ULONG_PTR)Profile->Buffer + + ((ProgramCounter - (ULONG_PTR)Profile->RangeBase) >> Profile->BucketShift) &~ 0x3); /* Increment the value */ - ++BucketValue; + (*BucketValue)++; } }

1 0

[tfaber] 68858: [NTOS:EX] - Fix MDL leak in NtStopProfile CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:14:43 2015 New Revision: 68858 URL: http://svn.reactos.org/svn/reactos?rev=68858&view=rev Log: [NTOS:EX] - Fix MDL leak in NtStopProfile CORE-10066 Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 14:14:43 2015 @@ -453,6 +453,7 @@ /* Unlock the Buffer */ MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); + IoFreeMdl(Profile->Mdl); ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE); /* Clear the Locked Buffer pointer, meaning the Object is Stopped */

1 0

[hbelusca] 68857: [HAL]: Addendum for r68856
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 14:09:57 2015 New Revision: 68857 URL: http://svn.reactos.org/svn/reactos?rev=68857&view=rev Log: [HAL]: Addendum for r68856 Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=68… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sat Aug 29 14:09:57 2015 @@ -952,7 +952,7 @@ Ocw2.EoiMode = SpecificEoi; /* Check which PIC needs the EOI */ - if (Irq > 8) + if (Irq >= 8) { /* Send the EOI for the IRQ */ __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF));

1 0

[tfaber] 68856: [HAL] - IRQ 8 belongs to the slave PIC, so send EOI appropriately CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:04:57 2015 New Revision: 68856 URL: http://svn.reactos.org/svn/reactos?rev=68856&view=rev Log: [HAL] - IRQ 8 belongs to the slave PIC, so send EOI appropriately CORE-10066 Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=68… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sat Aug 29 14:04:57 2015 @@ -808,7 +808,7 @@ Ocw2.EoiMode = SpecificEoi; /* Check which PIC needs the EOI */ - if (Irq > 8) + if (Irq >= 8) { /* Send the EOI for the IRQ */ __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF));

1 0

[hbelusca] 68855: [i8042prt] Improve debugging experience when pressing Tab+k, at least with WinDBG, by breaking with a suitable control code (adopt the SysRq one even if we don't use SysRq key for...
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 13:53:55 2015 New Revision: 68855 URL: http://svn.reactos.org/svn/reactos?rev=68855&view=rev Log: [i8042prt] Improve debugging experience when pressing Tab+k, at least with WinDBG, by breaking with a suitable control code (adopt the SysRq one even if we don't use SysRq key for breaking, but instead, Tab+k). Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Sat Aug 29 13:53:55 2015 @@ -855,7 +855,7 @@ if (InputData->MakeCode == 0x25) { /* k - Breakpoint */ - DbgBreakPoint(); + DbgBreakPointWithStatus(DBG_STATUS_SYSRQ); } else if (InputData->MakeCode == 0x30) {

1 0

[hbelusca] 68854: [NTOS] Addendum to r68851: - Reset the state of the worker thread *after* having captured the data, not before. - Fix the explanations given in comments.
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 12:53:08 2015 New Revision: 68854 URL: http://svn.reactos.org/svn/reactos?rev=68854&view=rev Log: [NTOS] Addendum to r68851: - Reset the state of the worker thread *after* having captured the data, not before. - Fix the explanations given in comments. Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -16,7 +16,7 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread data + * WinDBG Debugger Worker State Machine data */ WORK_QUEUE_ITEM ExpDebuggerWorkItem; /* @@ -33,19 +33,22 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread - * - * A worker thread is queued whenever WinDBG wants to attach or kill a user-mode + * WinDBG Debugger Worker State Machine + * + * This functionality is used whenever WinDBG wants to attach or kill a user-mode * process from within live kernel-mode session, and/or page-in an address region. + * It is implemented as a state machine: when it is in "Ready" state, WinDBG can + * initialize the data for the state machine, then switch its state to "Start". + * The worker thread balance manager detects this, switches the state to "Initialized" + * and queues a worker thread. As long as the state is not "Ready" again, WinDBG + * prevents from requeuing a new thread. When the thread is started, it captures + * all the data, then resets the machine state to "Ready", thus allowing WinDBG + * to requeue another worker thread. * * WinDBG commands: * .process /i <addr> (where <addr> is the address of the EPROCESS block for this process) * .kill <addr> ( " " " " ) * .pagein <addr> (where <addr> is the address to page in) - * - * The implementation is very naive because the same data is reused, so that if - * the worker thread has not started before WinDBG sends fresh new data again, - * then only the latest data is taken into account. */ VOID NTAPI @@ -59,22 +62,25 @@ UNREFERENCED_PARAMETER(Context); /* Be sure we were started in an initialized state */ - ASSERTMSG("ExpDebuggerWorker being entered with state != 2\n", + ASSERTMSG("ExpDebuggerWorker being entered in non-initialized state!\n", ExpDebuggerWork == WinKdWorkerInitialized); - if (ExpDebuggerWork != WinKdWorkerInitialized) return; - - /* Reset the worker flag to the disabled state */ - ExpDebuggerWork = WinKdWorkerDisabled; + if (ExpDebuggerWork != WinKdWorkerInitialized) + { + /* An error happened, so get a chance to restart proper */ + ExpDebuggerWork = WinKdWorkerReady; + return; + } /* Get the processes to be attached or killed, and the address to page in */ ProcessToAttach = ExpDebuggerProcessAttach; ProcessToKill = ExpDebuggerProcessKill; PageInAddress = ExpDebuggerPageIn; - /* Reset to their default values */ + /* Reset the state machine to its ready state */ ExpDebuggerProcessAttach = NULL; ExpDebuggerProcessKill = NULL; ExpDebuggerPageIn = (ULONG_PTR)NULL; + ExpDebuggerWork = WinKdWorkerReady; /* Default to the current process if we don't find the process to be attached or killed */ Process = NULL; Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=688… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -491,7 +491,7 @@ * If WinDBG wants to attach or kill a user-mode process, and/or * page-in an address region, queue a debugger worker thread. */ - if (ExpDebuggerWork == WinKdWorkerActivate) + if (ExpDebuggerWork == WinKdWorkerStart) { ExInitializeWorkItem(&ExpDebuggerWorkItem, ExpDebuggerWorker, NULL); ExpDebuggerWork = WinKdWorkerInitialized; Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -44,12 +44,12 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread data (see dbgctrl.c) + * WinDBG Debugger Worker State Machine data (see dbgctrl.c) */ typedef enum _WINKD_WORKER_STATE { - WinKdWorkerDisabled = 0, - WinKdWorkerActivate, + WinKdWorkerReady = 0, + WinKdWorkerStart, WinKdWorkerInitialized } WINKD_WORKER_STATE;

1 0

[tfaber] 68853: [FUSION] - Add missing psdk dependency to fusion_common
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 07:41:52 2015 New Revision: 68853 URL: http://svn.reactos.org/svn/reactos?rev=68853&view=rev Log: [FUSION] - Add missing psdk dependency to fusion_common Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat Aug 29 07:41:52 2015 @@ -13,6 +13,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) add_library(fusion_common STATIC ${COMMON_SOURCE}) +add_dependencies(fusion_common psdk) add_library(fusion SHARED version.rc

1 0

[tfaber] 68852: [NTOS:EX] - Remove superfluous dereference in NtCreateProfile - Allocate the right size for KPROFILE object - Don't leak the KPROFILE when deleting an EPROFILE - Avoid some casts CO...
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 07:35:59 2015 New Revision: 68852 URL: http://svn.reactos.org/svn/reactos?rev=68852&view=rev Log: [NTOS:EX] - Remove superfluous dereference in NtCreateProfile - Allocate the right size for KPROFILE object - Don't leak the KPROFILE when deleting an EPROFILE - Avoid some casts CORE-10066 Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 07:35:59 2015 @@ -42,7 +42,7 @@ ULONG State; /* Typecast the Object */ - Profile = (PEPROFILE)ObjectBody; + Profile = ObjectBody; /* Check if there if the Profile was started */ if (Profile->LockedBufferAddress) @@ -55,6 +55,7 @@ MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); IoFreeMdl(Profile->Mdl); + ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE); } /* Check if a Process is associated and reference it */ @@ -247,7 +248,6 @@ 0, NULL, &hProfile); - ObDereferenceObject(Profile); /* Check for Success */ if (!NT_SUCCESS(Status)) @@ -361,7 +361,7 @@ /* Allocate a Kernel Profile Object. */ ProfileObject = ExAllocatePoolWithTag(NonPagedPool, - sizeof(EPROFILE), + sizeof(*ProfileObject), TAG_PROFILE); if (!ProfileObject) { @@ -396,7 +396,7 @@ /* Initialize the Kernel Profile Object */ Profile->ProfileObject = ProfileObject; KeInitializeProfile(ProfileObject, - (PKPROCESS)Profile->Process, + &Profile->Process->Pcb, Profile->RangeBase, Profile->RangeSize, Profile->BucketSize,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs