From 6320fe51923df0db0a61a232b7e8e5ceeb85e723 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 28 Jul 2013 13:54:42 +0000 Subject: [PATCH] [CSRSRV] Use symbolic constant for number of hash buckets and use it where appropriate (fixing one missing location). svn path=/trunk/; revision=59592 --- reactos/subsystems/win32/csrsrv/api.h | 3 ++- reactos/subsystems/win32/csrsrv/procsup.c | 8 ++++---- reactos/subsystems/win32/csrsrv/thredsup.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/reactos/subsystems/win32/csrsrv/api.h b/reactos/subsystems/win32/csrsrv/api.h index d4a5960be4c..60385d9c4ff 100644 --- a/reactos/subsystems/win32/csrsrv/api.h +++ b/reactos/subsystems/win32/csrsrv/api.h @@ -45,7 +45,8 @@ extern HANDLE hBootstrapOk; extern HANDLE CsrApiPort; extern HANDLE CsrSmApiPort; extern HANDLE CsrSbApiPort; -extern LIST_ENTRY CsrThreadHashTable[257]; +#define NUMBER_THREAD_HASH_BUCKETS 257 +extern LIST_ENTRY CsrThreadHashTable[NUMBER_THREAD_HASH_BUCKETS]; extern PCSR_PROCESS CsrRootProcess; extern UNICODE_STRING CsrDirectoryName; extern ULONG CsrDebug; diff --git a/reactos/subsystems/win32/csrsrv/procsup.c b/reactos/subsystems/win32/csrsrv/procsup.c index d3ca5de1412..2dc5c116598 100644 --- a/reactos/subsystems/win32/csrsrv/procsup.c +++ b/reactos/subsystems/win32/csrsrv/procsup.c @@ -371,7 +371,7 @@ CsrInitializeProcessStructure(VOID) CsrRootProcess->ClientId = NtCurrentTeb()->ClientId; /* Initialize the Thread Hash List */ - for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); + for (i = 0; i < NUMBER_THREAD_HASH_BUCKETS; i++) InitializeListHead(&CsrThreadHashTable[i]); /* Initialize the Wait Lock */ return RtlInitializeCriticalSection(&CsrWaitListsLock); @@ -1382,7 +1382,7 @@ CsrEnumProcesses(IN CSRSS_ENUM_PROCESS_PROC EnumProc, /* Acquire process lock */ CsrAcquireProcessLock(); - + /* Get the list pointers */ NextEntry = CsrRootProcess->ListLink.Flink; while (NextEntry != &CsrRootProcess->ListLink) @@ -1397,13 +1397,13 @@ CsrEnumProcesses(IN CSRSS_ENUM_PROCESS_PROC EnumProc, CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; } - + /* Set shudown Priority */ CsrSetToShutdownPriority(); /* Loop all processes */ //DPRINT1("Enumerating for LUID: %lx %lx\n", CallerLuid->HighPart, CallerLuid->LowPart); - + /* Start looping */ while (TRUE) { diff --git a/reactos/subsystems/win32/csrsrv/thredsup.c b/reactos/subsystems/win32/csrsrv/thredsup.c index 4d443152a15..26b5bb12b86 100644 --- a/reactos/subsystems/win32/csrsrv/thredsup.c +++ b/reactos/subsystems/win32/csrsrv/thredsup.c @@ -14,11 +14,11 @@ #define NDEBUG #include -#define CsrHashThread(t) (HandleToUlong(t) % 257) +#define CsrHashThread(t) (HandleToUlong(t) % NUMBER_THREAD_HASH_BUCKETS) /* GLOBALS ********************************************************************/ -LIST_ENTRY CsrThreadHashTable[257]; +LIST_ENTRY CsrThreadHashTable[NUMBER_THREAD_HASH_BUCKETS]; /* PRIVATE FUNCTIONS **********************************************************/