swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-15 00:08:07 -04:00
Code Issues Projects Releases Wiki Activity

memory manager cleanup and removal

Browse Source
This commit is contained in:
DarthArgus
2016-12-04 00:55:37 +00:00
parent 23cf1cc584
commit 9f9fed4693
25 changed files with 39 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp
+1 -22
View File
@@ -41,7 +41,7 @@ static dvoid *mallocHook(dvoid *, size_t size)
static dvoid *reallocHook(dvoid *, dvoid *memptr, size_t newsize)
{
return reinterpret_cast<dvoid *>(MemoryManager::reallocate(memptr, newsize));
return reinterpret_cast<dvoid *>(realloc(memptr, newsize));
}
// ----------------------------------------------------------------------
@@ -81,26 +81,6 @@ bool DB::OCISession::connect()
// so that each session can be used by a different thread concurrently.
sword result=OCI_ERROR;
if (m_server->getUseMemoryManager())
{
result = OCIEnvCreate(&envhp, // OCIEnv **envhpp,
OCI_THREADED | OCI_OBJECT, //ub4 mode, //TODO: do we have to use threaded mode?
0, // CONST dvoid *ctxp,
&mallocHook, // CONST dvoid *(*malocfp)
// (dvoid *ctxp,
// size_t size),
&reallocHook, // CONST dvoid *(*ralocfp)
// (dvoid *ctxp,
// dvoid *memptr,
// size_t newsize),
&freeHook, // CONST void (*mfreefp)
// (dvoid *ctxp,
// dvoid *memptr))
0, //size_t xtramemsz,
0 ); //dvoid **usrmempp );
}
else
{
result = OCIEnvCreate(&envhp, // OCIEnv **envhpp,
OCI_THREADED | OCI_OBJECT, //ub4 mode, //TODO: do we have to use threaded mode?
0, // CONST dvoid *ctxp,
@@ -117,7 +97,6 @@ bool DB::OCISession::connect()
0, //size_t xtramemsz,
0 ); //dvoid **usrmempp );
}
FATAL(result != OCI_SUCCESS,("OciEnvCreate failed with error code %hd",result));
// Create error handle.