Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [NTOSKRNL] Implement CcSetAdditionalCacheAttributes()
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df5839db5b174754659b0… commit df5839db5b174754659b0f990410eb345dc1c243 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 11:49:22 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:49:22 2018 +0100 [NTOSKRNL] Implement CcSetAdditionalCacheAttributes() --- ntoskrnl/cc/cacheman.c | 31 ++++++++++++++++++++++++++++--- ntoskrnl/include/internal/cc.h | 4 ++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 5d7ff571e6..abfb5e425c 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -164,7 +164,7 @@ CcScheduleReadAhead ( } /* - * @unimplemented + * @implemented */ VOID NTAPI @@ -174,10 +174,35 @@ CcSetAdditionalCacheAttributes ( IN BOOLEAN DisableWriteBehind ) { + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; + CCTRACE(CC_API_DEBUG, "FileObject=%p DisableReadAhead=%d DisableWriteBehind=%d\n", FileObject, DisableReadAhead, DisableWriteBehind); - UNIMPLEMENTED; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + + if (DisableReadAhead) + { + SetFlag(SharedCacheMap->Flags, READAHEAD_DISABLED); + } + else + { + ClearFlag(SharedCacheMap->Flags, READAHEAD_DISABLED); + } + + if (DisableWriteBehind) + { + /* FIXME: also set flag 0x200 */ + SetFlag(SharedCacheMap->Flags, WRITEBEHIND_DISABLED); + } + else + { + ClearFlag(SharedCacheMap->Flags, WRITEBEHIND_DISABLED); + } + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } /* @@ -234,7 +259,7 @@ CcSetDirtyPageThreshold ( } /* - * @unimplemented + * @implemented */ VOID NTAPI diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 63b6bc44f1..51dea091e3 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -163,6 +163,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PFILE_OBJECT FileObject; ULONG DirtyPages; LIST_ENTRY SharedCacheMapLinks; + ULONG Flags; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; LIST_ENTRY PrivateList; @@ -178,6 +179,9 @@ typedef struct _ROS_SHARED_CACHE_MAP #endif } ROS_SHARED_CACHE_MAP, *PROS_SHARED_CACHE_MAP; +#define READAHEAD_DISABLED 0x1 +#define WRITEBEHIND_DISABLED 0x2 + typedef struct _ROS_VACB { /* Base address of the region where the view's data is mapped. */

1 0

03/03: [NTOSKRNL] Misc cosmetic changes
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8c3f0c9c4f5e217c6a46… commit f8c3f0c9c4f5e217c6a46420f4e4e5ed1e82cd88 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 11:02:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Misc cosmetic changes --- ntoskrnl/cc/fs.c | 2 +- ntoskrnl/cc/view.c | 4 +++- ntoskrnl/include/internal/cc.h | 23 ++++++++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index fddf76079a..7be40ae82b 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -362,7 +362,7 @@ CcUninitializeCacheMap ( /* And free it */ FileObject->PrivateCacheMap = NULL; - ExFreePoolWithTag(PrivateMap, 'cPcC'); + ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); } Status = CcRosReleaseFileCache(FileObject); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 4933665bd1..0d6d51b2f8 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1233,6 +1233,8 @@ CcRosInitializeFileCache ( FILE_ALL_ACCESS, NULL, KernelMode); + SharedCacheMap->NodeTypeCode = NODE_TYPE_SHARED_MAP; + SharedCacheMap->NodeByteSize = sizeof(*SharedCacheMap); SharedCacheMap->FileObject = FileObject; SharedCacheMap->Callbacks = CallBacks; SharedCacheMap->LazyWriteContext = LazyWriterContext; @@ -1255,7 +1257,7 @@ CcRosInitializeFileCache ( PPRIVATE_CACHE_MAP PrivateMap; /* Allocate the private cache map for this handle */ - PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), 'cPcC'); + PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); if (PrivateMap == NULL) { /* If we also allocated the shared cache map for this file, kill it */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 9679255697..63b6bc44f1 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -155,20 +155,24 @@ typedef struct _PFSN_PREFETCHER_GLOBALS typedef struct _ROS_SHARED_CACHE_MAP { - LIST_ENTRY CacheMapVacbListHead; - ULONG TimeStamp; - PFILE_OBJECT FileObject; - LARGE_INTEGER SectionSize; + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + ULONG OpenCount; LARGE_INTEGER FileSize; - BOOLEAN PinAccess; + LARGE_INTEGER SectionSize; + PFILE_OBJECT FileObject; + ULONG DirtyPages; + LIST_ENTRY SharedCacheMapLinks; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; LIST_ENTRY PrivateList; - KSPIN_LOCK CacheMapLock; - ULONG OpenCount; - ULONG DirtyPages; - LIST_ENTRY SharedCacheMapLinks; ULONG DirtyPageThreshold; + + /* ROS specific */ + LIST_ENTRY CacheMapVacbListHead; + ULONG TimeStamp; + BOOLEAN PinAccess; + KSPIN_LOCK CacheMapLock; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif @@ -257,6 +261,7 @@ extern LAZY_WRITER LazyWriter; #define NODE_TYPE_DEFERRED_WRITE 0x02FC #define NODE_TYPE_PRIVATE_MAP 0x02FE +#define NODE_TYPE_SHARED_MAP 0x02FF VOID NTAPI

1 0

02/03: [NTOSKRNL] Implement CcSetReadAheadGranularity()
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8792519737778c5b176… commit 9c8792519737778c5b17606c4eccaee6ad9fb5ca Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 09:46:57 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Implement CcSetReadAheadGranularity() --- ntoskrnl/cc/cacheman.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index aacf818c8a..5d7ff571e6 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -243,10 +243,11 @@ CcSetReadAheadGranularity ( IN ULONG Granularity ) { - static ULONG Warn; + PPRIVATE_CACHE_MAP PrivateMap; CCTRACE(CC_API_DEBUG, "FileObject=%p Granularity=%lu\n", FileObject, Granularity); - if (!Warn++) UNIMPLEMENTED; + PrivateMap = FileObject->PrivateCacheMap; + PrivateMap->ReadAheadMask = Granularity - 1; }

1 0

01/03: [NTOSKRNL] Magic value--
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c19c7c767448842af9b40… commit c19c7c767448842af9b403f140248958e5490038 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 09:46:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Magic value-- --- ntoskrnl/cc/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 145eb0d908..4933665bd1 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1277,7 +1277,7 @@ CcRosInitializeFileCache ( /* Initialize it */ RtlZeroMemory(PrivateMap, sizeof(PRIVATE_CACHE_MAP)); PrivateMap->NodeTypeCode = NODE_TYPE_PRIVATE_MAP; - PrivateMap->ReadAheadMask = 0xFFF; + PrivateMap->ReadAheadMask = PAGE_SIZE - 1; PrivateMap->FileObject = FileObject; /* Link it to the file */

1 0

01/01: [SYSDM] Make the GPL text ASCII. CORE-14278
by Thomas Faber 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0a227d9a5857eb2c2fd5… commit c0a227d9a5857eb2c2fd5978a9dc8192ee0d7dc9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 7 10:53:51 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 8 00:52:41 2018 +0100 [SYSDM] Make the GPL text ASCII. CORE-14278 This is better than wasting space on null chars (and having Git mangle it). Also ensure that it gets CRLF newlines since its contents go in the binary. --- dll/cpl/sysdm/licence.c | 10 +++++----- dll/cpl/sysdm/resources/.gitattributes | 2 ++ dll/cpl/sysdm/resources/gpl.txt | Bin 36652 -> 17987 bytes 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/cpl/sysdm/licence.c b/dll/cpl/sysdm/licence.c index d8461bf442..6894fd6598 100644 --- a/dll/cpl/sysdm/licence.c +++ b/dll/cpl/sysdm/licence.c @@ -20,7 +20,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) { HRSRC hResInfo; HGLOBAL hResMem; - WCHAR *LicenseText; + PCSTR LicenseText; pLicInfo->hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM), @@ -45,10 +45,10 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) return FALSE; } - /* Insert the license into the edit control (unicode!) */ - SetDlgItemText(hDlg, - IDC_LICENCEEDIT, - LicenseText); + /* Insert the license into the edit control */ + SetDlgItemTextA(hDlg, + IDC_LICENCEEDIT, + LicenseText); PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), EM_SETSEL, diff --git a/dll/cpl/sysdm/resources/.gitattributes b/dll/cpl/sysdm/resources/.gitattributes new file mode 100644 index 0000000000..4d51a75d04 --- /dev/null +++ b/dll/cpl/sysdm/resources/.gitattributes @@ -0,0 +1,2 @@ +# This text file is included in the binary output +gpl.txt text eol=crlf diff --git a/dll/cpl/sysdm/resources/gpl.txt b/dll/cpl/sysdm/resources/gpl.txt index 9f46aed4df..d511905c16 100644 Binary files a/dll/cpl/sysdm/resources/gpl.txt and b/dll/cpl/sysdm/resources/gpl.txt differ

1 0

01/01: [LIBXML2] Restore lost ROS-diff introduced in 7571d351ce. CORE-14291 CORE-11799
by Thomas Faber 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d887745a7effe4409485… commit 2d887745a7effe4409485ffb08c9f0368b2049e3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 8 00:41:13 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 8 00:41:39 2018 +0100 [LIBXML2] Restore lost ROS-diff introduced in 7571d351ce. CORE-14291 CORE-11799 --- sdk/lib/3rdparty/libxml2/trionan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/3rdparty/libxml2/trionan.c b/sdk/lib/3rdparty/libxml2/trionan.c index 6fbabb5dbd..71f1b1b9b3 100644 --- a/sdk/lib/3rdparty/libxml2/trionan.c +++ b/sdk/lib/3rdparty/libxml2/trionan.c @@ -327,7 +327,7 @@ trio_nan(TRIO_NOARGS) if (result == 0.0) { -#if defined(TRIO_COMPILER_SUPPORTS_C99) +#if defined(TRIO_COMPILER_SUPPORTS_C99) && !defined(__clang__) result = nan(""); #elif defined(NAN) && defined(__STDC_IEC_559__)

1 0

01/01: [NTOSKRNL] When initializing file cache, also allocate a private cache map if needed. Not used yet.
by Pierre Schweitzer 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=074e7e97fe140f0c9f627… commit 074e7e97fe140f0c9f627378995784b2c8328349 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 7 23:18:54 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 23:18:54 2018 +0100 [NTOSKRNL] When initializing file cache, also allocate a private cache map if needed. Not used yet. --- ntoskrnl/cc/fs.c | 19 +++++++++++++++++++ ntoskrnl/cc/view.c | 42 +++++++++++++++++++++++++++++++++++++++--- ntoskrnl/include/internal/cc.h | 2 ++ 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 38c9ae527c..fddf76079a 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -346,6 +346,25 @@ CcUninitializeCacheMap ( FALSE); } + /* Closing the handle, so kill the private cache map */ + if (FileObject->SectionObjectPointer->SharedCacheMap != NULL && + FileObject->PrivateCacheMap != NULL) + { + PPRIVATE_CACHE_MAP PrivateMap; + + PrivateMap = FileObject->PrivateCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + + /* Remove it from the file */ + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + RemoveEntryList(&PrivateMap->PrivateLinks); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + + /* And free it */ + FileObject->PrivateCacheMap = NULL; + ExFreePoolWithTag(PrivateMap, 'cPcC'); + } + Status = CcRosReleaseFileCache(FileObject); if (UninitializeCompleteEvent) { diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 1b4468cd41..145eb0d908 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1209,17 +1209,19 @@ CcRosInitializeFileCache ( * FUNCTION: Initializes a shared cache map for a file object */ { + KIRQL OldIrql; + BOOLEAN Allocated; PROS_SHARED_CACHE_MAP SharedCacheMap; SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; DPRINT("CcRosInitializeFileCache(FileObject 0x%p, SharedCacheMap 0x%p)\n", FileObject, SharedCacheMap); + Allocated = FALSE; KeAcquireGuardedMutex(&ViewLock); if (SharedCacheMap == NULL) { - KIRQL OldIrql; - + Allocated = TRUE; SharedCacheMap = ExAllocateFromNPagedLookasideList(&SharedCacheMapLookasideList); if (SharedCacheMap == NULL) { @@ -1239,6 +1241,7 @@ CcRosInitializeFileCache ( SharedCacheMap->PinAccess = PinAccess; SharedCacheMap->DirtyPageThreshold = 0; SharedCacheMap->DirtyPages = 0; + InitializeListHead(&SharedCacheMap->PrivateList); KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; @@ -1249,7 +1252,40 @@ CcRosInitializeFileCache ( } if (FileObject->PrivateCacheMap == NULL) { - FileObject->PrivateCacheMap = SharedCacheMap; + PPRIVATE_CACHE_MAP PrivateMap; + + /* Allocate the private cache map for this handle */ + PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), 'cPcC'); + if (PrivateMap == NULL) + { + /* If we also allocated the shared cache map for this file, kill it */ + if (Allocated) + { + KeAcquireSpinLock(&iSharedCacheMapLock, &OldIrql); + RemoveEntryList(&SharedCacheMap->SharedCacheMapLinks); + KeReleaseSpinLock(&iSharedCacheMapLock, OldIrql); + + FileObject->SectionObjectPointer->SharedCacheMap = NULL; + ObDereferenceObject(FileObject); + ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); + } + + KeReleaseGuardedMutex(&ViewLock); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize it */ + RtlZeroMemory(PrivateMap, sizeof(PRIVATE_CACHE_MAP)); + PrivateMap->NodeTypeCode = NODE_TYPE_PRIVATE_MAP; + PrivateMap->ReadAheadMask = 0xFFF; + PrivateMap->FileObject = FileObject; + + /* Link it to the file */ + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + InsertTailList(&SharedCacheMap->PrivateList, &PrivateMap->PrivateLinks); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + + FileObject->PrivateCacheMap = PrivateMap; SharedCacheMap->OpenCount++; } KeReleaseGuardedMutex(&ViewLock); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index f78e9c0491..9679255697 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -163,6 +163,7 @@ typedef struct _ROS_SHARED_CACHE_MAP BOOLEAN PinAccess; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; + LIST_ENTRY PrivateList; KSPIN_LOCK CacheMapLock; ULONG OpenCount; ULONG DirtyPages; @@ -255,6 +256,7 @@ typedef struct _WORK_QUEUE_ENTRY extern LAZY_WRITER LazyWriter; #define NODE_TYPE_DEFERRED_WRITE 0x02FC +#define NODE_TYPE_PRIVATE_MAP 0x02FE VOID NTAPI

1 0

01/01: [NTOSKRNL] Drop the CcTryToInitializeFileCache() which is actually doing nothing relevant
by Pierre Schweitzer 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e932c7bef7641314c54b… commit 0e932c7bef7641314c54b149a1b3a6a4589c2ef1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 7 22:23:25 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 22:23:49 2018 +0100 [NTOSKRNL] Drop the CcTryToInitializeFileCache() which is actually doing nothing relevant --- ntoskrnl/cc/view.c | 31 ------------------------------- ntoskrnl/include/internal/cc.h | 4 ---- ntoskrnl/mm/section.c | 12 +----------- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 2e8fb6c51e..1b4468cd41 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1197,37 +1197,6 @@ CcRosReleaseFileCache ( return STATUS_SUCCESS; } -NTSTATUS -NTAPI -CcTryToInitializeFileCache ( - PFILE_OBJECT FileObject) -{ - PROS_SHARED_CACHE_MAP SharedCacheMap; - NTSTATUS Status; - - KeAcquireGuardedMutex(&ViewLock); - - ASSERT(FileObject->SectionObjectPointer); - SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; - if (SharedCacheMap == NULL) - { - Status = STATUS_UNSUCCESSFUL; - } - else - { - if (FileObject->PrivateCacheMap == NULL) - { - FileObject->PrivateCacheMap = SharedCacheMap; - SharedCacheMap->OpenCount++; - } - Status = STATUS_SUCCESS; - } - KeReleaseGuardedMutex(&ViewLock); - - return Status; -} - - NTSTATUS NTAPI CcRosInitializeFileCache ( diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 3a44fda908..f78e9c0491 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -406,10 +406,6 @@ CcRosReleaseFileCache( PFILE_OBJECT FileObject ); -NTSTATUS -NTAPI -CcTryToInitializeFileCache(PFILE_OBJECT FileObject); - VOID NTAPI CcShutdownSystem(VOID); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 5c954395a9..b588f1c617 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -3758,17 +3758,7 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject, Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; -#ifndef NEWCC - /* - * Initialized caching for this file object if previously caching - * was initialized for the same on disk file - */ - Status = CcTryToInitializeFileCache(FileObject); -#else - Status = STATUS_SUCCESS; -#endif - - if (!NT_SUCCESS(Status) || FileObject->SectionObjectPointer->ImageSectionObject == NULL) + if (FileObject->SectionObjectPointer->ImageSectionObject == NULL) { NTSTATUS StatusExeFmt;

1 0

01/01: [NTOS:KE] Replace "Fatal System Error" with "BugCheck"
by Serge Gautherie 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ece4e9fc22d664ea2485… commit 6ece4e9fc22d664ea2485d04303e8ae10047f21f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Feb 7 06:29:02 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 22:22:28 2018 +0100 [NTOS:KE] Replace "Fatal System Error" with "BugCheck" --- ntoskrnl/ke/bug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index a92acb1bab..2127d7207c 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -1070,8 +1070,8 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) { /* Crash on the debugger console */ - DbgPrint("\n*** Fatal System Error: 0x%08lx\n" - " (0x%p,0x%p,0x%p,0x%p)\n\n", + DbgPrint("\n*** BugCheck: 0x%08lx\n" + " (0x%p,0x%p,0x%p,0x%p)\n\n", KiBugCheckData[0], KiBugCheckData[1], KiBugCheckData[2],

1 0

09/09: [NTOSKRNL] Use the LockQueueMasterLock where appropriate
by Pierre Schweitzer 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=323f71a5519858222d749… commit 323f71a5519858222d74917a0478de843e5d10d3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 7 21:35:22 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 7 21:37:17 2018 +0100 [NTOSKRNL] Use the LockQueueMasterLock where appropriate --- ntoskrnl/cc/copy.c | 5 ++++- ntoskrnl/cc/lazywrite.c | 4 +++- ntoskrnl/cc/view.c | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 7a84e23fb9..521d90b48e 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -628,6 +628,7 @@ CcDeferWrite ( IN ULONG BytesToWrite, IN BOOLEAN Retrying) { + KIRQL OldIrql; PDEFERRED_WRITE Context; PFSRTL_COMMON_FCB_HEADER Fcb; @@ -675,11 +676,13 @@ CcDeferWrite ( /* Try to execute the posted writes */ CcPostDeferredWrites(); - /* FIXME: lock master */ + /* Schedule a lazy writer run to handle deferred writes */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (!LazyWriter.ScanActive) { CcScheduleLazyWriteScan(FALSE); } + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } /* diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index 4619aa8c69..292266d191 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -119,7 +119,6 @@ CcScanDpc( CcPostWorkQueue(WorkItem, &CcRegularWorkQueue); } -/* FIXME: handle master lock */ VOID CcLazyWriteScan(VOID) { @@ -165,6 +164,7 @@ CcLazyWriteScan(VOID) CcPostDeferredWrites(); } + /* Post items that were due for end of run */ while (!IsListEmpty(&ToPost)) { ListEntry = RemoveHeadList(&ToPost); @@ -173,7 +173,9 @@ CcLazyWriteScan(VOID) } /* We're no longer active */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); LazyWriter.ScanActive = FALSE; + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } VOID CcScheduleLazyWriteScan( diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e050a33c17..2e8fb6c51e 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -520,11 +520,13 @@ CcRosMarkDirtyVacb ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - /* FIXME: lock master */ + /* Schedule a lazy writer run to now that we have dirty VACB */ + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (!LazyWriter.ScanActive) { CcScheduleLazyWriteScan(FALSE); } + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); } VOID

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs