Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[ion] 12774: Add more Critical Section Debug Data and fix two bugs.

by ion＠svn.reactos.com

Add more Critical Section Debug Data and fix two bugs. Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-04 01:49:08 UTC (rev 12773) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-04 01:51:16 UTC (rev 12774) @@ -279,10 +279,7 @@ RtlResetRtlTranslations (&NlsTable); NTHeaders = (PIMAGE_NT_HEADERS)(ImageBase + PEDosHeader->e_lfanew); - - /* Initialize Critical Section Data */ - RtlpInitDeferedCriticalSection(); - + /* create process heap */ RtlInitializeHeapManager(); Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, @@ -296,7 +293,10 @@ DPRINT1("Failed to create process heap\n"); ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); } - + + /* Initialize Critical Section Data */ + RtlpInitDeferedCriticalSection(); + /* initalize peb lock support */ RtlInitializeCriticalSection (&PebLock); Peb->FastPebLock = &PebLock; _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-04 01:49:08 UTC (rev 12773) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-04 01:51:16 UTC (rev 12774) @@ -16,7 +16,7 @@ #include <ntdll/rtl.h> #include <ntos/synch.h> -//#define NDEBUG +#define NDEBUG #include <ntdll/ntdll.h> /* FUNCTIONS *****************************************************************/ @@ -24,6 +24,8 @@ static RTL_CRITICAL_SECTION RtlCriticalSectionLock; static LIST_ENTRY RtlCriticalSectionList; static BOOLEAN RtlpCritSectInitialized = FALSE; +//static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[64]; +//static PRTL_CRITICAL_SECTION_DEBUG RtlpDebugInfoFreeList; /*++ * RtlDeleteCriticalSection @@ -209,6 +211,7 @@ PVOID Heap; /* First things first, set up the Object */ + DPRINT("Initializing Critical Section: %x\n", CriticalSection); CriticalSection->LockCount = -1; CriticalSection->RecursionCount = 0; CriticalSection->OwningThread = 0; @@ -222,6 +225,7 @@ if ((Heap = RtlGetProcessHeap())) { CritcalSectionDebugData = RtlAllocateHeap(Heap, 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + DPRINT("Allocated Critical Section Debug Data: %x\n", CritcalSectionDebugData); CritcalSectionDebugData->Type = RTL_CRITSECT_TYPE; CritcalSectionDebugData->ContentionCount = 0; CritcalSectionDebugData->EntryCount = 0; @@ -235,6 +239,10 @@ */ if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) { + DPRINT("Securely Inserting into ProcessLocks: %x, %x\n", + &CritcalSectionDebugData->ProcessLocksList, + CriticalSection); + /* Protect List */ RtlEnterCriticalSection(&RtlCriticalSectionLock); @@ -246,12 +254,17 @@ } else { + DPRINT("Inserting into ProcessLocks: %x, %x\n", + &CritcalSectionDebugData->ProcessLocksList, + CriticalSection); + /* Add it directly */ InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); } } else { + DPRINT1("No Debug Data was allocated for: %x\n", CriticalSection); /* This shouldn't happen... */ CritcalSectionDebugData = NULL; } @@ -372,7 +385,9 @@ BOOLEAN LastChance = FALSE; LARGE_INTEGER Timeout; - Timeout = RtlConvertLongToLargeInteger(150000); + /* Wait 2.5 minutes */ + Timeout.QuadPart = 150000L * (ULONGLONG)10000; + Timeout.QuadPart = -Timeout.QuadPart; /* ^^ HACK HACK HACK. Good way: Timeout = &NtCurrentPeb()->CriticalSectionTimeout */ @@ -382,14 +397,16 @@ } /* Increase the Debug Entry count */ - CriticalSection->DebugInfo->EntryCount++; + DPRINT("Waiting on Critical Section: %x\n", CriticalSection); + if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->EntryCount++; for (;;) { /* Increase the number of times we've had contention */ - CriticalSection->DebugInfo->ContentionCount++; + if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->ContentionCount++; /* Wait on the Event */ + DPRINT("Waiting on Event: %x\n", CriticalSection->LockSemaphore); Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, FALSE, &Timeout); @@ -400,6 +417,8 @@ /* Is this the 2nd time we've timed out? */ if (LastChance) { + DPRINT1("Deadlock: %x\n", CriticalSection); + /* Yes it is, we are raising an exception */ ExceptionRecord.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; ExceptionRecord.ExceptionFlags = 0; @@ -451,11 +470,13 @@ } /* Signal the Event */ + DPRINT("Signaling CS Event\n"); Status = NtSetEvent(CriticalSection->LockSemaphore, NULL); if (!NT_SUCCESS(Status)) { /* We've failed */ + DPRINT1("Signaling Failed\n"); RtlRaiseStatus(Status); } } @@ -487,7 +508,7 @@ /* Chevk if we have an event */ if (!hEvent) { - DPRINT ("Creating Event\n"); + DPRINT("Creating Event\n"); /* No, so create it */ if (!NT_SUCCESS(Status = NtCreateEvent(&hNewEvent, EVENT_ALL_ACCESS,

19 years, 10 months

[navaraf] 12773: Robert Shearman <rob@codeweavers.com>

by navaraf＠svn.reactos.com

Robert Shearman <rob(a)codeweavers.com> - Fix colours used for SS_*RECT, SS_*FRAME. - Implement SS_CENTERIMAGE for static control. Modified: trunk/reactos/lib/user32/controls/static.c _____ Modified: trunk/reactos/lib/user32/controls/static.c --- trunk/reactos/lib/user32/controls/static.c 2005-01-04 00:10:50 UTC (rev 12772) +++ trunk/reactos/lib/user32/controls/static.c 2005-01-04 01:49:08 UTC (rev 12773) @@ -34,7 +34,7 @@ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static COLORREF color_windowframe, color_background, color_window; +static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; /* offsets for GetWindowLong for static private information */ #define HFONT_GWL_OFFSET 0 @@ -104,7 +104,7 @@ if ((style & SS_TYPEMASK) != SS_ICON) return 0; prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon ); - if (hicon) + if (hicon && !(style & SS_CENTERIMAGE)) { ICONINFO info; BITMAP bm; @@ -118,7 +118,7 @@ return 0; } SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } return prevIcon; #else @@ -131,7 +131,7 @@ return 0; } prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon ); - if (hicon) + if (hicon && !(style & SS_CENTERIMAGE)) { SetWindowPos( hwnd, 0, 0, 0, info->nWidth, info->nHeight, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); @@ -153,14 +153,14 @@ if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { #ifdef __REACTOS__ - OutputDebugStringA("huh? hBitmap!=0, but not bitmap\n"); + OutputDebugStringA("huh? hBitmap!=0, but not bitmap\n"); #else ERR("huh? hBitmap!=0, but not bitmap\n"); #endif return 0; } hOldBitmap = (HBITMAP)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hBitmap ); - if (hBitmap) + if (hBitmap && !(style & SS_CENTERIMAGE)) { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); @@ -244,6 +244,13 @@ } } +static VOID STATIC_InitColours() +{ + color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); + color_3dshadow = GetSysColor(COLOR_3DSHADOW); + color_3dhighlight = GetSysColor(COLOR_3DHIGHLIGHT); +} + /*********************************************************************** * StaticWndProc_common */ @@ -266,10 +273,7 @@ #endif return -1; } - /* initialise colours */ - color_windowframe = GetSysColor(COLOR_WINDOWFRAME); - color_background = GetSysColor(COLOR_BACKGROUND); - color_window = GetSysColor(COLOR_WINDOW); + STATIC_InitColours(); break; case WM_NCDESTROY: @@ -302,9 +306,7 @@ break; case WM_SYSCOLORCHANGE: - color_windowframe = GetSysColor(COLOR_WINDOWFRAME); - color_background = GetSysColor(COLOR_BACKGROUND); - color_window = GetSysColor(COLOR_WINDOW); + STATIC_InitColours(); InvalidateRect(hwnd, NULL, TRUE); break; @@ -328,7 +330,7 @@ else hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam); /* FIXME : should we also return the previous hIcon here ??? */ - STATIC_SetIcon(hwnd, hIcon, style); + STATIC_SetIcon(hwnd, hIcon, full_style); break; } case SS_BITMAP: @@ -338,7 +340,7 @@ hBitmap = STATIC_LoadBitmapW(hwnd, (LPCWSTR)lParam); else hBitmap = STATIC_LoadBitmapA(hwnd, (LPCSTR)lParam); - STATIC_SetBitmap(hwnd, hBitmap, style); + STATIC_SetBitmap(hwnd, hBitmap, full_style); break; } case SS_LEFT: @@ -414,10 +416,10 @@ case STM_SETIMAGE: switch(wParam) { case IMAGE_BITMAP: - lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, style ); + lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; case IMAGE_ICON: - lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, style ); + lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: #ifndef __REACTOS__ @@ -432,7 +434,7 @@ case STM_SETICON16: #endif case STM_SETICON: - lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, style ); + lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); InvalidateRect( hwnd, NULL, TRUE ); break; @@ -519,6 +521,8 @@ if (style & SS_NOPREFIX) wFormat |= DT_NOPREFIX; + if (style & SS_CENTERIMAGE) + wFormat |= DT_VCENTER; if ((hFont = (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont ); @@ -550,27 +554,27 @@ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(color_windowframe); + hBrush = CreateSolidBrush(color_3ddkshadow); FillRect( hdc, &rc, hBrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(color_background); + hBrush = CreateSolidBrush(color_3dshadow); FillRect( hdc, &rc, hBrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(color_window); + hBrush = CreateSolidBrush(color_3dhighlight); FillRect( hdc, &rc, hBrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(color_windowframe); + hBrush = CreateSolidBrush(color_3ddkshadow); FrameRect( hdc, &rc, hBrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(color_background); + hBrush = CreateSolidBrush(color_3dshadow); FrameRect( hdc, &rc, hBrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(color_window); + hBrush = CreateSolidBrush(color_3dhighlight); FrameRect( hdc, &rc, hBrush ); break; default: @@ -585,13 +589,38 @@ RECT rc; HBRUSH hbrush; HICON hIcon; + INT x, y; GetClientRect( hwnd, &rc ); hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); FillRect( hdc, &rc, hbrush ); - if ((hIcon = (HICON)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) - DrawIcon( hdc, rc.left, rc.top, hIcon ); + hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + if (style & SS_CENTERIMAGE) + { +#ifndef __REACTOS__ + CURSORICONINFO *info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL; + x = (rc.right - rc.left)/2 - (info ? info->nWidth/2 : 0); + y = (rc.bottom - rc.top)/2 - (info ? info->nHeight/2 : 0); +#else + ICONINFO info; + BITMAP bm; + + if (!GetIconInfo(hIcon, &info)) + return; + if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) + return; + x = (rc.right - rc.left)/2 - bm.bmWidth/2; + y = (rc.bottom - rc.top)/2 - bm.bmHeight/2; +#endif + } + else + { + x = rc.left; + y = rc.top; + } + if (hIcon) + DrawIcon( hdc, x, y, hIcon ); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) @@ -606,12 +635,25 @@ if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) { BITMAP bm; + INT x, y; if(GetObjectType(hBitmap) != OBJ_BITMAP) return; if (!(hMemDC = CreateCompatibleDC( hdc ))) return; GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); - BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, + if (style & SS_CENTERIMAGE) + { + RECT rcClient; + GetClientRect(hwnd, &rcClient); + x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + } + else + { + x = 0; + y = 0; + } + BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY); SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC);

19 years, 10 months

[ion] 12772: Fix silly bugs in Critical section code. Thanks to Gunnar for finding one of them, thanks to mifritscher for finding the actual regression, and thanks to Filip for being understanding :P

by ion＠svn.reactos.com

Fix silly bugs in Critical section code. Thanks to Gunnar for finding one of them, thanks to mifritscher for finding the actual regression, and thanks to Filip for being understanding :P Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-01-03 23:35:02 UTC (rev 12771) +++ trunk/reactos/include/ntdll/rtl.h 2005-01-04 00:10:50 UTC (rev 12772) @@ -99,7 +99,6 @@ LIST_ENTRY ProcessLocksList; ULONG EntryCount; ULONG ContentionCount; - PVOID OwnerBackTrace[2]; PVOID Spare[2]; } CRITICAL_SECTION_DEBUG, *PCRITICAL_SECTION_DEBUG; _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-03 23:35:02 UTC (rev 12771) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-04 00:10:50 UTC (rev 12772) @@ -16,7 +16,7 @@ #include <ntdll/rtl.h> #include <ntos/synch.h> -#define NDEBUG +//#define NDEBUG #include <ntdll/ntdll.h> /* FUNCTIONS *****************************************************************/ @@ -146,6 +146,7 @@ } /* We don't own it, so we must wait for it */ + DPRINT ("Waiting\n"); RtlpWaitForCriticalSection(CriticalSection); } @@ -486,14 +487,16 @@ /* Chevk if we have an event */ if (!hEvent) { + DPRINT ("Creating Event\n"); /* No, so create it */ - if (NT_SUCCESS(Status = NtCreateEvent(hNewEvent, - EVENT_ALL_ACCESS, - NULL, - SynchronizationEvent, - FALSE))) { + if (!NT_SUCCESS(Status = NtCreateEvent(&hNewEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE))) { /* We failed, this is bad... */ + DPRINT1("Failed to Create Event!\n"); InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; @@ -508,11 +511,13 @@ } else { /* Some just created an event */ + DPRINT("Closing already created event!\n"); NtClose(hNewEvent); } /* Set either the new or the old */ CriticalSection->LockSemaphore = hEvent; + DPRINT("Event set!\n"); } return;

19 years, 10 months

[ion] 12771: Fix RtlCriticalSection dummy calls in ntoskrnl's libsupp, for consistency with previous patch and correctness of types.

by ion＠svn.reactos.com

Fix RtlCriticalSection dummy calls in ntoskrnl's libsupp, for consistency with previous patch and correctness of types. Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c --- trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-01-03 23:24:12 UTC (rev 12770) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-01-03 23:35:02 UTC (rev 12771) @@ -14,83 +14,73 @@ #define NDEBUG #include <internal/debug.h> -//FIXME: sort this out somehow -#define PCRITICAL_SECTION PVOID -#define LPCRITICAL_SECTION PVOID +//FIXME: sort this out somehow. IAI: Sorted in new header branch +#define PRTL_CRITICAL_SECTION PVOID /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ -VOID STDCALL -RtlDeleteCriticalSection(PCRITICAL_SECTION CriticalSection) +NTSTATUS +STDCALL +RtlDeleteCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { + return STATUS_SUCCESS; } -/* - * @implemented - */ -DWORD STDCALL +DWORD +STDCALL RtlSetCriticalSectionSpinCount( - LPCRITICAL_SECTION CriticalSection, + PRTL_CRITICAL_SECTION CriticalSection, DWORD SpinCount ) { return 0; } - -/* - * @implemented - */ -VOID STDCALL -RtlEnterCriticalSection(PCRITICAL_SECTION CriticalSection) +NTSTATUS +STDCALL +RtlEnterCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { - ExAcquireFastMutex((PFAST_MUTEX) CriticalSection ); + ExAcquireFastMutex((PFAST_MUTEX) CriticalSection); + return STATUS_SUCCESS; } - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlInitializeCriticalSection(PCRITICAL_SECTION CriticalSection) +NTSTATUS +STDCALL +RtlInitializeCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { ExInitializeFastMutex((PFAST_MUTEX)CriticalSection ); return STATUS_SUCCESS; } - -/* - * @implemented - */ -VOID STDCALL -RtlLeaveCriticalSection(PCRITICAL_SECTION CriticalSection) +NTSTATUS +STDCALL +RtlLeaveCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { - ExReleaseFastMutex((PFAST_MUTEX) CriticalSection ); + ExReleaseFastMutex((PFAST_MUTEX) CriticalSection ); + return STATUS_SUCCESS; } -/* - * @implemented - */ -BOOLEAN STDCALL -RtlTryEnterCriticalSection(PCRITICAL_SECTION CriticalSection) +BOOLEAN +STDCALL +RtlTryEnterCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { - return ExTryToAcquireFastMutex((PFAST_MUTEX) CriticalSection ); + return ExTryToAcquireFastMutex((PFAST_MUTEX) CriticalSection ); } -/* - * @implemented - */ -NTSTATUS STDCALL -RtlInitializeCriticalSectionAndSpinCount ( - PCRITICAL_SECTION CriticalSection, - ULONG SpinCount) +NTSTATUS +STDCALL +RtlInitializeCriticalSectionAndSpinCount( + PRTL_CRITICAL_SECTION CriticalSection, + ULONG SpinCount) { - ExInitializeFastMutex((PFAST_MUTEX)CriticalSection ); - return STATUS_SUCCESS; + ExInitializeFastMutex((PFAST_MUTEX)CriticalSection ); + return STATUS_SUCCESS; } /* EOF */

19 years, 10 months

[royce] 12770: get rid of transitory junk

by royce＠svn.reactos.com

get rid of transitory junk Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-03 23:21:25 UTC (rev 12769) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-03 23:24:12 UTC (rev 12770) @@ -108,39 +108,6 @@ return true; } -#if 0 -bool XMLFile::getc(char& c) -{ - while ( _bufidx >= _buf.size() ) - { - static buf[4096]; - if ( !fgets ( buf, sizeof(buf), _f.back() ) ) - { - fclose ( _f.back() ); - f.pop_back(); - continue; - } - _buf = buf; - _bufidx = 0; - // REM TODO FIXME - check for and load includes here... - /*char* p = &_buf[0]; - p += strspn ( p, " \t" ); - if ( *p++ != '#' ) - break; - p += strspn ( p, " \t" ); - if ( strncmp ( p, "include", 7 ) ) - break; - p += 7; - if ( !isspace(*p++) ) - break;*/ - - } - c = _buf[_bufidx++]; - return true; -} -#endif - - XMLAttribute::XMLAttribute() { }

19 years, 10 months

[royce] 12769: 1) vector<BaseClass> = bad juju, must use vector<BaseClass*>

by royce＠svn.reactos.com

1) vector<BaseClass> = bad juju, must use vector<BaseClass*> 2) BaseClass must have virtual dtor 3) make Run() pure virtual Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-03 23:12:56 UTC (rev 12768) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-03 23:21:25 UTC (rev 12769) @@ -8,7 +8,8 @@ public: bool Failed; BaseTest(); - /*virtual void Run();*/ + virtual ~BaseTest(); + virtual void Run() = 0; protected: void Assert(char *message); void IsTrue(bool condition); @@ -24,6 +25,7 @@ class ModuleTest : public BaseTest { +public: void Run(); }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-03 23:12:56 UTC (rev 12768) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-03 23:21:25 UTC (rev 12769) @@ -5,11 +5,11 @@ { Failed = true; } -/* -void BaseTest::Run() + +BaseTest::~BaseTest() { } -*/ + void BaseTest::Assert(char *message) { printf(message); @@ -81,6 +81,17 @@ Failed = true; } +class BaseTestList : public vector<BaseTest*> +{ +public: + ~BaseTestList() + { + for ( size_t i = 0; i < size(); i++ ) + { + delete (*this)[i]; + } + } +}; class TestDispatcher { @@ -88,10 +99,10 @@ void Run() { int numberOfFailedTests = 0; - vector<BaseTest> tests = GetTests(); + BaseTestList tests = GetTests(); for (size_t i = 0; i < tests.size(); i++) { - BaseTest& test = tests[i]; + BaseTest& test = *tests[i]; /*test.Run();*/ if (test.Failed) numberOfFailedTests++; @@ -105,10 +116,10 @@ } private: - vector<BaseTest> GetTests() + BaseTestList GetTests() { - vector<BaseTest> tests; - tests.push_back(ModuleTest()); + BaseTestList tests; + tests.push_back(new ModuleTest()); return tests; } };

19 years, 10 months

[blight] 12768: added ntagp.h

by blight＠svn.reactos.com

added ntagp.h Added: trunk/reactos/w32api/include/ddk/ntagp.h _____ Added: trunk/reactos/w32api/include/ddk/ntagp.h --- trunk/reactos/w32api/include/ddk/ntagp.h 2005-01-03 23:04:52 UTC (rev 12767) +++ trunk/reactos/w32api/include/ddk/ntagp.h 2005-01-03 23:12:56 UTC (rev 12768) @@ -0,0 +1,111 @@ +/* + * ntagp.h + * + * NT AGP bus driver interface + * + * This file is part of the w32api package. + * + * Contributors: + * Created by Gregor Anich <blight(a)blight.eu.org> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef __NTAGP_H +#define __NTAGP_H + +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include "ntddk.h" +#include "video.h" + + +#define AGP_BUS_INTERFACE_V1 1L +#define AGP_BUS_INTERFACE_V2 2L + +/* Indicates wether the GART supports mapping of physical memory for the CPU */ +#define AGP_CAPABILITIES_MAP_PHYSICAL 0x00000001L + +typedef NTSTATUS +(DDKAPI *PAGP_BUS_COMMIT_MEMORY)( + IN PVOID AgpContext, + IN PVOID MapHandle, + IN ULONG NumberOfPages, + IN ULONG OffsetInPages, + IN OUT PMDL Mdl OPTIONAL, + OUT PHYSICAL_ADDRESS *MemoryBase); + +typedef NTSTATUS +(DDKAPI *PAGP_BUS_FREE_MEMORY)( + IN PVOID AgpContext, + IN PVOID MapHandle, + IN ULONG NumberOfPages, + IN ULONG OffsetInPages); + +typedef NTSTATUS +(DDKAPI *PAGP_BUS_RELEASE_MEMORY)( + IN PVOID AgpContext, + IN PVOID MapHandle); + +typedef NTSTATUS +(DDKAPI *PAGP_BUS_RESERVE_MEMORY)( + IN PVOID AgpContext, + IN ULONG NumberOfPages, + IN MEMORY_CACHING_TYPE MemoryType, + OUT PVOID *MapHandle, + OUT PHYSICAL_ADDRESS *PhysicalAddress OPTIONAL); + +typedef NTSTATUS +(DDKAPI *PAGP_BUS_SET_RATE)( + IN PVOID AgpContext, + IN ULONG AgpRate); + +typedef NTSTATUS +(DDKAPI *PAGP_GET_MAPPED_PAGES)( + IN PVOID AgpContext, + IN PVOID MapHandle, + IN ULONG NumberOfPages, + IN ULONG OffsetInPages, + OUT PMDL Mdl); + +typedef struct _AGP_BUS_INTERFACE_STANDARD { + USHORT Size; + USHORT Version; + PVOID AgpContext; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + ULONG Capabilities; + PAGP_BUS_RESERVE_MEMORY ReserveMemory; + PAGP_BUS_RELEASE_MEMORY ReleaseMemory; + PAGP_BUS_COMMIT_MEMORY CommitMemory; + PAGP_BUS_FREE_MEMORY FreeMemory; + PAGP_GET_MAPPED_PAGES GetMappedPages; + PAGP_BUS_SET_RATE SetRate; +} AGP_BUS_INTERFACE_STANDARD, *PAGP_BUS_INTERFACE_STANDARD; + +#define AGP_BUS_INTERFACE_V2_SIZE sizeof(AGP_BUS_INTERFACE_STANDARD) +#define AGP_BUS_INTERFACE_V1_SIZE \ + (AGP_BUS_INTERFACE_V2_SIZE - sizeof(PAGP_BUS_SET_RATE)) + +#ifdef __cplusplus +} +#endif + +#endif /* __NTAGP_H */ +

19 years, 10 months

[chorns] 12767: Add small testing framework.

by chorns＠svn.reactos.com

Add small testing framework. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Added: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-03 23:04:52 UTC (rev 12767) @@ -4,10 +4,14 @@ all: $(TARGET) -OBJECTS = rbuild.o +BASE_OBJECTS = module.o -CLEAN_FILES = *.o rbuild$(EXE_POSTFIX) +OBJECTS = $(BASE_OBJECTS) rbuild.o +TESTS = tests/moduletest.o + +TEST_OBJECTS = $(BASE_OBJECTS) $(TESTS) tests/alltests.o + HOST_CFLAGS = -g -I. -Werror -Wall HOST_LFLAGS = -g @@ -19,11 +23,15 @@ clean: -rm -f *.o -rm -f rbuild$(EXE_POSTFIX) + -rm -f tests/*.o + -rm -f rbuild_tests$(EXE_POSTFIX) endif ifeq ($(HOST),mingw32-windows) clean: -del *.o -del rbuild$(EXE_POSTFIX) + -del tests\*.o + -del rbuild_tests$(EXE_POSTFIX) endif .phony: clean @@ -32,4 +40,10 @@ $(HALFVERBOSEECHO) [CXX] $< $(HOST_CXX) $(HOST_CFLAGS) -c $< -o $@ +test: rbuild_tests$(EXE_POSTFIX) + $(EXE_PREFIX)rbuild_tests$(EXE_POSTFIX) + +rbuild_tests$(EXE_POSTFIX): $(TEST_OBJECTS) + $(HOST_CXX) $(TEST_OBJECTS) $(HOST_LFLAGS) -o rbuild_tests$(EXE_POSTFIX) + include $(PATH_TO_TOP)/rules.mak _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-03 23:04:52 UTC (rev 12767) @@ -0,0 +1,5 @@ +#include "rbuild.h" + +Module::Module(XMLElement moduleNode) +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-03 23:04:52 UTC (rev 12767) @@ -4,18 +4,11 @@ #pragma warning ( disable : 4786 ) #endif//_MSC_VER -#include <string> -#include <vector> - #include <stdio.h> #include <io.h> #include <assert.h> -//#include <sys/stat.h> -//#include <sys/types.h> +#include "rbuild.h" -using std::string; -using std::vector; - #ifdef _MSC_VER unsigned __int64 #else @@ -36,218 +29,216 @@ static const char* WS = " \t\r\n"; static const char* WSEQ = " =\t\r\n"; -class XMLFile +XMLFile::XMLFile() { - vector<FILE*> _f; - string _buf; - const char *_p, *_end; -public: - XMLFile() {} - void close() +} + +void XMLFile::close() +{ + while ( _f.size() ) { - while ( _f.size() ) - { - fclose ( _f.back() ); - _f.pop_back(); - } - _buf.resize(0); - _p = _end = NULL; + fclose ( _f.back() ); + _f.pop_back(); } - bool open ( const char* filename ) + _buf.resize(0); + _p = _end = NULL; +} + +bool XMLFile::open(const char* filename) +{ + close(); + FILE* f = fopen ( filename, "r" ); + if ( !f ) + return false; + unsigned long len = (unsigned long)filelen(f); + _buf.resize ( len ); + fread ( &_buf[0], 1, len, f ); + _p = _buf.c_str(); + _end = _p + len; + _f.push_back ( f ); + next_token(); + return true; +} + +// next_token() moves the pointer to next token, which may be +// an xml element or a text element, basically it's a glorified +// skipspace, normally the user of this class won't need to call +// this function +void XMLFile::next_token() +{ + _p += strspn ( _p, WS ); +} + +bool XMLFile::next_is_text() +{ + return *_p != '<'; +} + +bool XMLFile::more_tokens() +{ + return _p != _end; +} + +// get_token() is used to return a token, and move the pointer +// past the token +bool XMLFile::get_token(string& token) +{ + const char* tokend; + if ( *_p == '<' ) { - close(); - FILE* f = fopen ( filename, "r" ); - if ( !f ) - return false; - unsigned long len = (unsigned long)filelen(f); - _buf.resize ( len ); - fread ( &_buf[0], 1, len, f ); - _p = _buf.c_str(); - _end = _p + len; - _f.push_back ( f ); - next_token(); - return true; + tokend = strchr ( _p, '>' ); + if ( !tokend ) + tokend = _end; + else + ++tokend; } - // next_token() moves the pointer to next token, which may be - // an xml element or a text element, basically it's a glorified - // skipspace, normally the user of this class won't need to call - // this function - void next_token() + else { - _p += strspn ( _p, WS ); + tokend = strchr ( _p, '<' ); + if ( !tokend ) + tokend = _end; + while ( tokend > _p && isspace(tokend[-1]) ) + --tokend; } - bool next_is_text() - { - return *_p != '<'; - } - bool more_tokens() - { - return _p != _end; - } - // get_token() is used to return a token, and move the pointer - // past the token - bool get_token ( string& token ) - { - const char* tokend; - if ( *_p == '<' ) - { - tokend = strchr ( _p, '>' ); - if ( !tokend ) - tokend = _end; - else - ++tokend; - } - else - { - tokend = strchr ( _p, '<' ); - if ( !tokend ) - tokend = _end; - while ( tokend > _p && isspace(tokend[-1]) ) - --tokend; - } - if ( tokend == _p ) - return false; - token = string ( _p, tokend-_p ); - _p = tokend; - next_token(); - return true; - } + if ( tokend == _p ) + return false; + token = string ( _p, tokend-_p ); + _p = tokend; + next_token(); + return true; +} + #if 0 - bool getc ( char& c ) +bool XMLFile::getc(char& c) +{ + while ( _bufidx >= _buf.size() ) { - while ( _bufidx >= _buf.size() ) + static buf[4096]; + if ( !fgets ( buf, sizeof(buf), _f.back() ) ) { - static buf[4096]; - if ( !fgets ( buf, sizeof(buf), _f.back() ) ) - { - fclose ( _f.back() ); - f.pop_back(); - continue; - } - _buf = buf; - _bufidx = 0; - // REM TODO FIXME - check for and load includes here... - /*char* p = &_buf[0]; - p += strspn ( p, " \t" ); - if ( *p++ != '#' ) - break; - p += strspn ( p, " \t" ); - if ( strncmp ( p, "include", 7 ) ) - break; - p += 7; - if ( !isspace(*p++) ) - break;*/ - + fclose ( _f.back() ); + f.pop_back(); + continue; } - c = _buf[_bufidx++]; - return true; + _buf = buf; + _bufidx = 0; + // REM TODO FIXME - check for and load includes here... + /*char* p = &_buf[0]; + p += strspn ( p, " \t" ); + if ( *p++ != '#' ) + break; + p += strspn ( p, " \t" ); + if ( strncmp ( p, "include", 7 ) ) + break; + p += 7; + if ( !isspace(*p++) ) + break;*/ + } + c = _buf[_bufidx++]; + return true; +} #endif -}; -class XMLAttribute + +XMLAttribute::XMLAttribute() { -public: - string name, value; +} - XMLAttribute() {} +XMLAttribute::XMLAttribute(const string& name_, + const string& value_) +: name(name_), value(value_) +{ +} - XMLAttribute ( const string& name_, const string& value_ ) - : name(name_), value(value_) - { - } +XMLAttribute::XMLAttribute(const XMLAttribute& src) +{ + name = src.name; + value = src.value; +} - XMLAttribute ( const XMLAttribute& src ) - { - name = src.name; - value = src.value; - } +XMLAttribute& XMLAttribute::operator=(const XMLAttribute& src) +{ + name = src.name; + value = src.value; + return *this; +} - XMLAttribute& operator = ( const XMLAttribute& src ) - { - name = src.name; - value = src.value; - return *this; - } -}; -class XMLElement +XMLElement::XMLElement() { -public: - string name; - vector<XMLAttribute> attributes; - vector<XMLElement*> subElements; - string value; +} - XMLElement() {} - // Parse() returns true if you need to look for a </tag> for - // this one... - bool Parse ( const string& token, bool& end_tag ) +// Parse() returns true if you need to look for a </tag> for +// this one... +bool XMLElement::Parse(const string& token, + bool& end_tag) +{ + const char* p = token.c_str(); + assert ( *p == '<' ); + p++; + p += strspn ( p, WS ); + end_tag = ( *p == '/' ); + if ( end_tag ) { - const char* p = token.c_str(); - assert ( *p == '<' ); - p++; + ++p; p += strspn ( p, WS ); - end_tag = ( *p == '/' ); - if ( end_tag ) - { - ++p; - p += strspn ( p, WS ); - } - const char* end = strpbrk ( p, WS ); + } + const char* end = strpbrk ( p, WS ); + if ( !end ) + { + end = strpbrk ( p, "/>" ); + assert ( end ); + } + name = string ( p, end-p ); + p = end; + p += strspn ( p, WS ); + while ( *p != '>' && *p != '/' ) + { + end = strpbrk ( p, WSEQ ); if ( !end ) { end = strpbrk ( p, "/>" ); assert ( end ); } - name = string ( p, end-p ); + string attribute ( p, end-p ), value; p = end; p += strspn ( p, WS ); - while ( *p != '>' && *p != '/' ) + if ( *p == '=' ) { - end = strpbrk ( p, WSEQ ); + ++p; + p += strspn ( p, WS ); + char quote = 0; + if ( strchr ( "\"'", *p ) ) + { + quote = *p++; + end = strchr ( p, quote ); + } + else + { + end = strpbrk ( p, WS ); + } if ( !end ) { - end = strpbrk ( p, "/>" ); - assert ( end ); + end = strchr ( p, '>' ); + assert(end); + if ( end[-1] == '/' ) + end--; } - string attribute ( p, end-p ), value; + value = string ( p, end-p ); p = end; + if ( quote && *p == quote ) + p++; p += strspn ( p, WS ); - if ( *p == '=' ) - { - ++p; - p += strspn ( p, WS ); - char quote = 0; - if ( strchr ( "\"'", *p ) ) - { - quote = *p++; - end = strchr ( p, quote ); - } - else - { - end = strpbrk ( p, WS ); - } - if ( !end ) - { - end = strchr ( p, '>' ); - assert(end); - if ( end[-1] == '/' ) - end--; - } - value = string ( p, end-p ); - p = end; - if ( quote && *p == quote ) - p++; - p += strspn ( p, WS ); - } - attributes.push_back ( XMLAttribute ( attribute, value ) ); } - return !( *p == '/' ) && !end_tag; + attributes.push_back ( XMLAttribute ( attribute, value ) ); } -}; + return !( *p == '/' ) && !end_tag; +} -XMLElement* XMLParse ( XMLFile& f, bool* pend_tag = NULL ) + +XMLElement* XMLParse(XMLFile& f, + bool* pend_tag = NULL) { string token; if ( !f.get_token(token) ) @@ -310,11 +301,11 @@ return -1; } - XMLElement* head = XMLParse ( f ); - if (head) - { - // REM TODO FIXME actually do something with the parsed info - } + XMLElement* head = XMLParse(f); + if (head) + { + // REM TODO FIXME actually do something with the parsed info + } return 0; } _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-03 23:04:52 UTC (rev 12767) @@ -0,0 +1,64 @@ +#ifndef __RBUILD_H +#define __RBUILD_H + +#include <string> +#include <vector> + +using std::string; +using std::vector; + +class XMLFile +{ + friend class XMLElement; +public: + XMLFile(); + void close(); + bool open(const char* filename); + void next_token(); + bool next_is_text(); + bool more_tokens(); + bool get_token(string& token); + +private: + vector<FILE*> _f; + string _buf; + + const char *_p, *_end; +}; + + +class XMLAttribute +{ +public: + string name; + string value; + + XMLAttribute(); + XMLAttribute ( const string& name_, const string& value_ ); +// : name(name_), value(value_); + XMLAttribute ( const XMLAttribute& src ); + XMLAttribute& operator = ( const XMLAttribute& src ); +}; + + +class XMLElement +{ +public: + string name; + vector<XMLAttribute> attributes; + vector<XMLElement*> subElements; + string value; + + XMLElement(); + bool Parse(const string& token, + bool& end_tag); +}; + + +class Module +{ +public: + Module(XMLElement moduleNode); +}; + +#endif /* __RBUILD_H */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-03 23:04:52 UTC (rev 12767) @@ -0,0 +1,30 @@ +#ifndef __TEST_H +#define __TEST_H + +#include "rbuild.h" + +class BaseTest +{ +public: + bool Failed; + BaseTest(); + /*virtual void Run();*/ +protected: + void Assert(char *message); + void IsTrue(bool condition); + void IsFalse(bool condition); + void AreEqual(int expected, + int actual); + void AreNotEqual(int expected, + int actual); +private: + void Fail(); +}; + + +class ModuleTest : public BaseTest +{ + void Run(); +}; + +#endif /* __TEST_H */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-03 23:04:52 UTC (rev 12767) @@ -0,0 +1,123 @@ +#include "rbuild.h" +#include "test.h" + +BaseTest::BaseTest() +{ + Failed = true; +} +/* +void BaseTest::Run() +{ +} +*/ +void BaseTest::Assert(char *message) +{ + printf(message); + Fail(); +} + +void BaseTest::IsTrue(bool condition) +{ + if (!condition) + { + char message[100]; + sprintf(message, + "Condition was not true at %s:%d", + __FILE__, + __LINE__); + Assert(message); + } +} + +void BaseTest::IsFalse(bool condition) +{ + if (condition) + { + char message[100]; + sprintf(message, + "Condition was not false at %s:%d", + __FILE__, + __LINE__); + Assert(message); + } +} + +void BaseTest::AreEqual(int expected, + int actual) +{ + if (actual != expected) + { + char message[100]; + sprintf(message, + "Expected %d/0x%.08x was %d/0x%.08x at %s:%d", + expected, + expected, + actual, + actual, + __FILE__, + __LINE__); + Assert(message); + } +} + +void BaseTest::AreNotEqual(int expected, + int actual) +{ + if (actual == expected) + { + char message[100]; + sprintf(message, + "Actual value expected to be different from %d/0x%.08x at %s:%d", + expected, + expected, + __FILE__, + __LINE__); + Assert(message); + } +} + +void BaseTest::Fail() +{ + Failed = true; +} + + +class TestDispatcher +{ +public: + void Run() + { + int numberOfFailedTests = 0; + vector<BaseTest> tests = GetTests(); + for (size_t i = 0; i < tests.size(); i++) + { + BaseTest& test = tests[i]; + /*test.Run();*/ + if (test.Failed) + numberOfFailedTests++; + } + + if (numberOfFailedTests > 0) + printf("%d tests failed", + numberOfFailedTests); + else + printf("All tests succeeded"); + } + +private: + vector<BaseTest> GetTests() + { + vector<BaseTest> tests; + tests.push_back(ModuleTest()); + return tests; + } +}; + + +int main(int argc, + char** argv) +{ + TestDispatcher testDispatcher = TestDispatcher(); + testDispatcher.Run(); + return 0; +}; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-03 23:02:15 UTC (rev 12766) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-03 23:04:52 UTC (rev 12767) @@ -0,0 +1,6 @@ +#include "test.h" + +void ModuleTest::Run() +{ + IsTrue(false); +}

19 years, 10 months

[ion] 12766: Rewrite ROS Critical Section implementation, which was slow and broken (because it always created an event, which is the slow path). Note that coincidentally, Gunnar also fixed this code and committed a patch this morning, taken from WINE. This code is also based on WINE, but adds more features which WINE does not support/need yet (regarding Debug CS). Hence, this code was a re-write of the original ROS code, not of Gunnar's, and we've both discussed the accidental conflict.

by ion＠svn.reactos.com

Rewrite ROS Critical Section implementation, which was slow and broken (because it always created an event, which is the slow path). Note that coincidentally, Gunnar also fixed this code and committed a patch this morning, taken from WINE. This code is also based on WINE, but adds more features which WINE does not support/need yet (regarding Debug CS). Hence, this code was a re-write of the original ROS code, not of Gunnar's, and we've both discussed the accidental conflict. Modified: trunk/reactos/include/funcs.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/misc/lcformat.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/misc/profile.c Modified: trunk/reactos/lib/kernel32/synch/critical.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/rtl/critical.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/include/funcs.h --- trunk/reactos/include/funcs.h 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/include/funcs.h 2005-01-03 23:02:15 UTC (rev 12766) @@ -2082,8 +2082,6 @@ DWORD STDCALL RtlDeleteSecurityObject(DWORD x1); DWORD STDCALL RtlNewSecurityObject(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); NTSTATUS STDCALL RtlWalkHeap( HANDLE heap, PVOID entry_ptr ); -NTSTATUS STDCALL RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *crit); -NTSTATUS STDCALL RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *crit); NTSTATUS STDCALL LdrLockLoaderLock(ULONG flags, ULONG *result, ULONG *magic); NTSTATUS STDCALL LdrUnlockLoaderLock(ULONG flags, ULONG magic); _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/include/ntdll/rtl.h 2005-01-03 23:02:15 UTC (rev 12766) @@ -99,8 +99,8 @@ LIST_ENTRY ProcessLocksList; ULONG EntryCount; ULONG ContentionCount; - ULONG Depth; - PVOID Spare[ 2 ]; + PVOID OwnerBackTrace[2]; + PVOID Spare[2]; } CRITICAL_SECTION_DEBUG, *PCRITICAL_SECTION_DEBUG; @@ -114,9 +114,13 @@ ULONG_PTR SpinCount; } CRITICAL_SECTION, *PCRITICAL_SECTION, *LPCRITICAL_SECTION; +#define RTL_CRITSECT_TYPE 0 + typedef CRITICAL_SECTION RTL_CRITICAL_SECTION; typedef PCRITICAL_SECTION PRTL_CRITICAL_SECTION; typedef LPCRITICAL_SECTION LPRTL_CRITICAL_SECTION; +typedef CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG; +typedef PCRITICAL_SECTION_DEBUG PRTL_CRITICAL_SECTION_DEBUG; #endif /* !__USE_W32API */ @@ -166,7 +170,30 @@ #define PDI_HEAP_BLOCKS 0x10 /* The heap blocks */ #define PDI_LOCKS 0x20 /* The locks created by the process */ +NTSTATUS +STDCALL +RtlpWaitForCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection +); +VOID +STDCALL +RtlpUnWaitCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection +); + +VOID +STDCALL +RtlpCreateCriticalSectionSem( + PRTL_CRITICAL_SECTION CriticalSection +); + +VOID +STDCALL +RtlpInitDeferedCriticalSection( + VOID +); + NTSTATUS STDCALL RtlAddAccessAllowedAceEx (IN OUT PACL Acl, IN ULONG Revision, @@ -191,19 +218,19 @@ IN BOOLEAN Failure); NTSTATUS STDCALL -RtlDeleteCriticalSection (PCRITICAL_SECTION CriticalSection); +RtlDeleteCriticalSection (PRTL_CRITICAL_SECTION CriticalSection); WCHAR STDCALL RtlDowncaseUnicodeChar(IN WCHAR Source); NTSTATUS STDCALL -RtlEnterCriticalSection (PCRITICAL_SECTION CriticalSection); +RtlEnterCriticalSection (PRTL_CRITICAL_SECTION CriticalSection); NTSTATUS STDCALL -RtlInitializeCriticalSection (PCRITICAL_SECTION CriticalSection); +RtlInitializeCriticalSection (PRTL_CRITICAL_SECTION CriticalSection); NTSTATUS STDCALL -RtlInitializeCriticalSectionAndSpinCount (PCRITICAL_SECTION CriticalSection, +RtlInitializeCriticalSectionAndSpinCount (PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount); NTSTATUS STDCALL @@ -212,10 +239,10 @@ PUNICODE_STRING String); NTSTATUS STDCALL -RtlLeaveCriticalSection (PCRITICAL_SECTION CriticalSection); +RtlLeaveCriticalSection (PRTL_CRITICAL_SECTION CriticalSection); BOOLEAN STDCALL -RtlTryEnterCriticalSection (PCRITICAL_SECTION CriticalSection); +RtlTryEnterCriticalSection (PRTL_CRITICAL_SECTION CriticalSection); DWORD STDCALL RtlCompactHeap ( _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -1,4 +1,4 @@ -/* $Id: reg.c,v 1.67 2004/12/26 23:09:51 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -24,7 +24,7 @@ /* GLOBALS ******************************************************************/ -static CRITICAL_SECTION HandleTableCS; +static RTL_CRITICAL_SECTION HandleTableCS; static HANDLE DefaultHandleTable[MAX_DEFAULT_HANDLES]; static HANDLE ProcessHeap; _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-01-03 23:02:15 UTC (rev 12766) @@ -39,7 +39,7 @@ extern HANDLE hBaseDir; extern HMODULE hCurrentModule; -extern CRITICAL_SECTION DllLock; +extern RTL_CRITICAL_SECTION DllLock; extern UNICODE_STRING DllDirectory; _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -1,4 +1,4 @@ -/* $Id: console.c,v 1.89 2004/12/24 17:45:57 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -21,7 +21,7 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); -extern CRITICAL_SECTION ConsoleLock; +extern RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI IsDebuggerPresent(VOID); _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -1,4 +1,4 @@ -/* $Id: dllmain.c,v 1.38 2004/11/29 00:08:59 gdalsnes Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -33,8 +33,8 @@ LPVOID lpReserved); /* Critical section for various kernel32 data structures */ -CRITICAL_SECTION DllLock; -CRITICAL_SECTION ConsoleLock; +RTL_CRITICAL_SECTION DllLock; +RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); _____ Modified: trunk/reactos/lib/kernel32/misc/lcformat.c --- trunk/reactos/lib/kernel32/misc/lcformat.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/misc/lcformat.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -82,15 +82,15 @@ #define GetShortMonth(fmt,mth) fmt->lppszStrings[30 + mth] /* Write access to the cache is protected by this critical section */ -static CRITICAL_SECTION NLS_FormatsCS; -static CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug = +static RTL_CRITICAL_SECTION NLS_FormatsCS; +static RTL_CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug = { 0, 0, &NLS_FormatsCS, { &NLS_FormatsCS_debug.ProcessLocksList, &NLS_FormatsCS_debug.ProcessLocksList }, 0, 0, { 0, (DWORD)(__FILE__ ": NLS_Formats") } }; -static CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; +static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; /*********************************************************************** *** * NLS_GetLocaleNumber <internal> _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -58,7 +58,7 @@ static LIST_ENTRY CodePageListHead; static CODEPAGE_ENTRY AnsiCodePage; static CODEPAGE_ENTRY OemCodePage; -static CRITICAL_SECTION CodePageListLock; +static RTL_CRITICAL_SECTION CodePageListLock; /* FORWARD DECLARATIONS *******************************************************/ _____ Modified: trunk/reactos/lib/kernel32/misc/profile.c --- trunk/reactos/lib/kernel32/misc/profile.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/misc/profile.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -72,14 +72,14 @@ static const WCHAR emptystringW[] = {0}; -static CRITICAL_SECTION PROFILE_CritSect; -static CRITICAL_SECTION_DEBUG critsect_debug = +static RTL_CRITICAL_SECTION PROFILE_CritSect; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &PROFILE_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { 0, (DWORD)(__FILE__ ": PROFILE_CritSect") } }; -static CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; +static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; static const char hex[16] = "0123456789ABCDEF"; _____ Modified: trunk/reactos/lib/kernel32/synch/critical.c --- trunk/reactos/lib/kernel32/synch/critical.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/kernel32/synch/critical.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -1,4 +1,4 @@ -/* $Id: critical.c,v 1.16 2004/01/29 23:41:36 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -26,7 +26,7 @@ { NTSTATUS Status; - Status = RtlInitializeCriticalSection(lpCriticalSection); + Status = RtlInitializeCriticalSection((PRTL_CRITICAL_SECTION)lpCriticalSection); if (!NT_SUCCESS(Status)) { RtlRaiseStatus(Status); @@ -45,7 +45,7 @@ { NTSTATUS Status; - Status = RtlInitializeCriticalSectionAndSpinCount(lpCriticalSection, dwSpinCount); + Status = RtlInitializeCriticalSectionAndSpinCount((PRTL_CRITICAL_SECTION)lpCritic alSection, dwSpinCount); if (Status) { RtlRaiseStatus(Status); _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -1,4 +1,4 @@ -/* $Id: startup.c,v 1.60 2004/12/15 03:00:33 royce Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -259,6 +259,7 @@ /* If MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase; DPRINT("PEDosHeader %x\n", PEDosHeader); + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L || *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_PE_MAGIC) @@ -279,6 +280,9 @@ NTHeaders = (PIMAGE_NT_HEADERS)(ImageBase + PEDosHeader->e_lfanew); + /* Initialize Critical Section Data */ + RtlpInitDeferedCriticalSection(); + /* create process heap */ RtlInitializeHeapManager(); Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, @@ -292,7 +296,7 @@ DPRINT1("Failed to create process heap\n"); ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); } - + /* initalize peb lock support */ RtlInitializeCriticalSection (&PebLock); Peb->FastPebLock = &PebLock; @@ -311,7 +315,7 @@ RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(PVOID) * (USER32_CALLBACK_MAXIMUM + 1)); - + /* initalize loader lock */ RtlInitializeCriticalSection (&LoaderLock); Peb->LoaderLock = &LoaderLock; _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-03 22:53:21 UTC (rev 12765) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-01-03 23:02:15 UTC (rev 12766) @@ -6,6 +6,8 @@ * PURPOSE: Critical sections * UPDATE HISTORY: * Created 30/09/98 + * Rewritten ROS version, based on WINE code plus + * some fixes useful only for ROS right now - 03/01/05 */ /* INCLUDES ******************************************************************/ @@ -19,391 +21,532 @@ /* FUNCTIONS *****************************************************************/ -inline static HANDLE RtlGetCurrentThreadId() -{ - return (HANDLE)NtCurrentTeb()->Cid.UniqueThread; -} +static RTL_CRITICAL_SECTION RtlCriticalSectionLock; +static LIST_ENTRY RtlCriticalSectionList; +static BOOLEAN RtlpCritSectInitialized = FALSE; -inline static void small_pause(void) +/*++ + * RtlDeleteCriticalSection + * @implemented NT4 + * + * Deletes a Critical Section + * + * Params: + * CriticalSection - Critical section to delete. + * + * Returns: + * STATUS_SUCCESS, or error value returned by NtClose. + * + * Remarks: + * The critical section members should not be read after this call. + * + *--*/ +NTSTATUS +STDCALL +RtlDeleteCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif + NTSTATUS Status = STATUS_SUCCESS; + + /* Close the Event Object Handle if it exists */ + if (CriticalSection->LockSemaphore) { + Status = NtClose(CriticalSection->LockSemaphore); + } + + /* Protect List */ + RtlEnterCriticalSection(&RtlCriticalSectionLock); + + /* Delete the Debug Data, if it exists */ + if (CriticalSection->DebugInfo) { + + /* Remove it from the list */ + RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); + + /* Free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, CriticalSection->DebugInfo); + } + + /* Unprotect */ + RtlLeaveCriticalSection(&RtlCriticalSectionLock); + + /* Wipe it out */ + RtlZeroMemory(CriticalSection, sizeof(RTL_CRITICAL_SECTION)); + + /* Return */ + return Status; } -/********************************************************************** * - * get_semaphore - */ -static inline HANDLE get_semaphore( PCRITICAL_SECTION crit ) -{ - HANDLE ret = crit->LockSemaphore; - if (!ret) - { - HANDLE sem; - if (!NT_SUCCESS(NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ))) return 0; - if (!(ret = (HANDLE)InterlockedCompareExchangePointer( (PVOID *)&crit->LockSemaphore, - (PVOID)sem, 0 ))) - ret = sem; - else - NtClose(sem); /* somebody beat us to it */ - } - return ret; +/*++ + * RtlSetCriticalSectionSpinCount + * @implemented NT4 + * + * Sets the spin count for a critical section. + * + * Params: + * CriticalSection - Critical section to set the spin count for. + * + * SpinCount - Spin count for the critical section. + * + * Returns: + * STATUS_SUCCESS. + * + * Remarks: + * SpinCount is ignored on single-processor systems. + * + *--*/ +DWORD +STDCALL +RtlSetCriticalSectionSpinCount( + PRTL_CRITICAL_SECTION CriticalSection, + DWORD SpinCount + ) +{ + DWORD OldCount = CriticalSection->SpinCount; + + /* Set to parameter if MP, or to 0 if this is Uniprocessor */ + CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; + return OldCount; } -/********************************************************************** * - * RtlInitializeCriticalSection (NTDLL.@) +/*++ + * RtlEnterCriticalSection + * @implemented NT4 * - * Initialises a new critical section. + * Waits to gain ownership of the critical section. * - * PARAMS - * crit [O] Critical section to initialise + * Params: + * CriticalSection - Critical section to wait for. * - * RETURNS - * STATUS_SUCCESS. + * Returns: + * STATUS_SUCCESS. * - * SEE - * RtlInitializeCriticalSectionAndSpinCount(), RtlDeleteCriticalSection(), - * RtlEnterCriticalSection(), RtlLeaveCriticalSection(), - * RtlTryEnterCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -NTSTATUS STDCALL RtlInitializeCriticalSection( PCRITICAL_SECTION crit ) + * Remarks: + * Uses a fast-path unless contention happens. + * + *--*/ +NTSTATUS +STDCALL +RtlEnterCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { - return RtlInitializeCriticalSectionAndSpinCount( crit, 0 ); + HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + + /* Try to Lock it */ + if (InterlockedIncrement(&CriticalSection->LockCount)) { + + /* + * We've failed to lock it! Does this thread + * actually own it? + */ + if (Thread == CriticalSection->OwningThread) { + + /* You own it, so you'll get it when you're done with it! */ + CriticalSection->RecursionCount++; + return STATUS_SUCCESS; + } + + /* We don't own it, so we must wait for it */ + RtlpWaitForCriticalSection(CriticalSection); + } + + /* Lock successful */ + CriticalSection->OwningThread = Thread; + CriticalSection->RecursionCount = 1; + return STATUS_SUCCESS; } -/********************************************************************** * - * RtlInitializeCriticalSectionAndSpinCount (NTDLL.@) +/*++ + * RtlInitializeCriticalSection + * @implemented NT4 * - * Initialises a new critical section with a given spin count. + * Initialises a new critical section. * - * PARAMS - * crit [O] Critical section to initialise - * spincount [I] Spin count for crit - * - * RETURNS - * STATUS_SUCCESS. + * Params: + * CriticalSection - Critical section to initialise * - * NOTES - * Available on NT4 SP3 or later. + * Returns: + * STATUS_SUCCESS. * - * SEE - * RtlInitializeCriticalSection(), RtlDeleteCriticalSection(), - * RtlEnterCriticalSection(), RtlLeaveCriticalSection(), - * RtlTryEnterCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -NTSTATUS STDCALL RtlInitializeCriticalSectionAndSpinCount( PCRITICAL_SECTION crit, ULONG spincount ) -{ - /* Does ROS need this, or is this special to Wine? And if ros need it, should - it be enabled in the release build? -Gunnar */ - if (RtlGetProcessHeap()) crit->DebugInfo = NULL; - else - { - crit->DebugInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(CRITICAL_SECTION_DEBUG)); - if (crit->DebugInfo) - { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - crit->DebugInfo->Spare[0] = 0; - crit->DebugInfo->Spare[1] = 0; - } - } - crit->LockCount = -1; - crit->RecursionCount = 0; - crit->OwningThread = 0; - crit->LockSemaphore = 0; - crit->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? spincount : 0; - return STATUS_SUCCESS; + * Remarks: + * Simply calls RtlInitializeCriticalSectionAndSpinCount + * + *--*/ +NTSTATUS +STDCALL +RtlInitializeCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) +{ + /* Call the Main Function */ + return RtlInitializeCriticalSectionAndSpinCount(CriticalSection, 0); } -/********************************************************************** * - * RtlSetCriticalSectionSpinCount (NTDLL.@) +/*++ + * RtlInitializeCriticalSectionAndSpinCount + * @implemented NT4 * - * Sets the spin count of a critical section. + * Initialises a new critical section. * - * PARAMS - * crit [I/O] Critical section - * spincount [I] Spin count for crit + * Params: + * CriticalSection - Critical section to initialise * - * RETURNS - * The previous spin count. + * SpinCount - Spin count for the critical section. * - * NOTES - * If the system is not SMP, spincount is ignored and set to 0. + * Returns: + * STATUS_SUCCESS. * - * SEE - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -ULONG STDCALL RtlSetCriticalSectionSpinCount( PCRITICAL_SECTION crit, ULONG spincount ) + * Remarks: + * SpinCount is ignored on single-processor systems. + * + *--*/ +NTSTATUS +STDCALL +RtlInitializeCriticalSectionAndSpinCount ( + PRTL_CRITICAL_SECTION CriticalSection, + DWORD SpinCount) { - ULONG oldspincount = crit->SpinCount; - crit->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? spincount : 0; - return oldspincount; + PRTL_CRITICAL_SECTION_DEBUG CritcalSectionDebugData; + PVOID Heap; + + /* First things first, set up the Object */ + CriticalSection->LockCount = -1; + CriticalSection->RecursionCount = 0; + CriticalSection->OwningThread = 0; + CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; + + /* + * Now set up the Debug Data + * Think of a better way to allocate it, because the Heap Manager won't + * have any debug data since the Heap isn't initalized! + */ + if ((Heap = RtlGetProcessHeap())) { + + CritcalSectionDebugData = RtlAllocateHeap(Heap, 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + CritcalSectionDebugData->Type = RTL_CRITSECT_TYPE; + CritcalSectionDebugData->ContentionCount = 0; + CritcalSectionDebugData->EntryCount = 0; + CritcalSectionDebugData->CriticalSection = CriticalSection; + CriticalSection->DebugInfo = CritcalSectionDebugData; + + /* + * Add it to the List of Critical Sections owned by the process. + * If we've initialized the Lock, then use it. If not, then probably + * this is the lock initialization itself, so insert it directly. + */ + if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) { + + /* Protect List */ + RtlEnterCriticalSection(&RtlCriticalSectionLock); + + /* Add this one */ + InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + + /* Unprotect */ + RtlLeaveCriticalSection(&RtlCriticalSectionLock); + + } else { + + /* Add it directly */ + InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + } + + } else { + + /* This shouldn't happen... */ + CritcalSectionDebugData = NULL; + } + + return STATUS_SUCCESS; } -/********************************************************************** * - * RtlDeleteCriticalSection (NTDLL.@) +/*++ + * RtlLeaveCriticalSection + * @implemented NT4 * - * Frees the resources used by a critical section. + * Releases a critical section and makes if available for new owners. * - * PARAMS - * crit [I/O] Critical section to free + * Params: + * CriticalSection - Critical section to release. * - * RETURNS - * STATUS_SUCCESS. + * Returns: + * STATUS_SUCCESS. * - * SEE - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS STDCALL RtlDeleteCriticalSection( PCRITICAL_SECTION crit ) -{ - crit->LockCount = -1; - crit->RecursionCount = 0; - crit->OwningThread = (HANDLE)0; - if (crit->LockSemaphore) - NtClose( crit->LockSemaphore ); - crit->LockSemaphore = 0; - if (crit->DebugInfo) - { - /* only free the ones we made in here */ - if (!crit->DebugInfo->Spare[1]) - { - RtlFreeHeap( RtlGetProcessHeap(), 0, crit->DebugInfo ); - crit->DebugInfo = NULL; - } - } - return STATUS_SUCCESS; + * Remarks: + * If another thread was waiting, the slow path is entered. + * + *--*/ +NTSTATUS +STDCALL +RtlLeaveCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) +{ + /* Decrease the Recursion Count */ + if (--CriticalSection->RecursionCount) { + + /* Someone still owns us, but we are free */ + InterlockedDecrement(&CriticalSection->LockCount); + + } else { + + /* Nobody owns us anymore */ + CriticalSection->OwningThread = 0; + + /* Was someone wanting us? */ + if (InterlockedDecrement(&CriticalSection->LockCount) >= 0) { + + /* Let him have us */ + RtlpUnWaitCriticalSection(CriticalSection); + + } + } + + /* Sucessful! */ + return STATUS_SUCCESS; } - -/********************************************************************** * - * RtlpWaitForCriticalSection (NTDLL.@) +/*++ + * RtlTryEnterCriticalSection + * @implemented NT4 * - * Waits for a busy critical section to become free. - * - * PARAMS - * crit [I/O] Critical section to wait for + * Attemps to gain ownership of the critical section without waiting. * - * RETURNS - * STATUS_SUCCESS. + * Params: + * CriticalSection - Critical section to attempt acquiring. * - * NOTES - * Use RtlEnterCriticalSection() instead of this function as it is often much - * faster. + * Returns: + * TRUE if the critical section has been acquired, FALSE otherwise. * - * SEE - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS STDCALL RtlpWaitForCriticalSection( PCRITICAL_SECTION crit ) -{ - for (;;) - { - EXCEPTION_RECORD rec; - HANDLE sem = get_semaphore( crit ); - LARGE_INTEGER time; - NTSTATUS status; + * Remarks: + * None + * + *--*/ +BOOLEAN +STDCALL +RtlTryEnterCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) +{ + /* Try to take control */ + if (InterlockedCompareExchange(&CriticalSection->LockCount, + 0, + -1) == -1) { - time.QuadPart = -5000 * 10000; /* 5 seconds */ - status = NtWaitForSingleObject( sem, FALSE, &time ); - if ( status == STATUS_TIMEOUT ) - { - const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[1]; - if (!name) name = "?"; - DPRINT1( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", - crit, name, RtlGetCurrentThreadId(), (DWORD)crit->OwningThread ); - time.QuadPart = -60000 * 10000; - status = NtWaitForSingleObject( sem, FALSE, &time ); - if ( status == STATUS_TIMEOUT /*&& TRACE_ON(relay)*/ ) - { - DPRINT1( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", - crit, name, RtlGetCurrentThreadId(), (DWORD) crit->OwningThread ); - time.QuadPart = -300000 * (ULONGLONG)10000; - status = NtWaitForSingleObject( sem, FALSE, &time ); - } - } - if (status == STATUS_WAIT_0) return STATUS_SUCCESS; - - /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[1])) continue; - - rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; - rec.ExceptionFlags = 0; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = RtlRaiseException; /* sic */ - rec.NumberParameters = 1; - rec.ExceptionInformation[0] = (DWORD)crit; - RtlRaiseException( &rec ); - } + /* It's ours */ + CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + CriticalSection->RecursionCount = 1; + return TRUE; + + } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { + + /* It's already ours */ + InterlockedIncrement(&CriticalSection->LockCount); + CriticalSection->RecursionCount++; + return TRUE; + } + + /* It's not ours */ + return FALSE; } - -/********************************************************************** * - * RtlpUnWaitCriticalSection (NTDLL.@) +/*++ + * RtlpWaitForCriticalSection * - * Notifies other threads waiting on the busy critical section that it has - * become free. - * - * PARAMS - * crit [I/O] Critical section + * Slow path of RtlEnterCriticalSection. Waits on an Event Object. * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any error returned by NtReleaseSemaphore() + * Params: + * CriticalSection - Critical section to acquire. * - * NOTES - * Use RtlLeaveCriticalSection() instead of this function as it is often much - * faster. + * Returns: + * STATUS_SUCCESS, or raises an exception if a deadlock is occuring. * - * SEE - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS STDCALL RtlpUnWaitCriticalSection( PCRITICAL_SECTION crit ) + * Remarks: + * None + * + *--*/ +NTSTATUS +STDCALL +RtlpWaitForCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) { - HANDLE sem = get_semaphore( crit ); - NTSTATUS res = NtReleaseSemaphore( sem, 1, NULL ); - if (!NT_SUCCESS(res)) RtlRaiseStatus( res ); - return res; + NTSTATUS Status; + EXCEPTION_RECORD ExceptionRecord; + BOOLEAN LastChance = FALSE; + LARGE_INTEGER Timeout; + + Timeout = RtlConvertLongToLargeInteger(150000); + /* ^^ HACK HACK HACK. Good way: + Timeout = &NtCurrentPeb()->CriticalSectionTimeout */ + + /* Do we have an Event yet? */ + if (!CriticalSection->LockSemaphore) { + RtlpCreateCriticalSectionSem(CriticalSection); + } + + /* Increase the Debug Entry count */ + CriticalSection->DebugInfo->EntryCount++; + + for (;;) { + + /* Increase the number of times we've had contention */ + CriticalSection->DebugInfo->ContentionCount++; + + /* Wait on the Event */ + Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, + FALSE, + &Timeout); + + /* We have Timed out */ + if (Status == STATUS_TIMEOUT) { + + /* Is this the 2nd time we've timed out? */ + if (LastChance) { + + /* Yes it is, we are raising an exception */ + ExceptionRecord.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; + ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionAddress = RtlRaiseException; + ExceptionRecord.NumberParameters = 1; + ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)CriticalSection; + RtlRaiseException(&ExceptionRecord); + + } + + /* One more try */ + LastChance = TRUE; + + } else { + + /* If we are here, everything went fine */ + return STATUS_SUCCESS; + } + } } - -/********************************************************************** * - * RtlEnterCriticalSection (NTDLL.@) +/*++ + * RtlpUnWaitCriticalSection * - * Enters a critical section, waiting for it to become available if necessary. + * Slow path of RtlLeaveCriticalSection. Fires an Event Object. * - * PARAMS - * crit [I/O] Critical section to enter + * Params: + * CriticalSection - Critical section to release. * - * RETURNS - * STATUS_SUCCESS. The critical section is held by the caller. - * - * SEE - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlSetCriticalSectionSpinCount(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS STDCALL RtlEnterCriticalSection( PCRITICAL_SECTION crit ) + * Returns: + * None. Raises an exception if the system call failed. + * + * Remarks: + * None + * + *--*/ +VOID +STDCALL +RtlpUnWaitCriticalSection( + PRTL_CRITICAL_SECTION CriticalSection) + { - if (crit->SpinCount) - { - ULONG count; - - if (RtlTryEnterCriticalSection( crit )) return STATUS_SUCCESS; - for (count = crit->SpinCount; count > 0; count--) - { - if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ - if (crit->LockCount == -1) /* try again */ - { - if (InterlockedCompareExchange(&crit->LockCount, 0,-1 ) == -1) goto done; - } - small_pause(); - } - } - - if (InterlockedIncrement( &crit->LockCount )) - { - if (crit->OwningThread == (HANDLE)RtlGetCurrentThreadId()) [truncated at 1000 lines; 302 more skipped]

19 years, 10 months

[gvg] 12765: Since we can load .sym files when defined(DBG) now, enable

by gvg＠svn.reactos.com

Since we can load .sym files when defined(DBG) now, enable /PROFILE option for defined(DBG) too. Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/dbg/profile.c Modified: trunk/reactos/ntoskrnl/kd/kdebug.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-03 22:00:39 UTC (rev 12764) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-03 22:53:21 UTC (rev 12765) @@ -34,7 +34,7 @@ ifeq ($(KDBG), 1) OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \ - dbg/i386/kdb_help.o dbg/profile.o \ + dbg/i386/kdb_help.o \ ../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o CFLAGS_KDBG := -I../lib/kjs/include preall: all @@ -45,7 +45,7 @@ OBJECTS_KDBG := endif ifeq ($(DBG_OR_KDBG), 1) -OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o +OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o endif TARGET_ASFLAGS = -I./include _____ Modified: trunk/reactos/ntoskrnl/dbg/profile.c --- trunk/reactos/ntoskrnl/dbg/profile.c 2005-01-03 22:00:39 UTC (rev 12764) +++ trunk/reactos/ntoskrnl/dbg/profile.c 2005-01-03 22:53:21 UTC (rev 12765) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: profile.c,v 1.10 2004/10/22 20:16:47 ekohl Exp $ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/profile.c * PURPOSE: Kernel profiling _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-01-03 22:00:39 UTC (rev 12764) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-01-03 22:53:21 UTC (rev 12765) @@ -1,5 +1,4 @@ -/* $Id: kdebug.c,v 1.58 2004/12/14 10:18:57 gvg Exp $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/kd/kdebug.c @@ -243,7 +242,7 @@ } } } -#ifdef KDBG +#if defined(KDBG) || defined(DBG) else if (!_strnicmp(p2, "PROFILE", 7) && BootPhase > 0) { KdbInitProfiling(); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-03 22:00:39 UTC (rev 12764) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-03 22:53:21 UTC (rev 12765) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/irq.c * PURPOSE: IRQ handling @@ -37,7 +36,7 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> -#ifdef KDBG +#if defined(KDBG) || defined(DBG) #include <../dbg/kdb.h> #endif /* KDBG */ @@ -358,7 +357,7 @@ { KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); KeUpdateSystemTime(&KernelTrapFrame, old_level); -#ifdef KDBG +#if defined(KDBG) || defined(DBG) KdbProfileInterrupt(Trapframe->Eip); #endif /* KDBG */ } _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-01-03 22:00:39 UTC (rev 12764) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-01-03 22:53:21 UTC (rev 12765) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/main.c * PURPOSE: Initalizes the kernel @@ -705,7 +704,7 @@ KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } -#ifdef KDBG +#if defined(KDBG) || defined(DBG) KdbInitProfiling2(); #endif /* KDBG */

19 years, 10 months

← Newer
1
...
58
59
60
61
62
63
64
...
71
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 January 2005