X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Firmem.c;h=c241a29aa3fa78849164a8f979bd14b30963d7a9;hp=140a16a6dd076356dffd042fc9168f08ad521134;hb=0f505368fa8abbc2e9ab0296b9a5e6bd4869345f;hpb=4bd20aac8c9404bcb04b49b13c4145f12f4ff48e diff --git a/src/apc/irmem.c b/src/apc/irmem.c index 140a16a..c241a29 100644 --- a/src/apc/irmem.c +++ b/src/apc/irmem.c @@ -11,7 +11,7 @@ struct cdat* alloc_cdat(void); struct odat* alloc_odat(void); -void +struct vdat* alloc_vdat(void); struct link* alloc_link(void); @@ -23,65 +23,112 @@ struct odat* curr_odat(void); struct vdat* curr_vdat(void); +struct variant* +curr_variant(void); struct set* curr_set(void); struct ref* -prev_ref(void); -struct model +curr_ref(void); +struct model* curr_model(void); void inc_posts(void); -#define CURR_CDAT (*cdat_stackp) -#define CURR_SET set_list[CURR_CDAT->num_sets] -#define REF_IDX (num_refs % (refs_per_page * pages_per_chunk)) -#define PREV_REF (ref_buf[num_ref_chunks] + (REF_IDX * (sizeof (struct ref)) + pagesize - (sizeof (struct ref)))) -#define CURR_REF (ref_buf[num_ref_chunks] + (REF_IDX * (sizeof (struct ref)) + pagesize)) -#define ODAT_IDX (num_odats % (odats_per_page * pages_per_chunk)) -#define CURR_ODAT (odat_buf[num_odat_chunks] + (ODAT_IDX * (sizeof (struct odat)) + pagesize)) -#define VDAT_IDX (num_vdats % (vdats_per_page * pages_per_chunk)) -#define CURR_VDAT (vdat_buf[num_vdat_chunks] + (VDAT_IDX * (sizeof (struct vdat)) + pagesize)) -#define CURR_MODEL (CURR_VDAT.model_list[CURR_VDAT.num_models]) -#define CURR_LINK (link_buf[num_links]) -#define CURR_POST (post_buf[num_posts]) -#define CURR_QUAD (CURR_ODAT->quad_file) +#define PAGES_PER_CHUNK 16 + +//"type free" chunk stacking +struct chunk_stack +{ void* chunks[MAX_CHUNKS]; + void* *csp; //chunk stack pointer + void* dsp[MAX_CHUNKS]; //dat stack pointer (per chunk) + int chunk_size; //size of a chunk (including its forfeited page) + int max_dats; //number of dats per chunk for this stack +} ocs, vcs, ccs, rcs, lcs, pcs, varcs; //odat, vdat, cdat,variant, ref, link, post stacks + +//type safety handled by macro expansion (do not call these directly from code, make dependent macros for access to these) +#define CHUNKS_LEN(STACK) ((STACK).csp - (STACK).chunks) +#define CURRENT_CHUNK(STACK) ((STACK).chunks[CHUNKS_LEN(STACK) - 1]) +#define CHUNKS_FULL(STACK) ( (STACK).csp >= \ + (STACK).chunks + MAX_CHUNKS * (STACK).chunk_size) +#define CURRENT_DSP(STACK,TYPE) ((TYPE*) ((STACK).dsp[CHUNKS_LEN(STACK) - 1])) +#define DATA_FULL(STACK,TYPE) ((void*) CURRENT_DSP(STACK,TYPE) >= \ + (CURRENT_CHUNK(STACK) + (STACK).chunk_size)) +#define CSP_PUSH(STACK) (*(++(STACK).csp) = malloc((STACK).chunk_size)) +#define CURRENT_DATP(STACK,TYPE) (((TYPE**)(STACK).dsp)[CHUNKS_LEN(STACK) - 1]) +#define PREVIOUS_DATP(STACK,TYPE) (((TYPE**)(STACK).dsp)[CHUNKS_LEN(STACK) - 2]) +#define ALLOC_DAT(STACK,TYPE) (++CURRENT_DATP(STACK,TYPE)) +#define INIT_STACK(STACK,TYPE) \ + { int i; \ + (STACK).chunk_size = PAGES_PER_CHUNK * pagesize; \ + (STACK).max_dats = (STACK).chunk_size / sizeof (TYPE); \ + CSP_PUSH(STACK); \ + for( i = 0; i < MAX_CHUNKS; i++){ \ + (STACK).dsp[i] += pagesize; \ + } \ + } +//Stack-specific macros (called directly from code (safety enforcement) +#define INIT_ODAT() (INIT_STACK(ocs, struct odat)) +#define CURRENT_ODAT() (CURRENT_DATP(ocs,struct odat)) +#define ODAT_FULL() (DATA_FULL(ocs,struct odat)) +#define ODAT_ALLOC() (ALLOC_DAT(ocs,struct odat)) +#define OCS_FULL() (CHUNKS_FULL(ocs)) +#define INIT_VDAT() (INIT_STACK(vcs, struct vdat)) +#define CURRENT_VDAT() (CURRENT_DATP(vcs,struct vdat)) +#define VDAT_FULL() (DATA_FULL(vcs,struct vdat)) +#define VDAT_ALLOC() (ALLOC_DAT(vcs,struct vdat)) +#define VCS_FULL() (CHUNKS_FULL(vcs)) +#define INIT_CDAT() (INIT_STACK(ccs, struct cdat)) +#define CURRENT_CDAT() (CURRENT_DATP(ccs,struct cdat)) +#define CDAT_FULL() (DATA_FULL(ccs, struct cdat)) +#define CDAT_ALLOC() (ALLOC_DAT(ccs, struct cdat)) +#define CCS_FULL() (CHUNKS_FULL(ccs)) +#define INIT_VARIANT() (INIT_STACK(varcs, struct variant)) +#define CURRENT_VARIANT() (CURRENT_DATP(varcs, struct variant)) +#define VARIANT_FULL() (DATA_FULL(varcs, struct variant)) +#define VARIANT_ALLOC() (ALLOC_DAT(varcs, struct variant)) +#define VARCS_FULL() (CHUNKS_FULL(varcs)) +#define INIT_LINK() (INIT_STACK(lcs, struct link)) +#define CURRENT_LINK() (CURRENT_DATP(lcs,struct link)) +#define LDAT_FULL() (DATA_FULL(lcs, struct link)) +#define LDAT_ALLOC() (ALLOC_DAT(lcs, struct link)) +#define LCS_FULL() (CHUNKS_FULL(lcs)) +#define INIT_POST() (INIT_STACK(rcs, struct ref)) +#define CURRENT_POST() (CURRENT_DATP(pcs,struct ref)) +#define POST_FULL() (DATA_FULL(pcs,struct ref)) +#define POST_ALLOC() (ALLOC_DAT(pcs,struct ref)) +#define PCS_FULL() (CHUNKS_FULL(pcs)) +#define INIT_REF() (INIT_STACK(rcs, struct ref)) +#define CURRENT_REF() (CURRENT_DATP(rcs,struct ref)) +#define PREVIOUS_REF() (PREVIOUS_DATP(rcs, struct ref)) +#define REF_FULL() (DATA_FULL(rcs,struct ref)) +#define REF_ALLOC() (ALLOC_DAT(rcs,struct ref)) +#define RCS_FULL() (CHUNKS_FULL(rcs)) +//Metadata +#define CURRENT_SET() (CURRENT_CDAT()->set_list[CURRENT_CDAT()->num_sets]) +//#define CURRENT_QUAD() (CURRENT_VARIANT()->quad_list[CURRENT_VARIANT()->num_quads]) +//#define CURRENT_MODEL() (CURRENT_VDAT()->model_list[CURRENT_VDAT()->num_models]) -long pagesize; -int pages_per_chunk = 10; + +long pagesize; int num_cdats = 0; -int curr_max_cdats = PTRS_IN_PAGE; -struct cdat* cdat_buf[PTRS_IN_PAGE]; -struct cdat* cdat_stack[PTRS_IN_PAGE]; +struct cdat* cdat_stack[MAX_CLASSES]; struct cdat** cdat_stackp; - -int num_odat_chunks = 0; int num_odats = 0; -void* odat_buf[MAX_CHUNKS]; -long odats_per_page; -int num_vdat_chunks = 0; int num_vdats = 0; -void* vdat_buf[MAX_CHUNKS]; -long vdats_per_page; -int num_ref_chunks = 0; -int num_refs = 0; -void* ref_buf[MAX_CHUNKS]; -long refs_per_page; -uint64_t ss_ref_id = 0x00FFFFFF; /* system space for ref_ids */ +int num_variants = 0; -int num_posts = -1; -int curr_max_posts = PTRS_IN_PAGE; -struct ref* post_buf[PTRS_IN_PAGE]; +int num_refs = 0; +int ss_ref_id = 0x0FFFFFFF; /* system space for ref_ids */ +int num_posts = 0; -int num_links = -1; -int curr_max_links = PTRS_IN_PAGE; -struct link* link_buf[PTRS_IN_PAGE]; +int num_links = 0; /* The initalization function of the IR. */ @@ -89,24 +136,22 @@ int ir_init() { - /* Init root cdat and stack */ char root[4] = "root"; - if( (cdat_buf[num_cdats] = (struct cdat*) malloc(sizeof(struct cdat))) == NULL) - { - perror("malloc root class failed\n"); - return -1; - } - cdat_buf[num_cdats]->idx = num_cdats; - memmove(cdat_buf[num_cdats]->name, root, 4); + pagesize = sysconf(_SC_PAGESIZE); - cdat_stackp = cdat_stack; - *cdat_stackp++ = cdat_buf[num_cdats++]; + INIT_CDAT(); + *cdat_stackp = CURRENT_CDAT(); + + memmove((*cdat_stackp)->name, root, 32); + + INIT_ODAT(); + INIT_VDAT(); + INIT_VARIANT(); + INIT_LINK(); + INIT_REF(); + INIT_POST(); - pagesize = sysconf(_SC_PAGESIZE); - odats_per_page = (sizeof (struct odat)/pagesize); - vdats_per_page = (sizeof (struct vdat)/pagesize); - refs_per_page = (sizeof (struct ref)/pagesize); return 0; @@ -117,125 +162,164 @@ ir_quit() { int i; - for(i = 0; i <= num_odats ; i++) + for(i = 0; i < CHUNKS_LEN(ccs) ; i++) + { + free(ccs.chunks[i]); + } + for(i = 0; i < CHUNKS_LEN(ocs); i++) { - free(odat_buf[i]); + free(ocs.chunks[i]); } - for(i = 0; i <= num_cdats; i++) + for(i = 0; i < CHUNKS_LEN(vcs) ; i++) { - free(cdat_buf[i]); + free(vcs.chunks[i]); } - for(i = 0; i <= num_vdats; i++) + for(i = 0; i < CHUNKS_LEN(rcs); i++) { - free(vdat_buf[i]); + free(rcs.chunks[i]); } - for(i = 0; i <= num_refs; i++) + for(i = 0; i < CHUNKS_LEN(lcs); i++) { - free(ref_buf[i]); + free(lcs.chunks[i]); } - for(i = 0; i<= num_links; i++) + for(i = 0; i < CHUNKS_LEN(pcs); i++) { - free(link_buf[i]); + free(pcs.chunks[i]); } } -//TODO: FREE MEMORY! struct cdat* alloc_cdat() { num_cdats++; - if(curr_max_cdats <= num_cdats) - { if( (realloc((void*) cdat_buf, PTRS_IN_PAGE * 4)) == NULL) - perror("realloc cdat_buf failed"); - curr_max_cdats += PTRS_IN_PAGE; - if( (realloc( (void*) cdat_stack, PTRS_IN_PAGE * 4)) == NULL) //increase cdat_stack also - perror("realloc cdat_stack failed"); + if(CDAT_FULL()) + { if(CCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) cdats ", num_cdats); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(ccs); } - if( (CURR_CDAT = (struct cdat*) malloc(sizeof (struct cdat)) ) == NULL ) - perror("malloc cdat failed"); - - return CURR_CDAT; + else + CDAT_ALLOC(); + return CURRENT_CDAT(); } + +//these should probably be inline struct odat* alloc_odat () { num_odats++; - - if(!(num_odats % (odats_per_page * pages_per_chunk))) //chunk is full - { - num_odat_chunks++; - if( ((odat_buf[num_odat_chunks] = malloc(odats_per_page * pages_per_chunk)) == NULL) ) - perror("malloc odat chunk failed"); + if(ODAT_FULL()) + { if(!OCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) odats ", num_odats); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(ocs); } + else + ODAT_ALLOC(); - return CURR_ODAT; + return CURRENT_ODAT(); } -void +struct vdat* alloc_vdat () -{ - num_vdats++; +{ num_vdats++; + if(VDAT_FULL()) + { if(!VCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) vdats ", num_vdats); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(vcs); + } + else + VDAT_ALLOC(); - if(!(num_vdats % (vdats_per_page * pages_per_chunk))) //chunk is full - { - num_vdat_chunks++; - if( ((vdat_buf[num_vdat_chunks] = malloc(vdats_per_page * pages_per_chunk)) == NULL) ) - perror("malloc vdat chunk failed"); + return CURRENT_VDAT(); +} + +struct variant* +alloc_variant +() +{ num_variants++; + if(VARIANT_FULL()) + { if(!VARCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) variants ", num_variants); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(varcs); } + else + VARIANT_ALLOC(); + return CURRENT_VARIANT(); } + struct link* alloc_link () -{ - num_links++; - - if(num_links >= curr_max_links) - { if( (realloc((void*) link_buf, PTRS_IN_PAGE * 4)) == NULL) - perror("realloc vdat_buf failed"); - curr_max_links += PTRS_IN_PAGE; +{ num_links++; + if(LDAT_FULL()) + { if(!LCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) links ", num_links); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(lcs); } - if((CURR_LINK = (struct link*) malloc(sizeof (struct link))) == NULL) - perror("malloc link failed"); + else + LDAT_ALLOC(); + + return CURRENT_LINK(); - return CURR_LINK; } struct ref* alloc_ref () -{ - num_refs++; +{ num_refs++; + if(REF_FULL()) + { if(!RCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) refs ", num_refs); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(rcs); + } + else + REF_ALLOC(); + if(num_refs % 16 == 0) - { CURR_POST = CURR_REF; + { CURRENT_POST() = CURRENT_REF(); inc_posts(); } - if(!(num_refs % (refs_per_page * pages_per_chunk))) //chunk is full - { - num_ref_chunks++; - if( ((ref_buf[num_ref_chunks] = malloc(refs_per_page * pages_per_chunk)) == NULL) ) - perror("malloc ref chunk failed"); - } - return CURR_REF; + return CURRENT_REF(); } void inc_posts() -{ - if(num_posts >= curr_max_posts) - { if( (realloc((void*) ref_buf, PTRS_IN_PAGE * 4)) == NULL) - perror("realoc post_buf failed"); - curr_max_posts += PTRS_IN_PAGE; +{ num_posts++; + if(POST_FULL()) + { if(!PCS_FULL()) + { fprintf(stderr, "You have allocated to many (%d) refs ", num_posts); + exit(EXIT_FAILURE); + } + else + CSP_PUSH(pcs); } - if ((CURR_POST = (struct ref*) malloc (sizeof (struct ref))) == NULL) - perror("malloc post failed"); + else + POST_ALLOC(); } @@ -243,36 +327,48 @@ struct cdat* curr_cdat () { - return CURR_CDAT; + return (*cdat_stackp); } struct odat* curr_odat () { - return CURR_ODAT; + return CURRENT_ODAT(); } struct vdat* curr_vdat () { - return CURR_VDAT; + return CURRENT_VDAT(); } struct set* curr_set () { - return &CURR_CDAT->CURR_SET; + return &CURRENT_SET(); } struct ref* -prev_ref +curr_ref () { - return PREV_REF; + return CURRENT_REF(); } -struct model -curr_model +struct variant* +curr_variant () { - return CURR_MODEL; + return CURRENT_VARIANT(); } +/* struct quad* */ +/* curr_quad */ +/* () */ +/* { */ +/* return &CURRENT_QUAD(); */ +/* } */ +/* struct model* */ +/* curr_model */ +/* () */ +/* { */ +/* return &CURRENT_MODEL(); */ +/* } */