Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[tkreuzer] 44296: Implement "portable" SList code for 64 bit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 27 18:37:07 2009 New Revision: 44296 URL: http://svn.reactos.org/svn/reactos?rev=44296&view=rev Log: Implement "portable" SList code for 64 bit Modified: branches/ros-amd64-bringup/reactos/lib/rtl/slist.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/slist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/slist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/slist.c [iso-8859-1] Fri Nov 27 18:37:07 2009 @@ -20,7 +20,10 @@ RtlInitializeSListHead(IN PSLIST_HEADER ListHead) { #ifdef _WIN64 - UNIMPLEMENTED; + ListHead->Alignment = 0; + ListHead->Region = 0; + ListHead->Header8.Init = 1; + // ListHead->Header8.HeaderType = 1; // FIXME: depending on cmpxchg16b support? #else ListHead->Alignment = 0; #endif @@ -31,8 +34,25 @@ RtlFirstEntrySList(IN const SLIST_HEADER *ListHead) { #ifdef _WIN64 - UNIMPLEMENTED; - return NULL; + if (ListHead->Header8.HeaderType) + { + return (PVOID)(ListHead->Region & ~0xF); + } + else + { + union { + PVOID P; + struct { + ULONG64 Reserved:4; + ULONG64 NextEntry:39; + ULONG64 Reserved2:21; + } Bits; + } Pointer; + + Pointer.P = (PVOID)ListHead; + Pointer.Bits.NextEntry = ListHead->Header8.NextEntry; + return Pointer.P; + } #else return ListHead->Next.Next; #endif @@ -43,8 +63,8 @@ RtlQueryDepthSList(IN PSLIST_HEADER ListHead) { #ifdef _WIN64 - UNIMPLEMENTED; - return 0; + return ListHead->Header8.HeaderType ? + ListHead->Header16.Sequence : ListHead->Header8.Sequence; #else return ListHead->Depth; #endif

15 years

[tkreuzer] 44295: Some more fixes for RtlInterlockedPopEntrySList and RtlInterlockedPushEntrySList

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 27 18:30:25 2009 New Revision: 44295 URL: http://svn.reactos.org/svn/reactos?rev=44295&view=rev Log: Some more fixes for RtlInterlockedPopEntrySList and RtlInterlockedPushEntrySList Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Fri Nov 27 18:30:25 2009 @@ -108,7 +108,7 @@ /* Use rcx as pointer template */ mov rdx, ~SLIST8_POINTER_MASK - or rdx, rcx + and rdx, rcx /* Combine result and return */ or rax, rdx @@ -178,17 +178,14 @@ .proc RtlInterlockedPushEntrySList _ExpInterlockedPushEntrySList: - /* Move 2nd parameter to r9 */ - mov r9, rdx - - /* Load ListHead->Region into rdx */ - mov rdx, [rcx + 8] - /* Load ListHead->Alignment into rax */ mov rax, [rcx] + /* Load ListHead->Region into rdx */ + mov r9, [rcx + 8] + /* Check what kind of header this is */ - test rdx, SLIST8B_HEADERTYPE_MASK + test r9, SLIST8B_HEADERTYPE_MASK jnz _RtlInterlockedPushEntrySList16 /* We have an 8 byte header */ @@ -198,45 +195,45 @@ /* Get ListHead->NextEntry */ mov r8, rax and r8, SLIST8A_NEXTENTRY_MASK + jz _RtlInterlockedPushEntrySListEmpty /* Shift the NextEntry pointer */ shr r8, SLIST8A_NEXTENTRY_SHIFT /* Create a pointer template from rcx in rdx */ - mov rdx, ~SLIST8_POINTER_MASK - and rdx, rcx + mov r9, ~SLIST8_POINTER_MASK + and r9, rcx /* Combine to new pointer and save as ListEntry->NextEntry */ - or rdx, r8 - mov [r9], rdx + or r8, r9 + +_RtlInterlockedPushEntrySListEmpty: + /* Store the NextEntry pointer in the new ListEntry */ + mov [rdx], r8 /* Shift and mask the new ListEntry pointer */ - shl r9, SLIST8A_NEXTENTRY_SHIFT - and r9, SLIST8A_NEXTENTRY_MASK + mov r8, rdx + shl r8, SLIST8A_NEXTENTRY_SHIFT + and r8, SLIST8A_NEXTENTRY_MASK /* Copy and adjust depth and sequence number */ - lea r8, [rax + SLIST8A_DEPTH_INC + SLIST8A_SEQUENCE_INC] - and r8, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK + lea r9, [rax + SLIST8A_DEPTH_INC + SLIST8A_SEQUENCE_INC] + and r9, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK /* Combine to exchange value in r8 */ or r8, r9 + /* Save the NextEntry in r9 */ + mov r9, [rdx] + /* If [rcx] equals rax, exchange it with r8 */ lock cmpxchg [rcx], r8 /* If not equal, retry with rax, being the content of [rcx] now */ jnz _RtlInterlockedPushEntrySListLoop - /* Shift the pointer bits in place */ - and rax, SLIST8A_NEXTENTRY_MASK - shr rax, SLIST8A_NEXTENTRY_SHIFT - - /* Use rcx as pointer template */ - mov rdx, ~SLIST8_POINTER_MASK - or rdx, rcx - - /* Combine result and return */ - or rax, rdx + /* Return the old NextEntry pointer */ + mov rax, r9 ret _RtlInterlockedPushEntrySList16: @@ -245,12 +242,15 @@ /* Save rbx */ push rbx - /* Copy rcx to r8, as we need rcx for the exchange */ + /* Copy rcx/rdx to r8/r9, as we need rcx/rdx for the exchange */ mov r8, rcx + mov r9, rdx /* Set ListHead->HeaderType = 1 and ListHead->Init = 1 */ - mov rcx, r9 + mov rcx, rdx or rcx, 0x3 + + mov rdx, [r8 + 8] _RtlInterlockedPushEntrySListLoop16:

15 years

[tkreuzer] 44294: Fix SLIST_ENTRY for WIN64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 27 18:23:05 2009 New Revision: 44294 URL: http://svn.reactos.org/svn/reactos?rev=44294&view=rev Log: Fix SLIST_ENTRY for WIN64 Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] Fri Nov 27 18:23:05 2009 @@ -575,11 +575,11 @@ #ifndef _SLIST_HEADER_ #define _SLIST_HEADER_ -#define SLIST_ENTRY SINGLE_LIST_ENTRY -#define _SLIST_ENTRY _SINGLE_LIST_ENTRY -#define PSLIST_ENTRY PSINGLE_LIST_ENTRY - #if defined(_WIN64) +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY { + PSLIST_ENTRY Next; +} SLIST_ENTRY; typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER { struct { ULONGLONG Alignment; @@ -604,6 +604,9 @@ } Header16; } SLIST_HEADER, *PSLIST_HEADER; #else +#define SLIST_ENTRY SINGLE_LIST_ENTRY +#define _SLIST_ENTRY _SINGLE_LIST_ENTRY +#define PSLIST_ENTRY PSINGLE_LIST_ENTRY typedef union _SLIST_HEADER { ULONGLONG Alignment; struct { Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Fri Nov 27 18:23:05 2009 @@ -3248,11 +3248,11 @@ #ifndef _SLIST_HEADER_ #define _SLIST_HEADER_ -#define SLIST_ENTRY SINGLE_LIST_ENTRY -#define _SLIST_ENTRY _SINGLE_LIST_ENTRY -#define PSLIST_ENTRY PSINGLE_LIST_ENTRY - #if defined(_WIN64) +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY { + PSLIST_ENTRY Next; +} SLIST_ENTRY; typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER { struct { ULONGLONG Alignment; @@ -3277,6 +3277,9 @@ } Header16; } SLIST_HEADER, *PSLIST_HEADER; #else +#define SLIST_ENTRY SINGLE_LIST_ENTRY +#define _SLIST_ENTRY _SINGLE_LIST_ENTRY +#define PSLIST_ENTRY PSINGLE_LIST_ENTRY typedef union _SLIST_HEADER { ULONGLONG Alignment; struct {

15 years

[tkreuzer] 44293: - Don't use a pointer to SINGLE_LIST_ENTRY as parameter for InterlockedPushEntrySList. It's not the same as SLIST_ENTRY!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 27 18:06:54 2009 New Revision: 44293 URL: http://svn.reactos.org/svn/reactos?rev=44293&view=rev Log: - Don't use a pointer to SINGLE_LIST_ENTRY as parameter for InterlockedPushEntrySList. It's not the same as SLIST_ENTRY! Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Fri Nov 27 18:06:54 2009 @@ -358,14 +358,14 @@ { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } else { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } }

15 years

[gedmurphy] 44292: Convert MsgTrans to a VS2010 project and add a regression test library using the built in MS test framework. I've been using this to play with the new IntelliTrace (Historical Debugging) feature, which is unquestionably the best tool MS has ever produced. I take my hat off to VS2010 ... stunning! (http://blogs.msdn.com/habibh/default.aspx)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Nov 27 15:25:31 2009 New Revision: 44292 URL: http://svn.reactos.org/svn/reactos?rev=44292&view=rev Log: Convert MsgTrans to a VS2010 project and add a regression test library using the built in MS test framework. I've been using this to play with the new IntelliTrace (Historical Debugging) feature, which is unquestionably the best tool MS has ever produced. I take my hat off to VS2010 ... stunning! (http://blogs.msdn.com/habibh/default.aspx) Added: trunk/tools/Message Translator/Local.testsettings trunk/tools/Message Translator/Msg Translator.vsmdi trunk/tools/Message Translator/MsgTrans.Library.Tests/ (with props) trunk/tools/Message Translator/MsgTrans.Library.Tests/MsgTrans.Library.Tests.csproj trunk/tools/Message Translator/MsgTrans.Library.Tests/MsgTrans.Library.cs trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/ (with props) trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/AssemblyInfo.cs trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.Designer.cs trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.settings trunk/tools/Message Translator/MsgTrans.Library.Tests/app.config trunk/tools/Message Translator/TraceAndTestImpact.testsettings Modified: trunk/tools/Message Translator/GUI/GUI.csproj trunk/tools/Message Translator/GUI/Properties/Resources.Designer.cs trunk/tools/Message Translator/GUI/Properties/Settings.Designer.cs trunk/tools/Message Translator/Msg Translator.sln trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj Modified: trunk/tools/Message Translator/GUI/GUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/GUI… ============================================================================== --- trunk/tools/Message Translator/GUI/GUI.csproj [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/GUI.csproj [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,4 +1,5 @@ -ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -11,10 +12,26 @@ <AssemblyName>MsgTranslator</AssemblyName> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> <ApplicationIcon>icon.ico</ApplicationIcon> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -24,6 +41,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -32,6 +50,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -100,6 +119,23 @@ <Name>MsgTrans.Library</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Windows Installer 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />  +</Project> Added: trunk/tools/Message Translator/MsgTrans.Library.Tests/MsgTrans.Library.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library.Tests/MsgTrans.Library.cs (added) +++ trunk/tools/Message Translator/MsgTrans.Library.Tests/MsgTrans.Library.cs [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,165 @@ +ï»¿using System; +using System.Text; +using System.Collections.Generic; +using System.Linq; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using MsgTrans.Library; + +namespace MsgTrans.Library.Tests +{ + [TestClass] + public class MsgTrans + { + private MessageTranslator msgTran; + + + public MsgTrans() + { + msgTran = new MessageTranslator(new MessageOutput(), + Properties.Settings.Default.NtStatusXml, + Properties.Settings.Default.WinerrorXml, + Properties.Settings.Default.HresultXml, + Properties.Settings.Default.BugcheckXml, + Properties.Settings.Default.WmXml, + Properties.Settings.Default.BugUrl); + Assert.IsNotNull(msgTran); + } + + [TestMethod] + public void TestGetErrorMsg() + { + int ErrNum = 18; + string message = "error " + ErrNum.ToString(); + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = msgTran.Messages[0]; + Assert.IsTrue(cmd.MsgType == MessageType.WinError); + + Assert.AreEqual(cmd.MsgType.ToString(), "WinError"); + Assert.AreEqual(cmd.Number, ErrNum); + Assert.AreEqual(cmd.Hex, ErrNum.ToString("X")); + Assert.AreEqual(cmd.Code, "ERROR_NO_MORE_FILES"); + string ErrMessage = new System.ComponentModel.Win32Exception(ErrNum).Message; + Assert.AreEqual(cmd.Message, ErrMessage); + } + + [TestMethod] + public void TestNtStatusMsg() + { + string ErrNum = "C0000005"; + string message = "error " + ErrNum; + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = null; + foreach (Command c in msgTran.Messages) + { + if (c.MsgType == MessageType.NTSTATUS) + cmd = c; + } + Assert.IsNotNull(cmd); + Assert.IsTrue(cmd.MsgType == MessageType.NTSTATUS); + Assert.AreEqual(cmd.MsgType.ToString(), "NTSTATUS"); + long num = long.Parse(ErrNum, System.Globalization.NumberStyles.HexNumber); + Assert.AreEqual(cmd.Number, num); + Assert.AreEqual(cmd.Hex, ErrNum); + Assert.AreEqual(cmd.Code, "STATUS_ACCESS_VIOLATION"); + } + + [TestMethod] + public void TestHResultMsg() + { + string ErrNum = "80000003"; + string message = "error " + ErrNum; + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = null; + foreach (Command c in msgTran.Messages) + { + if (c.MsgType == MessageType.HRESULT) + cmd = c; + } + Assert.IsNotNull(cmd); + Assert.IsTrue(cmd.MsgType == MessageType.HRESULT); + Assert.AreEqual(cmd.MsgType.ToString(), "HRESULT"); + long num = long.Parse(ErrNum, System.Globalization.NumberStyles.HexNumber); + Assert.AreEqual(cmd.Number, num); + Assert.AreEqual(cmd.Hex, ErrNum); + Assert.AreEqual(cmd.Code, "E_INVALIDARG"); + } + + [TestMethod] + public void TestBugCheckMsg() + { + string ErrNum = "A"; + string message = "error " + ErrNum; + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = null; + foreach (Command c in msgTran.Messages) + { + if (c.MsgType == MessageType.BugCheck) + cmd = c; + } + Assert.IsNotNull(cmd); + Assert.IsTrue(cmd.MsgType == MessageType.BugCheck); + Assert.AreEqual(cmd.MsgType.ToString(), "BugCheck"); + long num = long.Parse(ErrNum, System.Globalization.NumberStyles.HexNumber); + Assert.AreEqual(cmd.Number, num); + Assert.AreEqual(cmd.Hex, ErrNum); + Assert.AreEqual(cmd.Code, "IRQL_NOT_LESS_OR_EQUAL"); + } + + [TestMethod] + public void TestWindowsMsg() + { + int WmNum = 16; + string message = "wm " + WmNum.ToString(); + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = null; + foreach (Command c in msgTran.Messages) + { + if (c.MsgType == MessageType.WinMsg) + cmd = c; + } + Assert.IsNotNull(cmd); + Assert.IsTrue(cmd.MsgType == MessageType.WinMsg); + + Assert.AreEqual(cmd.MsgType.ToString(), "WinMsg"); + Assert.AreEqual(cmd.Number, WmNum); + Assert.AreEqual(cmd.Hex, WmNum.ToString("X")); + Assert.AreEqual(cmd.Code, "WM_CLOSE"); + } + + [TestMethod] + public void TestBugUrlMsg() + { + int BugNum = 256; + string message = "bug " + BugNum.ToString(); + Assert.IsTrue(msgTran.ParseCommandMessage(null, message)); + + Command cmd = null; + foreach (Command c in msgTran.Messages) + { + if (c.MsgType == MessageType.BugUrl) + cmd = c; + } + Assert.IsNotNull(cmd); + Assert.IsTrue(cmd.MsgType == MessageType.BugUrl); + Assert.AreEqual(cmd.Number, BugNum); + Assert.AreEqual(cmd.Hex, BugNum.ToString("X")); + string url = String.Format(Properties.Settings.Default.BugUrl, BugNum.ToString()); + Assert.AreEqual(cmd.Code, url); + + } + } + + public class MessageOutput : IMsgOutput + { + public void MsgOut(MessageContext context, + string message) + { + Console.WriteLine(message); + } + } +} Propchange: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Nov 27 15:25:31 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/AssemblyInfo.cs (added) +++ trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/AssemblyInfo.cs [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,35 @@ +ï»¿using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("MsgTrans.Library.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("MsgTrans.Library.Tests")] +[assembly: AssemblyCopyright("Copyright Â© 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM componenets. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("622ff099-e375-44ca-97eb-4003f560f7a5")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Added: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.Designer.cs (added) +++ trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.Designer.cs [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,98 @@ +ï»¿//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.21006.1 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace MsgTrans.Library.Tests.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\GUI\\Resources\\ntstatus.xml")] + public string NtStatusXml { + get { + return ((string)(this["NtStatusXml"])); + } + set { + this["NtStatusXml"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\GUI\\Resources\\winerror.xml")] + public string WinerrorXml { + get { + return ((string)(this["WinerrorXml"])); + } + set { + this["WinerrorXml"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\GUI\\Resources\\hresult.xml")] + public string HresultXml { + get { + return ((string)(this["HresultXml"])); + } + set { + this["HresultXml"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\GUI\\Resources\\bugcheck.xml")] + public string BugcheckXml { + get { + return ((string)(this["BugcheckXml"])); + } + set { + this["BugcheckXml"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\GUI\\Resources\\wm.xml")] + public string WmXml { + get { + return ((string)(this["WmXml"])); + } + set { + this["WmXml"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("http://www.reactos.org/bugzilla/show_bug.cgi?id={0}")] + public string BugUrl { + get { + return ((string)(this["BugUrl"])); + } + set { + this["BugUrl"] = value; + } + } + } +} Added: trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.settings (added) +++ trunk/tools/Message Translator/MsgTrans.Library.Tests/Properties/Settings.settings [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,24 @@ +ï»¿<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="MsgTrans.Library.Tests.Properties" GeneratedClassName="Settings"> + <Profiles /> + <Settings> + <Setting Name="NtStatusXml" Type="System.String" Scope="User"> + <Value Profile="(Default)">..\..\..\GUI\Resources\ntstatus.xml</Value> + </Setting> + <Setting Name="WinerrorXml" Type="System.String" Scope="User"> + <Value Profile="(Default)">..\..\..\GUI\Resources\winerror.xml</Value> + </Setting> + <Setting Name="HresultXml" Type="System.String" Scope="User"> + <Value Profile="(Default)">..\..\..\GUI\Resources\hresult.xml</Value> + </Setting> + <Setting Name="BugcheckXml" Type="System.String" Scope="User"> + <Value Profile="(Default)">..\..\..\GUI\Resources\bugcheck.xml</Value> + </Setting> + <Setting Name="WmXml" Type="System.String" Scope="User"> + <Value Profile="(Default)">..\..\..\GUI\Resources\wm.xml</Value> + </Setting> + <Setting Name="BugUrl" Type="System.String" Scope="User"> + <Value Profile="(Default)">http://www.reactos.org/bugzilla/show_bug.cgi?id={0}</Value> + </Setting> + </Settings> +</SettingsFile> Added: trunk/tools/Message Translator/MsgTrans.Library.Tests/app.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library.Tests/app.config (added) +++ trunk/tools/Message Translator/MsgTrans.Library.Tests/app.config [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,30 @@ +ï»¿<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <configSections> + <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > + <section name="MsgTrans.Library.Tests.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + </sectionGroup> + </configSections> + <userSettings> + <MsgTrans.Library.Tests.Properties.Settings> + <setting name="NtStatusXml" serializeAs="String"> + <value>..\..\..\GUI\Resources\ntstatus.xml</value> + </setting> + <setting name="WinerrorXml" serializeAs="String"> + <value>..\..\..\GUI\Resources\winerror.xml</value> + </setting> + <setting name="HresultXml" serializeAs="String"> + <value>..\..\..\GUI\Resources\hresult.xml</value> + </setting> + <setting name="BugcheckXml" serializeAs="String"> + <value>..\..\..\GUI\Resources\bugcheck.xml</value> + </setting> + <setting name="WmXml" serializeAs="String"> + <value>..\..\..\GUI\Resources\wm.xml</value> + </setting> + <setting name="BugUrl" serializeAs="String"> + <value>http://www.reactos.org/bugzilla/show_bug.cgi?id={0}</value> + </setting> + </MsgTrans.Library.Tests.Properties.Settings> + </userSettings> +</configuration> Modified: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,5 +1,5 @@ ï»¿<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -14,9 +14,25 @@ </StartupObject> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -26,6 +42,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -34,6 +51,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. @@ -65,4 +83,21 @@ <Reference Include="System.Data" /> <Reference Include="System.XML" /> </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Windows Installer 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> </Project> Added: trunk/tools/Message Translator/TraceAndTestImpact.testsettings URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/TraceAn… ============================================================================== --- trunk/tools/Message Translator/TraceAndTestImpact.testsettings (added) +++ trunk/tools/Message Translator/TraceAndTestImpact.testsettings [iso-8859-1] Fri Nov 27 15:25:31 2009 @@ -1,0 +1,26 @@ +ï»¿<?xml version="1.0" encoding="UTF-8"?> +<TestSettings name="Trace and Test Impact" id="09a9b354-bc78-4540-949e-366f06e1ad6a" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"> + <Description>These are test settings for Trace and Test Impact.</Description> + <Execution> + <TestTypeSpecific /> + <AgentRule name="Execution Agents"> + <DataCollectors> + <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information"> + <Configuration useAgentDefault="true" /> + </DataCollector> + <DataCollector uri="datacollector://microsoft/ActionLog/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.ManualTest.ActionLog.ActionLogPlugin, Microsoft.VisualStudio.TestTools.ManualTest.ActionLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Action Recording and Action Log"> + <Configuration useAgentDefault="true" /> + </DataCollector> + <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact"> + <Configuration useAgentDefault="true" /> + </DataCollector> + <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Test Impact"> + <Configuration useAgentDefault="true" /> + </DataCollector> + <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace"> + <Configuration useAgentDefault="true" /> + </DataCollector> + </DataCollectors> + </AgentRule> + </Execution> +</TestSettings>

15 years

[arty] 44291: Revert my recent traffic for now. This needs to be approached differently. I'm going in the wrong direction in complexity terms.

by arty＠svn.reactos.org

Author: arty Date: Fri Nov 27 02:03:24 2009 New Revision: 44291 URL: http://svn.reactos.org/svn/reactos?rev=44291&view=rev Log: Revert my recent traffic for now. This needs to be approached differently. I'm going in the wrong direction in complexity terms. Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/io/iomgr/device.c branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/freelist.c branches/arty-newcc/ntoskrnl/mm/mpw.c branches/arty-newcc/ntoskrnl/mm/pageop.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c branches/arty-newcc/ntoskrnl/mm/section/io.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -17,7 +17,12 @@ PFSN_PREFETCHER_GLOBALS CcPfGlobals; extern LONG CcOutstandingDeletes; +extern KEVENT CcpLazyWriteEvent; extern KEVENT CcFinalizeEvent; +extern VOID NTAPI CcpUnmapThread(PVOID Unused); +extern VOID NTAPI CcpLazyWriteThread(PVOID Unused); +HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; +CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; typedef struct _NOCC_PRIVATE_CACHE_MAP { @@ -43,6 +48,7 @@ KeInitializeEvent(&CcDeleteEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&CcFinalizeEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&CcpLazyWriteEvent, SynchronizationEvent, FALSE); CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -14,15 +14,21 @@ /* GLOBALS ********************************************************************/ -extern KEVENT MpwCompleteEvent; +KEVENT CcpLazyWriteEvent; /* FUNCTIONS ******************************************************************/ + +VOID NTAPI +CcpLazyWriteThread(PVOID Unused) +{ + /* Not implemented */ +} NTSTATUS NTAPI CcWaitForCurrentLazyWriterActivity(VOID) { - KeWaitForSingleObject(&MpwCompleteEvent, Executive, KernelMode, FALSE, NULL); + //KeWaitForSingleObject(&CcpLazyWriteEvent, Executive, KernelMode, FALSE, NULL); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -260,7 +260,7 @@ typedef struct _MM_SECTION_SEGMENT { - KGUARDED_MUTEX Lock; /* lock which protects the page directory */ + FAST_MUTEX Lock; /* lock which protects the page directory */ PFILE_OBJECT FileObject; ULARGE_INTEGER RawLength; /* length of the segment which is part of the mapped file */ ULARGE_INTEGER Length; /* absolute length of the segment */ @@ -1685,8 +1685,7 @@ NTSTATUS NTAPI -MiReadFilePage -(PFILE_OBJECT FileObject, PLARGE_INTEGER Offset, PPFN_TYPE Page, BOOLEAN Locked); +MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER Offset, PPFN_TYPE Page); VOID NTAPI @@ -1744,15 +1743,11 @@ VOID NTAPI -_MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); - -VOID -NTAPI -_MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); - -#define MmLockSectionSegment(S) _MmLockSectionSegment(S,__FILE__,__LINE__) - -#define MmUnlockSectionSegment(S) _MmUnlockSectionSegment(S,__FILE__,__LINE__) +MmLockSectionSegment(PMM_SECTION_SEGMENT Segment); + +VOID +NTAPI +MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment); VOID MmspCompleteAndReleasePageOp(PMM_PAGEOP PageOp); Modified: branches/arty-newcc/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/de… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/device.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -1150,11 +1150,7 @@ NTSTATUS Status; /* Make sure there's a VPB */ - if (!FileSystemDeviceObject->Vpb) - { - DPRINT1("STATUS_INVALID_PARAMETER\n"); - return STATUS_INVALID_PARAMETER; - } + if (!FileSystemDeviceObject->Vpb) return STATUS_INVALID_PARAMETER; /* Acquire it */ IoAcquireVpbSpinLock(&OldIrql); @@ -1186,7 +1182,6 @@ else { /* Fail */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -278,7 +278,6 @@ { /* Fail */ ObDereferenceObject(FileObject); - DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } @@ -1123,7 +1122,6 @@ /* Check if CompletionFilter is valid */ if (!CompletionFilter || (CompletionFilter & ~FILE_NOTIFY_VALID_MASK)) { - DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } } @@ -2052,7 +2050,6 @@ /* Otherwise, this was async I/O without a byte offset, so fail */ if (EventObject) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); - DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } @@ -2427,7 +2424,6 @@ (FileObject->CompletionContext)) { /* Fail */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -2462,7 +2458,6 @@ */ ExFreePool(Context); ObDereferenceObject(Queue); - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } } @@ -2908,7 +2903,6 @@ /* Otherwise, this was async I/O without a byte offset, so fail */ if (EventObject) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); - DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } Modified: branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/ra… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -239,7 +239,6 @@ else { /* Invalid create request */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; } @@ -436,7 +435,6 @@ default: /* Fail */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; break; } @@ -578,7 +576,6 @@ DeviceObject->AlignmentRequirement)) { /* It's not, fail */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -851,7 +848,6 @@ default: /* Fail it */ - DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; break; } Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -377,10 +377,13 @@ /* * Try to allocate a page */ - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + if (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + MmLockAddressSpace(AddressSpace); + } if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -32,17 +32,18 @@ /* GLOBALS ******************************************************************/ MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; -static ULONG MiMinimumAvailablePages = 512; +static ULONG MiMinimumAvailablePages; static ULONG MiNrTotalPages; static LIST_ENTRY AllocationListHead; static KSPIN_LOCK AllocationListLock; -static ULONG MiMinimumPagesPerRun = 128; +static ULONG MiPagesRequired = 0; +static ULONG MiMinimumPagesPerRun = 10; static CLIENT_ID MiBalancerThreadId; static HANDLE MiBalancerThreadHandle = NULL; static KEVENT MiBalancerEvent; -static KEVENT MiBalancerContinue; static KTIMER MiBalancerTimer; +static LONG MiBalancerWork = 0; /* FUNCTIONS ****************************************************************/ @@ -66,6 +67,7 @@ MiNrTotalPages = NrAvailablePages; /* Set up targets. */ + MiMinimumAvailablePages = 64; if ((NrAvailablePages + NrSystemPages) >= 8192) { MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 4 * 3; @@ -115,7 +117,7 @@ if (MmGetReferenceCountPage(Page) == 1) { (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (IsListEmpty(&AllocationListHead)) + if (IsListEmpty(&AllocationListHead) || MmAvailablePages < MiMinimumAvailablePages) { KeReleaseSpinLock(&AllocationListLock, OldIrql); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -127,8 +129,7 @@ Entry = RemoveHeadList(&AllocationListHead); Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); KeReleaseSpinLock(&AllocationListLock, OldIrql); - if(Consumer == MC_USER || Consumer == MC_PPOOL) - MmRemoveLRUUserPage(Page); + if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); MiZeroPage(Page); Request->Page = Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); @@ -137,10 +138,33 @@ else { KeReleaseSpinLock(&AllocationListLock, OldIrql); + if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); +} + +VOID +NTAPI +MiTrimMemoryConsumer(ULONG Consumer) +{ + LONG Target; + ULONG NrFreedPages; + + Target = MiMemoryConsumers[Consumer].PagesUsed - + MiMemoryConsumers[Consumer].PagesTarget; + if (Target < 1) + { + Target = 1; + } + + if (MiMemoryConsumers[Consumer].Trim != NULL) + { + MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); + } } NTSTATUS @@ -151,35 +175,27 @@ NTSTATUS Status; (*NrFreedPages) = 0; - DPRINT("Trimming user memory (want %d)\n", Target); CurrentPage = MmGetLRUFirstUserPage(); while (CurrentPage != 0 && Target > 0) { NextPage = MmGetLRUNextUserPage(CurrentPage); - - DPRINT("Page Out %x\n", CurrentPage); + Status = MmPageOutPhysicalAddress(CurrentPage); - DPRINT("Done %x\n", Status); if (NT_SUCCESS(Status)) { + DPRINT("Succeeded\n"); Target--; (*NrFreedPages)++; } else if (Status == STATUS_PAGEFILE_QUOTA) { - MmRemoveLRUUserPage(CurrentPage); - MmInsertLRULastUserPage(CurrentPage); - return STATUS_SUCCESS; + MmRemoveLRUUserPage(CurrentPage); + MmInsertLRULastUserPage(CurrentPage); } CurrentPage = NextPage; } - if (CurrentPage) - MmDereferencePage(CurrentPage); - - DPRINT("Done: %d\n", NrFreedPages); - return(STATUS_SUCCESS); } @@ -192,16 +208,14 @@ ULONG NrFreedPages; NTSTATUS Status; - Target = (MiMinimumAvailablePages - MmAvailablePages); + Target = (MiMinimumAvailablePages - MmAvailablePages) + MiPagesRequired; Target = max(Target, (LONG) MiMinimumPagesPerRun); for (i = 0; i < MC_MAXIMUM && Target > 0; i++) { if (MiMemoryConsumers[i].Trim != NULL) { - DPRINT("Trimming %d\n"); - Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); - DPRINT("Got %d pages\n", NrFreedPages); + Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { KeBugCheck(MEMORY_MANAGEMENT); @@ -215,7 +229,7 @@ MiIsBalancerThread(VOID) { return MiBalancerThreadHandle != NULL && - PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread; + PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; } NTSTATUS @@ -223,67 +237,106 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PPFN_TYPE AllocatedPage) { - PFN_TYPE Page = 0; + ULONG OldUsed; + PFN_TYPE Page; KIRQL OldIrql; - (void)InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - - if (!MiIsBalancerThread() && MmAvailablePages <= MiMinimumAvailablePages && CanWait) - { - DPRINT("MmAvailablePages %d MiMinimumAvailablePages %d\n", - MmAvailablePages, MiMinimumAvailablePages); - KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); - KeWaitForSingleObject(&MiBalancerContinue, 0, KernelMode, FALSE, NULL); + /* + * Make sure we don't exceed our individual target. + */ + OldUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + if (OldUsed >= (MiMemoryConsumers[Consumer].PagesTarget - 1) && + !MiIsBalancerThread()) + { + if (!CanWait) + { + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + return(STATUS_NO_MEMORY); + } + MiTrimMemoryConsumer(Consumer); } /* * Allocate always memory for the non paged pool and for the pager thread. */ - if ((Consumer == MC_NPPOOL) || - (Consumer == MC_SYSTEM) || - MiIsBalancerThread() || - (MmAvailablePages > MiMinimumAvailablePages)) + if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) { OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer, 0); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - if (!Page && MiIsBalancerThread()) - { - DPRINT1("Can't allocate for balancer: %d vs %d\n", - MmAvailablePages, MiMinimumAvailablePages); + if (Page == 0) + { KeBugCheck(NO_PAGES_AVAILABLE); } + *AllocatedPage = Page; + if (MmAvailablePages <= MiMinimumAvailablePages && + MiBalancerThreadHandle != NULL) + { + KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); + } + return(STATUS_SUCCESS); } /* * Make sure we don't exceed global targets. */ - while (!Page) - { - if (!MiIsBalancerThread() || CanWait) - { - KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); - KeWaitForSingleObject(&MiBalancerContinue, 0, KernelMode, FALSE, NULL); - } - - /* - * Actually allocate the page. - */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MmAllocPage(Consumer, 0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - if (!Page && !CanWait) - { - (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - return(STATUS_NO_MEMORY); - } - } - - if(Consumer == MC_USER || Consumer == MC_PPOOL) - MmInsertLRULastUserPage(Page); + if (MmAvailablePages <= MiMinimumAvailablePages) + { + MM_ALLOCATION_REQUEST Request; + + if (!CanWait) + { + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + return(STATUS_NO_MEMORY); + } + + /* Insert an allocation request. */ + Request.Page = 0; + + KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); + (void)InterlockedIncrementUL(&MiPagesRequired); + + KeAcquireSpinLock(&AllocationListLock, &OldIrql); + + if (MiBalancerThreadHandle != NULL) + { + KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); + } + InsertTailList(&AllocationListHead, &Request.ListEntry); + KeReleaseSpinLock(&AllocationListLock, OldIrql); + + KeWaitForSingleObject(&Request.Event, + 0, + KernelMode, + FALSE, + NULL); + + Page = Request.Page; + if (Page == 0) + { + KeBugCheck(NO_PAGES_AVAILABLE); + } + /* Update the Consumer */ + MiGetPfnEntry(Page)->u3.e1.PageLocation = Consumer; + if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); + *AllocatedPage = Page; + (void)InterlockedDecrementUL(&MiPagesRequired); + return(STATUS_SUCCESS); + } + + /* + * Actually allocate the page. + */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Page = MmAllocPage(Consumer, 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + if (Page == 0) + { + KeBugCheck(NO_PAGES_AVAILABLE); + } + if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; - + return(STATUS_SUCCESS); } @@ -292,11 +345,15 @@ { PVOID WaitObjects[2]; NTSTATUS Status; + ULONG i; + ULONG NrFreedPages; + ULONG NrPagesUsed; + ULONG Target; + BOOLEAN ShouldRun; + WaitObjects[0] = &MiBalancerEvent; WaitObjects[1] = &MiBalancerTimer; - - ASSERT(MiIsBalancerThread()); while (1) { @@ -309,8 +366,61 @@ NULL, NULL); - MmRebalanceMemoryConsumers(); - KeSetEvent(&MiBalancerContinue, IO_NO_INCREMENT, FALSE); + if (Status == STATUS_SUCCESS) + { + /* MiBalancerEvent */ + while (MmAvailablePages < MiMinimumAvailablePages + 5) + { + for (i = 0; i < MC_MAXIMUM; i++) + { + if (MiMemoryConsumers[i].Trim != NULL) + { + NrFreedPages = 0; + Status = MiMemoryConsumers[i].Trim(MiMinimumPagesPerRun, 0, &NrFreedPages); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + } + } + } + InterlockedExchange(&MiBalancerWork, 0); + } + else if (Status == STATUS_SUCCESS + 1) + { + /* MiBalancerTimer */ + ShouldRun = MmAvailablePages < MiMinimumAvailablePages + 5 ? TRUE : FALSE; + for (i = 0; i < MC_MAXIMUM; i++) + { + if (MiMemoryConsumers[i].Trim != NULL) + { + NrPagesUsed = MiMemoryConsumers[i].PagesUsed; + if (NrPagesUsed > MiMemoryConsumers[i].PagesTarget || ShouldRun) + { + if (NrPagesUsed > MiMemoryConsumers[i].PagesTarget) + { + Target = max (NrPagesUsed - MiMemoryConsumers[i].PagesTarget, + MiMinimumPagesPerRun); + } + else + { + Target = MiMinimumPagesPerRun; + } + NrFreedPages = 0; + Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + } + } + } + } + else + { + DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); + KeBugCheck(MEMORY_MANAGEMENT); + } } } @@ -330,7 +440,6 @@ KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&MiBalancerContinue, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); KeSetTimerEx(&MiBalancerTimer, #if defined(__GNUC__) Modified: branches/arty-newcc/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/freelist… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -99,7 +99,6 @@ return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - MmReferencePage(PageDescriptor - MmPfnDatabase); ASSERT_PFN(PageDescriptor); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase; @@ -116,7 +115,7 @@ Page = MiGetPfnEntry(Pfn); ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER || Page->Flags.Consumer == MC_PPOOL); + ASSERT(Page->Flags.Consumer == MC_USER); InsertTailList(&UserPageListHead, &Page->ListEntry); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -134,17 +133,14 @@ Page = MiGetPfnEntry(PreviousPfn); ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER || Page->Flags.Consumer == MC_PPOOL); + ASSERT(Page->Flags.Consumer == MC_USER); NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { - MmDereferencePage(PreviousPfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - MmReferencePage(PageDescriptor - MmPfnDatabase); - MmDereferencePage(PreviousPfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase; } @@ -910,7 +906,6 @@ NTAPI MmDereferencePage(PFN_TYPE Pfn) { - KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -933,12 +928,7 @@ if (Page->ReferenceCount == 0) { MmAvailablePages++; - if (Page->Flags.Consumer == MC_USER) - { - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - RemoveEntryList(&Page->ListEntry); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - } + if (Page->Flags.Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); if (Page->RmapListHead != (LONG)NULL) { DPRINT1("Freeing page with rmap entries.\n"); Modified: branches/arty-newcc/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mpw.c?re… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -17,8 +17,8 @@ /* GLOBALS *******************************************************************/ HANDLE MpwThreadHandle; -CLIENT_ID MpwThreadId; -KEVENT MpwThreadEvent, MpwCompleteEvent; +static CLIENT_ID MpwThreadId; +KEVENT MpwThreadEvent; BOOLEAN MpwThreadShouldTerminate; /* FUNCTIONS *****************************************************************/ @@ -81,11 +81,12 @@ } PagesWritten = 0; +#if 0 /* * FIXME: MmWriteDirtyPages doesn't work correctly. */ MmWriteDirtyPages(128, &PagesWritten); - KeSetEvent(&MpwCompleteEvent, IO_NO_INCREMENT, TRUE); +#endif } } @@ -98,7 +99,6 @@ MpwThreadShouldTerminate = FALSE; KeInitializeEvent(&MpwThreadEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&MpwCompleteEvent, SynchronizationEvent, FALSE); Status = PsCreateSystemThread(&MpwThreadHandle, THREAD_ALL_ACCESS, Modified: branches/arty-newcc/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/pageop.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -83,11 +83,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG_PTR)Segment) ^ (((ULONG_PTR)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG_PTR)Pid) ^ (((ULONG_PTR)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; @@ -151,11 +151,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG_PTR)Segment) ^ (((ULONG_PTR)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG_PTR)Pid) ^ (((ULONG_PTR)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -32,7 +32,6 @@ /* GLOBALS ******************************************************************/ -ULONG RmapPagingOut = 0; static FAST_MUTEX RmapListLock; static NPAGED_LOOKASIDE_LIST RmapLookasideList; @@ -63,7 +62,7 @@ ULONG Type; PVOID Address; PEPROCESS Process; - PMM_PAGEOP PageOp = NULL; + PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -122,7 +121,6 @@ { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; -#ifndef _NEWCC_ /* * Get or create a pageop */ @@ -139,7 +137,6 @@ } return(STATUS_UNSUCCESSFUL); } -#endif /* * Release locks now we have a page op. @@ -208,7 +205,7 @@ ULONG Type; PVOID Address; PEPROCESS Process; - PMM_PAGEOP PageOp = NULL; + PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -258,7 +255,6 @@ { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; -#ifndef _NEWCC_ /* * Get or create a pageop */ @@ -274,7 +270,6 @@ } return(STATUS_UNSUCCESSFUL); } -#endif /* * Release locks now we have a page op. @@ -393,8 +388,6 @@ { PMM_RMAP_ENTRY current_entry; - ASSERT(Page); - ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -416,8 +409,6 @@ { PMM_RMAP_ENTRY current_entry; - ASSERT(Page); - ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -438,8 +429,6 @@ MmIsDirtyPageRmap(PFN_TYPE Page) { PMM_RMAP_ENTRY current_entry; - - ASSERT(Page); ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); @@ -470,7 +459,6 @@ PMM_RMAP_ENTRY new_entry; ULONG PrevSize; - ASSERT(Page); Address = (PVOID)PAGE_ROUND_DOWN(Address); new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); @@ -542,8 +530,6 @@ PMM_RMAP_ENTRY previous_entry; PEPROCESS Process; - ASSERT(Page); - ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -581,8 +567,6 @@ PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; - - ASSERT(Page); ExAcquireFastMutex(&RmapListLock); previous_entry = NULL; Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -122,18 +122,18 @@ VOID NTAPI -_MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) -{ - DPRINT("MmLockSectionSegment(%p,%s:%d)\n", Segment, file, line); - KeAcquireGuardedMutex(&Segment->Lock); +MmLockSectionSegment(PMM_SECTION_SEGMENT Segment) +{ + DPRINT("MmLockSectionSegment(%p)\n", Segment); + ExAcquireFastMutex(&Segment->Lock); } VOID NTAPI -_MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) -{ - DPRINT("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); - KeReleaseGuardedMutex(&Segment->Lock); +MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment) +{ + ExReleaseFastMutex(&Segment->Lock); + DPRINT("MmUnlockSectionSegment(%p)\n", Segment); } VOID @@ -233,7 +233,7 @@ NTSTATUS NTAPI -MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, PPFN_TYPE Page, BOOLEAN Locked) +MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, PPFN_TYPE Page) { PFN_TYPE XPage; NTSTATUS Status; @@ -255,8 +255,7 @@ return Status; } - if (!Locked) - MmLockAddressSpace(MmGetKernelAddressSpace()); + MmLockAddressSpace(MmGetKernelAddressSpace()); Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), MEMORY_AREA_VIRTUAL_MEMORY, @@ -272,8 +271,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("STATUS_NO_MEMORY: %x\n", Status); - if (!Locked) - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MmReleasePageMemoryConsumer(MC_USER, *Page); return STATUS_NO_MEMORY; } @@ -282,15 +280,13 @@ if (!NT_SUCCESS(Status)) { MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - if (!Locked) - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MmReleasePageMemoryConsumer(MC_USER, *Page); DPRINT1("Status: %x\n", Status); return Status; } - if (!Locked) - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MiZeroPage(*Page); Status = MiSimpleRead @@ -302,13 +298,11 @@ DPRINT("Read Status %x (Page %x)\n", Status, *Page); - if (!Locked) - MmLockAddressSpace(MmGetKernelAddressSpace()); + MmLockAddressSpace(MmGetKernelAddressSpace()); MmDeleteVirtualMapping(NULL, PageBuf, FALSE, NULL, &XPage); ASSERT(XPage == *Page); MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - if (!Locked) - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) { @@ -383,11 +377,9 @@ DPRINT("Reading at offset %08x%08x (relative %x)\n", TotalOffset.HighPart, TotalOffset.LowPart, Offset); MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); - Status = MiReadFilePage(Segment->FileObject, &TotalOffset, &Page, Locked); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); + Status = MiReadFilePage(Segment->FileObject, &TotalOffset, &Page); + MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { @@ -430,23 +422,10 @@ SWAPENTRY SwapEntry; MmDeletePageFileMapping(Process, (PVOID)PAddress, &SwapEntry); - MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); - } - - MmLockSectionSegment(Segment); - - if (!Locked) - MmLockAddressSpace(AddressSpace); - if (!MmIsPageSwapEntry(Process, PAddress)) - { - // Handled elsewhere - return STATUS_SUCCESS; } Status = MmReadFromSwapPage(SwapEntry, Page); @@ -455,7 +434,6 @@ DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); ASSERT(FALSE); } - DPRINT("CreateVirtualMapping: %x -> %x\n", Address, Attributes); Status = MmCreateVirtualMapping(Process, Address, @@ -590,20 +568,17 @@ MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) { PEPROCESS Process; - KIRQL PrimaryIrql, Irql; + KIRQL Irql; PVOID TempAddress; Process = PsGetCurrentProcess(); - PrimaryIrql = KfRaiseIrql(DISPATCH_LEVEL); TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); if (TempAddress == NULL) { - KfLowerIrql(PrimaryIrql); return(STATUS_NO_MEMORY); } memcpy(TempAddress, SourceAddress, PAGE_SIZE); MiUnmapPageInHyperSpace(Process, TempAddress, Irql); - KfLowerIrql(PrimaryIrql); return(STATUS_SUCCESS); } @@ -682,9 +657,7 @@ /* * Allocate a page */ - MmUnlockSectionSegment(Segment); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); - if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -695,15 +668,6 @@ * Copy the old page */ MiCopyFromUserPage(NewPage, PAddress); - - MmLockSectionSegment(Segment); - if (MmGetPfnForProcess(Process, PAddress) != OldPage) - { - // Handled elsewhere - MmReleasePageMemoryConsumer(MC_USER, NewPage); - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; - } /* * Delete the old entry. @@ -870,39 +834,26 @@ ("Pulling zero pages for %08x%08x-%08x%08x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, End.u.HighPart, End.u.LowPart); - MmLockSectionSegment(Segment); while (FileOffset.QuadPart < End.QuadPart) { PVOID Address; ULONG Entry = MiGetPageEntrySectionSegment(Segment, &FileOffset); - if (Entry == 0) { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page))) { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); return STATUS_NO_MEMORY; } - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; - - if (!MmIsPagePresent(NULL, Address) && MiGetPageEntrySectionSegment(Segment, &FileOffset) == Entry) - { - MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, Address); - MiSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_SSE(Page << PAGE_SHIFT, 1)); - } - else - MmReleasePageMemoryConsumer(MC_USER, Page); + MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); + MmInsertRmap(Page, NULL, Address); + MiSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_SSE(Page << PAGE_SHIFT, 1)); } FileOffset.QuadPart += PAGE_SIZE; } - MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); return STATUS_SUCCESS; @@ -1049,6 +1000,8 @@ } MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) @@ -1064,6 +1017,8 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -1112,6 +1067,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); } } @@ -1156,6 +1113,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); } @@ -1184,6 +1143,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -1198,8 +1159,10 @@ PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PFN_TYPE Page; + SWAPENTRY SwapEntry; ULONG Entry; - NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN Private; + NTSTATUS Status; PFILE_OBJECT FileObject; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -1220,38 +1183,83 @@ /* * Get the section segment entry and the physical address. */ - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - Entry = MiGetPageEntrySectionSegment(Segment, &Offset); + if (!MmIsPagePresent(Process, Address)) + { + DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", + Process ? Process->UniqueProcessId : 0, Address); + ASSERT(FALSE); + } Page = MmGetPfnForProcess(Process, Address); - - if (!Page) - { - // Somebody else already paged it out - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; - } + SwapEntry = MmGetSavedSwapEntryPage(Page); /* * Check for a private (COWed) page. */ - if (!IS_SWAP_FROM_SSE(Entry) && PFN_FROM_SSE(Entry) == Page && MmIsDirtyPageRmap(Page)) - { - MmSetCleanAllRmaps(Page); - DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) + { + Private = TRUE; } else { - MmUnlockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); - } - - return(Status); + Private = FALSE; + } + + /* + * Speculatively set all mappings of the page to clean. + */ + MmSetCleanAllRmaps(Page); + + /* + * If this page was direct mapped from the cache then the cache manager + * will take care of writing it back to disk. + */ + if (!Private) + { + ASSERT(SwapEntry == 0); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); + Status = PageOp->Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); + MmspCompleteAndReleasePageOp(PageOp); + return(Status); + } + + /* + * If necessary, allocate an entry in the paging file for this page + */ + if (SwapEntry == 0) + { + SwapEntry = MmAllocSwapPage(); + if (SwapEntry == 0) + { + MmSetDirtyAllRmaps(Page); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_PAGEFILE_QUOTA); + } + MmSetSavedSwapEntryPage(Page, SwapEntry); + } + + /* + * Write the page to the pagefile + */ + Status = MmWriteToSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", + Status); + MmSetDirtyAllRmaps(Page); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_UNSUCCESSFUL); + } + + /* + * Otherwise we have succeeded. + */ + DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_SUCCESS); } NTSTATUS @@ -1283,6 +1291,8 @@ Segment = MemoryArea->Data.SectionData.Segment; ViewOffset.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; + MmLockSectionSegment(Segment); + Pages = ExAllocatePool (NonPagedPool, sizeof(PFN_TYPE) * @@ -1292,8 +1302,6 @@ { ASSERT(FALSE); } - - MmLockSectionSegment(Segment); for (PageAddress = BeginningAddress; PageAddress < EndingAddress; @@ -1328,10 +1336,8 @@ { DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &Segment->FileObject->FileName, FileOffset.u.HighPart, FileOffset.u.LowPart); Status = MiWriteBackPage(Segment->FileObject, &FileOffset, PAGE_SIZE, Page); - MmLockAddressSpace(AddressSpace); MmUnlockPage(Page); MmSetCleanAllRmaps(Page); - MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { DPRINT1 @@ -1689,7 +1695,7 @@ return(STATUS_NO_MEMORY); } - KeInitializeGuardedMutex(&Segment->Lock); + ExInitializeFastMutex(&Segment->Lock); Segment->ReferenceCount = 1; Section->Segment = Segment; @@ -1707,7 +1713,7 @@ /* * Set the lock before assigning the segment to the file object */ - KeAcquireGuardedMutex(&Segment->Lock); + ExAcquireFastMutex(&Segment->Lock); DPRINT("Filling out Segment info (No previous data section)\n"); ObReferenceObject(FileObject); @@ -2327,6 +2333,50 @@ return(STATUS_SUCCESS); } +NTSTATUS +NTAPI +MiAwaitPageOps(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress) +{ + NTSTATUS Status; + PMM_PAGEOP PageOp; + ULONG Offset; + + while (MemoryArea->PageOpCount) + { + Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress); + + while (Offset) + { + Offset -= PAGE_SIZE; + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, + MemoryArea->Data.SectionData.Segment, + Offset); + if (PageOp) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmspWaitForPageOpCompletionEvent(PageOp); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op, status = %x\n", Status); + ASSERT(FALSE); + } + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); + if (MemoryArea == NULL || + MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + { + MmUnlockAddressSpace(AddressSpace); + DPRINT("STATUS_NOT_MAPPED_VIEW\n"); + return STATUS_NOT_MAPPED_VIEW; + } + break; + } + } + } + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -2359,14 +2409,18 @@ if (MemoryArea->Type == MEMORY_AREA_IMAGE_SECTION) { MemoryArea->DeleteInProgress = TRUE; - Status = MiUnmapImageSection(AddressSpace, MemoryArea, BaseAddress); + Status = MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); + if (NT_SUCCESS(Status)) + Status = MiUnmapImageSection(AddressSpace, MemoryArea, BaseAddress); } else if (MemoryArea->Type == MEMORY_AREA_PHYSICAL_MEMORY_SECTION || MemoryArea->Type == MEMORY_AREA_PAGE_FILE_SECTION || MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { MemoryArea->DeleteInProgress = TRUE; - Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); + Status = MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); + if (NT_SUCCESS(Status)) + Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } else { Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -233,17 +233,14 @@ Entry = MiGetPageEntrySectionSegment(Segment, &Offset); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - if (Entry == 0 && !HasSwapEntry && - (Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart))) + if (Entry == 0 && !HasSwapEntry && Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart)) { TotalOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset/*.QuadPart*/; MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); - Status = MiReadFilePage(Section->FileObject, &TotalOffset, &Page, Locked); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); + Status = MiReadFilePage(Section->FileObject, &TotalOffset, &Page); + MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { @@ -285,15 +282,10 @@ MmDeletePageFileMapping(Process, (PVOID)PAddress, &SwapEntry); - MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - if (!Locked) - MmLockAddressSpace(AddressSpace); - return Status; + ASSERT(FALSE); } DPRINT("Allocated page %x\n", Page); @@ -304,14 +296,6 @@ ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - if (MmIsPagePresent(Process, Address)) - { - // Handled elsewhere - MmReleasePageMemoryConsumer(MC_USER, Page); - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; - } Status = MmCreateVirtualMapping(Process, Address, Region->Protect, @@ -351,26 +335,16 @@ */ if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) { - MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { DPRINT("Status %x\n", Status); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); return Status; } DPRINT("Allocated page %x\n", Page); - if (!Locked) - MmLockAddressSpace(AddressSpace); - if (MmIsPagePresent(Process, Address)) - { - // Handled elsewhere - MmReleasePageMemoryConsumer(MC_USER, Page); - return STATUS_SUCCESS; - } + MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, Address, Region->Protect, @@ -380,6 +354,7 @@ { MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); + MmUnlockSectionSegment(Segment); return(Status); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -391,6 +366,7 @@ /* * Cleanup and release locks */ + MmUnlockSectionSegment(Segment); //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -410,9 +386,7 @@ /* * Release all our locks and read in the page from disk */ - MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); if (Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart)) { @@ -420,8 +394,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); return Status; } DPRINT("Allocated page %x\n", Page); @@ -435,8 +409,8 @@ DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); return Status; } } @@ -452,8 +426,8 @@ DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmLockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); return Status; } @@ -463,21 +437,12 @@ /* * Relock the address space and segment */ - if (!Locked) - MmLockAddressSpace(AddressSpace); + MmLockAddressSpace(AddressSpace); /* * Mark the offset within the section as having valid, in-memory * data */ - MmLockSectionSegment(Segment); - if (Entry != MiGetPageEntrySectionSegment(Segment, &Offset)) - { - // Handled elsewhere - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; - } - Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MiSetPageEntrySectionSegment(Segment, &Offset, Entry); @@ -532,8 +497,6 @@ //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } - - ASSERT(FALSE); } NTSTATUS @@ -1437,7 +1400,7 @@ /* And finish their initialization */ for ( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - KeInitializeGuardedMutex(&ImageSectionObject->Segments[i].Lock); + ExInitializeFastMutex(&ImageSectionObject->Segments[i].Lock); ImageSectionObject->Segments[i].Flags = MM_IMAGE_SEGMENT; ImageSectionObject->Segments[i].ReferenceCount = 1; MiInitializeSectionPageTable(&ImageSectionObject->Segments[i]); @@ -1885,6 +1848,8 @@ //DPRINT("MiUnmapImageSection @ %x\n", BaseAddress); MemoryArea->DeleteInProgress = TRUE; + MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); + Section = MemoryArea->Data.SectionData.Section; if (Section->AllocationAttributes & SEC_IMAGE) Modified: branches/arty-newcc/ntoskrnl/mm/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -54,6 +54,8 @@ #pragma alloc_text(INIT, MmInitSectionImplementation) #endif +KEVENT CcpLazyWriteEvent; + /* * FUNCTION: Waits in kernel mode indefinitely for a file object lock. * ARGUMENTS: PFILE_OBJECT to wait for. @@ -426,65 +428,82 @@ ULONG Length, PFN_TYPE Page) { - PFN_TYPE XPage; NTSTATUS Status; + PVOID Hyperspace; IO_STATUS_BLOCK Iosb; - PVOID PageBuf = 0; - PMEMORY_AREA TmpArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - - Status = MmCreateMemoryArea - (MmGetKernelAddressSpace(), - MEMORY_AREA_VIRTUAL_MEMORY, - &PageBuf, - PAGE_SIZE, - PAGE_READWRITE, - &TmpArea, - FALSE, - MEM_TOP_DOWN, - BoundaryAddressMultiple); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("STATUS_NO_MEMORY: %x\n", Status); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - return STATUS_NO_MEMORY; - } - - Status = MmCreateVirtualMapping(NULL, PageBuf, PAGE_READWRITE, &Page, 1); - if (!NT_SUCCESS(Status)) - { - MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - DPRINT1("Status: %x\n", Status); - return Status; - } - MmReferencePage(Page); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + KIRQL OldIrql; + PVOID PageBuffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); + + if (!PageBuffer) return STATUS_NO_MEMORY; + + OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + Hyperspace = MmCreateHyperspaceMapping(Page); + RtlCopyMemory(PageBuffer, Hyperspace, PAGE_SIZE); + MmDeleteHyperspaceMapping(Hyperspace); + KfLowerIrql(OldIrql); DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart); Status = MiSimpleWrite (FileObject, FileOffset, - PageBuf, + PageBuffer, Length, &Iosb); + ExFreePool(PageBuffer); + if (!NT_SUCCESS(Status)) { DPRINT1("MiSimpleWrite failed (%x)\n", Status); } - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmDeleteVirtualMapping(NULL, PageBuf, FALSE, NULL, &XPage); - ASSERT(XPage == Page); - MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - MmDereferencePage(Page); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - return Status; } + +VOID +NTAPI +MiWriteThread() +{ + BOOLEAN Complete; + NTSTATUS Status; + LIST_ENTRY OldHead; + PLIST_ENTRY Entry; + PWRITE_SCHEDULE_ENTRY WriteEntry; + + ExAcquireFastMutex(&MiWriteMutex); + Complete = IsListEmpty(&MiWriteScheduleListHead); + ExReleaseFastMutex(&MiWriteMutex); + if (Complete) + { + DPRINT1("No items await writing\n"); + KeSetEvent(&CcpLazyWriteEvent, IO_NO_INCREMENT, FALSE); + } + + DPRINT1("Lazy write items are available\n"); + KeResetEvent(&CcpLazyWriteEvent); + + ExAcquireFastMutex(&MiWriteMutex); + RtlCopyMemory(&OldHead, &MiWriteScheduleListHead, sizeof(OldHead)); + OldHead.Flink->Blink = &OldHead; + OldHead.Blink->Flink = &OldHead; + InitializeListHead(&MiWriteScheduleListHead); + ExReleaseFastMutex(&MiWriteMutex); + + for (Entry = OldHead.Flink; + !IsListEmpty(&OldHead); + Entry = OldHead.Flink) + { + WriteEntry = CONTAINING_RECORD(Entry, WRITE_SCHEDULE_ENTRY, Entry); + Status = MiWriteBackPage(WriteEntry->FileObject, &WriteEntry->FileOffset, WriteEntry->Length, WriteEntry->Page); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MiSimpleWrite failed (%x)\n", Status); + } + + MmDereferencePage(WriteEntry->Page); + ObDereferenceObject(WriteEntry->FileObject); + RemoveEntryList(&WriteEntry->Entry); + ExFreePool(WriteEntry); + } +} Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Fri Nov 27 02:03:24 2009 @@ -69,7 +69,9 @@ PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Entry; + ULONG Entry1; ULONG Attributes; + PMM_PAGEOP PageOp; PMM_REGION Region; BOOLEAN HasSwapEntry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -98,14 +100,10 @@ Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); - /* * Lock the segment */ MmLockSectionSegment(Segment); - - Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); /* * Check if this page needs to be mapped COW @@ -121,63 +119,178 @@ Attributes = Region->Protect; } + /* + * Get or create a page operation descriptor + */ + PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.QuadPart, MM_PAGEOP_PAGEIN, FALSE); + if (PageOp == NULL) + { + DPRINT1("MmGetPageOp failed\n"); + ASSERT(FALSE); + } + + /* + * Check if someone else is already handling this fault, if so wait + * for them + */ + if (PageOp->Thread != PsGetCurrentThread()) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + Status = MmspWaitForPageOpCompletionEvent(PageOp); + /* + * Check for various strange conditions + */ + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op, status = %x\n", Status); + ASSERT(FALSE); + } + if (PageOp->Status == STATUS_PENDING) + { + DPRINT1("Woke for page op before completion\n"); + ASSERT(FALSE); + } + MmLockAddressSpace(AddressSpace); + /* + * If this wasn't a pagein then restart the operation + */ + if (PageOp->OpType != MM_PAGEOP_PAGEIN) + { + MmspCompleteAndReleasePageOp(PageOp); + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_MM_RESTART_OPERATION); + } + + /* + * If the thread handling this fault has failed then we don't retry + */ + if (!NT_SUCCESS(PageOp->Status)) + { + Status = PageOp->Status; + MmspCompleteAndReleasePageOp(PageOp); + DPRINT("Address 0x%.8X\n", Address); + return(Status); + } + MmLockSectionSegment(Segment); + /* + * If the completed fault was for another address space then set the + * page in this one. + */ + if (!MmIsPagePresent(Process, Address)) + { + DPRINT("!MmIsPagePresent(%p, %p)\n", Process, Address); + + Entry = MiGetPageEntrySectionSegment(Segment, &Offset); + HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); + + if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry) + { + /* + * The page was a private page in another or in our address space + */ + MmUnlockSectionSegment(Segment); + MmspCompleteAndReleasePageOp(PageOp); + return(STATUS_MM_RESTART_OPERATION); + } + + Page = PFN_FROM_SSE(Entry); + + MmSharePageEntrySectionSegment(Segment, &Offset); + + /* FIXME: Should we call MmCreateVirtualMappingUnsafe if + * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? + */ + Status = MmCreateVirtualMapping(Process, + Address, + Attributes, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + ASSERT(FALSE); + } + MmInsertRmap(Page, Process, (PVOID)PAddress); + } + if (Locked) + { + MmLockPage(Page); + } + MmUnlockSectionSegment(Segment); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_SUCCESS); + } + + /* + * Get the entry corresponding to the offset within the section + */ + Entry = MiGetPageEntrySectionSegment(Segment, &Offset); + if (Entry == 0) { + /* + * If the entry is zero (and it can't change because we have + * locked the segment) then we need to load the page. + */ + + /* + * Release all our locks and read in the page from disk + */ MmUnlockSectionSegment(Segment); - if (!Locked) - MmUnlockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); - if (!Locked) - MmLockAddressSpace(AddressSpace); - return Status; - } - - DPRINT("Allocated page %x\n", Page); + } Status = MmCreateVirtualMapping(Process, - PAddress, + Address, Attributes, &Page, 1); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - MmReleasePageMemoryConsumer(MC_USER, Page); - DPRINT("Release page %x\n", Page); - if (!Locked) - MmLockAddressSpace(AddressSpace); - return Status; + ASSERT(FALSE); } /* * Relock the address space and segment */ - if (!Locked) - MmLockAddressSpace(AddressSpace); - + MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); - if (Entry != MiGetPageEntrySectionSegment(Segment, &Offset)) - { - // Already handled - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; - } + + /* + * Check the entry. No one should change the status of a page + * that has a pending page-in. + */ + Entry1 = MiGetPageEntrySectionSegment(Segment, &Offset); + if (Entry != Entry1) + { + DPRINT1("Someone changed ppte entry while we slept\n"); + ASSERT(FALSE); + } + /* * Mark the offset within the section as having valid, in-memory * data */ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MiSetPageEntrySectionSegment(Segment, &Offset, Entry); + MmUnlockSectionSegment(Segment); + MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { MmLockPage(Page); } - - MmUnlockSectionSegment(Segment); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -189,6 +302,8 @@ { MmLockPage(Page); } + PageOp->Status = Status; + MmspCompleteAndReleasePageOp(PageOp); return Status; } else @@ -218,6 +333,8 @@ { MmLockPage(Page); } + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -292,7 +409,7 @@ } Section->Segment = Segment; Segment->ReferenceCount = 1; - KeInitializeGuardedMutex(&Segment->Lock); + ExInitializeFastMutex(&Segment->Lock); Segment->Protection = SectionPageProtection; Segment->RawLength.QuadPart = MaximumSize.QuadPart; Segment->Length.QuadPart = PAGE_ROUND_UP(MaximumSize.QuadPart); @@ -428,6 +545,8 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) @@ -443,6 +562,8 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -491,6 +612,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); } } @@ -535,6 +658,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); + PageOp->Status = STATUS_UNSUCCESSFUL; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); } @@ -563,6 +688,8 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } + PageOp->Status = STATUS_SUCCESS; + MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -572,6 +699,8 @@ PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; + PMM_PAGEOP PageOp; + NTSTATUS Status; LARGE_INTEGER Offset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; @@ -588,6 +717,26 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; + + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); + + while (PageOp) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + + Status = MmspWaitForPageOpCompletionEvent(PageOp); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op, status = %x\n", Status); + ASSERT(FALSE); + } + + MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Segment); + MmspCompleteAndReleasePageOp(PageOp); + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); + } DPRINT("MmFreeSectionPage -> MmGetPageEntrySectionSegment(%p, %x)\n", Segment, Offset.u.LowPart); Entry = MiGetPageEntrySectionSegment(Segment, &Offset);

15 years

[arty] 44290: Debug paths related to page reclamation and simplify balance to the core. Also remove some vestigal uses of PageOps.

by arty＠svn.reactos.org

Author: arty Date: Thu Nov 26 23:50:50 2009 New Revision: 44290 URL: http://svn.reactos.org/svn/reactos?rev=44290&view=rev Log: Debug paths related to page reclamation and simplify balance to the core. Also remove some vestigal uses of PageOps. Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/io/iomgr/device.c branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/freelist.c branches/arty-newcc/ntoskrnl/mm/mpw.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c branches/arty-newcc/ntoskrnl/mm/section/io.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -260,7 +260,7 @@ typedef struct _MM_SECTION_SEGMENT { - FAST_MUTEX Lock; /* lock which protects the page directory */ + KGUARDED_MUTEX Lock; /* lock which protects the page directory */ PFILE_OBJECT FileObject; ULARGE_INTEGER RawLength; /* length of the segment which is part of the mapped file */ ULARGE_INTEGER Length; /* absolute length of the segment */ @@ -1685,7 +1685,8 @@ NTSTATUS NTAPI -MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER Offset, PPFN_TYPE Page); +MiReadFilePage +(PFILE_OBJECT FileObject, PLARGE_INTEGER Offset, PPFN_TYPE Page, BOOLEAN Locked); VOID NTAPI @@ -1743,11 +1744,15 @@ VOID NTAPI -MmLockSectionSegment(PMM_SECTION_SEGMENT Segment); - -VOID -NTAPI -MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment); +_MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); + +VOID +NTAPI +_MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); + +#define MmLockSectionSegment(S) _MmLockSectionSegment(S,__FILE__,__LINE__) + +#define MmUnlockSectionSegment(S) _MmUnlockSectionSegment(S,__FILE__,__LINE__) VOID MmspCompleteAndReleasePageOp(PMM_PAGEOP PageOp); Modified: branches/arty-newcc/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/de… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -1150,7 +1150,11 @@ NTSTATUS Status; /* Make sure there's a VPB */ - if (!FileSystemDeviceObject->Vpb) return STATUS_INVALID_PARAMETER; + if (!FileSystemDeviceObject->Vpb) + { + DPRINT1("STATUS_INVALID_PARAMETER\n"); + return STATUS_INVALID_PARAMETER; + } /* Acquire it */ IoAcquireVpbSpinLock(&OldIrql); @@ -1182,6 +1186,7 @@ else { /* Fail */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -278,6 +278,7 @@ { /* Fail */ ObDereferenceObject(FileObject); + DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } @@ -1122,6 +1123,7 @@ /* Check if CompletionFilter is valid */ if (!CompletionFilter || (CompletionFilter & ~FILE_NOTIFY_VALID_MASK)) { + DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } } @@ -2050,6 +2052,7 @@ /* Otherwise, this was async I/O without a byte offset, so fail */ if (EventObject) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); + DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } @@ -2424,6 +2427,7 @@ (FileObject->CompletionContext)) { /* Fail */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -2458,6 +2462,7 @@ */ ExFreePool(Context); ObDereferenceObject(Queue); + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } } @@ -2903,6 +2908,7 @@ /* Otherwise, this was async I/O without a byte offset, so fail */ if (EventObject) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); + DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } Modified: branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/ra… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -239,6 +239,7 @@ else { /* Invalid create request */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; } @@ -435,6 +436,7 @@ default: /* Fail */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; break; } @@ -576,6 +578,7 @@ DeviceObject->AlignmentRequirement)) { /* It's not, fail */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -848,6 +851,7 @@ default: /* Fail it */ + DPRINT1("STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; break; } Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -377,13 +377,10 @@ /* * Try to allocate a page */ - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); - if (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - } + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + MmLockAddressSpace(AddressSpace); + if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -32,18 +32,17 @@ /* GLOBALS ******************************************************************/ MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; -static ULONG MiMinimumAvailablePages; +static ULONG MiMinimumAvailablePages = 512; static ULONG MiNrTotalPages; static LIST_ENTRY AllocationListHead; static KSPIN_LOCK AllocationListLock; -static ULONG MiPagesRequired = 0; -static ULONG MiMinimumPagesPerRun = 10; +static ULONG MiMinimumPagesPerRun = 128; static CLIENT_ID MiBalancerThreadId; static HANDLE MiBalancerThreadHandle = NULL; static KEVENT MiBalancerEvent; +static KEVENT MiBalancerContinue; static KTIMER MiBalancerTimer; -static LONG MiBalancerWork = 0; /* FUNCTIONS ****************************************************************/ @@ -67,7 +66,6 @@ MiNrTotalPages = NrAvailablePages; /* Set up targets. */ - MiMinimumAvailablePages = 64; if ((NrAvailablePages + NrSystemPages) >= 8192) { MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 4 * 3; @@ -117,7 +115,7 @@ if (MmGetReferenceCountPage(Page) == 1) { (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (IsListEmpty(&AllocationListHead) || MmAvailablePages < MiMinimumAvailablePages) + if (IsListEmpty(&AllocationListHead)) { KeReleaseSpinLock(&AllocationListLock, OldIrql); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -129,7 +127,8 @@ Entry = RemoveHeadList(&AllocationListHead); Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); KeReleaseSpinLock(&AllocationListLock, OldIrql); - if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); + if(Consumer == MC_USER || Consumer == MC_PPOOL) + MmRemoveLRUUserPage(Page); MiZeroPage(Page); Request->Page = Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); @@ -142,26 +141,6 @@ } return(STATUS_SUCCESS); -} - -VOID -NTAPI -MiTrimMemoryConsumer(ULONG Consumer) -{ - LONG Target; - ULONG NrFreedPages; - - Target = MiMemoryConsumers[Consumer].PagesUsed - - MiMemoryConsumers[Consumer].PagesTarget; - if (Target < 1) - { - Target = 1; - } - - if (MiMemoryConsumers[Consumer].Trim != NULL) - { - MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); - } } NTSTATUS @@ -172,27 +151,35 @@ NTSTATUS Status; (*NrFreedPages) = 0; + DPRINT("Trimming user memory (want %d)\n", Target); CurrentPage = MmGetLRUFirstUserPage(); while (CurrentPage != 0 && Target > 0) { NextPage = MmGetLRUNextUserPage(CurrentPage); - + + DPRINT("Page Out %x\n", CurrentPage); Status = MmPageOutPhysicalAddress(CurrentPage); + DPRINT("Done %x\n", Status); if (NT_SUCCESS(Status)) { - DPRINT("Succeeded\n"); Target--; (*NrFreedPages)++; } else if (Status == STATUS_PAGEFILE_QUOTA) { - MmRemoveLRUUserPage(CurrentPage); - MmInsertLRULastUserPage(CurrentPage); + MmRemoveLRUUserPage(CurrentPage); + MmInsertLRULastUserPage(CurrentPage); + return STATUS_SUCCESS; } CurrentPage = NextPage; } + if (CurrentPage) + MmDereferencePage(CurrentPage); + + DPRINT("Done: %d\n", NrFreedPages); + return(STATUS_SUCCESS); } @@ -205,14 +192,16 @@ ULONG NrFreedPages; NTSTATUS Status; - Target = (MiMinimumAvailablePages - MmAvailablePages) + MiPagesRequired; + Target = (MiMinimumAvailablePages - MmAvailablePages); Target = max(Target, (LONG) MiMinimumPagesPerRun); for (i = 0; i < MC_MAXIMUM && Target > 0; i++) { if (MiMemoryConsumers[i].Trim != NULL) { - Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); + DPRINT("Trimming %d\n"); + Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); + DPRINT("Got %d pages\n", NrFreedPages); if (!NT_SUCCESS(Status)) { KeBugCheck(MEMORY_MANAGEMENT); @@ -226,7 +215,7 @@ MiIsBalancerThread(VOID) { return MiBalancerThreadHandle != NULL && - PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; + PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread; } NTSTATUS @@ -234,106 +223,67 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PPFN_TYPE AllocatedPage) { - ULONG OldUsed; - PFN_TYPE Page; + PFN_TYPE Page = 0; KIRQL OldIrql; - /* - * Make sure we don't exceed our individual target. - */ - OldUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (OldUsed >= (MiMemoryConsumers[Consumer].PagesTarget - 1) && - !MiIsBalancerThread()) - { - if (!CanWait) - { - (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - return(STATUS_NO_MEMORY); - } - MiTrimMemoryConsumer(Consumer); + (void)InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + + if (!MiIsBalancerThread() && MmAvailablePages <= MiMinimumAvailablePages && CanWait) + { + DPRINT("MmAvailablePages %d MiMinimumAvailablePages %d\n", + MmAvailablePages, MiMinimumAvailablePages); + KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); + KeWaitForSingleObject(&MiBalancerContinue, 0, KernelMode, FALSE, NULL); } /* * Allocate always memory for the non paged pool and for the pager thread. */ - if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) + if ((Consumer == MC_NPPOOL) || + (Consumer == MC_SYSTEM) || + MiIsBalancerThread() || + (MmAvailablePages > MiMinimumAvailablePages)) { OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer, 0); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - if (Page == 0) + if (!Page && MiIsBalancerThread()) { + DPRINT1("Can't allocate for balancer: %d vs %d\n", + MmAvailablePages, MiMinimumAvailablePages); KeBugCheck(NO_PAGES_AVAILABLE); } - *AllocatedPage = Page; - if (MmAvailablePages <= MiMinimumAvailablePages && - MiBalancerThreadHandle != NULL) - { - KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); - } - return(STATUS_SUCCESS); } /* * Make sure we don't exceed global targets. */ - if (MmAvailablePages <= MiMinimumAvailablePages) - { - MM_ALLOCATION_REQUEST Request; - - if (!CanWait) - { - (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - return(STATUS_NO_MEMORY); - } - - /* Insert an allocation request. */ - Request.Page = 0; - - KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); - (void)InterlockedIncrementUL(&MiPagesRequired); - - KeAcquireSpinLock(&AllocationListLock, &OldIrql); - - if (MiBalancerThreadHandle != NULL) - { - KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); - } - InsertTailList(&AllocationListHead, &Request.ListEntry); - KeReleaseSpinLock(&AllocationListLock, OldIrql); - - KeWaitForSingleObject(&Request.Event, - 0, - KernelMode, - FALSE, - NULL); - - Page = Request.Page; - if (Page == 0) - { - KeBugCheck(NO_PAGES_AVAILABLE); - } - /* Update the Consumer */ - MiGetPfnEntry(Page)->u3.e1.PageLocation = Consumer; - if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); - *AllocatedPage = Page; - (void)InterlockedDecrementUL(&MiPagesRequired); - return(STATUS_SUCCESS); - } - - /* - * Actually allocate the page. - */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MmAllocPage(Consumer, 0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - if (Page == 0) - { - KeBugCheck(NO_PAGES_AVAILABLE); - } - if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); + while (!Page) + { + if (!MiIsBalancerThread() || CanWait) + { + KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); + KeWaitForSingleObject(&MiBalancerContinue, 0, KernelMode, FALSE, NULL); + } + + /* + * Actually allocate the page. + */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Page = MmAllocPage(Consumer, 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + if (!Page && !CanWait) + { + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + return(STATUS_NO_MEMORY); + } + } + + if(Consumer == MC_USER || Consumer == MC_PPOOL) + MmInsertLRULastUserPage(Page); *AllocatedPage = Page; - + return(STATUS_SUCCESS); } @@ -342,15 +292,11 @@ { PVOID WaitObjects[2]; NTSTATUS Status; - ULONG i; - ULONG NrFreedPages; - ULONG NrPagesUsed; - ULONG Target; - BOOLEAN ShouldRun; - WaitObjects[0] = &MiBalancerEvent; WaitObjects[1] = &MiBalancerTimer; + + ASSERT(MiIsBalancerThread()); while (1) { @@ -363,61 +309,8 @@ NULL, NULL); - if (Status == STATUS_SUCCESS) - { - /* MiBalancerEvent */ - while (MmAvailablePages < MiMinimumAvailablePages + 5) - { - for (i = 0; i < MC_MAXIMUM; i++) - { - if (MiMemoryConsumers[i].Trim != NULL) - { - NrFreedPages = 0; - Status = MiMemoryConsumers[i].Trim(MiMinimumPagesPerRun, 0, &NrFreedPages); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - } - } - } - InterlockedExchange(&MiBalancerWork, 0); - } - else if (Status == STATUS_SUCCESS + 1) - { - /* MiBalancerTimer */ - ShouldRun = MmAvailablePages < MiMinimumAvailablePages + 5 ? TRUE : FALSE; - for (i = 0; i < MC_MAXIMUM; i++) - { - if (MiMemoryConsumers[i].Trim != NULL) - { - NrPagesUsed = MiMemoryConsumers[i].PagesUsed; - if (NrPagesUsed > MiMemoryConsumers[i].PagesTarget || ShouldRun) - { - if (NrPagesUsed > MiMemoryConsumers[i].PagesTarget) - { - Target = max (NrPagesUsed - MiMemoryConsumers[i].PagesTarget, - MiMinimumPagesPerRun); - } - else - { - Target = MiMinimumPagesPerRun; - } - NrFreedPages = 0; - Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - } - } - } - } - else - { - DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } + MmRebalanceMemoryConsumers(); + KeSetEvent(&MiBalancerContinue, IO_NO_INCREMENT, FALSE); } } @@ -437,6 +330,7 @@ KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&MiBalancerContinue, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); KeSetTimerEx(&MiBalancerTimer, #if defined(__GNUC__) Modified: branches/arty-newcc/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/freelist… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -116,7 +116,7 @@ Page = MiGetPfnEntry(Pfn); ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER); + ASSERT(Page->Flags.Consumer == MC_USER || Page->Flags.Consumer == MC_PPOOL); InsertTailList(&UserPageListHead, &Page->ListEntry); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -134,7 +134,7 @@ Page = MiGetPfnEntry(PreviousPfn); ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER); + ASSERT(Page->Flags.Consumer == MC_USER || Page->Flags.Consumer == MC_PPOOL); NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { Modified: branches/arty-newcc/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mpw.c?re… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mpw.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -17,7 +17,7 @@ /* GLOBALS *******************************************************************/ HANDLE MpwThreadHandle; -static CLIENT_ID MpwThreadId; +CLIENT_ID MpwThreadId; KEVENT MpwThreadEvent, MpwCompleteEvent; BOOLEAN MpwThreadShouldTerminate; Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -32,6 +32,7 @@ /* GLOBALS ******************************************************************/ +ULONG RmapPagingOut = 0; static FAST_MUTEX RmapListLock; static NPAGED_LOOKASIDE_LIST RmapLookasideList; @@ -62,7 +63,7 @@ ULONG Type; PVOID Address; PEPROCESS Process; - PMM_PAGEOP PageOp; + PMM_PAGEOP PageOp = NULL; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -121,6 +122,7 @@ { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; +#ifndef _NEWCC_ /* * Get or create a pageop */ @@ -137,6 +139,7 @@ } return(STATUS_UNSUCCESSFUL); } +#endif /* * Release locks now we have a page op. @@ -205,7 +208,7 @@ ULONG Type; PVOID Address; PEPROCESS Process; - PMM_PAGEOP PageOp; + PMM_PAGEOP PageOp = NULL; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -255,6 +258,7 @@ { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; +#ifndef _NEWCC_ /* * Get or create a pageop */ @@ -270,6 +274,7 @@ } return(STATUS_UNSUCCESSFUL); } +#endif /* * Release locks now we have a page op. @@ -388,6 +393,8 @@ { PMM_RMAP_ENTRY current_entry; + ASSERT(Page); + ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -409,6 +416,8 @@ { PMM_RMAP_ENTRY current_entry; + ASSERT(Page); + ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -429,6 +438,8 @@ MmIsDirtyPageRmap(PFN_TYPE Page) { PMM_RMAP_ENTRY current_entry; + + ASSERT(Page); ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); @@ -459,6 +470,7 @@ PMM_RMAP_ENTRY new_entry; ULONG PrevSize; + ASSERT(Page); Address = (PVOID)PAGE_ROUND_DOWN(Address); new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); @@ -530,6 +542,8 @@ PMM_RMAP_ENTRY previous_entry; PEPROCESS Process; + ASSERT(Page); + ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -567,6 +581,8 @@ PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; + + ASSERT(Page); ExAcquireFastMutex(&RmapListLock); previous_entry = NULL; Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -122,18 +122,18 @@ VOID NTAPI -MmLockSectionSegment(PMM_SECTION_SEGMENT Segment) -{ - DPRINT("MmLockSectionSegment(%p)\n", Segment); - ExAcquireFastMutex(&Segment->Lock); +_MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) +{ + DPRINT("MmLockSectionSegment(%p,%s:%d)\n", Segment, file, line); + KeAcquireGuardedMutex(&Segment->Lock); } VOID NTAPI -MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment) -{ - ExReleaseFastMutex(&Segment->Lock); - DPRINT("MmUnlockSectionSegment(%p)\n", Segment); +_MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) +{ + DPRINT("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); + KeReleaseGuardedMutex(&Segment->Lock); } VOID @@ -233,7 +233,7 @@ NTSTATUS NTAPI -MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, PPFN_TYPE Page) +MiReadFilePage(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, PPFN_TYPE Page, BOOLEAN Locked) { PFN_TYPE XPage; NTSTATUS Status; @@ -255,7 +255,8 @@ return Status; } - MmLockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmLockAddressSpace(MmGetKernelAddressSpace()); Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), MEMORY_AREA_VIRTUAL_MEMORY, @@ -271,7 +272,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("STATUS_NO_MEMORY: %x\n", Status); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MmReleasePageMemoryConsumer(MC_USER, *Page); return STATUS_NO_MEMORY; } @@ -280,13 +282,15 @@ if (!NT_SUCCESS(Status)) { MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MmReleasePageMemoryConsumer(MC_USER, *Page); DPRINT1("Status: %x\n", Status); return Status; } - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmUnlockAddressSpace(MmGetKernelAddressSpace()); MiZeroPage(*Page); Status = MiSimpleRead @@ -298,11 +302,13 @@ DPRINT("Read Status %x (Page %x)\n", Status, *Page); - MmLockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmLockAddressSpace(MmGetKernelAddressSpace()); MmDeleteVirtualMapping(NULL, PageBuf, FALSE, NULL, &XPage); ASSERT(XPage == *Page); MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + if (!Locked) + MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) { @@ -377,9 +383,11 @@ DPRINT("Reading at offset %08x%08x (relative %x)\n", TotalOffset.HighPart, TotalOffset.LowPart, Offset); MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - Status = MiReadFilePage(Segment->FileObject, &TotalOffset, &Page); - MmLockAddressSpace(AddressSpace); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); + Status = MiReadFilePage(Segment->FileObject, &TotalOffset, &Page, Locked); + if (!Locked) + MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { @@ -422,10 +430,23 @@ SWAPENTRY SwapEntry; MmDeletePageFileMapping(Process, (PVOID)PAddress, &SwapEntry); + MmUnlockSectionSegment(Segment); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); + } + + MmLockSectionSegment(Segment); + + if (!Locked) + MmLockAddressSpace(AddressSpace); + if (!MmIsPageSwapEntry(Process, PAddress)) + { + // Handled elsewhere + return STATUS_SUCCESS; } Status = MmReadFromSwapPage(SwapEntry, Page); @@ -434,6 +455,7 @@ DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); ASSERT(FALSE); } + DPRINT("CreateVirtualMapping: %x -> %x\n", Address, Attributes); Status = MmCreateVirtualMapping(Process, Address, @@ -568,17 +590,20 @@ MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) { PEPROCESS Process; - KIRQL Irql; + KIRQL PrimaryIrql, Irql; PVOID TempAddress; Process = PsGetCurrentProcess(); + PrimaryIrql = KfRaiseIrql(DISPATCH_LEVEL); TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); if (TempAddress == NULL) { + KfLowerIrql(PrimaryIrql); return(STATUS_NO_MEMORY); } memcpy(TempAddress, SourceAddress, PAGE_SIZE); MiUnmapPageInHyperSpace(Process, TempAddress, Irql); + KfLowerIrql(PrimaryIrql); return(STATUS_SUCCESS); } @@ -657,7 +682,9 @@ /* * Allocate a page */ + MmUnlockSectionSegment(Segment); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); + if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -668,6 +695,15 @@ * Copy the old page */ MiCopyFromUserPage(NewPage, PAddress); + + MmLockSectionSegment(Segment); + if (MmGetPfnForProcess(Process, PAddress) != OldPage) + { + // Handled elsewhere + MmReleasePageMemoryConsumer(MC_USER, NewPage); + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS; + } /* * Delete the old entry. @@ -834,26 +870,39 @@ ("Pulling zero pages for %08x%08x-%08x%08x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, End.u.HighPart, End.u.LowPart); + MmLockSectionSegment(Segment); while (FileOffset.QuadPart < End.QuadPart) { PVOID Address; ULONG Entry = MiGetPageEntrySectionSegment(Segment, &FileOffset); + if (Entry == 0) { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page))) { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); return STATUS_NO_MEMORY; } + + MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Segment); Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; - MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, Address); - MiSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_SSE(Page << PAGE_SHIFT, 1)); + + if (!MmIsPagePresent(NULL, Address) && MiGetPageEntrySectionSegment(Segment, &FileOffset) == Entry) + { + MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); + MmInsertRmap(Page, NULL, Address); + MiSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_SSE(Page << PAGE_SHIFT, 1)); + } + else + MmReleasePageMemoryConsumer(MC_USER, Page); } FileOffset.QuadPart += PAGE_SIZE; } + MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); return STATUS_SUCCESS; @@ -1000,8 +1049,6 @@ } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) @@ -1017,8 +1064,6 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -1067,8 +1112,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); } } @@ -1113,8 +1156,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); } @@ -1143,8 +1184,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -1159,10 +1198,8 @@ PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PFN_TYPE Page; - SWAPENTRY SwapEntry; ULONG Entry; - BOOLEAN Private; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -1183,83 +1220,38 @@ /* * Get the section segment entry and the physical address. */ + MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Segment); + Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - if (!MmIsPagePresent(Process, Address)) - { - DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", - Process ? Process->UniqueProcessId : 0, Address); - ASSERT(FALSE); - } Page = MmGetPfnForProcess(Process, Address); - SwapEntry = MmGetSavedSwapEntryPage(Page); + + if (!Page) + { + // Somebody else already paged it out + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + return STATUS_SUCCESS; + } /* * Check for a private (COWed) page. */ - if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) - { - Private = TRUE; + if (!IS_SWAP_FROM_SSE(Entry) && PFN_FROM_SSE(Entry) == Page && MmIsDirtyPageRmap(Page)) + { + MmSetCleanAllRmaps(Page); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); } else { - Private = FALSE; - } - - /* - * Speculatively set all mappings of the page to clean. - */ - MmSetCleanAllRmaps(Page); - - /* - * If this page was direct mapped from the cache then the cache manager - * will take care of writing it back to disk. - */ - if (!Private) - { - ASSERT(SwapEntry == 0); - DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); - Status = PageOp->Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); - MmspCompleteAndReleasePageOp(PageOp); - return(Status); - } - - /* - * If necessary, allocate an entry in the paging file for this page - */ - if (SwapEntry == 0) - { - SwapEntry = MmAllocSwapPage(); - if (SwapEntry == 0) - { - MmSetDirtyAllRmaps(Page); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_PAGEFILE_QUOTA); - } - MmSetSavedSwapEntryPage(Page, SwapEntry); - } - - /* - * Write the page to the pagefile - */ - Status = MmWriteToSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); - MmSetDirtyAllRmaps(Page); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* - * Otherwise we have succeeded. - */ - DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_SUCCESS); + MmUnlockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + } + + return(Status); } NTSTATUS @@ -1291,8 +1283,6 @@ Segment = MemoryArea->Data.SectionData.Segment; ViewOffset.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; - MmLockSectionSegment(Segment); - Pages = ExAllocatePool (NonPagedPool, sizeof(PFN_TYPE) * @@ -1302,6 +1292,8 @@ { ASSERT(FALSE); } + + MmLockSectionSegment(Segment); for (PageAddress = BeginningAddress; PageAddress < EndingAddress; @@ -1336,8 +1328,10 @@ { DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &Segment->FileObject->FileName, FileOffset.u.HighPart, FileOffset.u.LowPart); Status = MiWriteBackPage(Segment->FileObject, &FileOffset, PAGE_SIZE, Page); + MmLockAddressSpace(AddressSpace); MmUnlockPage(Page); MmSetCleanAllRmaps(Page); + MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { DPRINT1 @@ -1695,7 +1689,7 @@ return(STATUS_NO_MEMORY); } - ExInitializeFastMutex(&Segment->Lock); + KeInitializeGuardedMutex(&Segment->Lock); Segment->ReferenceCount = 1; Section->Segment = Segment; @@ -1713,7 +1707,7 @@ /* * Set the lock before assigning the segment to the file object */ - ExAcquireFastMutex(&Segment->Lock); + KeAcquireGuardedMutex(&Segment->Lock); DPRINT("Filling out Segment info (No previous data section)\n"); ObReferenceObject(FileObject); Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -233,14 +233,17 @@ Entry = MiGetPageEntrySectionSegment(Segment, &Offset); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - if (Entry == 0 && !HasSwapEntry && Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart)) + if (Entry == 0 && !HasSwapEntry && + (Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart))) { TotalOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset/*.QuadPart*/; MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - Status = MiReadFilePage(Section->FileObject, &TotalOffset, &Page); - MmLockAddressSpace(AddressSpace); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); + Status = MiReadFilePage(Section->FileObject, &TotalOffset, &Page, Locked); + if (!Locked) + MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { @@ -282,10 +285,15 @@ MmDeletePageFileMapping(Process, (PVOID)PAddress, &SwapEntry); + MmUnlockSectionSegment(Segment); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + if (!Locked) + MmLockAddressSpace(AddressSpace); + return Status; } DPRINT("Allocated page %x\n", Page); @@ -296,6 +304,14 @@ ASSERT(FALSE); } MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Segment); + if (MmIsPagePresent(Process, Address)) + { + // Handled elsewhere + MmReleasePageMemoryConsumer(MC_USER, Page); + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS; + } Status = MmCreateVirtualMapping(Process, Address, Region->Protect, @@ -335,16 +351,26 @@ */ if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) { - MmUnlockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { DPRINT("Status %x\n", Status); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } DPRINT("Allocated page %x\n", Page); - MmLockAddressSpace(AddressSpace); + if (!Locked) + MmLockAddressSpace(AddressSpace); + if (MmIsPagePresent(Process, Address)) + { + // Handled elsewhere + MmReleasePageMemoryConsumer(MC_USER, Page); + return STATUS_SUCCESS; + } Status = MmCreateVirtualMapping(Process, Address, Region->Protect, @@ -354,7 +380,6 @@ { MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - MmUnlockSectionSegment(Segment); return(Status); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -366,7 +391,6 @@ /* * Cleanup and release locks */ - MmUnlockSectionSegment(Segment); //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -386,7 +410,9 @@ /* * Release all our locks and read in the page from disk */ - MmUnlockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); if (Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart)) { @@ -394,8 +420,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); - MmLockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } DPRINT("Allocated page %x\n", Page); @@ -409,8 +435,8 @@ DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - MmLockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } } @@ -426,8 +452,8 @@ DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - MmLockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } @@ -437,12 +463,21 @@ /* * Relock the address space and segment */ - MmLockAddressSpace(AddressSpace); + if (!Locked) + MmLockAddressSpace(AddressSpace); /* * Mark the offset within the section as having valid, in-memory * data */ + MmLockSectionSegment(Segment); + if (Entry != MiGetPageEntrySectionSegment(Segment, &Offset)) + { + // Handled elsewhere + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS; + } + Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MiSetPageEntrySectionSegment(Segment, &Offset, Entry); @@ -497,6 +532,8 @@ //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } + + ASSERT(FALSE); } NTSTATUS @@ -1400,7 +1437,7 @@ /* And finish their initialization */ for ( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - ExInitializeFastMutex(&ImageSectionObject->Segments[i].Lock); + KeInitializeGuardedMutex(&ImageSectionObject->Segments[i].Lock); ImageSectionObject->Segments[i].Flags = MM_IMAGE_SEGMENT; ImageSectionObject->Segments[i].ReferenceCount = 1; MiInitializeSectionPageTable(&ImageSectionObject->Segments[i]); Modified: branches/arty-newcc/ntoskrnl/mm/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -54,8 +54,6 @@ #pragma alloc_text(INIT, MmInitSectionImplementation) #endif -KEVENT CcpLazyWriteEvent; - /* * FUNCTION: Waits in kernel mode indefinitely for a file object lock. * ARGUMENTS: PFILE_OBJECT to wait for. @@ -428,82 +426,65 @@ ULONG Length, PFN_TYPE Page) { + PFN_TYPE XPage; NTSTATUS Status; - PVOID Hyperspace; IO_STATUS_BLOCK Iosb; - KIRQL OldIrql; - PVOID PageBuffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); - - if (!PageBuffer) return STATUS_NO_MEMORY; - - OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - Hyperspace = MmCreateHyperspaceMapping(Page); - RtlCopyMemory(PageBuffer, Hyperspace, PAGE_SIZE); - MmDeleteHyperspaceMapping(Hyperspace); - KfLowerIrql(OldIrql); + PVOID PageBuf = 0; + PMEMORY_AREA TmpArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + + BoundaryAddressMultiple.QuadPart = 0; + + MmLockAddressSpace(MmGetKernelAddressSpace()); + + Status = MmCreateMemoryArea + (MmGetKernelAddressSpace(), + MEMORY_AREA_VIRTUAL_MEMORY, + &PageBuf, + PAGE_SIZE, + PAGE_READWRITE, + &TmpArea, + FALSE, + MEM_TOP_DOWN, + BoundaryAddressMultiple); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("STATUS_NO_MEMORY: %x\n", Status); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + return STATUS_NO_MEMORY; + } + + Status = MmCreateVirtualMapping(NULL, PageBuf, PAGE_READWRITE, &Page, 1); + if (!NT_SUCCESS(Status)) + { + MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + DPRINT1("Status: %x\n", Status); + return Status; + } + MmReferencePage(Page); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart); Status = MiSimpleWrite (FileObject, FileOffset, - PageBuffer, + PageBuf, Length, &Iosb); - ExFreePool(PageBuffer); - if (!NT_SUCCESS(Status)) { DPRINT1("MiSimpleWrite failed (%x)\n", Status); } + MmLockAddressSpace(MmGetKernelAddressSpace()); + MmDeleteVirtualMapping(NULL, PageBuf, FALSE, NULL, &XPage); + ASSERT(XPage == Page); + MmFreeMemoryArea(MmGetKernelAddressSpace(), TmpArea, NULL, NULL); + MmDereferencePage(Page); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + return Status; } - -VOID -NTAPI -MiWriteThread() -{ - BOOLEAN Complete; - NTSTATUS Status; - LIST_ENTRY OldHead; - PLIST_ENTRY Entry; - PWRITE_SCHEDULE_ENTRY WriteEntry; - - ExAcquireFastMutex(&MiWriteMutex); - Complete = IsListEmpty(&MiWriteScheduleListHead); - ExReleaseFastMutex(&MiWriteMutex); - if (Complete) - { - DPRINT1("No items await writing\n"); - KeSetEvent(&CcpLazyWriteEvent, IO_NO_INCREMENT, FALSE); - } - - DPRINT1("Lazy write items are available\n"); - KeResetEvent(&CcpLazyWriteEvent); - - ExAcquireFastMutex(&MiWriteMutex); - RtlCopyMemory(&OldHead, &MiWriteScheduleListHead, sizeof(OldHead)); - OldHead.Flink->Blink = &OldHead; - OldHead.Blink->Flink = &OldHead; - InitializeListHead(&MiWriteScheduleListHead); - ExReleaseFastMutex(&MiWriteMutex); - - for (Entry = OldHead.Flink; - !IsListEmpty(&OldHead); - Entry = OldHead.Flink) - { - WriteEntry = CONTAINING_RECORD(Entry, WRITE_SCHEDULE_ENTRY, Entry); - Status = MiWriteBackPage(WriteEntry->FileObject, &WriteEntry->FileOffset, WriteEntry->Length, WriteEntry->Page); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("MiSimpleWrite failed (%x)\n", Status); - } - - MmDereferencePage(WriteEntry->Page); - ObDereferenceObject(WriteEntry->FileObject); - RemoveEntryList(&WriteEntry->Entry); - ExFreePool(WriteEntry); - } -} Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Thu Nov 26 23:50:50 2009 @@ -123,13 +123,15 @@ if (Entry == 0) { - MmUnlockAddressSpace(AddressSpace); + MmUnlockSectionSegment(Segment); + if (!Locked) + MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); - MmLockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } @@ -144,16 +146,24 @@ DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); DPRINT("Release page %x\n", Page); - MmLockAddressSpace(AddressSpace); - MmUnlockSectionSegment(Segment); + if (!Locked) + MmLockAddressSpace(AddressSpace); return Status; } /* * Relock the address space and segment */ - MmLockAddressSpace(AddressSpace); - + if (!Locked) + MmLockAddressSpace(AddressSpace); + + MmLockSectionSegment(Segment); + if (Entry != MiGetPageEntrySectionSegment(Segment, &Offset)) + { + // Already handled + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS; + } /* * Mark the offset within the section as having valid, in-memory * data @@ -282,7 +292,7 @@ } Section->Segment = Segment; Segment->ReferenceCount = 1; - ExInitializeFastMutex(&Segment->Lock); + KeInitializeGuardedMutex(&Segment->Lock); Segment->Protection = SectionPageProtection; Segment->RawLength.QuadPart = MaximumSize.QuadPart; Segment->Length.QuadPart = PAGE_ROUND_UP(MaximumSize.QuadPart); @@ -418,8 +428,6 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) @@ -435,8 +443,6 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } @@ -485,8 +491,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); } } @@ -531,8 +535,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); } @@ -561,8 +563,6 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); }

15 years

[tkreuzer] 44289: - rewrite the completely broken RtlInterlockedPopEntrySList, implement RtlInterlockedPushEntrySList, RtlInterlockedFlushSList - use these for ExpInterlocked* - remove a bunch of Interlocked* functions from amd64 kernel exports

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 26 23:40:07 2009 New Revision: 44289 URL: http://svn.reactos.org/svn/reactos?rev=44289&view=rev Log: - rewrite the completely broken RtlInterlockedPopEntrySList, implement RtlInterlockedPushEntrySList, RtlInterlockedFlushSList - use these for ExpInterlocked* - remove a bunch of Interlocked* functions from amd64 kernel exports Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S - copied, changed from r44068, branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S Removed: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec Removed: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S (removed) @@ -1,188 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/amd64/interlck.S - * PURPOSE: Rtl Interlocked Functions for amd64 - * PROGRAMMERS: Timo Kreuzer - */ - -#include <ndk/asm.h> -#include <ndk/amd64/asmmacro.S> -.intel_syntax noprefix - - -#define SLIST8A_DEPTH_MASK 0x000000000000FFFF -#define SLIST8A_DEPTH_INC 0x0000000000000001 -#define SLIST8A_SEQUENCE_MASK 0x0000000001FF0000 -#define SLIST8A_SEQUENCE_INC 0x0000000000010000 -#define SLIST8A_NEXTENTRY_MASK 0xFFFFFFFFFE000000 -#define SLIST8A_NEXTENTRY_SHIFT 21 -#define SLIST8B_HEADERTYPE_MASK 0x0000000000000001 -#define SLIST8B_INIT_MASK 0x0000000000000002 -#define SLIST8B_REGION_MASK 0xE000000000000000 - -#define SLIST16A_DEPTH_MASK 0x000000000000FFFF -#define SLIST16A_DEPTH_INC 0x0000000000000001 -#define SLIST16A_SEQUENCE_MASK 0xFFFFFFFFFFFF0000 -#define SLIST16B_HEADERTYPE_MASK 0x0000000000000001 -#define SLIST16B_INIT_MASK 0x0000000000000002 -#define SLIST16B_NEXTENTY_MASK 0xFFFFFFFFFFFFFFF0 - - -POINTER_MASK: .quad 0x000007FFFFFFFFF0 - -SLIST16_POINTER_MASK: .quad 0xFFFFFFFFFFFFFFF0 - - -/* FUNCTIONS ****************************************************************/ - - -/* PSLIST_ENTRY - * NTAPI - * RtlInterlockedPopEntrySList( - * IN PSLIST_HEADER ListHead); - */ -.proc RtlInterlockedPopEntrySList - - /* Save registers */ - push rbx - push rbp - - /* Load ListHead->Region into rax */ - mov rax, [rcx + 8] - - /* Check what kind of header this is */ - test rax, SLIST8B_HEADERTYPE_MASK - jnz 3f - - /* We have an 8 byte header */ - - /* Load ListHead->Alignment into rax */ - mov rax, [rcx] - - /* Check if ListHead->NextEntry is NULL */ - and rax, SLIST8A_NEXTENTRY_MASK - jz 2f - - /* Copy rcx to rbp, as we need ecx for the exchange */ - mov rbp, rcx - - /* Copy the low 32 bits to eax */ - mov eax, [rbp] - - /* Copy the high 32 bits to edx */ - mov edx, [rbp + 4] - -1: - /* Use rbp as pointer template in rbx*/ - mov rbx, rbp - and rbx, POINTER_MASK - - /* Extract the NextEntry pointer */ - mov rcx, [rbp] - and rcx, SLIST8A_NEXTENTRY_MASK - shr rcx, SLIST8A_NEXTENTRY_SHIFT - - /* Combine to new pointer in rcx */ - or rcx, rbx - - /* Load the next NextEntry pointer to rcx */ - mov rcx, [rcx] - - /* Copy Depth and Sequence number and adjust Depth */ - lea rbx, [rax - SLIST8A_DEPTH_INC] - - /* Shift bits in place */ - shl rcx, SLIST8A_NEXTENTRY_SHIFT - - /* Combine into rbx */ - and rbx, SLIST8A_SEQUENCE_INC | SLIST8A_DEPTH_MASK - or rbx, rcx - - /* Copy higher 32 bits into ecx */ - mov rcx, rbx - shr rcx, 32 - - /* If [rbp] equals edx:eax, exchange it with ecx:ebx */ - lock cmpxchg8b [rbp] - - /* If not equal, retry with edx:eax, being the content of [rbp] now */ - jnz 1b - - /* Move result from edx:eax to rax */ - shl rdx, 32 - or rax, rdx - - /* Use rbp as pointer template */ - and rbp, POINTER_MASK - - and rax, SLIST8A_NEXTENTRY_MASK - shr rax, SLIST8A_NEXTENTRY_SHIFT - or rax, rbp - -2: - /* Restore registers and return */ - pop rbp - pop rbx - ret - -3: /* This is a 16 byte header */ - - /* Copy rcx to rbp, as we need rcx for the exchange */ - mov rbp, rcx - - -4: - /* Check if ListHead->NextEntry is NULL */ - mov rcx, rdx - and rcx, SLIST16_POINTER_MASK - jz 5f - - /* Copy Depth and Sequence number and adjust Depth */ - lea rbx, [rax - SLIST16A_DEPTH_INC] - - /* Get next pointer */ - mov rcx, [rcx] - - /* Set ListHead->HeaderType = 1 */ - or rcx, 1 - - /* If [rbp] equals rdx:rax, exchange it with rcx:rbx */ - lock cmpxchg16b [rbp] - - /* If not equal, retry with rdx:rax, being the content of [rbp] now */ - jnz 4b - -5: - - - /* Restore registers and return */ - pop rbp - pop rbx - ret -.endproc - - -/* PSLIST_ENTRY - * NTAPI - * RtlInterlockedPushEntrySList( - * IN PSLIST_HEADER ListHead, - * IN PSLIST_ENTRY ListEntry); - */ -.proc RtlInterlockedPushEntrySList - - - ret -.endproc - - -/* PSLIST_ENTRY - * NTAPI - * RtlInterlockedFlushSList( - * IN PSINGLE_LIST_ENTRY ListHead); - */ -.proc RtlInterlockedFlushSList - - - ret -.endproc Copied: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S (from r44068, branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Thu Nov 26 23:40:07 2009 @@ -10,32 +10,37 @@ #include <ndk/amd64/asmmacro.S> .intel_syntax noprefix - -#define SLIST8A_DEPTH_MASK 0x000000000000FFFF -#define SLIST8A_DEPTH_INC 0x0000000000000001 -#define SLIST8A_SEQUENCE_MASK 0x0000000001FF0000 -#define SLIST8A_SEQUENCE_INC 0x0000000000010000 -#define SLIST8A_NEXTENTRY_MASK 0xFFFFFFFFFE000000 -#define SLIST8A_NEXTENTRY_SHIFT 21 -#define SLIST8B_HEADERTYPE_MASK 0x0000000000000001 -#define SLIST8B_INIT_MASK 0x0000000000000002 -#define SLIST8B_REGION_MASK 0xE000000000000000 +#define SLIST8A_DEPTH_MASK 0x000000000000FFFF +#define SLIST8A_DEPTH_INC 0x0000000000000001 +#define SLIST8A_SEQUENCE_MASK 0x0000000001FF0000 +#define SLIST8A_SEQUENCE_INC 0x0000000000010000 +#define SLIST8A_NEXTENTRY_MASK 0xFFFFFFFFFE000000 +#define SLIST8A_NEXTENTRY_SHIFT 21 +#define SLIST8B_HEADERTYPE_MASK 0x0000000000000001 +#define SLIST8B_INIT_MASK 0x0000000000000002 +#define SLIST8B_REGION_MASK 0xE000000000000000 +#define SLIST8_POINTER_MASK 0x000007FFFFFFFFF0 #define SLIST16A_DEPTH_MASK 0x000000000000FFFF #define SLIST16A_DEPTH_INC 0x0000000000000001 #define SLIST16A_SEQUENCE_MASK 0xFFFFFFFFFFFF0000 +#define SLIST16A_SEQUENCE_INC 0x0000000000010000 #define SLIST16B_HEADERTYPE_MASK 0x0000000000000001 #define SLIST16B_INIT_MASK 0x0000000000000002 #define SLIST16B_NEXTENTY_MASK 0xFFFFFFFFFFFFFFF0 -POINTER_MASK: .quad 0x000007FFFFFFFFF0 - -SLIST16_POINTER_MASK: .quad 0xFFFFFFFFFFFFFFF0 - - /* FUNCTIONS ****************************************************************/ +.global _ExpInterlockedPopEntrySList +.global _ExpInterlockedPopEntrySListResume +.global _ExpInterlockedPopEntrySListFault +.global _ExpInterlockedPopEntrySListEnd +.global _ExpInterlockedPopEntrySListResume16 +.global _ExpInterlockedPopEntrySListFault16 +.global _ExpInterlockedPopEntrySListEnd16 +.global _ExpInterlockedPushEntrySList +.global _ExpInterlockedFlushSList /* PSLIST_ENTRY * NTAPI @@ -43,123 +48,124 @@ * IN PSLIST_HEADER ListHead); */ .proc RtlInterlockedPopEntrySList - - /* Save registers */ - push rbx - push rbp - - /* Load ListHead->Region into rax */ - mov rax, [rcx + 8] - - /* Check what kind of header this is */ - test rax, SLIST8B_HEADERTYPE_MASK - jnz 3f - - /* We have an 8 byte header */ +_ExpInterlockedPopEntrySList: + + /* Load ListHead->Region into rdx */ + mov rdx, [rcx + 8] /* Load ListHead->Alignment into rax */ mov rax, [rcx] + /* Check what kind of header this is */ + test rdx, SLIST8B_HEADERTYPE_MASK + jnz _RtlInterlockedPopEntrySList16 + + /* We have an 8 byte header */ + +_ExpInterlockedPopEntrySListResume: + /* Check if ListHead->NextEntry is NULL */ - and rax, SLIST8A_NEXTENTRY_MASK - jz 2f - - /* Copy rcx to rbp, as we need ecx for the exchange */ - mov rbp, rcx - - /* Copy the low 32 bits to eax */ - mov eax, [rbp] - - /* Copy the high 32 bits to edx */ - mov edx, [rbp + 4] - -1: - /* Use rbp as pointer template in rbx*/ - mov rbx, rbp - and rbx, POINTER_MASK - - /* Extract the NextEntry pointer */ - mov rcx, [rbp] - and rcx, SLIST8A_NEXTENTRY_MASK - shr rcx, SLIST8A_NEXTENTRY_SHIFT - - /* Combine to new pointer in rcx */ - or rcx, rbx - - /* Load the next NextEntry pointer to rcx */ - mov rcx, [rcx] + mov r9, rax + and r9, SLIST8A_NEXTENTRY_MASK + jz _RtlInterlockedPopEntrySListEmpty /* Copy Depth and Sequence number and adjust Depth */ - lea rbx, [rax - SLIST8A_DEPTH_INC] + lea r8, [rax - SLIST8A_DEPTH_INC] + and r8, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK + + /* Create a pointer template from rcx in rdx */ + mov rdx, ~SLIST8_POINTER_MASK + and rdx, rcx + + /* Shift the NextEntry pointer */ + shr r9, SLIST8A_NEXTENTRY_SHIFT + + /* Combine to new pointer in rdx */ + or rdx, r9 + +_ExpInterlockedPopEntrySListFault: + + /* Load the next NextEntry pointer to r9 */ + mov r9, [rdx] /* Shift bits in place */ - shl rcx, SLIST8A_NEXTENTRY_SHIFT - - /* Combine into rbx */ - and rbx, SLIST8A_SEQUENCE_INC | SLIST8A_DEPTH_MASK - or rbx, rcx - - /* Copy higher 32 bits into ecx */ - mov rcx, rbx - shr rcx, 32 - - /* If [rbp] equals edx:eax, exchange it with ecx:ebx */ - lock cmpxchg8b [rbp] - - /* If not equal, retry with edx:eax, being the content of [rbp] now */ - jnz 1b - - /* Move result from edx:eax to rax */ - shl rdx, 32 - or rax, rdx - - /* Use rbp as pointer template */ - and rbp, POINTER_MASK - + shl r9, SLIST8A_NEXTENTRY_SHIFT + + /* Combine into r8 */ + or r8, r9 + +_ExpInterlockedPopEntrySListEnd: + + /* If [rcx] equals rax, exchange it with r8 */ + lock cmpxchg [rcx], r8 + + /* If not equal, retry with rax, being the content of [rcx] now */ + jnz _ExpInterlockedPopEntrySListResume + + /* Shift the pointer bits in place */ and rax, SLIST8A_NEXTENTRY_MASK shr rax, SLIST8A_NEXTENTRY_SHIFT - or rax, rbp - -2: - /* Restore registers and return */ - pop rbp - pop rbx - ret - -3: /* This is a 16 byte header */ - - /* Copy rcx to rbp, as we need rcx for the exchange */ - mov rbp, rcx - - -4: + + /* Use rcx as pointer template */ + mov rdx, ~SLIST8_POINTER_MASK + or rdx, rcx + + /* Combine result and return */ + or rax, rdx + ret + +_RtlInterlockedPopEntrySListEmpty: + xor rax, rax + ret + +_RtlInterlockedPopEntrySList16: + /* This is a 16 byte header */ + + /* Save rbx */ + push rbx + + /* Copy rcx to r8, as we need rcx for the exchange */ + mov r8, rcx + +_ExpInterlockedPopEntrySListResume16: + /* Check if ListHead->NextEntry is NULL */ - mov rcx, rdx - and rcx, SLIST16_POINTER_MASK - jz 5f + mov r9, rdx + and r9, SLIST16B_NEXTENTY_MASK + jz _RtlInterlockedPopEntrySListEmpty16 + +_ExpInterlockedPopEntrySListFault16: + + /* Get next pointer */ + mov rcx, [r9] + + /* Set ListHead->HeaderType = 1 and ListHead->Init = 1 */ + or rcx, 0x3 /* Copy Depth and Sequence number and adjust Depth */ lea rbx, [rax - SLIST16A_DEPTH_INC] - /* Get next pointer */ - mov rcx, [rcx] - - /* Set ListHead->HeaderType = 1 */ - or rcx, 1 - - /* If [rbp] equals rdx:rax, exchange it with rcx:rbx */ - lock cmpxchg16b [rbp] - - /* If not equal, retry with rdx:rax, being the content of [rbp] now */ - jnz 4b - -5: - - - /* Restore registers and return */ - pop rbp +_ExpInterlockedPopEntrySListEnd16: + + /* If [r8] equals rdx:rax, exchange it with rcx:rbx */ + lock cmpxchg16b [r8] + + /* If not equal, retry with rdx:rax, being the content of [r8] now */ + jnz _ExpInterlockedPopEntrySListResume16 + + /* Copy the old NextEntry pointer to rax */ + mov rax, rdx + and rax, SLIST16B_NEXTENTY_MASK + + /* Return */ pop rbx ret + +_RtlInterlockedPopEntrySListEmpty16: + xor rax, rax + pop rbx + ret + .endproc @@ -170,11 +176,109 @@ * IN PSLIST_ENTRY ListEntry); */ .proc RtlInterlockedPushEntrySList - - - ret +_ExpInterlockedPushEntrySList: + + /* Move 2nd parameter to r9 */ + mov r9, rdx + + /* Load ListHead->Region into rdx */ + mov rdx, [rcx + 8] + + /* Load ListHead->Alignment into rax */ + mov rax, [rcx] + + /* Check what kind of header this is */ + test rdx, SLIST8B_HEADERTYPE_MASK + jnz _RtlInterlockedPushEntrySList16 + + /* We have an 8 byte header */ + +_RtlInterlockedPushEntrySListLoop: + + /* Get ListHead->NextEntry */ + mov r8, rax + and r8, SLIST8A_NEXTENTRY_MASK + + /* Shift the NextEntry pointer */ + shr r8, SLIST8A_NEXTENTRY_SHIFT + + /* Create a pointer template from rcx in rdx */ + mov rdx, ~SLIST8_POINTER_MASK + and rdx, rcx + + /* Combine to new pointer and save as ListEntry->NextEntry */ + or rdx, r8 + mov [r9], rdx + + /* Shift and mask the new ListEntry pointer */ + shl r9, SLIST8A_NEXTENTRY_SHIFT + and r9, SLIST8A_NEXTENTRY_MASK + + /* Copy and adjust depth and sequence number */ + lea r8, [rax + SLIST8A_DEPTH_INC + SLIST8A_SEQUENCE_INC] + and r8, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK + + /* Combine to exchange value in r8 */ + or r8, r9 + + /* If [rcx] equals rax, exchange it with r8 */ + lock cmpxchg [rcx], r8 + + /* If not equal, retry with rax, being the content of [rcx] now */ + jnz _RtlInterlockedPushEntrySListLoop + + /* Shift the pointer bits in place */ + and rax, SLIST8A_NEXTENTRY_MASK + shr rax, SLIST8A_NEXTENTRY_SHIFT + + /* Use rcx as pointer template */ + mov rdx, ~SLIST8_POINTER_MASK + or rdx, rcx + + /* Combine result and return */ + or rax, rdx + ret + +_RtlInterlockedPushEntrySList16: + /* This is a 16 byte header */ + + /* Save rbx */ + push rbx + + /* Copy rcx to r8, as we need rcx for the exchange */ + mov r8, rcx + + /* Set ListHead->HeaderType = 1 and ListHead->Init = 1 */ + mov rcx, r9 + or rcx, 0x3 + +_RtlInterlockedPushEntrySListLoop16: + + /* Move ListHead->NextEntry to rbx */ + mov rbx, rdx + and rbx, SLIST16B_NEXTENTY_MASK + + /* Store next pointer in ListEntry->NextEntry */ + mov [r9], rbx + + /* Copy Depth and Sequence number and adjust Depth */ + lea rbx, [rax + SLIST16A_DEPTH_INC + SLIST16A_SEQUENCE_INC] + + /* If [r8] equals rdx:rax, exchange it with rcx:rbx */ + lock cmpxchg16b [r8] + + /* If not equal, retry with rdx:rax, being the content of [r8] now */ + jnz _RtlInterlockedPushEntrySListLoop16 + + /* Copy the old NextEntry pointer to rax */ + mov rax, rdx + and rax, SLIST16B_NEXTENTY_MASK + + /* Return */ + pop rbx + ret + .endproc - /* PSLIST_ENTRY * NTAPI @@ -182,7 +286,58 @@ * IN PSINGLE_LIST_ENTRY ListHead); */ .proc RtlInterlockedFlushSList - - - ret +_ExpInterlockedFlushSList: + + /* Load ListHead->Region into rdx */ + mov rax, [rcx + 8] + + /* Check what kind of header this is */ + test rax, SLIST8B_HEADERTYPE_MASK + jnz _RtlInterlockedFlushSList16 + + /* We have an 8 byte header */ + +_RtlInterlockedFlushSListLoop: + + /* Zero ListHead->Alignment */ + xor r8, r8 + + /* If [rcx] equals rax, exchange it with r8 */ + lock cmpxchg [rcx], r8 + + /* If not equal, retry with rax, being the content of [rcx] now */ + jnz _RtlInterlockedFlushSListLoop + + /* Use rcx as pointer template */ + mov rdx, ~SLIST8_POINTER_MASK + or rdx, rcx + + /* Combine result and return */ + or rax, rdx + ret + +_RtlInterlockedFlushSList16: + /* We have a 16 byte header */ + push rbx + + mov rdx, [rcx + 8] + xor rbx, rbx + mov rcx, 0x3 + +_RtlInterlockedFlushSListLoop16: + + /* If [r8] equals rdx:rax, exchange it with rcx:rbx */ + lock cmpxchg16b [r8] + + /* If not equal, retry with rdx:rax, being the content of [r8] now */ + jnz _RtlInterlockedFlushSListLoop16 + + /* Copy the old NextEntry pointer to rax */ + mov rax, rdx + and rax, SLIST16B_NEXTENTY_MASK + + /* Return */ + pop rbx + ret + .endproc Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Thu Nov 26 23:40:07 2009 @@ -39,7 +39,7 @@ <directory name="amd64"> <file>debug_asm.S</file> <file>except_asm.S</file> - <file>interlck.S</file> + <file>slist.S</file> <file>unwind.c</file> <file>stubs.c</file> </directory> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c [iso-8859-1] Thu Nov 26 23:40:07 2009 @@ -111,27 +111,3 @@ return OldHead; } -PSLIST_ENTRY -ExpInterlockedFlushSList( - PSLIST_HEADER ListHead) -{ - UNIMPLEMENTED; - return NULL; -} - -PSLIST_ENTRY -ExpInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead) -{ - UNIMPLEMENTED; - return NULL; -} - -PSLIST_ENTRY -ExpInterlockedPushEntrySList( - PSLIST_HEADER ListHead, - PSLIST_ENTRY ListEntry) -{ - UNIMPLEMENTED; - return NULL; -} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Thu Nov 26 23:40:07 2009 @@ -339,12 +339,12 @@ @ stdcall InbvSetTextColor(long) @ stdcall InbvSolidColorFill(long long long long long) @ extern InitSafeBootMode +#ifndef __x86_64__ @ FASTCALL InterlockedCompareExchange(ptr long long) @ FASTCALL InterlockedDecrement(ptr) @ FASTCALL InterlockedExchange(ptr long) @ FASTCALL InterlockedExchangeAdd(ptr long) @ FASTCALL InterlockedIncrement(ptr) -#ifndef __x86_64__ @ FASTCALL InterlockedPopEntrySList(ptr) @ FASTCALL InterlockedPushEntrySList(ptr ptr) #endif

15 years

[pschweitzer] 44288: Implemented IoReportTargetDeviceChangeAsynchronous and IoReportTargetDeviceChange

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 26 11:31:19 2009 New Revision: 44288 URL: http://svn.reactos.org/svn/reactos?rev=44288&view=rev Log: Implemented IoReportTargetDeviceChangeAsynchronous and IoReportTargetDeviceChange Modified: branches/arty-newcc/ntoskrnl/include/internal/io.h branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c Modified: branches/arty-newcc/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/io.h [iso-8859-1] Thu Nov 26 11:31:19 2009 @@ -490,6 +490,18 @@ } DEVICETREE_TRAVERSE_CONTEXT, *PDEVICETREE_TRAVERSE_CONTEXT; // +// Internal structure for notifications +// +typedef struct _INTERNAL_WORK_QUEUE_ITEM +{ + WORK_QUEUE_ITEM WorkItem; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_CHANGE_COMPLETE_CALLBACK Callback; + PVOID Context; + PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure; +} INTERNAL_WORK_QUEUE_ITEM, *PINTERNAL_WORK_QUEUE_ITEM; + +// // PNP Routines // VOID @@ -506,6 +518,16 @@ VOID PnpInit2( VOID +); + +NTSTATUS +PpSetCustomTargetEvent( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PKEVENT NotifyEvent, + IN OUT PNTSTATUS NotifyStatus, + IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback, + IN PVOID Context, + IN PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure ); VOID @@ -613,6 +635,9 @@ IopGetRegistryValue(IN HANDLE Handle, IN PWSTR ValueName, OUT PKEY_VALUE_FULL_INFORMATION *Information); + +VOID +IopReportTargetDeviceChangeAsyncWorker(PVOID Context); // Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Nov 26 11:31:19 2009 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/io/pnpmgr/pnpreport.c * PURPOSE: Device Changes Reporting Functions * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) + * Pierre Schweitzer */ /* INCLUDES ******************************************************************/ @@ -11,6 +12,34 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +PpSetCustomTargetEvent(IN PDEVICE_OBJECT DeviceObject, + IN OUT PKEVENT NotifyEvent, + IN OUT PNTSTATUS NotifyStatus, + IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback, + IN PVOID Context, + IN PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationStructure) +{ + ASSERT(NotificationStructure); + ASSERT(DeviceObject); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +VOID +IopReportTargetDeviceChangeAsyncWorker(PVOID Context) +{ + PINTERNAL_WORK_QUEUE_ITEM Item; + + Item = (PINTERNAL_WORK_QUEUE_ITEM)Context; + PpSetCustomTargetEvent(Item->PhysicalDeviceObject, NULL, NULL, Item->Callback, Item->Context, Item->NotificationStructure); + ObDereferenceObject(Item->PhysicalDeviceObject); + ExFreePoolWithTag(Context, ' pP'); +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -112,35 +141,54 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoReportTargetDeviceChange(IN PDEVICE_OBJECT PhysicalDeviceObject, IN PVOID NotificationStructure) { - PTARGET_DEVICE_CUSTOM_NOTIFICATION IntNotificationStructure; - - ASSERT(NotificationStructure); - - if (!IopIsValidPhysicalDeviceObject(PhysicalDeviceObject)) - { - KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG)PhysicalDeviceObject, 0, 0); - } - - IntNotificationStructure = (PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure; - if ((RtlCompareMemory(&(IntNotificationStructure->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID))) || - (RtlCompareMemory(&(IntNotificationStructure->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID))) || - (RtlCompareMemory(&(IntNotificationStructure->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)))) - { - return STATUS_INVALID_DEVICE_REQUEST; - } - - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + KEVENT NotifyEvent; + NTSTATUS Status, NotifyStatus; + PTARGET_DEVICE_CUSTOM_NOTIFICATION notifyStruct = (PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure; + + ASSERT(notifyStruct); + + /* Check for valid PDO */ + if (!IopIsValidPhysicalDeviceObject(PhysicalDeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG)PhysicalDeviceObject, 0, 0); + } + + /* FileObject must be null. PnP will fill in it */ + ASSERT(notifyStruct->FileObject == NULL); + + /* Do not handle system PnP events */ + if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* FIXME: Other checks to do on notify struct */ + + /* Initialize even that will let us know when PnP will have finished notify */ + KeInitializeEvent(&NotifyEvent, NotificationEvent, FALSE); + + Status = PpSetCustomTargetEvent(PhysicalDeviceObject, &NotifyEvent, &NotifyStatus, NULL, NULL, notifyStruct); + /* If no error, wait for the notify to end and return the status of the notify and not of the event */ + if (NT_SUCCESS(Status)) + { + KeWaitForSingleObject(&NotifyEvent, Executive, KernelMode, FALSE, NULL); + Status = NotifyStatus; + } + + return Status; +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -149,6 +197,47 @@ IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback OPTIONAL, IN PVOID Context OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PINTERNAL_WORK_QUEUE_ITEM Item = NULL; + PTARGET_DEVICE_CUSTOM_NOTIFICATION notifyStruct = (PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure; + + ASSERT(notifyStruct); + + /* Check for valid PDO */ + if (!IopIsValidPhysicalDeviceObject(PhysicalDeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG)PhysicalDeviceObject, 0, 0); + } + + /* FileObject must be null. PnP will fill in it */ + ASSERT(notifyStruct->FileObject == NULL); + + /* Do not handle system PnP events */ + if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || + (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* FIXME: Other checks to do on notify struct */ + + /* We need to store all the data given by the caller with the WorkItem, so use our own struct */ + Item = ExAllocatePoolWithTag(NonPagedPool, sizeof(INTERNAL_WORK_QUEUE_ITEM), ' pP'); + if (!Item) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize all stuff */ + ObReferenceObject(PhysicalDeviceObject); + Item->NotificationStructure = notifyStruct; + Item->PhysicalDeviceObject = PhysicalDeviceObject; + Item->Callback = Callback; + Item->Context = Context; + ExInitializeWorkItem(&(Item->WorkItem), (PWORKER_THREAD_ROUTINE)IopReportTargetDeviceChangeAsyncWorker, Item); + + /* Finally, queue the item, our work here is done */ + ExQueueWorkItem(&(Item->WorkItem), DelayedWorkQueue); + + return STATUS_PENDING; +}

15 years

[fireball] 44287: [rpcrt4] - Revert rpcrt4 back to 1.1.31-partial. Fixes various RPC related regressions.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Nov 25 20:36:10 2009 New Revision: 44287 URL: http://svn.reactos.org/svn/reactos?rev=44287&view=rev Log: [rpcrt4] - Revert rpcrt4 back to 1.1.31-partial. Fixes various RPC related regressions. Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_async.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Modified: trunk/reactos/dll/win32/rpcrt4/epm_towers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm_tower… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma…

15 years

← Newer
1
2
3
4
5
6
7
8
...
45
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 November 2009