undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rj/commit-slab-fix'

Browse Source 
* rj/commit-slab-fix:
  commit-slab.h: Fix memory allocation and addressing
This commit is contained in:
Junio C Hamano 2013-07-31 12:38:27 -07:00
commit 2ed8ecaf57
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commit-slab.h
View File

@ -48,7 +48,7 @@ static void init_ ##slabname## _with_stride(struct slabname *s, \
if (!stride) \ if (!stride) \
stride = 1; \ stride = 1; \
s->stride = stride; \ s->stride = stride; \
elem_size = sizeof(struct slabname) * stride; \ elem_size = sizeof(elemtype) * stride; \
s->slab_size = COMMIT_SLAB_SIZE / elem_size; \ s->slab_size = COMMIT_SLAB_SIZE / elem_size; \
s->slab_count = 0; \ s->slab_count = 0; \
s->slab = NULL; \ s->slab = NULL; \
@ -72,11 +72,10 @@ static void clear_ ##slabname(struct slabname *s) \
static elemtype *slabname## _at(struct slabname *s, \ static elemtype *slabname## _at(struct slabname *s, \
const struct commit *c) \ const struct commit *c) \
{ \ { \
int nth_slab, nth_slot, ix; \ int nth_slab, nth_slot; \
\ \
ix = c->index * s->stride; \ nth_slab = c->index / s->slab_size; \
nth_slab = ix / s->slab_size; \ nth_slot = c->index % s->slab_size; \
nth_slot = ix % s->slab_size; \
\ \
if (s->slab_count <= nth_slab) { \ if (s->slab_count <= nth_slab) { \
int i; \ int i; \
@ -89,8 +88,8 @@ static elemtype *slabname## _at(struct slabname *s, \
} \ } \
if (!s->slab[nth_slab]) \ if (!s->slab[nth_slab]) \
s->slab[nth_slab] = xcalloc(s->slab_size, \ s->slab[nth_slab] = xcalloc(s->slab_size, \
sizeof(**s->slab)); \ sizeof(**s->slab) * s->stride); \
return &s->slab[nth_slab][nth_slot]; \ return &s->slab[nth_slab][nth_slot * s->stride]; \
} \ } \
\ \
static int stat_ ##slabname## realloc static int stat_ ##slabname## realloc