Commit d379e0ae authored by Rusty Russell's avatar Rusty Russell

alloc: move into antithread/alloc.

Our first nested module; easy because noone else relies on it.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 8fc1b230
......@@ -4,7 +4,6 @@ TAGS
*.o
libccan.a
config.h
ccan/*-Makefile
*~
tools/ccan_depends
tools/doc_extract
......
......@@ -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 $<
......
......@@ -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 \
......
../../licenses/LGPL-2.1
\ No newline at end of file
......@@ -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");
......
../../../licenses/LGPL-2.1
\ No newline at end of file
......@@ -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 <fcntl.h>
* #include <string.h>
* #include <stdlib.h>
* #include <ccan/alloc/alloc.h>
* #include <ccan/antithread/alloc/alloc.h>
*
* static void usage(const char *name)
* {
......
/* Example allocation which caused corruption. */
#include <ccan/alloc/alloc.c>
#include <ccan/alloc/bitops.c>
#include <ccan/alloc/tiny.c>
#include <ccan/antithread/alloc/alloc.c>
#include <ccan/antithread/alloc/bitops.c>
#include <ccan/antithread/alloc/tiny.c>
#include <ccan/tap/tap.h>
#include <stdlib.h>
......
#include <ccan/alloc/alloc.h>
#include <ccan/antithread/alloc/alloc.h>
#include <ccan/tap/tap.h>
#include <ccan/alloc/alloc.c>
#include <ccan/alloc/bitops.c>
#include <ccan/alloc/tiny.c>
#include <ccan/antithread/alloc/alloc.c>
#include <ccan/antithread/alloc/bitops.c>
#include <ccan/antithread/alloc/tiny.c>
#include <stdlib.h>
#include <stdbool.h>
#include <err.h>
......
#include <ccan/tap/tap.h>
#include "config.h"
#include <ccan/alloc/tiny.c>
#include <ccan/alloc/bitops.c>
#include <ccan/antithread/alloc/tiny.c>
#include <ccan/antithread/alloc/bitops.c>
#include <stdlib.h>
#include <err.h>
......
#include <ccan/alloc/alloc.h>
#include <ccan/antithread/alloc/alloc.h>
#include <ccan/tap/tap.h>
#include <ccan/alloc/alloc.c>
#include <ccan/alloc/bitops.c>
#include <ccan/alloc/tiny.c>
#include <ccan/antithread/alloc/alloc.c>
#include <ccan/antithread/alloc/bitops.c>
#include <ccan/antithread/alloc/tiny.c>
#include <stdlib.h>
#include <err.h>
......
......@@ -15,7 +15,7 @@
#include <ccan/noerr/noerr.h>
#include <ccan/talloc/talloc.h>
#include <ccan/read_write_all/read_write_all.h>
#include <ccan/alloc/alloc.h>
#include <ccan/antithread/alloc/alloc.h>
#include <ccan/list/list.h>
/* FIXME: Valgrind support should be possible for some cases. Tricky
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment