mirror of
https://github.com/git/git
synced 2024-11-05 01:58:18 +00:00
f332121e75
For sanity, we should probably do one of the following:
(a) make C and header files both depend upon everything they need
(b) consistently exclude git-compat-util.h from headers and require it
be the first include in C files
Currently, we have some of the headers following (a) and others
following (b), which makes things messy. In the past I was pushed
towards (b), as per [1] and [2]. Further, during this series I
discovered that this mixture empirically will mean that we end up with C
files that do not directly include git-compat-util.h, and do include
headers that don't include git-compat-util.h, with the result that we
likely have headers included before an indirect inclusion of
git-compat-util.h. Since git-compat-util.h has tricky platform-specific
stuff that is meant to be included before everything else, this state of
affairs is risky and may lead to things breaking in subtle ways (and
only on some platforms) as per [1] and [2].
Since including git-compat-util.h in existing header files makes it
harder for us to catch C files that are missing that include, let's
switch to (b) to make the enforcement of this rule easier. Remove the
inclusion of git-compat-util.h from header files other than the ones
that have been approved as alternate first includes.
[1] https://lore.kernel.org/git/20180811173406.GA9119@sigill.intra.peff.net/
[2] https://lore.kernel.org/git/20180811174301.GA9287@sigill.intra.peff.net/
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
105 lines
3.1 KiB
C
105 lines
3.1 KiB
C
#ifndef COMMIT_SLAB_IMPL_H
|
|
#define COMMIT_SLAB_IMPL_H
|
|
|
|
#define implement_static_commit_slab(slabname, elemtype) \
|
|
implement_commit_slab(slabname, elemtype, MAYBE_UNUSED static)
|
|
|
|
#define implement_shared_commit_slab(slabname, elemtype) \
|
|
implement_commit_slab(slabname, elemtype, )
|
|
|
|
#define implement_commit_slab(slabname, elemtype, scope) \
|
|
\
|
|
scope void init_ ##slabname## _with_stride(struct slabname *s, \
|
|
unsigned stride) \
|
|
{ \
|
|
unsigned int elem_size; \
|
|
if (!stride) \
|
|
stride = 1; \
|
|
s->stride = stride; \
|
|
elem_size = sizeof(elemtype) * stride; \
|
|
s->slab_size = COMMIT_SLAB_SIZE / elem_size; \
|
|
s->slab_count = 0; \
|
|
s->slab = NULL; \
|
|
} \
|
|
\
|
|
scope void init_ ##slabname(struct slabname *s) \
|
|
{ \
|
|
init_ ##slabname## _with_stride(s, 1); \
|
|
} \
|
|
\
|
|
scope void clear_ ##slabname(struct slabname *s) \
|
|
{ \
|
|
unsigned int i; \
|
|
for (i = 0; i < s->slab_count; i++) \
|
|
free(s->slab[i]); \
|
|
s->slab_count = 0; \
|
|
FREE_AND_NULL(s->slab); \
|
|
} \
|
|
\
|
|
scope void deep_clear_ ##slabname(struct slabname *s, void (*free_fn)(elemtype *)) \
|
|
{ \
|
|
unsigned int i; \
|
|
for (i = 0; i < s->slab_count; i++) { \
|
|
unsigned int j; \
|
|
if (!s->slab[i]) \
|
|
continue; \
|
|
for (j = 0; j < s->slab_size; j++) \
|
|
free_fn(&s->slab[i][j * s->stride]); \
|
|
} \
|
|
clear_ ##slabname(s); \
|
|
} \
|
|
\
|
|
scope elemtype *slabname## _at_peek(struct slabname *s, \
|
|
const struct commit *c, \
|
|
int add_if_missing) \
|
|
{ \
|
|
unsigned int nth_slab, nth_slot; \
|
|
\
|
|
nth_slab = c->index / s->slab_size; \
|
|
nth_slot = c->index % s->slab_size; \
|
|
\
|
|
if (s->slab_count <= nth_slab) { \
|
|
unsigned int i; \
|
|
if (!add_if_missing) \
|
|
return NULL; \
|
|
REALLOC_ARRAY(s->slab, nth_slab + 1); \
|
|
for (i = s->slab_count; i <= nth_slab; i++) \
|
|
s->slab[i] = NULL; \
|
|
s->slab_count = nth_slab + 1; \
|
|
} \
|
|
if (!s->slab[nth_slab]) { \
|
|
if (!add_if_missing) \
|
|
return NULL; \
|
|
s->slab[nth_slab] = xcalloc(s->slab_size, \
|
|
sizeof(**s->slab) * s->stride); \
|
|
} \
|
|
return &s->slab[nth_slab][nth_slot * s->stride]; \
|
|
} \
|
|
\
|
|
scope elemtype *slabname## _at(struct slabname *s, \
|
|
const struct commit *c) \
|
|
{ \
|
|
return slabname##_at_peek(s, c, 1); \
|
|
} \
|
|
\
|
|
scope elemtype *slabname## _peek(struct slabname *s, \
|
|
const struct commit *c) \
|
|
{ \
|
|
return slabname##_at_peek(s, c, 0); \
|
|
} \
|
|
\
|
|
struct slabname
|
|
|
|
/*
|
|
* Note that this redundant forward declaration is required
|
|
* to allow a terminating semicolon, which makes instantiations look
|
|
* like function declarations. I.e., the expansion of
|
|
*
|
|
* implement_commit_slab(indegree, int, static);
|
|
*
|
|
* ends in 'struct indegree;'. This would otherwise
|
|
* be a syntax error according (at least) to ISO C. It's hard to
|
|
* catch because GCC silently parses it by default.
|
|
*/
|
|
|
|
#endif /* COMMIT_SLAB_IMPL_H */
|