Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[cgutman] 55526: [CLASS2] - Fix boot from HDD with USB drive present - Fix USB drive failure with no HDD present

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 10 17:14:39 2012 New Revision: 55526 URL: http://svn.reactos.org/svn/reactos?rev=55526&view=rev Log: [CLASS2] - Fix boot from HDD with USB drive present - Fix USB drive failure with no HDD present Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Fri Feb 10 17:14:39 2012 @@ -11,6 +11,10 @@ #include <scsi.h> #include <include/class2.h> #include <stdio.h> + +/* Part of the drive letter hack */ +#include <ntifs.h> +#include <ketypes.h> //#define NDEBUG #include <debug.h> @@ -371,8 +375,16 @@ /* Attach it to the PDO */ DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); - /* Assign a drive letter */ - ScsiClassAssignDriveLetter(DeviceInfo); + /* Check that the kernel has already assigned drive letters */ + if (KeLoaderBlock == NULL) + { + /* Assign a drive letter */ + ScsiClassAssignDriveLetter(DeviceInfo); + } + else + { + /* The kernel will handle it */ + } /* Move to the next port number */ DriverExtension->PortNumber++; @@ -533,7 +545,8 @@ } while(NT_SUCCESS(status)); - return deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE; + /* We don't want to fail init just because we don't have devices right now */ + return STATUS_SUCCESS; /*deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE;*/ }

12 years, 10 months

[janderwald] 55525: [USBEHCI] [USBOHCI] - Don't corrupt memory when a queue head / transfer descriptor is freed - How did this work before...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 10 16:28:35 2012 New Revision: 55525 URL: http://svn.reactos.org/svn/reactos?rev=55525&view=rev Log: [USBEHCI] [USBOHCI] - Don't corrupt memory when a queue head / transfer descriptor is freed - How did this work before... Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/memory_manager.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp [iso-8859-1] Fri Feb 10 16:28:35 2012 @@ -271,7 +271,7 @@ IN ULONG Size) { KIRQL OldLevel; - ULONG BlockOffset = 0, BlockLength; + ULONG BlockOffset = 0, BlockLength, BlockCount; // // sanity checks @@ -302,14 +302,25 @@ Size = (Size + m_BlockSize - 1) & ~(m_BlockSize - 1); // + // convert to blocks + // + BlockCount = Size / m_BlockSize; + ASSERT(BlockCount); + + // // acquire lock // KeAcquireSpinLock(m_Lock, &OldLevel); // + // sanity check + // + ASSERT(RtlAreBitsSet(&m_Bitmap, BlockOffset, BlockCount)); + + // // release buffer // - RtlClearBits(&m_Bitmap, BlockOffset, Size); + RtlClearBits(&m_Bitmap, BlockOffset, BlockCount); // // release lock Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/memory_manager.cpp [iso-8859-1] Fri Feb 10 16:28:35 2012 @@ -271,7 +271,7 @@ IN ULONG Size) { KIRQL OldLevel; - ULONG BlockOffset = 0, BlockLength; + ULONG BlockOffset = 0, BlockLength, BlockCount; // // sanity checks @@ -302,14 +302,25 @@ Size = (Size + m_BlockSize - 1) & ~(m_BlockSize - 1); // + // convert to blocks + // + BlockCount = Size / m_BlockSize; + ASSERT(BlockCount); + + // // acquire lock // KeAcquireSpinLock(m_Lock, &OldLevel); // + // sanity check + // + ASSERT(RtlAreBitsSet(&m_Bitmap, BlockOffset, BlockCount)); + + // // release buffer // - RtlClearBits(&m_Bitmap, BlockOffset, Size); + RtlClearBits(&m_Bitmap, BlockOffset, BlockCount); // // release lock

12 years, 10 months

[janderwald] 55524: [USB-BRINGUP-TRUNK] - Rename usbehci & usbhub

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 10 11:58:11 2012 New Revision: 55524 URL: http://svn.reactos.org/svn/reactos?rev=55524&view=rev Log: [USB-BRINGUP-TRUNK] - Rename usbehci & usbhub Added: branches/usb-bringup-trunk/drivers/usb/usbehci/ (props changed) - copied from r55523, branches/usb-bringup-trunk/drivers/usb/usbehci_new/ branches/usb-bringup-trunk/drivers/usb/usbhub/ (props changed) - copied from r55523, branches/usb-bringup-trunk/drivers/usb/usbhub_new/ Removed: branches/usb-bringup-trunk/drivers/usb/usbehci_new/ branches/usb-bringup-trunk/drivers/usb/usbhub_new/ Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] Fri Feb 10 11:58:11 2012 @@ -1,6 +1,6 @@ add_subdirectory(usbccgp) add_subdirectory(usbd) -add_subdirectory(usbehci_new) -add_subdirectory(usbhub_new) +add_subdirectory(usbehci) +add_subdirectory(usbhub) add_subdirectory(usbohci) add_subdirectory(usbstor) Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Feb 10 11:58:11 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 10 11:58:11 2012 @@ -1,0 +1,14 @@ +/branches/GSoC_2011/GSoC_Network/drivers/usb/usbehci_new:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbehci_new:51550 +/branches/GSoC_2011/TcpIpDriver/drivers/usb/usbehci_new:51551-53074,53076-53119 +/branches/GSoC_Network/drivers/usb/usbehci_new:51545-51546 +/branches/cmake-bringup/drivers/usb/usbehci_new:50484,50693,50719,51544-52564 +/branches/header-work/drivers/usb/usbehci_new:45691-47721 +/branches/reactos-yarotows/drivers/usb/usbehci_new:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/usbehci_new:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/usbehci_new:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/usbehci_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup/drivers/usb/usbehci_new:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/drivers/usb/usbehci_new:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/drivers/usb/usbehci_new:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/usb-bringup-trunk/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 10 11:58:11 2012 @@ -1,0 +1,14 @@ +/branches/GSoC_2011/GSoC_Network/drivers/usb/usbhub_new:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbhub_new:51550 +/branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub_new:51551-53074,53076-53119 +/branches/GSoC_Network/drivers/usb/usbhub_new:51545-51546 +/branches/cmake-bringup/drivers/usb/usbhub_new:50484,50693,50719,51544-52564 +/branches/header-work/drivers/usb/usbhub_new:45691-47721 +/branches/reactos-yarotows/drivers/usb/usbhub_new:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/usbhub_new:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/usbhub_new:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/usbhub_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup/drivers/usb/usbhub_new:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/drivers/usb/usbhub_new:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/drivers/usb/usbhub_new:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998

12 years, 10 months

[janderwald] 55523: [USB-BRINGUP] - Delete old usb branch

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 10 11:40:24 2012 New Revision: 55523 URL: http://svn.reactos.org/svn/reactos?rev=55523&view=rev Log: [USB-BRINGUP] - Delete old usb branch Removed: branches/usb-bringup/

12 years, 10 months

[gadamopoulos] 55522: [win32k] - fix some more tests in user32:winstation

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Feb 9 23:18:47 2012 New Revision: 55522 URL: http://svn.reactos.org/svn/reactos?rev=55522&view=rev Log: [win32k] - fix some more tests in user32:winstation Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Feb 9 23:18:47 2012 @@ -1243,10 +1243,20 @@ { PDESKTOP Object; NTSTATUS Status; + PTHREADINFO pti; DECLARE_RETURN(BOOL); + + pti = PsGetCurrentThreadWin32Thread(); TRACE("Enter NtUserCloseDesktop\n"); UserEnterExclusive(); + + if( hDesktop == pti->hdesk || hDesktop == pti->ppi->hdeskStartup) + { + ERR("Attempted to close thread desktop\n"); + EngSetLastError(ERROR_BUSY); + RETURN(FALSE); + } TRACE("About to close desktop handle (0x%X)\n", hDesktop);

12 years, 10 months

[janderwald] 55521: [USBHUB] - Fix mingw build

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 9 21:37:37 2012 New Revision: 55521 URL: http://svn.reactos.org/svn/reactos?rev=55521&view=rev Log: [USBHUB] - Fix mingw build Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu Feb 9 21:37:37 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/usb/usbhub/fdo.c @@ -1056,7 +1056,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - RtlInitUnicodeString(&UsbChildExtension->usTextDescription, ""); + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L""); } else {

12 years, 10 months

[tkreuzer] 55520: [FREELDR] Fix rbuild...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 20:11:35 2012 New Revision: 55520 URL: http://svn.reactos.org/svn/reactos?rev=55520&view=rev Log: [FREELDR] Fix rbuild... Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Thu Feb 9 20:11:35 2012 @@ -51,7 +51,6 @@ <file>binhive.c</file> </directory> <directory name="rtl"> - <file>bget.c</file> <file>libsupp.c</file> </directory> <directory name="ui">

12 years, 10 months

[tkreuzer] 55519: [FREELDR] Rename Heap_new.c to Heap.c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 20:10:26 2012 New Revision: 55519 URL: http://svn.reactos.org/svn/reactos?rev=55519&view=rev Log: [FREELDR] Rename Heap_new.c to Heap.c Added: trunk/reactos/boot/freeldr/freeldr/mm/heap.c - copied unchanged from r55497, trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Removed: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Feb 9 20:10:26 2012 @@ -54,7 +54,7 @@ inifile/parse.c mm/meminit.c mm/mm.c - mm/heap_new.c + mm/heap.c reactos/registry.c reactos/arcname.c reactos/archwsup.c Removed: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c (removed) @@ -1,531 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2011 Timo Kreuzer (timo.kreuzer(a)reactos.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> -#include <debug.h> - -DBG_DEFAULT_CHANNEL(HEAP); - -#define DEFAULT_HEAP_SIZE (1024 * 1024) -#define TEMP_HEAP_SIZE (1024 * 1024) - -PVOID FrLdrDefaultHeap; -PVOID FrLdrTempHeap; - -typedef struct _BLOCK_DATA -{ - ULONG Flink; - ULONG Blink; -} BLOCK_DATA, *PBLOCK_DATA; - -typedef struct _HEAP_BLOCK -{ - USHORT Size; - USHORT PreviousSize; - ULONG Tag; - BLOCK_DATA Data[]; -} HEAP_BLOCK, *PHEAP_BLOCK; - -typedef struct _HEAP -{ - ULONG MaximumSize; - ULONG CurrentAllocBytes; - ULONG MaxAllocBytes; - ULONG NumAllocs; - ULONG NumFrees; - ULONG LargestAllocation; - ULONGLONG AllocationTime; - ULONGLONG FreeTime; - ULONG TerminatingBlock; - HEAP_BLOCK Blocks; -} HEAP, *PHEAP; - -PVOID -HeapCreate( - ULONG MaximumSize, - TYPE_OF_MEMORY MemoryType) -{ - PHEAP Heap; - PHEAP_BLOCK Block; - ULONG Remaining; - USHORT PreviousSize; - TRACE("HeapCreate(MemoryType=%ld)\n", MemoryType); - - /* Allocate some memory for the heap */ - MaximumSize = ALIGN_UP_BY(MaximumSize, MM_PAGE_SIZE); - Heap = MmAllocateMemoryWithType(MaximumSize, MemoryType); - if (!Heap) - { - ERR("HEAP: Failed to allocate heap of size 0x%lx, Type\n", - MaximumSize, MemoryType); - return NULL; - } - - /* Initialize the heap header */ - Heap->MaximumSize = MaximumSize; - Heap->CurrentAllocBytes = 0; - Heap->MaxAllocBytes = 0; - Heap->NumAllocs = 0; - Heap->NumFrees = 0; - Heap->LargestAllocation = 0; - - /* Calculate what's left to process */ - Remaining = (MaximumSize - sizeof(HEAP)) / sizeof(HEAP_BLOCK); - TRACE("Remaining = %ld\n", Remaining); - - /* Substract 2 for the terminating entry (header + free entry) */ - Remaining -= 2; - - Block = &Heap->Blocks; - PreviousSize = 0; - - /* Create free blocks */ - while (Remaining > 1) - { - /* Initialize this free block */ - Block->Size = (USHORT)min(MAXUSHORT, Remaining - 1); - Block->PreviousSize = PreviousSize; - Block->Tag = 0; - Block->Data[0].Flink = (Block - &Heap->Blocks) + Block->Size + 1; - Block->Data[0].Blink = (Block - &Heap->Blocks) - 1 - PreviousSize; - - /* Substract current block size from remainder */ - Remaining -= (Block->Size + 1); - - /* Go to next block */ - PreviousSize = Block->Size; - Block = Block + Block->Size + 1; - - TRACE("Remaining = %ld\n", Remaining); - } - - /* Now finish with a terminating block */ - Heap->TerminatingBlock = Block - &Heap->Blocks; - Block->Size = 0; - Block->PreviousSize = PreviousSize; - Block->Tag = 'dnE#'; - Block->Data[0].Flink = 0; - Block->Data[0].Blink = (Block - &Heap->Blocks) - 1 - PreviousSize; - Heap->Blocks.Data[0].Blink = Heap->TerminatingBlock; - - return Heap; -} - -VOID -HeapDestroy( - PVOID HeapHandle) -{ - PHEAP Heap = HeapHandle; - - /* Mark all pages as firmware temporary, so they are free for the kernel */ - MmMarkPagesInLookupTable(PageLookupTableAddress, - (ULONG_PTR)Heap / MM_PAGE_SIZE, - Heap->MaximumSize / MM_PAGE_SIZE, - LoaderFirmwareTemporary); -} - -VOID -HeapRelease( - PVOID HeapHandle) -{ - PHEAP Heap = HeapHandle; - PHEAP_BLOCK Block; - PUCHAR StartAddress, EndAddress; - ULONG FreePages, AllFreePages = 0; - TRACE("HeapRelease(%p)\n", HeapHandle); - - /* Loop all heap chunks */ - for (Block = &Heap->Blocks; - Block->Size != 0; - Block = Block + 1 + Block->Size) - { - /* Continue, if its not free */ - if (Block->Tag != 0) continue; - - /* Calculate page aligned start address of the free region */ - StartAddress = ALIGN_UP_POINTER_BY(Block->Data, PAGE_SIZE); - - /* Walk over adjacent free blocks */ - while (Block->Tag == 0) Block = Block + Block->Size + 1; - - /* Check if this was the last block */ - if (Block->Size == 0) - { - /* Align the end address up to cover the end of the heap */ - EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); - } - else - { - /* Align the end address down to not cover any allocations */ - EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); - } - - FreePages = (EndAddress - StartAddress) / MM_PAGE_SIZE; - AllFreePages += FreePages; - - /* Now mark the pages free */ - MmMarkPagesInLookupTable(PageLookupTableAddress, - (ULONG_PTR)StartAddress / MM_PAGE_SIZE, - FreePages, - LoaderFree); - - /* bail out, if it was the last block */ - if (Block->Size == 0) break; - } - - ERR("HeapRelease() done, freed %ld pages\n", AllFreePages); -} - -VOID -HeapCleanupAll(VOID) -{ - PHEAP Heap; - - Heap = FrLdrDefaultHeap; - ERR("Heap statistics for default heap:\n" - "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" - "NumAllocs=%ld, NumFrees=%ld\n", - Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, - Heap->NumAllocs, Heap->NumFrees); - ERR("AllocTime = %I64d, FreeTime = %I64d, sum = %I64d\n", - Heap->AllocationTime, Heap->FreeTime, Heap->AllocationTime + Heap->FreeTime); - - - /* Release fre pages */ - HeapRelease(FrLdrDefaultHeap); - - Heap = FrLdrTempHeap; - ERR("Heap statistics for temp heap:\n" - "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" - "NumAllocs=%ld, NumFrees=%ld\n", - Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, - Heap->NumAllocs, Heap->NumFrees); - - /* Destroy the heap */ - HeapDestroy(FrLdrTempHeap); -} - -static VOID -HeapRemoveFreeList( - PHEAP Heap, - PHEAP_BLOCK Block) -{ - PHEAP_BLOCK Previous, Next; - - Next = &Heap->Blocks + Block->Data[0].Flink; - Previous = &Heap->Blocks + Block->Data[0].Blink; - ASSERT((Next->Tag == 0) || (Next->Tag == 'dnE#')); - ASSERT(Next->Data[0].Blink == Block - &Heap->Blocks); - ASSERT((Previous->Tag == 0) || (Previous->Tag == 'dnE#')); - ASSERT(Previous->Data[0].Flink == Block - &Heap->Blocks); - - Next->Data[0].Blink = Previous - &Heap->Blocks; - Previous->Data[0].Flink = Next - &Heap->Blocks; -} - -static VOID -HeapInsertFreeList( - PHEAP Heap, - PHEAP_BLOCK FreeBlock) -{ - PHEAP_BLOCK ListHead, NextBlock; - ASSERT(FreeBlock->Tag == 0); - - /* Terminating block serves as free list head */ - ListHead = &Heap->Blocks + Heap->TerminatingBlock; - - for (NextBlock = &Heap->Blocks + ListHead->Data[0].Flink; - NextBlock < FreeBlock; - NextBlock = &Heap->Blocks + NextBlock->Data[0].Flink); - - FreeBlock->Data[0].Flink = NextBlock - &Heap->Blocks; - FreeBlock->Data[0].Blink = NextBlock->Data[0].Blink; - NextBlock->Data[0].Blink = FreeBlock - &Heap->Blocks; - NextBlock = &Heap->Blocks + FreeBlock->Data[0].Blink; - NextBlock->Data[0].Flink = FreeBlock - &Heap->Blocks; -} - -PVOID -HeapAllocate( - PVOID HeapHandle, - SIZE_T ByteSize, - ULONG Tag) -{ - PHEAP Heap = HeapHandle; - PHEAP_BLOCK Block, NextBlock; - USHORT BlockSize, Remaining; - ULONGLONG Time = __rdtsc(); - - /* Check if the allocation is too large */ - if ((ByteSize + sizeof(HEAP_BLOCK)) > MAXUSHORT * sizeof(HEAP_BLOCK)) - { - ERR("HEAP: Allocation of 0x%lx bytes too large\n", ByteSize); - return NULL; - } - - /* We need a proper tag */ - if (Tag == 0) Tag = 'enoN'; - - /* Calculate alloc size */ - BlockSize = (USHORT)((ByteSize + sizeof(HEAP_BLOCK) - 1) / sizeof(HEAP_BLOCK)); - - /* Walk the free block list */ - Block = &Heap->Blocks + Heap->TerminatingBlock; - for (Block = &Heap->Blocks + Block->Data[0].Flink; - Block->Size != 0; - Block = &Heap->Blocks + Block->Data[0].Flink) - { - ASSERT(Block->Tag == 0); - - /* Continue, if its too small */ - if (Block->Size < BlockSize) continue; - - /* This block is just fine, use it */ - Block->Tag = Tag; - - /* Remove this entry from the free list */ - HeapRemoveFreeList(Heap, Block); - - /* Calculate the remaining size */ - Remaining = Block->Size - BlockSize; - - /* Check if the remaining space is large enough for a new block */ - if (Remaining > 1) - { - /* Make the allocated block as large as neccessary */ - Block->Size = BlockSize; - - /* Get pointer to the new block */ - NextBlock = Block + 1 + BlockSize; - - /* Make it a free block */ - NextBlock->Tag = 0; - NextBlock->Size = Remaining - 1; - NextBlock->PreviousSize = BlockSize; - BlockSize = NextBlock->Size; - HeapInsertFreeList(Heap, NextBlock); - - /* Advance to the next block */ - NextBlock = NextBlock + 1 + BlockSize; - } - else - { - /* Not enough left, use the full block */ - BlockSize = Block->Size; - - /* Get the next block */ - NextBlock = Block + 1 + BlockSize; - } - - /* Update the next blocks back link */ - NextBlock->PreviousSize = BlockSize; - - /* Update heap usage */ - Heap->NumAllocs++; - Heap->CurrentAllocBytes += Block->Size * sizeof(HEAP_BLOCK); - Heap->MaxAllocBytes = max(Heap->MaxAllocBytes, Heap->CurrentAllocBytes); - Heap->LargestAllocation = max(Heap->LargestAllocation, - Block->Size * sizeof(HEAP_BLOCK)); - Heap->AllocationTime += (__rdtsc() - Time); - - TRACE("HeapAllocate(%p, %ld, %.4s) -> return %p\n", - HeapHandle, ByteSize, &Tag, Block->Data); - - /* Return pointer to the data */ - return Block->Data; - } - - /* We found nothing */ - WARN("HEAP: nothing suitable found for 0x%lx bytes\n", ByteSize); - return NULL; -} - -VOID -HeapFree( - PVOID HeapHandle, - PVOID Pointer, - ULONG Tag) -{ - PHEAP Heap = HeapHandle; - PHEAP_BLOCK Block, PrevBlock, NextBlock; - ULONGLONG Time = __rdtsc(); - TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); - ASSERT(Tag != 'dnE#'); - - /* Check if the block is really inside this heap */ - if ((Pointer < (PVOID)(Heap + 1)) || - (Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize))) - { - ERR("HEAP: trying to free %p outside of heap %p\n", Pointer, Heap); - ASSERT(FALSE); - } - - Block = ((PHEAP_BLOCK)Pointer) - 1; - - /* Check if the tag matches */ - if ((Tag && (Block->Tag != Tag)) || (Block->Tag == 0)) - { - ERR("HEAP: Bad tag! Pointer=%p: block tag '%.4s', requested '%.4s', size=0x%lx\n", - Pointer, &Block->Tag, &Tag, Block->Size); - ASSERT(FALSE); - } - - /* Mark as free */ - Block->Tag = 0; - - /* Update heap usage */ - Heap->NumFrees++; - Heap->CurrentAllocBytes -= Block->Size * sizeof(HEAP_BLOCK); - - /* Get pointers to the next and previous block */ - PrevBlock = Block - Block->PreviousSize - 1; - NextBlock = Block + Block->Size + 1; - - /* Check if next block is free */ - if ((NextBlock->Tag == 0) && - ((Block->Size + NextBlock->Size + 1) <= MAXUSHORT)) - { - /* Merge next block into current */ - Block->Size += NextBlock->Size + 1; - HeapRemoveFreeList(Heap, NextBlock); - - NextBlock = Block + Block->Size + 1; - } - - /* Check if there is a block before and it's free */ - if ((Block->PreviousSize != 0) && (PrevBlock->Tag == 0) && - ((PrevBlock->Size + Block->Size + 1) <= MAXUSHORT)) - { - /* Merge current block into previous */ - PrevBlock->Size += Block->Size + 1; - Block = PrevBlock; - } - else - { - /* Insert the entry into the free list */ - HeapInsertFreeList(Heap, Block); - } - - /* Update the next block's back link */ - NextBlock->PreviousSize = Block->Size; - - Heap->FreeTime += (__rdtsc() - Time); -} - - -/* Wrapper functions *********************************************************/ - -VOID -MmInitializeHeap(PVOID PageLookupTable) -{ - TRACE("MmInitializeHeap()\n"); - - /* Create the default heap */ - FrLdrDefaultHeap = HeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap); - ASSERT(FrLdrDefaultHeap); - - /* Create a temporary heap */ - FrLdrTempHeap = HeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary); - ASSERT(FrLdrTempHeap); - - TRACE("MmInitializeHeap() done, default heap %p, temp heap %p\n", - FrLdrDefaultHeap, FrLdrTempHeap); -} - -PVOID -MmHeapAlloc(ULONG MemorySize) -{ - return HeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM'); -} - -VOID -MmHeapFree(PVOID MemoryPointer) -{ - HeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); -} - - -#undef ExAllocatePoolWithTag -PVOID -NTAPI -ExAllocatePoolWithTag( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag) -{ - return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); -} - -PVOID -NTAPI -ExAllocatePool( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes) -{ - return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); -} - -#undef ExFreePool -VOID -NTAPI -ExFreePool( - IN PVOID P) -{ - HeapFree(FrLdrDefaultHeap, P, 0); -} - -#undef ExFreePoolWithTag -VOID -NTAPI -ExFreePoolWithTag( - IN PVOID P, - IN ULONG Tag) -{ - HeapFree(FrLdrDefaultHeap, P, Tag); -} - -PVOID -NTAPI -RtlAllocateHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN SIZE_T Size) -{ - PVOID ptr; - - ptr = HeapAllocate(FrLdrDefaultHeap, Size, ' ltR'); - if (ptr && (Flags & HEAP_ZERO_MEMORY)) - { - RtlZeroMemory(ptr, Size); - } - - return ptr; -} - -BOOLEAN -NTAPI -RtlFreeHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID HeapBase) -{ - HeapFree(FrLdrDefaultHeap, HeapBase, ' ltR'); - return TRUE; -} -

12 years, 10 months

[tkreuzer] 55518: [FREELDR] - Enable new heap code and cleanup the heap, releasing unused memory, before starting reactos - Gives our kernel about 4MB additional memory, which - at the current leak...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 20:01:10 2012 New Revision: 55518 URL: http://svn.reactos.org/svn/reactos?rev=55518&view=rev Log: [FREELDR] - Enable new heap code and cleanup the heap, releasing unused memory, before starting reactos - Gives our kernel about 4MB additional memory, which - at the current leak rate - means around 8 minutes longer before it runs out of memory :) - Using the temp heap for all temporary allocations should increase the amount of saved space Removed: trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/rtl/bget.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Feb 9 20:01:10 2012 @@ -54,7 +54,7 @@ inifile/parse.c mm/meminit.c mm/mm.c - mm/heap.c + mm/heap_new.c reactos/registry.c reactos/arcname.c reactos/archwsup.c @@ -155,7 +155,6 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c - rtl/bget.c rtl/libsupp.c) if (NOT MSVC) Removed: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c (removed) @@ -1,157 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> -#include <debug.h> - -//#define MM_DBG 1 // needs #define BufStats 1 in bget.c - -ULONG MmMaximumHeapAlloc; - -DBG_DEFAULT_CHANNEL(MEMORY); - -VOID MmInitializeHeap(PVOID PageLookupTable) -{ - ULONG PagesNeeded = 0; - ULONG HeapStart = 0; - - // Find contigious memory block for HEAP:STACK - PagesNeeded = HEAP_PAGES + STACK_PAGES; - HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); - - if (HeapStart == 0) - { - UiMessageBox("Critical error: Can't allocate heap!"); - return; - } - - // Initialize BGET - bpool((PVOID)(HeapStart << MM_PAGE_SHIFT), PagesNeeded << MM_PAGE_SHIFT); - - // Mark those pages as used - MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap); - - TRACE("Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded); -} - -PVOID MmHeapAlloc(ULONG MemorySize) -{ - PVOID Result; - - if (MemorySize > MM_PAGE_SIZE) - { - WARN("Consider using other functions to allocate %d bytes of memory!\n", MemorySize); - } - - // Get the buffer from BGET pool - Result = bget(MemorySize); - - if (Result == NULL) - { - ERR("Heap allocation for %d bytes failed\n", MemorySize); - } -#ifdef MM_DBG - { - LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; - - // Gather some stats - bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); - if (CurAlloc > MmMaximumHeapAlloc) MmMaximumHeapAlloc = CurAlloc; - - TRACE("Current alloc %d, free %d, max alloc %lx, allocs %d, frees %d\n", - CurAlloc, TotalFree, MmMaximumHeapAlloc, NumberOfGets, NumberOfRels); - } -#endif - return Result; -} - -VOID MmHeapFree(PVOID MemoryPointer) -{ - // Release the buffer to the pool - brel(MemoryPointer); -} - - -PVOID -NTAPI -ExAllocatePool( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes) -{ - return MmHeapAlloc(NumberOfBytes); -} - -#undef ExAllocatePoolWithTag -PVOID -NTAPI -ExAllocatePoolWithTag( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag) -{ - return MmHeapAlloc(NumberOfBytes); -} - -#undef ExFreePool -VOID -NTAPI -ExFreePool( - IN PVOID P) -{ - MmHeapFree(P); -} - -#undef ExFreePoolWithTag -VOID -NTAPI -ExFreePoolWithTag( - IN PVOID P, - IN ULONG Tag) -{ - ExFreePool(P); -} - -PVOID -NTAPI -RtlAllocateHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN SIZE_T Size) -{ - PVOID ptr; - - ptr = MmHeapAlloc(Size); - if (ptr && (Flags & HEAP_ZERO_MEMORY)) - { - RtlZeroMemory(ptr, Size); - } - - return ptr; -} - -BOOLEAN -NTAPI -RtlFreeHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID HeapBase) -{ - MmHeapFree(HeapBase); - return TRUE; -} Removed: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/b… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/bget.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/bget.c (removed) @@ -1,1599 +1,0 @@ -/* - - B G E T - - Buffer allocator - - Designed and implemented in April of 1972 by John Walker, based on the - Case Algol OPRO$ algorithm implemented in 1966. - - Reimplemented in 1975 by John Walker for the Interdata 70. - Reimplemented in 1977 by John Walker for the Marinchip 9900. - Reimplemented in 1982 by Duff Kurland for the Intel 8080. - - Portable C version implemented in September of 1990 by an older, wiser - instance of the original implementor. - - Souped up and/or weighed down slightly shortly thereafter by Greg - Lutz. - - AMIX edition, including the new compaction call-back option, prepared - by John Walker in July of 1992. - - Bug in built-in test program fixed, ANSI compiler warnings eradicated, - buffer pool validator implemented, and guaranteed repeatable test - added by John Walker in October of 1995. - - This program is in the public domain. - - 1. This is the book of the generations of Adam. In the day that God - created man, in the likeness of God made he him; - 2. Male and female created he them; and blessed them, and called - their name Adam, in the day when they were created. - 3. And Adam lived an hundred and thirty years, and begat a son in - his own likeness, and after his image; and called his name Seth: - 4. And the days of Adam after he had begotten Seth were eight - hundred years: and he begat sons and daughters: - 5. And all the days that Adam lived were nine hundred and thirty - years: and he died. - 6. And Seth lived an hundred and five years, and begat Enos: - 7. And Seth lived after he begat Enos eight hundred and seven years, - and begat sons and daughters: - 8. And all the days of Seth were nine hundred and twelve years: and - he died. - 9. And Enos lived ninety years, and begat Cainan: - 10. And Enos lived after he begat Cainan eight hundred and fifteen - years, and begat sons and daughters: - 11. And all the days of Enos were nine hundred and five years: and - he died. - 12. And Cainan lived seventy years and begat Mahalaleel: - 13. And Cainan lived after he begat Mahalaleel eight hundred and - forty years, and begat sons and daughters: - 14. And all the days of Cainan were nine hundred and ten years: and - he died. - 15. And Mahalaleel lived sixty and five years, and begat Jared: - 16. And Mahalaleel lived after he begat Jared eight hundred and - thirty years, and begat sons and daughters: - 17. And all the days of Mahalaleel were eight hundred ninety and - five years: and he died. - 18. And Jared lived an hundred sixty and two years, and he begat - Enoch: - 19. And Jared lived after he begat Enoch eight hundred years, and - begat sons and daughters: - 20. And all the days of Jared were nine hundred sixty and two years: - and he died. - 21. And Enoch lived sixty and five years, and begat Methuselah: - 22. And Enoch walked with God after he begat Methuselah three - hundred years, and begat sons and daughters: - 23. And all the days of Enoch were three hundred sixty and five - years: - 24. And Enoch walked with God: and he was not; for God took him. - 25. And Methuselah lived an hundred eighty and seven years, and - begat Lamech. - 26. And Methuselah lived after he begat Lamech seven hundred eighty - and two years, and begat sons and daughters: - 27. And all the days of Methuselah were nine hundred sixty and nine - years: and he died. - 28. And Lamech lived an hundred eighty and two years, and begat a - son: - 29. And he called his name Noah, saying, This same shall comfort us - concerning our work and toil of our hands, because of the ground - which the LORD hath cursed. - 30. And Lamech lived after he begat Noah five hundred ninety and - five years, and begat sons and daughters: - 31. And all the days of Lamech were seven hundred seventy and seven - years: and he died. - 32. And Noah was five hundred years old: and Noah begat Shem, Ham, - and Japheth. - - And buffers begat buffers, and links begat links, and buffer pools - begat links to chains of buffer pools containing buffers, and lo the - buffers and links and pools of buffers and pools of links to chains of - pools of buffers were fruitful and they multiplied and the Operating - System looked down upon them and said that it was Good. - - - INTRODUCTION - ============ - - BGET is a comprehensive memory allocation package which is easily - configured to the needs of an application. BGET is efficient in - both the time needed to allocate and release buffers and in the - memory overhead required for buffer pool management. It - automatically consolidates contiguous space to minimise - fragmentation. BGET is configured by compile-time definitions, - Major options include: - - * A built-in test program to exercise BGET and - demonstrate how the various functions are used. - - * Allocation by either the "first fit" or "best fit" - method. - - * Wiping buffers at release time to catch code which - references previously released storage. - - * Built-in routines to dump individual buffers or the - entire buffer pool. - - * Retrieval of allocation and pool size statistics. - - * Quantisation of buffer sizes to a power of two to - satisfy hardware alignment constraints. - - * Automatic pool compaction, growth, and shrinkage by - means of call-backs to user defined functions. - - Applications of BGET can range from storage management in - ROM-based embedded programs to providing the framework upon which - a multitasking system incorporating garbage collection is - constructed. BGET incorporates extensive internal consistency - checking using the <assert.h> mechanism; all these checks can be - turned off by compiling with NDEBUG defined, yielding a version of - BGET with minimal size and maximum speed. - - The basic algorithm underlying BGET has withstood the test of - time; more than 25 years have passed since the first - implementation of this code. And yet, it is substantially more - efficient than the native allocation schemes of many operating - systems: the Macintosh and Microsoft Windows to name two, on which - programs have obtained substantial speed-ups by layering BGET as - an application level memory manager atop the underlying system's. - - BGET has been implemented on the largest mainframes and the lowest - of microprocessors. It has served as the core for multitasking - operating systems, multi-thread applications, embedded software in - data network switching processors, and a host of C programs. And - while it has accreted flexibility and additional options over the - years, it remains fast, memory efficient, portable, and easy to - integrate into your program. - - - BGET IMPLEMENTATION ASSUMPTIONS - =============================== - - BGET is written in as portable a dialect of C as possible. The - only fundamental assumption about the underlying hardware - architecture is that memory is allocated is a linear array which - can be addressed as a vector of C "char" objects. On segmented - address space architectures, this generally means that BGET should - be used to allocate storage within a single segment (although some - compilers simulate linear address spaces on segmented - architectures). On segmented architectures, then, BGET buffer - pools may not be larger than a segment, but since BGET allows any - number of separate buffer pools, there is no limit on the total - storage which can be managed, only on the largest individual - object which can be allocated. Machines with a linear address - architecture, such as the VAX, 680x0, Sparc, MIPS, or the Intel - 80386 and above in native mode, may use BGET without restriction. - - - GETTING STARTED WITH BGET - ========================= - - Although BGET can be configured in a multitude of fashions, there - are three basic ways of working with BGET. The functions - mentioned below are documented in the following section. Please - excuse the forward references which are made in the interest of - providing a roadmap to guide you to the BGET functions you're - likely to need. - - Embedded Applications - --------------------- - - Embedded applications typically have a fixed area of memory - dedicated to buffer allocation (often in a separate RAM address - space distinct from the ROM that contains the executable code). - To use BGET in such an environment, simply call bpool() with the - start address and length of the buffer pool area in RAM, then - allocate buffers with bget() and release them with brel(). - Embedded applications with very limited RAM but abundant CPU speed - may benefit by configuring BGET for BestFit allocation (which is - usually not worth it in other environments). - - Malloc() Emulation - ------------------ - - If the C library malloc() function is too slow, not present in - your development environment (for example, an a native Windows or - Macintosh program), or otherwise unsuitable, you can replace it - with BGET. Initially define a buffer pool of an appropriate size - with bpool()--usually obtained by making a call to the operating - system's low-level memory allocator. Then allocate buffers with - bget(), bgetz(), and bgetr() (the last two permit the allocation - of buffers initialised to zero and [inefficient] re-allocation of - existing buffers for compatibility with C library functions). - Release buffers by calling brel(). If a buffer allocation request - fails, obtain more storage from the underlying operating system, - add it to the buffer pool by another call to bpool(), and continue - execution. - - Automatic Storage Management - ---------------------------- - - You can use BGET as your application's native memory manager and - implement automatic storage pool expansion, contraction, and - optionally application-specific memory compaction by compiling - BGET with the BECtl variable defined, then calling bectl() and - supplying functions for storage compaction, acquisition, and - release, as well as a standard pool expansion increment. All of - these functions are optional (although it doesn't make much sense - to provide a release function without an acquisition function, - does it?). Once the call-back functions have been defined with - bectl(), you simply use bget() and brel() to allocate and release - storage as before. You can supply an initial buffer pool with - bpool() or rely on automatic allocation to acquire the entire - pool. When a call on bget() cannot be satisfied, BGET first - checks if a compaction function has been supplied. If so, it is - called (with the space required to satisfy the allocation request - and a sequence number to allow the compaction routine to be called - successively without looping). If the compaction function is able - to free any storage (it needn't know whether the storage it freed - was adequate) it should return a nonzero value, whereupon BGET - will retry the allocation request and, if it fails again, call the - compaction function again with the next-higher sequence number. - - If the compaction function returns zero, indicating failure to - free space, or no compaction function is defined, BGET next tests - whether a non-NULL allocation function was supplied to bectl(). - If so, that function is called with an argument indicating how - many bytes of additional space are required. This will be the - standard pool expansion increment supplied in the call to bectl() - unless the original bget() call requested a buffer larger than - this; buffers larger than the standard pool block can be managed - "off the books" by BGET in this mode. If the allocation function - succeeds in obtaining the storage, it returns a pointer to the new - block and BGET expands the buffer pool; if it fails, the - allocation request fails and returns NULL to the caller. If a - non-NULL release function is supplied, expansion blocks which - become totally empty are released to the global free pool by - passing their addresses to the release function. - - Equipped with appropriate allocation, release, and compaction - functions, BGET can be used as part of very sophisticated memory - management strategies, including garbage collection. (Note, - however, that BGET is *not* a garbage collector by itself, and - that developing such a system requires much additional logic and - careful design of the application's memory allocation strategy.) - - - BGET FUNCTION DESCRIPTIONS - ========================== - - Functions implemented in this file (some are enabled by certain of - the optional settings below): - - void bpool(void *buffer, bufsize len); - - Create a buffer pool of <len> bytes, using the storage starting at - <buffer>. You can call bpool() subsequently to contribute - additional storage to the overall buffer pool. - - void *bget(bufsize size); - - Allocate a buffer of <size> bytes. The address of the buffer is - returned, or NULL if insufficient memory was available to allocate - the buffer. - - void *bgetz(bufsize size); - - Allocate a buffer of <size> bytes and clear it to all zeroes. The - address of the buffer is returned, or NULL if insufficient memory - was available to allocate the buffer. - - void *bgetr(void *buffer, bufsize newsize); - - Reallocate a buffer previously allocated by bget(), changing its - size to <newsize> and preserving all existing data. NULL is - returned if insufficient memory is available to reallocate the - buffer, in which case the original buffer remains intact. - - void brel(void *buf); - - Return the buffer <buf>, previously allocated by bget(), to the - free space pool. - - void bectl(int (*compact)(bufsize sizereq, int sequence), - void *(*acquire)(bufsize size), - void (*release)(void *buf), - bufsize pool_incr); - - Expansion control: specify functions through which the package may - compact storage (or take other appropriate action) when an - allocation request fails, and optionally automatically acquire - storage for expansion blocks when necessary, and release such - blocks when they become empty. If <compact> is non-NULL, whenever - a buffer allocation request fails, the <compact> function will be - called with arguments specifying the number of bytes (total buffer - size, including header overhead) required to satisfy the - allocation request, and a sequence number indicating the number of - consecutive calls on <compact> attempting to satisfy this - allocation request. The sequence number is 1 for the first call - on <compact> for a given allocation request, and increments on - subsequent calls, permitting the <compact> function to take - increasingly dire measures in an attempt to free up storage. If - the <compact> function returns a nonzero value, the allocation - attempt is re-tried. If <compact> returns 0 (as it must if it - isn't able to release any space or add storage to the buffer - pool), the allocation request fails, which can trigger automatic - pool expansion if the <acquire> argument is non-NULL. At the time - the <compact> function is called, the state of the buffer - allocator is identical to that at the moment the allocation - request was made; consequently, the <compact> function may call - brel(), bpool(), bstats(), and/or directly manipulate the buffer - pool in any manner which would be valid were the application in - control. This does not, however, relieve the <compact> function - of the need to ensure that whatever actions it takes do not change - things underneath the application that made the allocation - request. For example, a <compact> function that released a buffer - in the process of being reallocated with bgetr() would lead to - disaster. Implementing a safe and effective <compact> mechanism - requires careful design of an application's memory architecture, - and cannot generally be easily retrofitted into existing code. - - If <acquire> is non-NULL, that function will be called whenever an - allocation request fails. If the <acquire> function succeeds in - allocating the requested space and returns a pointer to the new - area, allocation will proceed using the expanded buffer pool. If - <acquire> cannot obtain the requested space, it should return NULL - and the entire allocation process will fail. <pool_incr> - specifies the normal expansion block size. Providing an <acquire> - function will cause subsequent bget() requests for buffers too - large to be managed in the linked-block scheme (in other words, - larger than <pool_incr> minus the buffer overhead) to be satisfied - directly by calls to the <acquire> function. Automatic release of - empty pool blocks will occur only if all pool blocks in the system - are the size given by <pool_incr>. - - void bstats(bufsize *curalloc, bufsize *totfree, - bufsize *maxfree, long *nget, long *nrel); - - The amount of space currently allocated is stored into the - variable pointed to by <curalloc>. The total free space (sum of - all free blocks in the pool) is stored into the variable pointed - to by <totfree>, and the size of the largest single block in the - free space pool is stored into the variable pointed to by - <maxfree>. The variables pointed to by <nget> and <nrel> are - filled, respectively, with the number of successful (non-NULL - return) bget() calls and the number of brel() calls. - - void bstatse(bufsize *pool_incr, long *npool, - long *npget, long *nprel, - long *ndget, long *ndrel); - - Extended statistics: The expansion block size will be stored into - the variable pointed to by <pool_incr>, or the negative thereof if - automatic expansion block releases are disabled. The number of - currently active pool blocks will be stored into the variable - pointed to by <npool>. The variables pointed to by <npget> and - <nprel> will be filled with, respectively, the number of expansion - block acquisitions and releases which have occurred. The - variables pointed to by <ndget> and <ndrel> will be filled with - the number of bget() and brel() calls, respectively, managed - through blocks directly allocated by the acquisition and release - functions. - - void bufdump(void *buf); - - The buffer pointed to by <buf> is dumped on standard output. - - void bpoold(void *pool, int dumpalloc, int dumpfree); - - All buffers in the buffer pool <pool>, previously initialised by a - call on bpool(), are listed in ascending memory address order. If - <dumpalloc> is nonzero, the contents of allocated buffers are - dumped; if <dumpfree> is nonzero, the contents of free blocks are - dumped. - - int bpoolv(void *pool); - - The named buffer pool, previously initialised by a call on - bpool(), is validated for bad pointers, overwritten data, etc. If - compiled with NDEBUG not defined, any error generates an assertion - failure. Otherwise 1 is returned if the pool is valid, 0 if an - error is found. - - - BGET CONFIGURATION - ================== -*/ - -/*#define TestProg 20000*/ /* Generate built-in test program - if defined. The value specifies - how many buffer allocation attempts - the test program should make. */ - -#define SizeQuant 4 /* Buffer allocation size quantum: - all buffers allocated are a - multiple of this size. This - MUST be a power of two. */ -#ifdef MM_DBG - -#define BufDump 1 /* Define this symbol to enable the - bpoold() function which dumps the - buffers in a buffer pool. */ - -#define BufValid 1 /* Define this symbol to enable the - bpoolv() function for validating - a buffer pool. */ - -#define DumpData 1 /* Define this symbol to enable the - bufdump() function which allows - dumping the contents of an allocated - or free buffer. */ - -#define BufStats 1 /* Define this symbol to enable the - bstats() function which calculates - the total free space in the buffer - pool, the largest available - buffer, and the total space - currently allocated. */ - -#define FreeWipe 1 /* Wipe free buffers to a guaranteed - pattern of garbage to trip up - miscreants who attempt to use - pointers into released buffers. */ - -#define BestFit 1 /* Use a best fit algorithm when - searching for space for an - allocation request. This uses - memory more efficiently, but - allocation will be much slower. */ - -#define BECtl 1 /* Define this symbol to enable the - bectl() function for automatic - pool space control. */ -#else -#endif - -#include <stdio.h> - -int TuiPrintf(const char *format, ... ); -#define printf TuiPrintf - -#ifdef lint -#define NDEBUG /* Exits in asserts confuse lint */ -/* LINTLIBRARY */ /* Don't complain about def, no ref */ -extern char *sprintf(); /* Sun includes don't define sprintf */ -#endif - -#define NDEBUG - -#include <assert.h> -#include <memory.h> - -#ifdef BufDump /* BufDump implies DumpData */ -#ifndef DumpData -#define DumpData 1 -#endif -#endif - -#ifdef DumpData -#include <ctype.h> -#endif - -/* Declare the interface, including the requested buffer size type, - bufsize. */ - -#include "bget.h" - -#define MemSize int /* Type for size arguments to memxxx() - functions such as memcmp(). */ - -/* Queue links */ - -struct qlinks { - struct bfhead *flink; /* Forward link */ - struct bfhead *blink; /* Backward link */ -}; - -/* Header in allocated and free buffers */ - -struct bhead { - bufsize prevfree; /* Relative link back to previous - free buffer in memory or 0 if - previous buffer is allocated. */ - bufsize bsize; /* Buffer size: positive if free, - negative if allocated. */ -}; -#define BH(p) ((struct bhead *) (p)) - -/* Header in directly allocated buffers (by acqfcn) */ - -struct bdhead { - bufsize tsize; /* Total size, including overhead */ - struct bhead bh; /* Common header */ -}; -#define BDH(p) ((struct bdhead *) (p)) - -/* Header in free buffers */ - -struct bfhead { - struct bhead bh; /* Common allocated/free header */ - struct qlinks ql; /* Links on free list */ -}; -#define BFH(p) ((struct bfhead *) (p)) - -static struct bfhead freelist = { /* List of free buffers */ - {0, 0}, - {&freelist, &freelist} -}; - - -#ifdef BufStats -static bufsize totalloc = 0; /* Total space currently allocated */ -static long numget = 0, numrel = 0; /* Number of bget() and brel() calls */ -#ifdef BECtl -static long numpblk = 0; /* Number of pool blocks */ -static long numpget = 0, numprel = 0; /* Number of block gets and rels */ -static long numdget = 0, numdrel = 0; /* Number of direct gets and rels */ -#endif /* BECtl */ -#endif /* BufStats */ - -#ifdef BECtl - -/* Automatic expansion block management functions */ - -static int (*compfcn) _((bufsize sizereq, int sequence)) = NULL; -static void *(*acqfcn) _((bufsize size)) = NULL; -static void (*relfcn) _((void *buf)) = NULL; - -static bufsize exp_incr = 0; /* Expansion block size */ -static bufsize pool_len = 0; /* 0: no bpool calls have been made - -1: not all pool blocks are - the same size - >0: (common) block size for all - bpool calls made so far - */ -#endif - -/* Minimum allocation quantum: */ - -#define QLSize (sizeof(struct qlinks)) -#define SizeQ ((SizeQuant > QLSize) ? SizeQuant : QLSize) - -#define V (void) /* To denote unwanted returned values */ - -/* End sentinel: value placed in bsize field of dummy block delimiting - end of pool block. The most negative number which will fit in a - bufsize, defined in a way that the compiler will accept. */ - -#define ESent ((bufsize) (-(((1L << (sizeof(bufsize) * 8 - 2)) - 1) * 2) - 2)) - -/* BGET -- Allocate a buffer. */ - -void *bget(requested_size) - bufsize requested_size; -{ - bufsize size = requested_size; - struct bfhead *b; -#ifdef BestFit - struct bfhead *best; -#endif - void *buf; -#ifdef BECtl - int compactseq = 0; -#endif - - assert(size > 0); - - if (size < SizeQ) { /* Need at least room for the */ - size = SizeQ; /* queue links. */ - } -#ifdef SizeQuant -#if SizeQuant > 1 - size = (size + (SizeQuant - 1)) & (~(SizeQuant - 1)); -#endif -#endif - - size += sizeof(struct bhead); /* Add overhead in allocated buffer - to size required. */ - -#ifdef BECtl - /* If a compact function was provided in the call to bectl(), wrap - a loop around the allocation process to allow compaction to - intervene in case we don't find a suitable buffer in the chain. */ - - while (1) { -#endif - b = freelist.ql.flink; -#ifdef BestFit - best = &freelist; -#endif - - - /* Scan the free list searching for the first buffer big enough - to hold the requested size buffer. */ - -#ifdef BestFit - while (b != &freelist) { - if (b->bh.bsize >= size) { - if ((best == &freelist) || (b->bh.bsize < best->bh.bsize)) { - best = b; - } - } - b = b->ql.flink; /* Link to next buffer */ - } - b = best; -#endif /* BestFit */ - - while (b != &freelist) { - if ((bufsize) b->bh.bsize >= size) { - - /* Buffer is big enough to satisfy the request. Allocate it - to the caller. We must decide whether the buffer is large - enough to split into the part given to the caller and a - free buffer that remains on the free list, or whether the - entire buffer should be removed from the free list and - given to the caller in its entirety. We only split the - buffer if enough room remains for a header plus the minimum - quantum of allocation. */ - - if ((b->bh.bsize - size) > (SizeQ + (sizeof(struct bhead)))) { - struct bhead *ba, *bn; - - ba = BH(((char *) b) + (b->bh.bsize - size)); - bn = BH(((char *) ba) + size); - assert(bn->prevfree == b->bh.bsize); - /* Subtract size from length of free block. */ - b->bh.bsize -= size; - /* Link allocated buffer to the previous free buffer. */ - ba->prevfree = b->bh.bsize; - /* Plug negative size into user buffer. */ - ba->bsize = -(bufsize) size; - /* Mark buffer after this one not preceded by free block. */ - bn->prevfree = 0; - -#ifdef BufStats - totalloc += size; - numget++; /* Increment number of bget() calls */ -#endif - buf = (void *) ((((char *) ba) + sizeof(struct bhead))); - return buf; - } else { - struct bhead *ba; - - ba = BH(((char *) b) + b->bh.bsize); - assert(ba->prevfree == b->bh.bsize); - - /* The buffer isn't big enough to split. Give the whole - shebang to the caller and remove it from the free list. */ - - assert(b->ql.blink->ql.flink == b); - assert(b->ql.flink->ql.blink == b); - b->ql.blink->ql.flink = b->ql.flink; - b->ql.flink->ql.blink = b->ql.blink; - -#ifdef BufStats - totalloc += b->bh.bsize; - numget++; /* Increment number of bget() calls */ -#endif - /* Negate size to mark buffer allocated. */ - b->bh.bsize = -(b->bh.bsize); - - /* Zero the back pointer in the next buffer in memory - to indicate that this buffer is allocated. */ - ba->prevfree = 0; - - /* Give user buffer starting at queue links. */ - buf = (void *) &(b->ql); - return buf; - } - } - b = b->ql.flink; /* Link to next buffer */ - } -#ifdef BECtl - - /* We failed to find a buffer. If there's a compact function - defined, notify it of the size requested. If it returns - TRUE, try the allocation again. */ - - if ((compfcn == NULL) || (!(*compfcn)(size, ++compactseq))) { - break; - } - } - - /* No buffer available with requested size free. */ - - /* Don't give up yet -- look in the reserve supply. */ - - if (acqfcn != NULL) { - if (size > exp_incr - sizeof(struct bhead)) { - - /* Request is too large to fit in a single expansion - block. Try to satisy it by a direct buffer acquisition. */ - - struct bdhead *bdh; - - size += sizeof(struct bdhead) - sizeof(struct bhead); - if ((bdh = BDH((*acqfcn)((bufsize) size))) != NULL) { - - /* Mark the buffer special by setting the size field - of its header to zero. */ - bdh->bh.bsize = 0; - bdh->bh.prevfree = 0; - bdh->tsize = size; -#ifdef BufStats - totalloc += size; - numget++; /* Increment number of bget() calls */ - numdget++; /* Direct bget() call count */ -#endif - buf = (void *) (bdh + 1); - return buf; - } - - } else { - - /* Try to obtain a new expansion block */ - - void *newpool; - - if ((newpool = (*acqfcn)((bufsize) exp_incr)) != NULL) { - bpool(newpool, exp_incr); - buf = bget(requested_size); /* This can't, I say, can't - get into a loop. */ - return buf; - } - } - } - - /* Still no buffer available */ - -#endif /* BECtl */ - - return NULL; -} - -/* BGETZ -- Allocate a buffer and clear its contents to zero. We clear - the entire contents of the buffer to zero, not just the - region requested by the caller. */ - -void *bgetz(size) - bufsize size; -{ - char *buf = (char *) bget(size); - - if (buf != NULL) { - struct bhead *b; - bufsize rsize; - - b = BH(buf - sizeof(struct bhead)); - rsize = -(b->bsize); - if (rsize == 0) { - struct bdhead *bd; - - bd = BDH(buf - sizeof(struct bdhead)); - rsize = bd->tsize - sizeof(struct bdhead); - } else { - rsize -= sizeof(struct bhead); - } - assert(rsize >= size); - V memset(buf, 0, (MemSize) rsize); - } - return ((void *) buf); -} - -/* BGETR -- Reallocate a buffer. This is a minimal implementation, - simply in terms of brel() and bget(). It could be - enhanced to allow the buffer to grow into adjacent free - blocks and to avoid moving data unnecessarily. */ - -void *bgetr(buf, size) - void *buf; - bufsize size; -{ - void *nbuf; - bufsize osize; /* Old size of buffer */ - struct bhead *b; - - if ((nbuf = bget(size)) == NULL) { /* Acquire new buffer */ - return NULL; - } - if (buf == NULL) { - return nbuf; - } - b = BH(((char *) buf) - sizeof(struct bhead)); - osize = -b->bsize; -#ifdef BECtl - if (osize == 0) { - /* Buffer acquired directly through acqfcn. */ - struct bdhead *bd; - - bd = BDH(((char *) buf) - sizeof(struct bdhead)); - osize = bd->tsize - sizeof(struct bdhead); - } else -#endif - osize -= sizeof(struct bhead); - assert(osize > 0); - V memcpy((char *) nbuf, (char *) buf, /* Copy the data */ - (MemSize) ((size < osize) ? size : osize)); - brel(buf); - return nbuf; -} - -/* BREL -- Release a buffer. */ - -void brel(buf) - void *buf; -{ - struct bfhead *b, *bn; - - b = BFH(((char *) buf) - sizeof(struct bhead)); -#ifdef BufStats - numrel++; /* Increment number of brel() calls */ -#endif - assert(buf != NULL); - -#ifdef BECtl - if (b->bh.bsize == 0) { /* Directly-acquired buffer? */ - struct bdhead *bdh; - - bdh = BDH(((char *) buf) - sizeof(struct bdhead)); - assert(b->bh.prevfree == 0); -#ifdef BufStats - totalloc -= bdh->tsize; - assert(totalloc >= 0); - numdrel++; /* Number of direct releases */ -#endif /* BufStats */ -#ifdef FreeWipe - V memset((char *) buf, 0x55, - (MemSize) (bdh->tsize - sizeof(struct bdhead))); -#endif /* FreeWipe */ - assert(relfcn != NULL); - (*relfcn)((void *) bdh); /* Release it directly. */ - return; - } -#endif /* BECtl */ - - /* Buffer size must be negative, indicating that the buffer is - allocated. */ - - if (b->bh.bsize >= 0) { - bn = NULL; - } - assert(b->bh.bsize < 0); - - /* Back pointer in next buffer must be zero, indicating the - same thing: */ - - assert(BH((char *) b - b->bh.bsize)->prevfree == 0); - -#ifdef BufStats - totalloc += b->bh.bsize; - assert(totalloc >= 0); -#endif - - /* If the back link is nonzero, the previous buffer is free. */ - - if (b->bh.prevfree != 0) { - - /* The previous buffer is free. Consolidate this buffer with it - by adding the length of this buffer to the previous free - buffer. Note that we subtract the size in the buffer being - released, since it's negative to indicate that the buffer is - allocated. */ - - register bufsize size = b->bh.bsize; - - /* Make the previous buffer the one we're working on. */ - assert(BH((char *) b - b->bh.prevfree)->bsize == b->bh.prevfree); - b = BFH(((char *) b) - b->bh.prevfree); - b->bh.bsize -= size; - } else { - - /* The previous buffer isn't allocated. Insert this buffer - on the free list as an isolated free block. */ - - assert(freelist.ql.blink->ql.flink == &freelist); - assert(freelist.ql.flink->ql.blink == &freelist); - b->ql.flink = &freelist; - b->ql.blink = freelist.ql.blink; - freelist.ql.blink = b; - b->ql.blink->ql.flink = b; - b->bh.bsize = -b->bh.bsize; - } - - /* Now we look at the next buffer in memory, located by advancing from - the start of this buffer by its size, to see if that buffer is - free. If it is, we combine this buffer with the next one in - memory, dechaining the second buffer from the free list. */ - - bn = BFH(((char *) b) + b->bh.bsize); - if (bn->bh.bsize > 0) { - - /* The buffer is free. Remove it from the free list and add - its size to that of our buffer. */ - - assert(BH((char *) bn + bn->bh.bsize)->prevfree == bn->bh.bsize); - assert(bn->ql.blink->ql.flink == bn); - assert(bn->ql.flink->ql.blink == bn); - bn->ql.blink->ql.flink = bn->ql.flink; - bn->ql.flink->ql.blink = bn->ql.blink; - b->bh.bsize += bn->bh.bsize; - - /* Finally, advance to the buffer that follows the newly - consolidated free block. We must set its backpointer to the - head of the consolidated free block. We know the next block - must be an allocated block because the process of recombination - guarantees that two free blocks will never be contiguous in - memory. */ - - bn = BFH(((char *) b) + b->bh.bsize); - } -#ifdef FreeWipe - V memset(((char *) b) + sizeof(struct bfhead), 0x55, - (MemSize) (b->bh.bsize - sizeof(struct bfhead))); -#endif - assert(bn->bh.bsize < 0); - - /* The next buffer is allocated. Set the backpointer in it to point - to this buffer; the previous free buffer in memory. */ - - bn->bh.prevfree = b->bh.bsize; - -#ifdef BECtl - - /* If a block-release function is defined, and this free buffer - constitutes the entire block, release it. Note that pool_len - is defined in such a way that the test will fail unless all - pool blocks are the same size. */ - - if (relfcn != NULL && - ((bufsize) b->bh.bsize) == (pool_len - sizeof(struct bhead))) { - - assert(b->bh.prevfree == 0); - assert(BH((char *) b + b->bh.bsize)->bsize == ESent); - assert(BH((char *) b + b->bh.bsize)->prevfree == b->bh.bsize); - /* Unlink the buffer from the free list */ - b->ql.blink->ql.flink = b->ql.flink; - b->ql.flink->ql.blink = b->ql.blink; - - (*relfcn)(b); -#ifdef BufStats - numprel++; /* Nr of expansion block releases */ - numpblk--; /* Total number of blocks */ - assert(numpblk == numpget - numprel); -#endif /* BufStats */ - } -#endif /* BECtl */ -} - -#ifdef BECtl - -/* BECTL -- Establish automatic pool expansion control */ - -void bectl(compact, acquire, release, pool_incr) - int (*compact) _((bufsize sizereq, int sequence)); - void *(*acquire) _((bufsize size)); - void (*release) _((void *buf)); - bufsize pool_incr; -{ - compfcn = compact; - acqfcn = acquire; - relfcn = release; - exp_incr = pool_incr; -} -#endif - -/* BPOOL -- Add a region of memory to the buffer pool. */ - -void bpool(buf, len) - void *buf; - bufsize len; -{ - struct bfhead *b = BFH(buf); - struct bhead *bn; - -#ifdef SizeQuant - len &= ~(SizeQuant - 1); -#endif -#ifdef BECtl - if (pool_len == 0) { - pool_len = len; - } else if (len != pool_len) { - pool_len = -1; - } -#ifdef BufStats - numpget++; /* Number of block acquisitions */ - numpblk++; /* Number of blocks total */ - assert(numpblk == numpget - numprel); -#endif /* BufStats */ -#endif /* BECtl */ - - /* Since the block is initially occupied by a single free buffer, - it had better not be (much) larger than the largest buffer - whose size we can store in bhead.bsize. */ - - assert(len - sizeof(struct bhead) <= -((bufsize) ESent + 1)); - - /* Clear the backpointer at the start of the block to indicate that - there is no free block prior to this one. That blocks - recombination when the first block in memory is released. */ - - b->bh.prevfree = 0; - - /* Chain the new block to the free list. */ - - assert(freelist.ql.blink->ql.flink == &freelist); - assert(freelist.ql.flink->ql.blink == &freelist); - b->ql.flink = &freelist; - b->ql.blink = freelist.ql.blink; - freelist.ql.blink = b; - b->ql.blink->ql.flink = b; - - /* Create a dummy allocated buffer at the end of the pool. This dummy - buffer is seen when a buffer at the end of the pool is released and - blocks recombination of the last buffer with the dummy buffer at - the end. The length in the dummy buffer is set to the largest - negative number to denote the end of the pool for diagnostic - routines (this specific value is not counted on by the actual - allocation and release functions). */ - - len -= sizeof(struct bhead); - b->bh.bsize = (bufsize) len; -#ifdef FreeWipe - V memset(((char *) b) + sizeof(struct bfhead), 0x55, - (MemSize) (len - sizeof(struct bfhead))); -#endif - bn = BH(((char *) b) + len); - bn->prevfree = (bufsize) len; - /* Definition of ESent assumes two's complement! */ - assert((~0) == -1); - bn->bsize = ESent; -} - -#ifdef BufStats - -/* BSTATS -- Return buffer allocation free space statistics. */ - -void bstats(curalloc, totfree, maxfree, nget, nrel) - bufsize *curalloc, *totfree, *maxfree; - long *nget, *nrel; -{ - struct bfhead *b = freelist.ql.flink; - - *nget = numget; - *nrel = numrel; - *curalloc = totalloc; - *totfree = 0; - *maxfree = -1; - while (b != &freelist) { - assert(b->bh.bsize > 0); - *totfree += b->bh.bsize; - if (b->bh.bsize > *maxfree) { - *maxfree = b->bh.bsize; - } - b = b->ql.flink; /* Link to next buffer */ - } -} - -#ifdef BECtl - -/* BSTATSE -- Return extended statistics */ - -void bstatse(pool_incr, npool, npget, nprel, ndget, ndrel) - bufsize *pool_incr; - long *npool, *npget, *nprel, *ndget, *ndrel; -{ - *pool_incr = (pool_len < 0) ? -exp_incr : exp_incr; - *npool = numpblk; - *npget = numpget; - *nprel = numprel; - *ndget = numdget; - *ndrel = numdrel; -} -#endif /* BECtl */ -#endif /* BufStats */ - -#ifdef DumpData - -/* BUFDUMP -- Dump the data in a buffer. This is called with the user - data pointer, and backs up to the buffer header. It will - dump either a free block or an allocated one. */ - -void bufdump(buf) - void *buf; -{ - struct bfhead *b; - unsigned char *bdump; - bufsize bdlen; - - b = BFH(((char *) buf) - sizeof(struct bhead)); - assert(b->bh.bsize != 0); - if (b->bh.bsize < 0) { - bdump = (unsigned char *) buf; - bdlen = (-b->bh.bsize) - sizeof(struct bhead); - } else { - bdump = (unsigned char *) (((char *) b) + sizeof(struct bfhead)); - bdlen = b->bh.bsize - sizeof(struct bfhead); - } - - while (bdlen > 0) { - int i, dupes = 0; - bufsize l = bdlen; - char bhex[50], bascii[20]; - - if (l > 16) { - l = 16; - } - - for (i = 0; i < l; i++) { - V sprintf(bhex + i * 3, "%02X ", bdump[i]); - bascii[i] = isprint(bdump[i]) ? bdump[i] : ' '; - } - bascii[i] = 0; - V printf("%-48s %s\n", bhex, bascii); - bdump += l; - bdlen -= l; - while ((bdlen > 16) && (memcmp((char *) (bdump - 16), - (char *) bdump, 16) == 0)) { - dupes++; - bdump += 16; - bdlen -= 16; - } - if (dupes > 1) { - V printf( - " (%d lines [%d bytes] identical to above line skipped)\n", - dupes, dupes * 16); - } else if (dupes == 1) { - bdump -= 16; - bdlen += 16; - } - } -} -#endif - -#ifdef BufDump - -/* BPOOLD -- Dump a buffer pool. The buffer headers are always listed. - If DUMPALLOC is nonzero, the contents of allocated buffers - are dumped. If DUMPFREE is nonzero, free blocks are - dumped as well. If FreeWipe checking is enabled, free - blocks which have been clobbered will always be dumped. */ - -void bpoold(buf, dumpalloc, dumpfree) - void *buf; - int dumpalloc, dumpfree; -{ - struct bfhead *b = BFH(buf); - - while (b->bh.bsize != ESent) { - bufsize bs = b->bh.bsize; - - if (bs < 0) { - bs = -bs; - V printf("Allocated buffer: size %6ld bytes.\n", (long) bs); - if (dumpalloc) { - bufdump((void *) (((char *) b) + sizeof(struct bhead))); - } - } else { - char *lerr = ""; - - assert(bs > 0); - if ((b->ql.blink->ql.flink != b) || - (b->ql.flink->ql.blink != b)) { - lerr = " (Bad free list links)"; - } - V printf("Free block: size %6ld bytes.%s\n", - (long) bs, lerr); -#ifdef FreeWipe - lerr = ((char *) b) + sizeof(struct bfhead); - if ((bs > sizeof(struct bfhead)) && ((*lerr != 0x55) || - (memcmp(lerr, lerr + 1, - (MemSize) (bs - (sizeof(struct bfhead) + 1))) != 0))) { - V printf( - "(Contents of above free block have been overstored.)\n"); - bufdump((void *) (((char *) b) + sizeof(struct bhead))); - } else -#endif - if (dumpfree) { - bufdump((void *) (((char *) b) + sizeof(struct bhead))); - } - } - b = BFH(((char *) b) + bs); - } -} -#endif /* BufDump */ - -#ifdef BufValid - -/* BPOOLV -- Validate a buffer pool. If NDEBUG isn't defined, - any error generates an assertion failure. */ - -int bpoolv(buf) - void *buf; -{ - struct bfhead *b = BFH(buf); - - while (b->bh.bsize != ESent) { - bufsize bs = b->bh.bsize; - - if (bs < 0) { - bs = -bs; - } else { - char *lerr = ""; - - assert(bs > 0); - if (bs <= 0) { - return 0; - } - if ((b->ql.blink->ql.flink != b) || - (b->ql.flink->ql.blink != b)) { - V printf("Free block: size %6ld bytes. (Bad free list links)\n", - (long) bs); - assert(0); - return 0; - } -#ifdef FreeWipe - lerr = ((char *) b) + sizeof(struct bfhead); - if ((bs > sizeof(struct bfhead)) && ((*lerr != 0x55) || - (memcmp(lerr, lerr + 1, - (MemSize) (bs - (sizeof(struct bfhead) + 1))) != 0))) { - V printf( - "(Contents of above free block have been overstored.)\n"); - bufdump((void *) (((char *) b) + sizeof(struct bhead))); - assert(0); - return 0; - } -#endif - } - b = BFH(((char *) b) + bs); - } - return 1; -} -#endif /* BufValid */ - - /***********************\ - * * - * Built-in test program * - * * - \***********************/ - -#ifdef TestProg - -#define Repeatable 1 /* Repeatable pseudorandom sequence */ - /* If Repeatable is not defined, a - time-seeded pseudorandom sequence - is generated, exercising BGET with - a different pattern of calls on each - run. */ -#define OUR_RAND /* Use our own built-in version of - rand() to guarantee the test is - 100% repeatable. */ - -#ifdef BECtl -#define PoolSize 300000 /* Test buffer pool size */ -#else -#define PoolSize 50000 /* Test buffer pool size */ -#endif -#define ExpIncr 32768 /* Test expansion block size */ -#define CompactTries 10 /* Maximum tries at compacting */ - -#define dumpAlloc 0 /* Dump allocated buffers ? */ -#define dumpFree 0 /* Dump free buffers ? */ - -#ifndef Repeatable -extern long time(); -#endif - -extern char *malloc(); -extern int free _((char *)); - -static char *bchain = NULL; /* Our private buffer chain */ -static char *bp = NULL; /* Our initial buffer pool */ - -#include <math.h> - -#ifdef OUR_RAND - -static unsigned long int next = 1; - -/* Return next random integer */ - -int rand() -{ - next = next * 1103515245L + 12345; - return (unsigned int) (next / 65536L) % 32768L; -} - -/* Set seed for random generator */ - -void srand(seed) - unsigned int seed; -{ - next = seed; -} -#endif - -/* STATS -- Edit statistics returned by bstats() or bstatse(). */ - -static void stats(when) - char *when; -{ - bufsize cural, totfree, maxfree; - long nget, nfree; -#ifdef BECtl - bufsize pincr; - long totblocks, npget, nprel, ndget, ndrel; -#endif - - bstats(&cural, &totfree, &maxfree, &nget, &nfree); - V printf( - "%s: %ld gets, %ld releases. %ld in use, %ld free, largest = %ld\n", - when, nget, nfree, (long) cural, (long) totfree, (long) maxfree); -#ifdef BECtl - bstatse(&pincr, &totblocks, &npget, &nprel, &ndget, &ndrel); - V printf( - " Blocks: size = %ld, %ld (%ld bytes) in use, %ld gets, %ld frees\n", - (long)pincr, totblocks, pincr * totblocks, npget, nprel); - V printf(" %ld direct gets, %ld direct frees\n", ndget, ndrel); -#endif /* BECtl */ -} - -#ifdef BECtl -static int protect = 0; /* Disable compaction during bgetr() */ - -/* BCOMPACT -- Compaction call-back function. */ - -static int bcompact(bsize, seq) - bufsize bsize; - int seq; -{ -#ifdef CompactTries - char *bc = bchain; - int i = rand() & 0x3; - -#ifdef COMPACTRACE - V printf("Compaction requested. %ld bytes needed, sequence %d.\n", - (long) bsize, seq); -#endif - - if (protect || (seq > CompactTries)) { -#ifdef COMPACTRACE - V printf("Compaction gave up.\n"); -#endif - return 0; - } - - /* Based on a random cast, release a random buffer in the list - of allocated buffers. */ - - while (i > 0 && bc != NULL) { - bc = *((char **) bc); - i--; - } - if (bc != NULL) { - char *fb; - - fb = *((char **) bc); - if (fb != NULL) { - *((char **) bc) = *((char **) fb); - brel((void *) fb); - return 1; - } - } - -#ifdef COMPACTRACE - V printf("Compaction bailed out.\n"); -#endif -#endif /* CompactTries */ - return 0; -} - -/* BEXPAND -- Expand pool call-back function. */ - -static void *bexpand(size) - bufsize size; -{ - void *np = NULL; - bufsize cural, totfree, maxfree; - long nget, nfree; - - /* Don't expand beyond the total allocated size given by PoolSize. */ - - bstats(&cural, &totfree, &maxfree, &nget, &nfree); - - if (cural < PoolSize) { - np = (void *) malloc((unsigned) size); - } -#ifdef EXPTRACE - V printf("Expand pool by %ld -- %s.\n", (long) size, - np == NULL ? "failed" : "succeeded"); -#endif - return np; -} - -/* BSHRINK -- Shrink buffer pool call-back function. */ - -static void bshrink(buf) - void *buf; -{ - if (((char *) buf) == bp) { -#ifdef EXPTRACE - V printf("Initial pool released.\n"); -#endif - bp = NULL; - } -#ifdef EXPTRACE - V printf("Shrink pool.\n"); -#endif - free((char *) buf); -} - -#endif /* BECtl */ - -/* Restrict buffer requests to those large enough to contain our pointer and - small enough for the CPU architecture. */ - -static bufsize blimit(bs) - bufsize bs; -{ - if (bs < sizeof(char *)) { - bs = sizeof(char *); - } - - /* This is written out in this ugly fashion because the - cool expression in sizeof(int) that auto-configured - to any length int befuddled some compilers. */ - - if (sizeof(int) == 2) { - if (bs > 32767) { - bs = 32767; - } - } else { - if (bs > 200000) { - bs = 200000; - } - } - return bs; -} - -int main() -{ - int i; - double x; - - /* Seed the random number generator. If Repeatable is defined, we - always use the same seed. Otherwise, we seed from the clock to - shake things up from run to run. */ - -#ifdef Repeatable - V srand(1234); -#else - V srand((int) time((long *) NULL)); -#endif - - /* Compute x such that pow(x, p) ranges between 1 and 4*ExpIncr as - p ranges from 0 to ExpIncr-1, with a concentration in the lower - numbers. */ - - x = 4.0 * ExpIncr; - x = log(x); - x = exp(log(4.0 * ExpIncr) / (ExpIncr - 1.0)); - -#ifdef BECtl - bectl(bcompact, bexpand, bshrink, (bufsize) ExpIncr); - bp = malloc(ExpIncr); - assert(bp != NULL); - bpool((void *) bp, (bufsize) ExpIncr); -#else - bp = malloc(PoolSize); - assert(bp != NULL); - bpool((void *) bp, (bufsize) PoolSize); -#endif - - stats("Create pool"); - V bpoolv((void *) bp); - bpoold((void *) bp, dumpAlloc, dumpFree); - - for (i = 0; i < TestProg; i++) { - char *cb; - bufsize bs = pow(x, (double) (rand() & (ExpIncr - 1))); - - assert(bs <= (((bufsize) 4) * ExpIncr)); - bs = blimit(bs); - if (rand() & 0x400) { - cb = (char *) bgetz(bs); - } else { - cb = (char *) bget(bs); - } - if (cb == NULL) { -#ifdef EasyOut - break; -#else - char *bc = bchain; - - if (bc != NULL) { - char *fb; - - fb = *((char **) bc); - if (fb != NULL) { - *((char **) bc) = *((char **) fb); - brel((void *) fb); - } - continue; - } -#endif - } - *((char **) cb) = (char *) bchain; - bchain = cb; - - /* Based on a random cast, release a random buffer in the list - of allocated buffers. */ - - if ((rand() & 0x10) == 0) { - char *bc = bchain; - int i = rand() & 0x3; - - while (i > 0 && bc != NULL) { - bc = *((char **) bc); - i--; - } - if (bc != NULL) { - char *fb; - - fb = *((char **) bc); - if (fb != NULL) { - *((char **) bc) = *((char **) fb); - brel((void *) fb); - } - } - } - - /* Based on a random cast, reallocate a random buffer in the list - to a random size */ - - if ((rand() & 0x20) == 0) { - char *bc = bchain; - int i = rand() & 0x3; - - while (i > 0 && bc != NULL) { - bc = *((char **) bc); - i--; - } - if (bc != NULL) { - char *fb; - - fb = *((char **) bc); - if (fb != NULL) { - char *newb; - - bs = pow(x, (double) (rand() & (ExpIncr - 1))); - bs = blimit(bs); -#ifdef BECtl - protect = 1; /* Protect against compaction */ -#endif - newb = (char *) bgetr((void *) fb, bs); -#ifdef BECtl - protect = 0; -#endif - if (newb != NULL) { - *((char **) bc) = newb; - } - } - } - } - } - stats("\nAfter allocation"); - if (bp != NULL) { - V bpoolv((void *) bp); - bpoold((void *) bp, dumpAlloc, dumpFree); - } - - while (bchain != NULL) { - char *buf = bchain; - - bchain = *((char **) buf); - brel((void *) buf); - } - stats("\nAfter release"); -#ifndef BECtl - if (bp != NULL) { - V bpoolv((void *) bp); - bpoold((void *) bp, dumpAlloc, dumpFree); - } -#endif - - return 0; -} -#endif Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Thu Feb 9 20:01:10 2012 @@ -202,8 +202,11 @@ //PKTSS Tss; //BOOLEAN Status; - // - // Creating a suitable memory map for the Windows can be tricky, so let's + /* Cleanup heap */ + HeapCleanupAll(); + + // + // Creating a suitable memory map for Windows can be tricky, so let's // give a few advices: // 1) One must not map the whole available memory pages to PDE! // Map only what's needed - 16Mb, 24Mb, 32Mb max I think,

12 years, 10 months

[gadamopoulos] 55517: [win32k] - Use the parse context to store whether or not the desktop object was created. If the object was not created, NtUserCreateDesktop should return immediately (this can...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Feb 9 19:41:38 2012 New Revision: 55517 URL: http://svn.reactos.org/svn/reactos?rev=55517&view=rev Log: [win32k] - Use the parse context to store whether or not the desktop object was created. If the object was not created, NtUserCreateDesktop should return immediately (this can happen if it didn't exist) - Before this , if the desktop already exited, we opened the existing desktop and initialized it again. We also created another desktop heap, desktop window, etc.. This fact confused threads using this desktop and caused problems like the assertion we see in the test suite Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Feb 9 19:41:38 2012 @@ -67,6 +67,10 @@ PLIST_ENTRY NextEntry, ListHead; PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)ParseObject; PUNICODE_STRING DesktopName; + PBOOLEAN pContext = (PBOOLEAN) Context; + + if(pContext) + *pContext = FALSE; /* Set the list pointers and loop the window station */ ListHead = &WinStaObject->DesktopListHead; @@ -144,6 +148,7 @@ /* Set the desktop object and return success */ *Object = Desktop; + *pContext = TRUE; return STATUS_SUCCESS; } @@ -844,7 +849,7 @@ CSR_API_MESSAGE Request; PVOID DesktopHeapSystemBase = NULL; SIZE_T DesktopInfoSize; - ULONG DummyContext; + BOOLEAN Context; ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ UNICODE_STRING ClassName; LARGE_STRING WindowName; @@ -880,10 +885,12 @@ UserMode, NULL, dwDesiredAccess, - (PVOID)&DummyContext, + (PVOID)&Context, (HANDLE*)&Desktop); if (!NT_SUCCESS(Status)) RETURN(NULL); - if (Status == STATUS_OBJECT_NAME_EXISTS) + + /* In case the object was not created (eg if it existed), return now */ + if (Context == FALSE) { RETURN( Desktop); }

12 years, 10 months

← Newer
1
...
39
40
41
42
43
44
45
...
58
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 February 2012