Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00
Code Activity

Fix SDK issues with NO_MALLOC_OVERRIDE (bug 5521).

Browse Source
This commit is contained in:
Nicholas Hastings
2012-10-26 14:45:40 -04:00
parent 3a36e4b850
commit 38003f0586
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
linux_sdk/Makefile.tier1
View File

@ -42,7 +42,6 @@ LIB_OBJS= \
$(LIB_OBJ_DIR)/interface.o \ $(LIB_OBJ_DIR)/interface.o \
$(LIB_OBJ_DIR)/KeyValues.o \ $(LIB_OBJ_DIR)/KeyValues.o \
$(LIB_OBJ_DIR)/mempool.o \ $(LIB_OBJ_DIR)/mempool.o \
$(LIB_OBJ_DIR)/memstack.o \
$(LIB_OBJ_DIR)/NetAdr.o \ $(LIB_OBJ_DIR)/NetAdr.o \
$(LIB_OBJ_DIR)/newbitbuf.o \ $(LIB_OBJ_DIR)/newbitbuf.o \
$(LIB_OBJ_DIR)/processor_detect.o \ $(LIB_OBJ_DIR)/processor_detect.o \

1
public/tier0/memalloc.h
View File

@ -349,6 +349,7 @@ struct MemAllocFileLine_t
#define MEM_ALLOC_CREDIT() MEM_ALLOC_CREDIT_(__FILE__) #define MEM_ALLOC_CREDIT() MEM_ALLOC_CREDIT_(__FILE__)
#define MEM_ALLOC_CREDIT_CLASS() #define MEM_ALLOC_CREDIT_CLASS()
#define MEM_ALLOC_CLASSNAME(type) NULL #define MEM_ALLOC_CLASSNAME(type) NULL
#define MEM_ALLOC_CREDIT_FUNCTION()
#endif // !STEAM && NO_MALLOC_OVERRIDE #endif // !STEAM && NO_MALLOC_OVERRIDE

16
public/tier1/utlmemory.h
View File

@ -37,6 +37,14 @@
#define UTLMEMORY_TRACK_FREE() ((void)0) #define UTLMEMORY_TRACK_FREE() ((void)0)
#endif #endif
#if defined(_LINUX) || defined(__APPLE__)
#define ALIGNED_MALLOC( size, alignment ) \
memalign( alignment, size )
#else
#define ALIGNED_MALLOC( size, alignment ) \
_aligned_malloc( size, alignment )
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// The CUtlMemory class: // The CUtlMemory class:
@ -768,8 +776,8 @@ CUtlMemoryAligned<T, nAlignment>::CUtlMemoryAligned( int nGrowSize, int nInitAll
{ {
UTLMEMORY_TRACK_ALLOC(); UTLMEMORY_TRACK_ALLOC();
MEM_ALLOC_CREDIT_CLASS(); MEM_ALLOC_CREDIT_CLASS();
CUtlMemory<T>::m_pMemory = (T*)_aligned_malloc( nInitAllocationCount * sizeof(T), nAlignment ); CUtlMemory<T>::m_pMemory = (T*)ALIGNED_MALLOC( nInitAllocationCount * sizeof(T), nAlignment );
} }
} }
template< class T, int nAlignment > template< class T, int nAlignment >
@ -863,7 +871,7 @@ void CUtlMemoryAligned<T, nAlignment>::Grow( int num )
else else
{ {
MEM_ALLOC_CREDIT_CLASS(); MEM_ALLOC_CREDIT_CLASS();
CUtlMemory<T>::m_pMemory = (T*)_aligned_malloc( CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment ); CUtlMemory<T>::m_pMemory = (T*)ALIGNED_MALLOC( CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment );
Assert( CUtlMemory<T>::m_pMemory ); Assert( CUtlMemory<T>::m_pMemory );
} }
} }
@ -899,7 +907,7 @@ inline void CUtlMemoryAligned<T, nAlignment>::EnsureCapacity( int num )
else else
{ {
MEM_ALLOC_CREDIT_CLASS(); MEM_ALLOC_CREDIT_CLASS();
CUtlMemory<T>::m_pMemory = (T*)_aligned_malloc( CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment ); CUtlMemory<T>::m_pMemory = (T*)ALIGNED_MALLOC( CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment );
} }
} }

4
tier1/KeyValues.cpp
View File

@ -2348,9 +2348,13 @@ void *KeyValues::operator new( size_t iAllocSize )
void *KeyValues::operator new( size_t iAllocSize, int nBlockUse, const char *pFileName, int nLine ) void *KeyValues::operator new( size_t iAllocSize, int nBlockUse, const char *pFileName, int nLine )
{ {
#ifndef NO_MALLOC_OVERRIDE
MemAlloc_PushAllocDbgInfo( pFileName, nLine ); MemAlloc_PushAllocDbgInfo( pFileName, nLine );
#endif
void *p = KeyValuesSystem()->AllocKeyValuesMemory(iAllocSize); void *p = KeyValuesSystem()->AllocKeyValuesMemory(iAllocSize);
#ifndef NO_MALLOC_OVERRIDE
MemAlloc_PopAllocDbgInfo(); MemAlloc_PopAllocDbgInfo();
#endif
return p; return p;
} }