firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00
Code Issues

MemoryPool work

Browse Source
This commit is contained in:
tamlin 2001-12-28 05:16:31 +00:00
parent 1a1ec82e56
commit e48b2468d7
15 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/alice/alice.cpp
View File

@ -24,7 +24,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: alice.cpp,v 1.8 2001-12-25 08:01:58 tamlin Exp $ // $Id: alice.cpp,v 1.9 2001-12-28 05:14:41 tamlin Exp $
// //
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE" // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports // conditionals, as the engine now fully supports
@ -38,18 +38,18 @@
#define FB_FROM_ALICE_CPP #define FB_FROM_ALICE_CPP
#include "../jrd/ib_stdio.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../jrd/license.h"
#include "../jrd/ibsetjmp.h"
#include "../jrd/msg_encode.h"
#include "../alice/alice.h" #include "../alice/alice.h"
#include "../alice/aliceswi.h" #include "../alice/aliceswi.h"
#include "../alice/all.h" #include "../alice/all.h"
#include "../alice/alice_proto.h" #include "../alice/alice_proto.h"
#include "../alice/all_proto.h" #include "../alice/all_proto.h"
#include "../alice/exe_proto.h" #include "../alice/exe_proto.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../jrd/license.h"
#include "../jrd/ibsetjmp.h"
#include "../jrd/msg_encode.h"
#include "../jrd/gds_proto.h" #include "../jrd/gds_proto.h"
#include "../jrd/svc.h" #include "../jrd/svc.h"
#include "../jrd/svc_proto.h" #include "../jrd/svc_proto.h"

4
src/alice/alice.h
View File

@ -203,8 +203,8 @@ extern struct tgbl *gdgbl;
#define GET_THREAD_DATA (gdgbl) #define GET_THREAD_DATA (gdgbl)
#ifdef __cplusplus #ifdef __cplusplus
#define SET_THREAD_DATA gdgbl = tdgbl; \ #define SET_THREAD_DATA gdgbl = const_cast<tgbl*>(tdgbl); \
tdgbl->tgbl_thd_data.thdd_type = const_cast<tgbl*>(THDD_TYPE_TGBL) tdgbl->tgbl_thd_data.thdd_type = THDD_TYPE_TGBL
#else #else
#define SET_THREAD_DATA gdgbl = tdgbl; \ #define SET_THREAD_DATA gdgbl = tdgbl; \
tdgbl->tgbl_thd_data.thdd_type = THDD_TYPE_TGBL tdgbl->tgbl_thd_data.thdd_type = THDD_TYPE_TGBL

10
src/alice/all.cpp
View File

@ -24,7 +24,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: all.cpp,v 1.3 2001-12-24 02:50:47 tamlin Exp $ // $Id: all.cpp,v 1.4 2001-12-28 05:14:41 tamlin Exp $
// //
#include "../alice/all.h" #include "../alice/all.h"
@ -59,7 +59,8 @@ void ALLA_fini(void)
} }
tdgbl->pools.clear(); tdgbl->pools.clear();
tdgbl->ALICE_default_pool = tdgbl->ALICE_permanent_pool = NULL; tdgbl->ALICE_default_pool = 0;
tdgbl->ALICE_permanent_pool = 0;
} }
@ -78,8 +79,9 @@ void ALLA_init(void)
tdgbl->ALICE_default_pool = tdgbl->ALICE_permanent_pool = tdgbl->ALICE_default_pool = tdgbl->ALICE_permanent_pool =
AliceMemoryPool::create_new_pool(); AliceMemoryPool::create_new_pool();
#else #else
tdgbl->ALICE_default_pool = tdgbl->ALICE_permanent_pool = // TMN: John, what pool to use here?
new(*FB_MemoryPool) AliceMemoryPool; tdgbl->ALICE_permanent_pool = new AliceMemoryPool;
tdgbl->ALICE_default_pool = tdgbl->ALICE_permanent_pool;
#endif #endif
} }

2
src/alice/all.h
View File

@ -39,7 +39,7 @@ public:
// : MemoryPool(0, p), // : MemoryPool(0, p),
// lls_cache(*this) // lls_cache(*this)
// {} // {}
AliceMemoryPool(int extSize = 0, MemoryPool* p = FB_MemoryPool) AliceMemoryPool(int extSize = 0, MemoryPool* p = getDefaultMemoryPool())
: MemoryPool(extSize, p), : MemoryPool(extSize, p),
lls_cache(*this) lls_cache(*this)
{ {

11
src/common/memory/allocators.cpp
View File

@ -31,6 +31,15 @@
#include "../../jrd/gdsassert.h" #include "../../jrd/gdsassert.h"
#include <new> #include <new>
static MemoryPool* FB_MemoryPool = 0;
MemoryPool* getDefaultMemoryPool()
{
return FB_MemoryPool;
}
class InitMemoryPool class InitMemoryPool
{ {
public: public:
@ -57,7 +66,7 @@ private:
}; };
}; };
MemoryPool *FB_MemoryPool = 0;
static InitMemoryPool poolLoader; static InitMemoryPool poolLoader;
static int badNewCount = 0; static int badNewCount = 0;

16
src/common/memory/allocators.h
View File

@ -42,18 +42,16 @@ void* API_ROUTINE gds__alloc(SLONG size_request);
extern ULONG API_ROUTINE gds__free(void* blk); extern ULONG API_ROUTINE gds__free(void* blk);
}; };
extern MemoryPool *FB_MemoryPool;
void* operator new(size_t); void* operator new(size_t);
void* operator new[](size_t); void* operator new[](size_t);
void* operator new(size_t, MemoryPool&); FB_DLL_EXPORT void* operator new(size_t, MemoryPool&);
void operator delete(void* mem, MemoryPool&); FB_DLL_EXPORT void operator delete(void* mem, MemoryPool&);
void* operator new[](size_t s, MemoryPool&); FB_DLL_EXPORT void* operator new[](size_t s, MemoryPool&);
void operator delete[](void* mem, MemoryPool&); FB_DLL_EXPORT void operator delete[](void* mem, MemoryPool&);
void* operator new(size_t, MemoryPool*); FB_DLL_EXPORT void* operator new(size_t, MemoryPool*);
void* operator new[](size_t s, MemoryPool*); FB_DLL_EXPORT void* operator new[](size_t s, MemoryPool*);
void operator delete(void* mem); void operator delete(void* mem);
void operator delete[](void* mem); void operator delete[](void* mem);
@ -100,7 +98,7 @@ namespace Firebird
typedef T value_type; typedef T value_type;
allocator(MemoryPool& p, SSHORT t = 0) : pool(&p), type(t) {} allocator(MemoryPool& p, SSHORT t = 0) : pool(&p), type(t) {}
allocator(MemoryPool *p = FB_MemoryPool, SSHORT t = 0) : pool(p), type(t) {} allocator(MemoryPool *p = getDefaultMemoryPool(), SSHORT t = 0) : pool(p), type(t) {}
pointer allocate(size_type s, const void * = 0) pointer allocate(size_type s, const void * = 0)
{ return (pointer) (pool ? pool->allocate(sizeof(T) * s) : gds__alloc(sizeof(T)*s)); } { return (pointer) (pool ? pool->allocate(sizeof(T) * s) : gds__alloc(sizeof(T)*s)); }

8
src/common/memory/memory_pool.h
View File

@ -27,10 +27,12 @@
#ifndef MEMORY_POOL_H #ifndef MEMORY_POOL_H
#define MEMORY_POOL_H #define MEMORY_POOL_H
#include "../include/fb_types.h" #include "../../include/firebird.h"
#include "../../include/fb_types.h"
#include "../jrd/ib_stdio.h" #include "../jrd/ib_stdio.h"
extern class MemoryPool *FB_MemoryPool;
FB_DLL_EXPORT class MemoryPool* getDefaultMemoryPool();
/** /**
For various reasons Firebird has chosen to do its own heap management. For various reasons Firebird has chosen to do its own heap management.
@ -79,7 +81,7 @@ extern class MemoryPool *FB_MemoryPool;
If any memory operation fail an exception is raised. If any memory operation fail an exception is raised.
**/ **/
class MemoryPool class FB_DLL_EXPORT MemoryPool
{ {
public: public:
MemoryPool(size_t = 0, MemoryPool* = 0); MemoryPool(size_t = 0, MemoryPool* = 0);

2
src/dsql/all.h
View File

@ -34,7 +34,7 @@ void ALLD_fini(); /* get rid of everything */
class DsqlMemoryPool : public MemoryPool class DsqlMemoryPool : public MemoryPool
{ {
public: public:
DsqlMemoryPool(int extSize = 0, MemoryPool& p = *FB_MemoryPool); DsqlMemoryPool(int extSize = 0, MemoryPool& p = *getDefaultMemoryPool());
~DsqlMemoryPool(); ~DsqlMemoryPool();
static class blk* ALLD_pop(class dsql_lls**); static class blk* ALLD_pop(class dsql_lls**);

2
src/dsql/alld.cpp
View File

@ -113,7 +113,7 @@ void ALLD_init()
if (!init_flag) if (!init_flag)
{ {
init_flag = true; init_flag = true;
DSQL_permanent_pool = new(*FB_MemoryPool) DsqlMemoryPool; DSQL_permanent_pool = new(*getDefaultMemoryPool()) DsqlMemoryPool;
pools = new(*DSQL_permanent_pool) Firebird::vector<DsqlMemoryPool*> pools = new(*DSQL_permanent_pool) Firebird::vector<DsqlMemoryPool*>
(10, *DSQL_permanent_pool, dsql_type_vec); (10, *DSQL_permanent_pool, dsql_type_vec);
tdsql->tsql_default = DSQL_permanent_pool; tdsql->tsql_default = DSQL_permanent_pool;

10
src/include/firebird.h
View File

@ -26,17 +26,23 @@
* *
* Contributor(s): * Contributor(s):
* Mark O'Donohue <mark.odonohue@ludwig.edu.au> * Mark O'Donohue <mark.odonohue@ludwig.edu.au>
* Mike Nordel <tamlin@algonet.se> * Mike Nordell <tamlin@algonet.se>
* John Bellardo <bellardo@cs.ucsd.edu> * John Bellardo <bellardo@cs.ucsd.edu>
* *
* *
* $Id: firebird.h,v 1.2 2001-12-24 02:50:49 tamlin Exp $ * $Id: firebird.h,v 1.3 2001-12-28 05:15:46 tamlin Exp $
* *
*/ */
#include "gen/autoconfig.h" #include "gen/autoconfig.h"
#if defined(WIN32) || defined(_WIN32)
#define FB_DLL_EXPORT __declspec(dllexport)
#else
#define FB_DLL_EXPORT
#endif
#ifdef __cplusplus #ifdef __cplusplus
#include "fb_exception.h" #include "fb_exception.h"
#endif #endif

2
src/jrd/all.h
View File

@ -43,7 +43,7 @@ void ALL_check_memory(void);
class JrdMemoryPool : public MemoryPool class JrdMemoryPool : public MemoryPool
{ {
public: public:
JrdMemoryPool(int extSize = 0, MemoryPool* p = FB_MemoryPool) JrdMemoryPool(int extSize = 0, MemoryPool* p = getDefaultMemoryPool())
: MemoryPool(extSize, p), : MemoryPool(extSize, p),
plb_buckets(0), plb_buckets(0),
plb_segments(0), plb_segments(0),

2
src/jrd/jrd.cpp
View File

@ -5374,7 +5374,7 @@ static DBB init(TDBB tdbb,
try { try {
JrdMemoryPool* perm = new(*FB_MemoryPool) JrdMemoryPool; JrdMemoryPool* perm = new(*getDefaultMemoryPool()) JrdMemoryPool;
dbb_ = dbb::newDbb(*perm); dbb_ = dbb::newDbb(*perm);
//temp.blk_type = type_dbb; //temp.blk_type = type_dbb;
dbb_->dbb_permanent = perm; dbb_->dbb_permanent = perm;

8
src/jrd/met.epp
View File

@ -21,7 +21,7 @@
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
/* /*
$Id: met.epp,v 1.3 2001-12-24 02:50:51 tamlin Exp $ $Id: met.epp,v 1.4 2001-12-28 05:16:31 tamlin Exp $
*/ */
// This MUST be at the top of the file // This MUST be at the top of the file
#ifdef DARWIN #ifdef DARWIN
@ -2195,7 +2195,7 @@ void MET_parse_sys_trigger(TDBB tdbb, REL relation)
((trig_flags & TRG_ignore_perm) ? csb_ignore_perm : 0); ((trig_flags & TRG_ignore_perm) ? csb_ignore_perm : 0);
old_pool = tdbb->tdbb_default; old_pool = tdbb->tdbb_default;
tdbb->tdbb_default = new(*FB_MemoryPool) JrdMemoryPool; tdbb->tdbb_default = new(*getDefaultMemoryPool()) JrdMemoryPool;
PAR_blr(tdbb, PAR_blr(tdbb,
relation, relation,
const_cast<UCHAR*>(blr), const_cast<UCHAR*>(blr),
@ -2520,7 +2520,7 @@ PRC MET_procedure(TDBB tdbb, int id, USHORT flags)
} }
old_pool = tdbb->tdbb_default; old_pool = tdbb->tdbb_default;
tdbb->tdbb_default = new(*FB_MemoryPool) JrdMemoryPool; tdbb->tdbb_default = new(*getDefaultMemoryPool()) JrdMemoryPool;
csb_ = Csb::newCsb(*tdbb->tdbb_default, 5); csb_ = Csb::newCsb(*tdbb->tdbb_default, 5);
csb_->csb_rpt.resize(5); // vec always allocates one too many csb_->csb_rpt.resize(5); // vec always allocates one too many
csb_->csb_count = 5; csb_->csb_count = 5;
@ -3441,7 +3441,7 @@ static void get_trigger(
return; return;
old_pool = tdbb->tdbb_default; old_pool = tdbb->tdbb_default;
tdbb->tdbb_default = new(*FB_MemoryPool) JrdMemoryPool; tdbb->tdbb_default = new(*getDefaultMemoryPool()) JrdMemoryPool;
MET_parse_blob( tdbb, MET_parse_blob( tdbb,
relation, relation,
blob_id, blob_id,

4
src/jrd/rse.cpp
View File

@ -21,7 +21,7 @@
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
/* /*
$Id: rse.cpp,v 1.4 2001-12-24 02:50:52 tamlin Exp $ $Id: rse.cpp,v 1.5 2001-12-28 05:16:31 tamlin Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -3746,7 +3746,7 @@ static void write_merge_block(TDBB tdbb, MFB mfb, ULONG block)
SFB sfb_; SFB sfb_;
if (!(sfb_ = mfb->mfb_sfb)) { if (!(sfb_ = mfb->mfb_sfb)) {
sfb_ = mfb->mfb_sfb = new(*FB_MemoryPool) sfb; sfb_ = mfb->mfb_sfb = new(*getDefaultMemoryPool()) sfb;
} }
if (!sfb_->sfb_file_name) { if (!sfb_->sfb_file_name) {
TEXT file_name[128]; TEXT file_name[128];

2
src/jrd/svc.cpp
View File

@ -602,7 +602,7 @@ SVC SVC_attach(USHORT service_length,
we cannot use the JRD allocator. */ we cannot use the JRD allocator. */
// service = (SVC) gds__alloc((SLONG) (sizeof(struct svc))); // service = (SVC) gds__alloc((SLONG) (sizeof(struct svc)));
service = new(*FB_MemoryPool) svc; service = new(*getDefaultMemoryPool()) svc;
/* FREE: by SETJMP handler */ /* FREE: by SETJMP handler */
if (!service) if (!service)
ERR_post(isc_virmemexh, 0); ERR_post(isc_virmemexh, 0);