UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #340 from asherkin/datapack-alloc

Browse Source 
Improve DataPack memory allocation & Report size for DataPack Handles
This commit is contained in:
Asher Baker 2015-07-08 20:07:40 +01:00
commit 705b5d3f5f
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/CDataPack.cpp
View File

@ -33,7 +33,7 @@
#include <string.h>
#include "CDataPack.h"
#define DATAPACK_INITIAL_SIZE 512
#define DATAPACK_INITIAL_SIZE 64
CDataPack::CDataPack()
{
@ -64,9 +64,10 @@ void CDataPack::CheckSize(size_t typesize)
do
{
m_capacity *= 2;
m_pBase = (char *)realloc(m_pBase, m_capacity);
m_curptr = m_pBase + pos;
} while (m_curptr - m_pBase + typesize > m_capacity);
} while (pos + typesize > m_capacity);
m_pBase = (char *)realloc(m_pBase, m_capacity);
m_curptr = m_pBase + pos;
}
void CDataPack::ResetSize()

1
core/CDataPack.h
View File

@ -61,6 +61,7 @@ public: //IDataPack
void PackFunction(cell_t function);
public:
void Initialize();
inline size_t GetCapacity() const { return m_capacity; }
private:
void CheckSize(size_t sizetype);
private:

13
core/logic/smn_datapacks.cpp
View File

@ -31,9 +31,14 @@
#include "common_logic.h"
#include <IHandleSys.h>
#include <IDataPack.h>
#include <ISourceMod.h>
// This just in from the bucket o' hacks department.
// One day, IDataPack will go away and CDataPack will be merged into this file.
// This internal header is included directly to access GetCapacity,
// which can not be added to the public interface due to ABI issues.
#include "../CDataPack.h"
HandleType_t g_DataPackType;
class DataPackNatives :
@ -63,6 +68,12 @@ public:
{
g_pSM->FreeDataPack(reinterpret_cast<IDataPack *>(object));
}
bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize)
{
CDataPack *pack = reinterpret_cast<CDataPack *>(object);
*pSize = sizeof(CDataPack) + pack->GetCapacity();
return true;
}
};
static cell_t smn_CreateDataPack(IPluginContext *pContext, const cell_t *params)