Decouple pool initialization and validation from allocation logic
This commit is contained in:
@@ -22,5 +22,6 @@
|
||||
#include <mm/mmgr.hh>
|
||||
#include <mm/pfault.hh>
|
||||
#include <mm/pfn.hh>
|
||||
#include <mm/pool.hh>
|
||||
|
||||
#endif /* __XTOSKRNL_MM_HH */
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* PROJECT: ExectOS
|
||||
* COPYRIGHT: See COPYING.md in the top level directory
|
||||
* FILE: xtoskrnl/includes/mm/alloc.hh
|
||||
* DESCRIPTION: Memory manager pool allocation
|
||||
* DESCRIPTION: Memory Manager pool allocator
|
||||
* DEVELOPERS: Aiken Harris <harraiken91@gmail.com>
|
||||
*/
|
||||
|
||||
@@ -10,18 +10,14 @@
|
||||
#define __XTOSKRNL_MM_ALLOC_HH
|
||||
|
||||
#include <xtos.hh>
|
||||
#include <mm/pool.hh>
|
||||
|
||||
|
||||
/* Memory Manager */
|
||||
namespace MM
|
||||
{
|
||||
class Allocator
|
||||
class Allocator final : private Pool
|
||||
{
|
||||
private:
|
||||
STATIC PFN_NUMBER NonPagedPoolFrameEnd;
|
||||
STATIC PFN_NUMBER NonPagedPoolFrameStart;
|
||||
STATIC LIST_ENTRY NonPagedPoolFreeList[MM_MAX_FREE_PAGE_LIST_HEADS];
|
||||
|
||||
public:
|
||||
STATIC XTAPI XTSTATUS AllocatePages(IN MMPOOL_TYPE PoolType,
|
||||
IN SIZE_T Bytes,
|
||||
@@ -34,23 +30,21 @@ namespace MM
|
||||
OUT PVOID *Memory,
|
||||
IN ULONG Tag);
|
||||
STATIC XTAPI XTSTATUS FreePages(IN PVOID VirtualAddress);
|
||||
STATIC XTAPI XTSTATUS FreePages(IN PVOID VirtualAddress,
|
||||
OUT PPFN_NUMBER PagesFreed);
|
||||
STATIC XTAPI XTSTATUS FreePool(IN PVOID VirtualAddress);
|
||||
STATIC XTAPI XTSTATUS FreePool(IN PVOID VirtualAddress,
|
||||
IN ULONG Tag);
|
||||
STATIC XTAPI VOID InitializeNonPagedPool(VOID);
|
||||
STATIC XTAPI VOID InitializePagedPool(VOID);
|
||||
|
||||
private:
|
||||
STATIC XTAPI XTSTATUS AllocateNonPagedPoolPages(IN PFN_COUNT Pages,
|
||||
OUT PVOID *Memory);
|
||||
STATIC XTAPI XTSTATUS AllocatePagedPoolPages(IN PFN_COUNT Pages,
|
||||
OUT PVOID *Memory);
|
||||
STATIC XTAPI XTSTATUS FreeNonPagedPoolPages(IN PVOID VirtualAddress);
|
||||
STATIC XTAPI XTSTATUS FreePagedPoolPages(IN PVOID VirtualAddress);
|
||||
STATIC XTAPI VOID MapNonPagedPool(VOID);
|
||||
STATIC XTINLINE VOID VerifyRunLevel(IN MMPOOL_TYPE PoolType,
|
||||
IN SIZE_T Bytes,
|
||||
IN PVOID Entry);
|
||||
STATIC XTAPI XTSTATUS FreeNonPagedPoolPages(IN PVOID VirtualAddress,
|
||||
OUT PPFN_NUMBER PagesFreed);
|
||||
STATIC XTAPI XTSTATUS FreePagedPoolPages(IN PVOID VirtualAddress,
|
||||
OUT PPFN_NUMBER PagesFreed);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
39
xtoskrnl/includes/mm/pool.hh
Normal file
39
xtoskrnl/includes/mm/pool.hh
Normal file
@@ -0,0 +1,39 @@
|
||||
/**
|
||||
* PROJECT: ExectOS
|
||||
* COPYRIGHT: See COPYING.md in the top level directory
|
||||
* FILE: xtoskrnl/includes/mm/pool.hh
|
||||
* DESCRIPTION: Memory Manager pool manager
|
||||
* DEVELOPERS: Aiken Harris <harraiken91@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef __XTOSKRNL_MM_POOL_HH
|
||||
#define __XTOSKRNL_MM_POOL_HH
|
||||
|
||||
#include <xtos.hh>
|
||||
|
||||
|
||||
/* Memory Manager */
|
||||
namespace MM
|
||||
{
|
||||
class Pool
|
||||
{
|
||||
protected:
|
||||
STATIC PFN_NUMBER NonPagedPoolFrameEnd;
|
||||
STATIC PFN_NUMBER NonPagedPoolFrameStart;
|
||||
STATIC LIST_ENTRY NonPagedPoolFreeList[MM_MAX_FREE_PAGE_LIST_HEADS];
|
||||
|
||||
public:
|
||||
STATIC XTAPI VOID InitializeNonPagedPool(VOID);
|
||||
STATIC XTAPI VOID InitializePagedPool(VOID);
|
||||
|
||||
protected:
|
||||
STATIC XTAPI VOID VerifyRunLevel(IN MMPOOL_TYPE PoolType,
|
||||
IN SIZE_T Bytes,
|
||||
IN PVOID Entry);
|
||||
|
||||
private:
|
||||
STATIC XTAPI VOID MapNonPagedPool(VOID);
|
||||
};
|
||||
}
|
||||
|
||||
#endif /* __XTOSKRNL_MM_POOL_HH */
|
||||
Reference in New Issue
Block a user