curr_odat(void);
struct vdat*
curr_vdat(void);
-struct ele*
-curr_ele(void);
struct set*
curr_set(void);
struct ref*
prev_ref(void);
-struct quad
-curr_quad(void);
-struct model
+struct model*
curr_model(void);
void
inc_posts(void);
-#define CURR_CDAT (*cdat_stackp)
-#define CURR_SET set_list[CURR_CDAT->num_sets]
-#define CURR_ELE ele_list[CURR_CDAT->CURR_SET.num_ele]
-#define PREV_REF (ref_buf[num_refs-1])
-#define CURR_REF (ref_buf[num_refs])
-#define PREV_ODAT (odat_buf[num_odats-1])
-#define CURR_ODAT (odat_buf[num_odats])
-#define CURR_VDAT (vdat_buf[num_vdats])
-#define PREV_VDAT (vdat_buf[num_vdats-1])
-#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_list[CURR_ODAT->num_quads])
-
+#define PAGES_PER_CHUNK 16
+
+#define CURR_CDAT (*cdat_stackp)
+//"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 max_dats; //num dats in a chunk
+} ocs, vcs, ccs, rcs, lcs, pcs; //odat, vdat, and cdat, ref, link, post stacks
+
+//type safety handled by macro expansion
+#define CURRENT_CHUNK(STACK) ( (void*) (STACK).csp - (void*) (STACK).chunks - 1)
+#define CHUNKS_LEN(STACK) ( (void*) (STACK).csp - (void*) (STACK).chunks)
+#define CHUNK_FULL(STACK, TYPE) ( (CURRENT_DAT(STACK,TYPE) - (TYPE) CURRENT_CHUNK(STACK)) \
+ >= (STACK).max_dats )
+#define CSP_PUSH(STACK) (++(STACK).csp = malloc(pagesize * PAGES_PER_CHUNK))
+#define CURRENT_DAT(STACK,TYPE) ((TYPE) (STACK).dsp[CHUNKS_LEN(STACK)])
+#define PREVIOUS_DAT(STACK,TYPE) ((TYPE) (STACK).dsp[CHUNKS_LEN(STACK)]-1)
+#define INCREMENT_DAT(STACK,TYPE) (++CURRENT_DAT(STACK,TYPE))
+//Stack-specific macros
+#define CURRENT_ODAT() (CURRENT_DAT(ocs,struct odat*))
+#define CURRENT_VDAT() (CURRENT_DAT(vcs,struct vdat*))
+#define CURRENT_CDAT() (CURRENT_DAT(ccs,struct cdat*))
+#define CURRENT_LINK() (CURRENT_DAT(lcs,struct link*))
+#define CURRENT_POST() (CURRENT_DAT(pcs,struct ref*))
+#define CURRENT_REF() (CURRENT_DAT(rcs,struct ref*))
+#define PREVIOUS_REF() (PREVIOUS_DAT(rcs, struct ref*))
+//Metadata
+#define CURRENT_SET() (CURRENT_CDAT()->set_list[CURRENT_CDAT()->num_sets])
+#define CURRENT_MODEL() (CURRENT_VDAT()->model_list[CURRENT_VDAT()->num_models])
+
+
+#define CURR_QUAD (CURR_ODAT->quad_file)
+
+long pagesize;
+
+int pages_per_chunk = 10;
int num_cdats = 0;
int curr_max_cdats = PTRS_IN_PAGE;
struct cdat* cdat_stack[PTRS_IN_PAGE];
struct cdat** cdat_stackp;
+int num_odats = 0;
-int num_odats = -1;
-int curr_max_odats = PTRS_IN_PAGE;
-struct odat* odat_buf[PTRS_IN_PAGE];
-
-
-int num_vdats = -1;
-int curr_max_vdats = PTRS_IN_PAGE;
-struct vdat* vdat_buf[PTRS_IN_PAGE];
+int num_vdats = 0;
-
-int num_refs = -1;
-int curr_max_refs = PTRS_IN_PAGE;
-struct ref* ref_buf[PTRS_IN_PAGE];
+int num_refs = 0;
uint64_t ss_ref_id = 0x00FFFFFF; /* system space for ref_ids */
int num_posts = -1;
cdat_stackp = cdat_stack;
*cdat_stackp++ = cdat_buf[num_cdats++];
- return 0;
+ pagesize = sysconf(_SC_PAGESIZE);
+
+ return 0;
}
for(i = 0; i <= num_odats ; i++)
{
- free(odat_buf[i]);
}
for(i = 0; i <= num_cdats; i++)
{
- free(cdat_buf[i]);
}
for(i = 0; i <= num_vdats; i++)
{
- free(vdat_buf[i]);
}
for(i = 0; i <= num_refs; i++)
{
- free(ref_buf[i]);
}
for(i = 0; i<= num_links; i++)
{
- free(link_buf[i]);
+ }
+ for(i = 0; i<= num_posts; i++)
+ {
}
}
alloc_odat
()
{
+ if(CHUNK_FULL(ocs, struct odat*))
+ CSP_PUSH(ocs);
+ else
+ INCREMENT_DAT(ocs, struct odat*);
- num_odats++;
- if(num_odats >= curr_max_odats)
- { if( (realloc((void*) odat_buf, PTRS_IN_PAGE * 4)) == NULL)
- perror("realloc odat_buf failed");
- curr_max_odats += PTRS_IN_PAGE;
- }
- if( (CURR_ODAT = (struct odat*) malloc(sizeof (struct odat))) == NULL)
- perror("malloc odat failed");
-
- return CURR_ODAT;
+ return CURRENT_ODAT();
}
void
()
{
num_vdats++;
- if(num_vdats >= curr_max_vdats)
- { if( (realloc((void*) vdat_buf, PTRS_IN_PAGE * 4)) == NULL)
- perror("realloc vdat_buf failed");
- curr_max_vdats += PTRS_IN_PAGE;
- }
- if((CURR_VDAT = (struct vdat*) malloc(sizeof (struct vdat))) == NULL)
- perror("malloc vdat failed");
+
+ if(CHUNK_FULL(vcs, struct vdat*))
+ CSP_PUSH(vcs);
+ else
+ INCREMENT_DAT(vcs, struct vdat*);
}
{
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;
- }
- if((CURR_LINK = (struct link*) malloc(sizeof (struct link))) == NULL)
- perror("malloc link failed");
+ if(CHUNK_FULL(lcs, struct link*))
+ CSP_PUSH(lcs);
+ else
+ INCREMENT_DAT(lcs, struct link*);
- return CURR_LINK;
+ return CURRENT_LINK();
}
struct ref*
()
{
num_refs++;
+ if(CHUNK_FULL(rcs, struct link*))
+ CSP_PUSH(rcs);
+ else
+ INCREMENT_DAT(rcs, struct link*);
if(num_refs % 16 == 0)
- { CURR_POST = CURR_REF;
+ { CURRENT_POST() = CURRENT_REF();
inc_posts();
}
- if(num_refs >= curr_max_refs)
- { if( (realloc((void*) ref_buf, PTRS_IN_PAGE * 4)) == NULL)
- perror("realloc ref_buf failed");
- curr_max_refs += PTRS_IN_PAGE;
- }
- if((CURR_REF = (struct ref*) malloc(sizeof (struct ref))) == NULL)
- perror("malloc ref 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;
- }
- if ((CURR_POST = (struct ref*) malloc (sizeof (struct ref))) == NULL)
- perror("malloc post failed");
+ num_posts++;
+
+ if(CHUNK_FULL(pcs, struct ref*))
+ {CSP_PUSH(pcs);}
+ else
+ INCREMENT_DAT(pcs, struct ref*);
+
}
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;
-}
-struct ele*
-curr_ele
-()
-{
- return &CURR_CDAT->CURR_SET.CURR_ELE;
+ return &CURRENT_SET();
}
struct ref*
prev_ref
()
{
- return PREV_REF;
-}
-
-struct quad
-curr_quad
-()
-{
- return CURR_QUAD;
+ return PREVIOUS_REF();
}
-struct model
+struct model*
curr_model
()
{
- return CURR_MODEL;
+ return &CURRENT_MODEL();
}
projects / henge / webcc.git / blobdiff