From d379e0ae835bdd047a5d277f7ded41f180134e27 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 22 Nov 2012 11:42:11 +1030 Subject: [PATCH] alloc: move into antithread/alloc. Our first nested module; easy because noone else relies on it. Signed-off-by: Rusty Russell --- .gitignore | 1 - Makefile | 4 ++++ Makefile-ccan | 4 ++-- ccan/.gitignore | 1 + ccan/alloc/LICENSE | 1 - ccan/antithread/_info | 2 +- ccan/antithread/alloc/LICENSE | 1 + ccan/{ => antithread}/alloc/_info | 4 ++-- ccan/{ => antithread}/alloc/alloc.c | 10 +++++----- ccan/{ => antithread}/alloc/alloc.h | 0 ccan/{ => antithread}/alloc/bitops.c | 0 ccan/{ => antithread}/alloc/bitops.h | 0 ccan/{ => antithread}/alloc/test/run-corrupt.c | 6 +++--- ccan/{ => antithread}/alloc/test/run-testsize.c | 8 ++++---- ccan/{ => antithread}/alloc/test/run-tiny-encode.c | 4 ++-- ccan/{ => antithread}/alloc/test/run.c | 12 ++++++------ ccan/{ => antithread}/alloc/tiny.c | 0 ccan/{ => antithread}/alloc/tiny.h | 0 ccan/antithread/antithread.c | 2 +- 19 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 ccan/.gitignore delete mode 120000 ccan/alloc/LICENSE create mode 120000 ccan/antithread/alloc/LICENSE rename ccan/{ => antithread}/alloc/_info (96%) rename ccan/{ => antithread}/alloc/alloc.c (99%) rename ccan/{ => antithread}/alloc/alloc.h (100%) rename ccan/{ => antithread}/alloc/bitops.c (100%) rename ccan/{ => antithread}/alloc/bitops.h (100%) rename ccan/{ => antithread}/alloc/test/run-corrupt.c (80%) rename ccan/{ => antithread}/alloc/test/run-testsize.c (90%) rename ccan/{ => antithread}/alloc/test/run-tiny-encode.c (94%) rename ccan/{ => antithread}/alloc/test/run.c (94%) rename ccan/{ => antithread}/alloc/tiny.c (100%) rename ccan/{ => antithread}/alloc/tiny.h (100%) diff --git a/.gitignore b/.gitignore index 2cccc453..061c08d0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ TAGS *.o libccan.a config.h -ccan/*-Makefile *~ tools/ccan_depends tools/doc_extract diff --git a/Makefile b/Makefile index b3553156..1e089827 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,10 @@ summary-check-%: tools/ccanlint/ccanlint $(OBJFILES) summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES) tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/$* +# FIXME: Horrible hacks because % doesn't match / +summary-fastcheck-antithread/%: tools/ccanlint/ccanlint $(OBJFILES) + tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/antithread/$* + ccan/%/info: ccan/%/_info $(CC) $(CCAN_CFLAGS) -o $@ -x c $< diff --git a/Makefile-ccan b/Makefile-ccan index 39e5c695..6641e53e 100644 --- a/Makefile-ccan +++ b/Makefile-ccan @@ -25,8 +25,8 @@ MODS_NORMAL_NO_SRC := alignof \ typesafe_cb # No external dependencies, with C code: -MODS_NORMAL_WITH_SRC := alloc \ - antithread \ +MODS_NORMAL_WITH_SRC := antithread \ + antithread/alloc \ asort \ asprintf \ autodata \ diff --git a/ccan/.gitignore b/ccan/.gitignore new file mode 100644 index 00000000..714e66ab --- /dev/null +++ b/ccan/.gitignore @@ -0,0 +1 @@ +*-Makefile diff --git a/ccan/alloc/LICENSE b/ccan/alloc/LICENSE deleted file mode 120000 index dc314eca..00000000 --- a/ccan/alloc/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../licenses/LGPL-2.1 \ No newline at end of file diff --git a/ccan/antithread/_info b/ccan/antithread/_info index ca8cd16c..b4cf67fc 100644 --- a/ccan/antithread/_info +++ b/ccan/antithread/_info @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) return 1; if (strcmp(argv[1], "depends") == 0) { - printf("ccan/alloc\n"); + printf("ccan/antithread/alloc\n"); printf("ccan/err\n"); printf("ccan/list\n"); printf("ccan/noerr\n"); diff --git a/ccan/antithread/alloc/LICENSE b/ccan/antithread/alloc/LICENSE new file mode 120000 index 00000000..4d0b239e --- /dev/null +++ b/ccan/antithread/alloc/LICENSE @@ -0,0 +1 @@ +../../../licenses/LGPL-2.1 \ No newline at end of file diff --git a/ccan/alloc/_info b/ccan/antithread/alloc/_info similarity index 96% rename from ccan/alloc/_info rename to ccan/antithread/alloc/_info index e4a47bac..5ad18002 100644 --- a/ccan/alloc/_info +++ b/ccan/antithread/alloc/_info @@ -3,7 +3,7 @@ #include "config.h" /** - * alloc - memory allocator routines + * antithread/alloc - memory allocator routines * * The alloc module implements a simple allocator which you can use to * dynamically allocate space within a region of memory. This can be useful @@ -24,7 +24,7 @@ * #include * #include * #include - * #include + * #include * * static void usage(const char *name) * { diff --git a/ccan/alloc/alloc.c b/ccan/antithread/alloc/alloc.c similarity index 99% rename from ccan/alloc/alloc.c rename to ccan/antithread/alloc/alloc.c index 47a59709..1b36aa47 100644 --- a/ccan/alloc/alloc.c +++ b/ccan/antithread/alloc/alloc.c @@ -20,7 +20,7 @@ http://samba.org/~tridge/junkcode/alloc_mmap/ Copyright (C) Andrew Tridgell 2007 - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -362,7 +362,7 @@ void alloc_init(void *pool, unsigned long poolsize) /* We rely on page numbers fitting in 16 bit. */ BUILD_ASSERT(MAX_SMALL_PAGES < 65536); - + sp_bits = small_page_bits(poolsize); lp_bits = sp_bits + BITS_FROM_SMALL_TO_LARGE_PAGE; @@ -776,7 +776,7 @@ void alloc_free(void *pool, unsigned long poolsize, void *free) tiny_alloc_free(pool, poolsize, free); return; } - + /* Get page header. */ sp_bits = small_page_bits(poolsize); pgnum = offset >> sp_bits; @@ -1097,7 +1097,7 @@ bool alloc_check(void *pool, unsigned long poolsize) prev = i; } - + /* Make sure every page accounted for. */ for (i = 0; i < poolsize >> sp_bits; i++) { if (!test_bit(pages, i)) @@ -1200,7 +1200,7 @@ void alloc_visualize(FILE *out, void *pool, unsigned long poolsize) tiny_alloc_visualize(out, pool, poolsize); return; } - + sp_bits = small_page_bits(poolsize); lp_bits = sp_bits + BITS_FROM_SMALL_TO_LARGE_PAGE; diff --git a/ccan/alloc/alloc.h b/ccan/antithread/alloc/alloc.h similarity index 100% rename from ccan/alloc/alloc.h rename to ccan/antithread/alloc/alloc.h diff --git a/ccan/alloc/bitops.c b/ccan/antithread/alloc/bitops.c similarity index 100% rename from ccan/alloc/bitops.c rename to ccan/antithread/alloc/bitops.c diff --git a/ccan/alloc/bitops.h b/ccan/antithread/alloc/bitops.h similarity index 100% rename from ccan/alloc/bitops.h rename to ccan/antithread/alloc/bitops.h diff --git a/ccan/alloc/test/run-corrupt.c b/ccan/antithread/alloc/test/run-corrupt.c similarity index 80% rename from ccan/alloc/test/run-corrupt.c rename to ccan/antithread/alloc/test/run-corrupt.c index 3e7be173..2c332d56 100644 --- a/ccan/alloc/test/run-corrupt.c +++ b/ccan/antithread/alloc/test/run-corrupt.c @@ -1,7 +1,7 @@ /* Example allocation which caused corruption. */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/ccan/alloc/test/run-testsize.c b/ccan/antithread/alloc/test/run-testsize.c similarity index 90% rename from ccan/alloc/test/run-testsize.c rename to ccan/antithread/alloc/test/run-testsize.c index c70770cf..c702a3d2 100644 --- a/ccan/alloc/test/run-testsize.c +++ b/ccan/antithread/alloc/test/run-testsize.c @@ -1,8 +1,8 @@ -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/ccan/alloc/test/run-tiny-encode.c b/ccan/antithread/alloc/test/run-tiny-encode.c similarity index 94% rename from ccan/alloc/test/run-tiny-encode.c rename to ccan/antithread/alloc/test/run-tiny-encode.c index 8f548622..a76e746b 100644 --- a/ccan/alloc/test/run-tiny-encode.c +++ b/ccan/antithread/alloc/test/run-tiny-encode.c @@ -1,7 +1,7 @@ #include #include "config.h" -#include -#include +#include +#include #include #include diff --git a/ccan/alloc/test/run.c b/ccan/antithread/alloc/test/run.c similarity index 94% rename from ccan/alloc/test/run.c rename to ccan/antithread/alloc/test/run.c index f9981e70..4b2b900b 100644 --- a/ccan/alloc/test/run.c +++ b/ccan/antithread/alloc/test/run.c @@ -1,8 +1,8 @@ -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include @@ -22,9 +22,9 @@ static bool unique(void *p[], unsigned int num) if (p[i] == p[i-1]) return false; return true; -} +} -static bool free_every_second_one(void *mem, unsigned int num, +static bool free_every_second_one(void *mem, unsigned int num, unsigned long pool_size, void *p[]) { unsigned int i; diff --git a/ccan/alloc/tiny.c b/ccan/antithread/alloc/tiny.c similarity index 100% rename from ccan/alloc/tiny.c rename to ccan/antithread/alloc/tiny.c diff --git a/ccan/alloc/tiny.h b/ccan/antithread/alloc/tiny.h similarity index 100% rename from ccan/alloc/tiny.h rename to ccan/antithread/alloc/tiny.h diff --git a/ccan/antithread/antithread.c b/ccan/antithread/antithread.c index 080f890c..72e172b1 100644 --- a/ccan/antithread/antithread.c +++ b/ccan/antithread/antithread.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include /* FIXME: Valgrind support should be possible for some cases. Tricky -- 2.39.2