MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-05 10:03:27 +00:00
Code Issues Releases Wiki Activity

Added tracker

Browse Source
This commit is contained in:
Bryan Roe
2021-01-23 00:44:52 -08:00
parent 9bb81b946a
commit 4be310f809
4 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
microstack/ILibParsers.c
View File

@@ -997,6 +997,18 @@ typedef struct ILibBaseChain
int lastDescriptorCount;
}ILibBaseChain;
#if defined(ILIBMEMTRACK) && !defined(ILIBCHAIN_GLOBAL_LOCK)
size_t ILib_NativeAllocSize = 0;
ILibSpinLock ILib_MemoryTrackLock = 0;
void* ILibMemory_InitEx(void *ptr, size_t primarySize, size_t extraSize, ILibMemory_Types memType)
{
ILibSpinLock_Lock(&ILib_MemoryTrackLock);
ILib_NativeAllocSize += (primarySize + extraSize);
ILibSpinLock_UnLock(&ILib_MemoryTrackLock);
return(ILibMemory_Init(ptr, primarySize, extraSize, memType));
}
#endif
void* ILibMemory_AllocateA_Init(void *buffer)
{
@@ -1031,6 +1043,19 @@ void* ILibMemory_SmartReAllocate(void *ptr, size_t len)
memmove_s(ILibMemory_Extra(ret) - sizeof(ILibMemory_Header) + offset, originalExtraSize + sizeof(ILibMemory_Header), ILibMemory_Extra(ret) - sizeof(ILibMemory_Header), originalExtraSize + sizeof(ILibMemory_Header));
}
#if defined(ILIBMEMTRACK) && !defined(ILIBCHAIN_GLOBAL_LOCK)
ILibSpinLock_Lock(&ILib_MemoryTrackLock);
if (newRawSize > originalRawSize)
{
ILib_NativeAllocSize += (newRawSize - originalRawSize);
}
else
{
ILib_NativeAllocSize -= (originalRawSize - newRawSize);
}
ILibSpinLock_UnLock(&ILib_MemoryTrackLock);
#endif
ILibMemory_Size(ret) = len;
return(ret);
}
@@ -1076,6 +1101,7 @@ void* ILibMemory_Init(void *ptr, size_t primarySize, size_t extraSize, ILibMemor
return(primary);
}
void ILibMemory_SecureZero(void *ptr, size_t len)
{
#if !defined(MICROSTACK_NOTLS)
@@ -1102,6 +1128,12 @@ void ILibMemory_Free(void *ptr)
{
if (ILibMemory_CanaryOK(ptr) && ILibMemory_MemType(ptr) == ILibMemory_Types_HEAP)
{
#if defined(ILIBMEMTRACK) && !defined(ILIBCHAIN_GLOBAL_LOCK)
ILibSpinLock_Lock(&ILib_MemoryTrackLock);
ILib_NativeAllocSize -= (ILibMemory_Size(ptr) + ILibMemory_ExtraSize(ptr));
ILibSpinLock_UnLock(&ILib_MemoryTrackLock);
#endif
if (ILibMemory_ExtraSize(ptr) > 0)
{
ILibMemory_SecureZero(ILibMemory_RawPtr(ILibMemory_Extra(ptr)), sizeof(ILibMemory_Header));

11
microstack/ILibParsers.h
View File

@@ -450,6 +450,13 @@ int ILibIsRunningOnChainThread(void* chain);
ILibMemory_Types memoryType;
}ILibMemory_Header;
#if defined(ILIBMEMTRACK) && !defined(ILIBCHAIN_GLOBAL_LOCK)
void* ILibMemory_InitEx(void *ptr, size_t primarySize, size_t extraSize, ILibMemory_Types memType);
#else
#define ILibMemory_InitEx(ptr, primarySize, extraSize, memType) ILibMemory_Init(ptr, primarySize, extraSize, memType)
#endif
#define ILibChain_Link_SetMetadata(chainLink, value) if((chainLink)!=NULL) { ILibMemory_Free(((ILibChain_Link*)chainLink)->MetaData); ((ILibChain_Link*)chainLink)->MetaData = value; }
#define ILibChain_Link_GetMetadata(chainLink) ((chainLink)==NULL?"":(((ILibChain_Link*)chainLink)->MetaData))
#define ILibMemory_Canary (((int*)((char*)(const char*)"broe"))[0])
@@ -471,8 +478,8 @@ int ILibIsRunningOnChainThread(void* chain);
#define ILibMemory_Size_Validate(primaryLen, extraLen) (((size_t)(primaryLen)<(UINT32_MAX - (size_t)(extraLen)))&&((size_t)(extraLen)<(UINT32_MAX-(size_t)(primaryLen)))&&((size_t)((primaryLen) + (extraLen))<(UINT32_MAX - sizeof(ILibMemory_Header)))&&((extraLen)==0 || ((size_t)((primaryLen)+(extraLen)+sizeof(ILibMemory_Header))<(UINT32_MAX-sizeof(ILibMemory_Header)))))
#define ILibMemory_Init_Size(primaryLen, extraLen) (primaryLen + extraLen + sizeof(ILibMemory_Header) + (extraLen>0?sizeof(ILibMemory_Header):0))
void* ILibMemory_Init(void *ptr, size_t primarySize, size_t extraSize, ILibMemory_Types memType);
#define ILibMemory_SmartAllocate(len) ILibMemory_Init(ILibMemory_Size_Validate(len,0)?malloc(ILibMemory_Init_Size(len, 0)):NULL, (int)len, 0, ILibMemory_Types_HEAP)
#define ILibMemory_SmartAllocateEx(primaryLen, extraLen) ILibMemory_Init(ILibMemory_Size_Validate(primaryLen,extraLen)?malloc(ILibMemory_Init_Size(primaryLen, extraLen)):NULL, (int)primaryLen, (int)extraLen, ILibMemory_Types_HEAP)
#define ILibMemory_SmartAllocate(len) ILibMemory_InitEx(ILibMemory_Size_Validate(len,0)?malloc(ILibMemory_Init_Size(len, 0)):NULL, (int)len, 0, ILibMemory_Types_HEAP)
#define ILibMemory_SmartAllocateEx(primaryLen, extraLen) ILibMemory_InitEx(ILibMemory_Size_Validate(primaryLen,extraLen)?malloc(ILibMemory_Init_Size(primaryLen, extraLen)):NULL, (int)primaryLen, (int)extraLen, ILibMemory_Types_HEAP)
void* ILibMemory_SmartReAllocate(void *ptr, size_t len);
void* ILibMemory_SmartAllocateEx_ResizeExtra(void *ptr, size_t extraSize);