@@ -15,7 +15,6 @@ typedef struct { PDB *pdb; - Pool *pool; struct evhttp *httpd; struct evhttp_request *request; source/VertexServer.h @@ -5,6 +5,12 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include "Pool.h" + +Datum *Datum_poolNew(void) +{ + return GLOBAL_POOL_ALLOC(Datum) +} Datum *Datum_new(void) { source/pdb/Datum.c @@ -16,6 +16,8 @@ typedef struct #define DATUM_STACKALLOCATED(name, string) Datum _##name; Datum *name = &_##name; name->data = (char *)string; name->size = strlen(string); +Datum *Datum_poolNew(void); + Datum *Datum_new(void); Datum *Datum_newWithCString_(const char *s); Datum *Datum_clone(Datum *d); source/pdb/Datum.h @@ -70,7 +70,6 @@ PDB *PDB_new(void) self->corruptFile = File_new(); self->unusedPid = Datum_new(); self->useBackups = 1; - self->pool = Pool_new(); srand(time(NULL)); // need to do because Datum_makePid64 uses rand @@ -83,9 +82,7 @@ void PDB_setYajl_(PDB *self, yajl_gen y) } void PDB_free(PDB *self) -{ - PDB_freeNodes(self); - +{ PDB_close(self); File_free(self->dbFile); File_free(self->isOpenFile); @@ -93,7 +90,6 @@ void PDB_free(PDB *self) File_free(self->newBackupFile); File_free(self->corruptFile); Datum_free(self->unusedPid); - Pool_free(self->pool); self->yajl = 0x0; free(self); } @@ -102,24 +98,13 @@ void PDB_free(PDB *self) PNode *PDB_allocNode(PDB *self) { - PNode *node = POOL_ALLOC(self->pool, PNode); + PNode *node = PNode_poolNew(); PNode_setPdb_(node, self); PNode_setToRoot(node); - assert(self->yajl); PNode_setYajl_(node, self->yajl); return node; } -Datum *PDB_allocDatum(PDB *self) -{ - return POOL_ALLOC(self->pool, Datum); -} - -void PDB_freeNodes(PDB *self) -{ - Pool_freeRefs(self->pool); -} - // open/close ------------ void PDB_setPathCString_(PDB *self, const char *path) source/pdb/PDB.c @@ -35,7 +35,6 @@ typedef struct Datum *currentUser; - Pool *pool; yajl_gen yajl; } PDB; @@ -45,7 +44,6 @@ void PDB_free(PDB *self); // node caching ------------- PNode *PDB_allocNode(PDB *self); -Datum *PDB_allocDatum(PDB *self); void PDB_freeNodes(PDB *self); // open/close ------------ source/pdb/PDB.h @@ -15,6 +15,13 @@ #define PNODE_ID_LENGTH 9 +#include "Pool.h" + +PNode *PNode_poolNew(void) +{ + return GLOBAL_POOL_ALLOC(PNode) +} + PNode *PNode_new(void) { PNode *self = calloc(1, sizeof(PNode)); @@ -1051,7 +1058,7 @@ int PNode_op_html(PNode *self, Datum *d) Datum *PNode_metaSlotFor_(PNode *self, Datum *key) { - Datum *d = PDB_allocDatum(self->pdb); + Datum *d = Datum_poolNew(); Datum_copy_(d, self->pid); Datum_appendCString_(d, "/m/"); Datum_append_(d, key); @@ -1080,7 +1087,7 @@ Datum *PNode_metaAt_(PNode *self, Datum *d) if (v) { - Datum *value = PDB_allocDatum(self->pdb); + Datum *value = Datum_poolNew(); Datum_setData_size_(value, v, vSize); return value; } source/pdb/PNode.c @@ -43,7 +43,9 @@ typedef struct typedef int (PNodeOp)(PNode *, Datum *); + // creation and setup +PNode *PNode_poolNew(void); PNode *PNode_new(void); void PNode_setYajl_(PNode *self, yajl_gen y); void PNode_setPdb_(PNode *self, void *pdb); source/pdb/PNode.h @@ -5,6 +5,32 @@ #include <stdlib.h> #include <time.h> +static Pool *globalPool = 0x0; + +Pool *Pool_globalPool(void) +{ + if(!globalPool) + { + globalPool = Pool_new(); + } + + return globalPool; +} + +void Pool_globalPoolFreeRefs(void) +{ + Pool_freeRefs(Pool_globalPool()); +} + +void Pool_freeGlobalPool(void) +{ + if(globalPool) + { + Pool_free(globalPool); + globalPool = 0x0; + } +} + Pool *Pool_new(void) { Pool *self = calloc(1, sizeof(Pool)); source/pdb/Pool.c @@ -17,12 +17,17 @@ typedef struct typedef void *(PoolNewFunc)(void); typedef void (PoolFreeFunc)(void *); +Pool *Pool_globalPool(void); +void Pool_globalPoolFreeRefs(void); +void Pool_freeGlobalPool(void); + Pool *Pool_new(void); void Pool_free(Pool *self); void Pool_freeRefs(Pool *self); void *Pool_alllocWithNewAndFree(Pool *self, PoolNewFunc *newFunc, PoolFreeFunc *freeFunc); #define POOL_ALLOC(self, name) Pool_alllocWithNewAndFree(self, (PoolNewFunc *)name##_new, (PoolFreeFunc *)name##_free) +#define GLOBAL_POOL_ALLOC(name) POOL_ALLOC(Pool_globalPool(), name); #ifdef __cplusplus } source/pdb/Pool.h @@ -1,4 +1,6 @@ #include "Yajl_extras.h" +#include <stdio.h> +#include <string.h> void yajl_gen_cstring(yajl_gen self, const char *s) { source/pdb/Yajl_extras.c 19a9277ef8973352ba74bc0f45be535f9fdc2ba0 227447f8fec48e64db5da597839b37b1654554c6 Rich Collins richcollins@gmail.com http://github.com/hassy/vertexdb/commit/fa9757e044e9f75199efb997ea09c219161cb589 fa9757e044e9f75199efb997ea09c219161cb589 2009-10-30T11:48:19-07:00 2009-10-30T11:48:19-07:00 Merge branch 'master' of git://github.com/stevedekorte/vertexdb 3ea801837886e38a2f5733b6950e7f1bed608c5f Rich Collins richcollins@gmail.com