From: Casper Hornstrup Date: Sun, 20 Nov 2005 13:34:15 +0000 (+0000) Subject: Remove support for performance tests since that never worked X-Git-Tag: backups/ros-branch-0_2_9@19949~559 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=031ac865db9babc2b246760c906bee45a606c58c;hp=f1bef0d01acfd7bdea50f8e3d53a1b39c8cb58d0 Remove support for performance tests since that never worked svn path=/trunk/; revision=19361 --- diff --git a/reactos/regtests/regtests/regtests.c b/reactos/regtests/regtests/regtests.c index e321aaef745..ccda2f93d66 100755 --- a/reactos/regtests/regtests/regtests.c +++ b/reactos/regtests/regtests/regtests.c @@ -99,24 +99,6 @@ _GetCurrentThread() return GetCurrentThread(); } -BOOL STDCALL -_GetThreadContext(HANDLE hThread, LPCONTEXT lpContext) -{ - return GetThreadContext(hThread, lpContext); -} - -DWORD STDCALL -_SuspendThread(HANDLE hThread) -{ - return SuspendThread(hThread); -} - -DWORD STDCALL -_ResumeThread(HANDLE hThread) -{ - return ResumeThread(hThread); -} - VOID STDCALL _Sleep(DWORD dwMilliseconds) { diff --git a/reactos/regtests/regtests/regtests.def b/reactos/regtests/regtests/regtests.def index 3cd1eec7de4..cd492c37c75 100644 --- a/reactos/regtests/regtests/regtests.def +++ b/reactos/regtests/regtests/regtests.def @@ -14,7 +14,4 @@ _SetPriorityClass@8 _SetThreadPriority@8 _GetCurrentProcess@0 _GetCurrentThread@0 -_GetThreadContext@8 -_SuspendThread@4 -_ResumeThread@4 _Sleep@4 diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c index 64daaccb243..3513911b600 100755 --- a/reactos/regtests/shared/regtests.c +++ b/reactos/regtests/shared/regtests.c @@ -68,12 +68,6 @@ PerformTest(PVOID _arg) return 1; } -BOOL -IsContextChanged(LPCONTEXT context1, LPCONTEXT context2) -{ - return memcmp(context1, context2, sizeof(CONTEXT)) != 0; -} - VOID ControlNormalTest(HANDLE hThread, PERFORM_TEST_ARGS *Args, @@ -97,50 +91,6 @@ ControlNormalTest(HANDLE hThread, Args->Time = executionTime.dwLowDateTime / 10000; } -VOID -ControlPerformanceTest(HANDLE hThread, - PERFORM_TEST_ARGS *Args, - DWORD TimeOut) -{ - DWORD status; - CONTEXT lastContext; - CONTEXT currentContext; - - ZeroMemory(&lastContext, sizeof(CONTEXT)); - lastContext.ContextFlags = CONTEXT_FULL; - ZeroMemory(¤tContext, sizeof(CONTEXT)); - currentContext.ContextFlags = CONTEXT_FULL; - - do { - _Sleep(1); - - if (_SuspendThread(hThread) == (DWORD)-1) - break; - - if (_GetThreadContext(hThread, ¤tContext) == 0) - break; - - if (IsContextChanged(¤tContext, &lastContext)) - Args->Time++; - - if (_ResumeThread(hThread) == (DWORD)-1) - break; - - if (Args->Time >= TimeOut) - { - _TerminateThread(hThread, 0); - Args->Result = TS_TIMEDOUT; - break; - } - - status = _WaitForSingleObject(hThread, 0); - if (status == WAIT_OBJECT_0 || status == WAIT_FAILED) - break; - - lastContext = currentContext; - } while (TRUE); -} - VOID DisplayResult(PERFORM_TEST_ARGS* Args, LPSTR OutputBuffer) @@ -183,9 +133,6 @@ ControlTest(HANDLE hThread, case TT_NORMAL: ControlNormalTest(hThread, Args, TimeOut); break; - case TT_PERFORMANCE: - ControlPerformanceTest(hThread, Args, TimeOut); - break; default: printf("Unknown test type %ld\n", TestType); break; diff --git a/reactos/regtests/shared/regtests.h b/reactos/regtests/shared/regtests.h index 1510cf1efc1..9d6e772b9cd 100755 --- a/reactos/regtests/shared/regtests.h +++ b/reactos/regtests/shared/regtests.h @@ -30,7 +30,6 @@ void SetupOnce() /* Test types */ #define TT_NORMAL 0 -#define TT_PERFORMANCE 1 /* Valid values for return values of TestRoutine */ #define TS_TIMEDOUT ((DWORD)-2) @@ -237,15 +236,6 @@ _GetCurrentProcess(); HANDLE STDCALL _GetCurrentThread(); -BOOL STDCALL -_GetThreadContext(HANDLE hThread, LPCONTEXT lpContext); - -DWORD STDCALL -_SuspendThread(HANDLE hThread); - -DWORD STDCALL -_ResumeThread(HANDLE hThread); - VOID STDCALL _Sleep(DWORD dwMilliseconds); diff --git a/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c b/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c deleted file mode 100644 index 5e63b0fbe0e..00000000000 --- a/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c +++ /dev/null @@ -1,44 +0,0 @@ -#include - -#include "regtests.h" - -static void SetupSurface(SURFOBJ* surface, RECTL* rect) -{ - UINT sizex; - UINT sizey; - UINT size; - UINT depth; - - RtlZeroMemory(surface, sizeof(SURFOBJ)); - depth = BitsPerFormat(BMF_24BPP); - sizex = rect->right - rect->left; - sizey = rect->bottom - rect->top; - size = sizey * sizex * depth; - surface->pvScan0 = malloc(size); - surface->lDelta = DIB_GetDIBWidthBytes(sizex, depth); -} - -static void CleanupSurface(SURFOBJ* surface) -{ - free(surface->pvScan0); -} - -static void RunTest() -{ - static RECTL rect = { 0, 0, 100, 100 }; - SURFOBJ surface; - UINT color; - UINT i; - - SetupSurface(&surface, &rect); - for (i = 0; i < 10000; i++) - { - BOOLEAN success = DIB_24BPP_ColorFill(&surface, &rect, color); - _AssertTrue(success); - if (!success) - break; - } - CleanupSurface(&surface); -} - -_DispatcherType(Dib_24bpp_colorfill_performanceTest, "DIB_24BPP_ColorFill performance", TT_PERFORMANCE) diff --git a/reactos/subsys/win32k/tests/win32k.xml b/reactos/subsys/win32k/tests/win32k.xml index 0903b045b2d..92799054d25 100644 --- a/reactos/subsys/win32k/tests/win32k.xml +++ b/reactos/subsys/win32k/tests/win32k.xml @@ -14,9 +14,6 @@ regtests win32k_base pseh - - DIB_24BPP_ColorFill-performance.c - setup.c