mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

ccan: update to latest.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2015-09-30 10:54:55 +09:30
parent 242fa1b2dd
commit c895d4a135
12 changed files with 81 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccan/README
View File

@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.
CCAN version: init-2049-gc2966d1
CCAN version: init-2084-gb87f63c

2
ccan/ccan/array_size/_info
View File

@ -12,7 +12,7 @@
* macro or constant.
*
* Example:
* // Outputs "Initialized 32 values"
* // Outputs "Initialized 32 values\n"
* #include <ccan/array_size/array_size.h>
* #include <stdlib.h>
* #include <stdio.h>

4
ccan/ccan/array_size/test/compile_fail-function-param.c
View File

@ -5,8 +5,8 @@ struct foo {
unsigned int a, b;
};
int check_parameter(const struct foo array[4]);
int check_parameter(const struct foo array[4])
int check_parameter(const struct foo *array);
int check_parameter(const struct foo *array)
{
#ifdef FAIL
return (ARRAY_SIZE(array) == 4);

2
ccan/ccan/cast/_info
View File

@ -20,7 +20,7 @@
* License: LGPL (v2.1 or any later version)
*
* Example:
* // Given "test" contains "3 t's in 'test string'
* // Given "test" output contains "3 t's in 'test string'"
* #include <ccan/cast/cast.h>
* #include <stdint.h>
* #include <stdio.h>

4
ccan/ccan/list/list.h
View File

@ -95,8 +95,8 @@ struct list_node *list_check_node(const struct list_node *n,
#define list_debug(h, loc) list_check((h), loc)
#define list_debug_node(n, loc) list_check_node((n), loc)
#else
#define list_debug(h, loc) (h)
#define list_debug_node(n, loc) (n)
#define list_debug(h, loc) ((void)loc, h)
#define list_debug_node(n, loc) ((void)loc, n)
#endif
/**

6
ccan/ccan/strmap/_info
View File

@ -40,9 +40,9 @@
* printf("\n");
* return 0;
* }
* // Given 'foo' outputs 'foo at 1. '
* // Given 'foo bar' outputs 'bar at 2. foo at 1. '
* // Given 'foo foo bar zebra' outputs 'bar at 3. foo at 1. zebra at 4. '
* // Given "foo" outputs "foo at 1. \n"
* // Given "foo bar" outputs "bar at 2. foo at 1. \n"
* // Given "foo foo bar zebra" outputs "bar at 3. foo at 1. zebra at 4. \n"
*/
int main(int argc, char *argv[])
{

2
ccan/ccan/take/_info
View File

@ -13,7 +13,7 @@
* License: CC0 (Public domain)
*
* Example:
* // Given foo/bar.c outputs basename is bar.c
* // Given "foo/bar.c" outputs basename is bar.c
* #include <ccan/take/take.h>
* #include <string.h>
*

4
ccan/ccan/tal/link/_info
View File

@ -14,8 +14,8 @@
* // Silly program which keeps a cache of uppercased strings.
* // The cache wants to keep strings around even after they may have
* // been "freed" by the caller.
* // Given 'hello' outputs '1 cache hits HELLO '
* // Given 'hello hello there' outputs '4 cache hits HELLO HELLO THERE '
* // Given "hello" outputs "1 cache hits HELLO \n"
* // Given "hello hello there" outputs "4 cache hits HELLO HELLO THERE \n"
* #include <stdio.h>
* #include <err.h>
* #include <string.h>

6
ccan/ccan/tal/str/str.h
View File

@ -164,9 +164,9 @@ char *tal_strjoin(const void *ctx, char *strings[], const char *delim,
* regcomp(3), regex(3).
*
* Example:
* // Given 'My name is Rusty' outputs 'Hello Rusty!'
* // Given 'my first name is Rusty Russell' outputs 'Hello Rusty Russell!'
* // Given 'My name isnt Rusty Russell' outputs 'Hello there!'
* // Given "My name is Rusty" outputs "Hello Rusty!\n"
* // Given "my first name is Rusty Russell" outputs "Hello Rusty Russell!\n"
* // Given "My name isnt Rusty Russell" outputs "Hello there!\n"
* int main(int argc, char *argv[])
* {
* char *person, *input;

4
ccan/ccan/tcon/_info
View File

@ -54,8 +54,8 @@
* container_get(&sc), *container_get(&ic) - 1);
* return 0;
* }
* // Given "foo" outputs "Last arg is foo of 1 arguments"
* // Given "foo bar" outputs "Last arg is bar of 2 arguments"
* // Given "foo" outputs "Last arg is foo of 1 arguments\n"
* // Given "foo bar" outputs "Last arg is bar of 2 arguments\n"
*
* License: CC0 (Public domain)
*

2
ccan/config.h
View File

@ -64,4 +64,6 @@
#define HAVE_UNALIGNED_ACCESS 1
#define HAVE_UTIME 1
#define HAVE_WARN_UNUSED_RESULT 1
#define HAVE_OPENMP 1
#define HAVE_VALGRIND_MEMCHECK_H 1
#endif /* CCAN_CONFIG_H */

78
ccan/tools/configurator/configurator.c
View File

@ -55,6 +55,7 @@ struct test {
const char *depends;
const char *link;
const char *fragment;
const char *flags;
const char *overrides; /* On success, force this to '1' */
bool done;
bool answer;
@ -63,13 +64,15 @@ struct test {
static struct test tests[] = {
{ "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
"#include <sys/types.h>\n"
"int main(int argc, char *argv[]) {\n"
"int main(void) {\n"
" return sizeof(off_t) == 4 ? 0 : 1;\n"
"}\n" },
{ "HAVE_ALIGNOF", INSIDE_MAIN, NULL, NULL,
"return __alignof__(double) > 0 ? 0 : 1;" },
{ "HAVE_ASPRINTF", DEFINES_FUNC, NULL, NULL,
"#ifndef _GNU_SOURCE\n"
"#define _GNU_SOURCE\n"
"#endif\n"
"#include <stdio.h>\n"
"static char *func(int x) {"
" char *p;\n"
@ -88,7 +91,7 @@ static struct test tests[] = {
"#include <stdlib.h>\n"
"static void __attribute__((noreturn)) func(int x) { exit(x); }" },
{ "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL, NULL,
"static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { }" },
"static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { (void)fmt; }" },
{ "HAVE_ATTRIBUTE_UNUSED", OUTSIDE_MAIN, NULL, NULL,
"static int __attribute__((unused)) func(int x) { return x; }" },
{ "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL, NULL,
@ -189,7 +192,7 @@ static struct test tests[] = {
"HAVE_32BIT_OFF_T", NULL,
"#define _FILE_OFFSET_BITS 64\n"
"#include <sys/types.h>\n"
"int main(int argc, char *argv[]) {\n"
"int main(void) {\n"
" return sizeof(off_t) == 8 ? 0 : 1;\n"
"}\n" },
{ "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL, NULL,
@ -201,7 +204,9 @@ static struct test tests[] = {
"#include <unistd.h>\n"
"static int func(void) { return getpagesize(); }" },
{ "HAVE_ISBLANK", DEFINES_FUNC, NULL, NULL,
"#ifndef _GNU_SOURCE\n"
"#define _GNU_SOURCE\n"
"#endif\n"
"#include <ctype.h>\n"
"static int func(void) { return isblank(' '); }" },
{ "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, NULL,
@ -209,13 +214,17 @@ static struct test tests[] = {
"u.i = 0x01020304;\n"
"return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;" },
{ "HAVE_MEMMEM", DEFINES_FUNC, NULL, NULL,
"#ifndef _GNU_SOURCE\n"
"#define _GNU_SOURCE\n"
"#endif\n"
"#include <string.h>\n"
"static void *func(void *h, size_t hl, void *n, size_t nl) {\n"
"return memmem(h, hl, n, nl);"
"}\n", },
{ "HAVE_MEMRCHR", DEFINES_FUNC, NULL, NULL,
"#ifndef _GNU_SOURCE\n"
"#define _GNU_SOURCE\n"
"#endif\n"
"#include <string.h>\n"
"static void *func(void *s, int c, size_t n) {\n"
"return memrchr(s, c, n);"
@ -234,7 +243,9 @@ static struct test tests[] = {
"}\n" },
{ "HAVE_QSORT_R_PRIVATE_LAST",
DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL,
"#define _GNU_SOURCE 1\n"
"#ifndef _GNU_SOURCE\n"
"#define _GNU_SOURCE\n"
"#endif\n"
"#include <stdlib.h>\n"
"static int cmp(const void *lp, const void *rp, void *priv) {\n"
" *(unsigned int *)priv = 1;\n"
@ -267,7 +278,8 @@ static struct test tests[] = {
" return nest(base, i-1);\n"
"}\n"
"int main(int argc, char *argv[]) {\n"
" return (nest(&argc, argc) > 0) ? 0 : 1\n;"
" (void)argv;\n"
" return (nest(&argc, argc) > 0) ? 0 : 1;\n"
"}\n" },
{ "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL, NULL,
"return ({ int x = argc; x == argc ? 0 : 1; });" },
@ -280,9 +292,11 @@ static struct test tests[] = {
{ "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
"#include <string.h>\n"
"int main(int argc, char *argv[]) {\n"
" (void)argc;\n"
" char pad[sizeof(int *) * 1];\n"
" strncpy(pad, argv[0], sizeof(pad));\n"
" return *(int *)(pad) == *(int *)(pad + 1);\n"
" int *x = (int *)pad, *y = (int *)(pad + 1);\n"
" return *x == *y;\n"
"}\n" },
{ "HAVE_UTIME", DEFINES_FUNC, NULL, NULL,
"#include <sys/types.h>\n"
@ -297,6 +311,14 @@ static struct test tests[] = {
"static __attribute__((warn_unused_result)) int func(int i) {\n"
" return i + 1;\n"
"}" },
{ "HAVE_OPENMP", INSIDE_MAIN, NULL, NULL,
"int i;\n"
"#pragma omp parallel for\n"
"for(i = 0; i < 0; i++) {};\n"
"return 0;\n",
"-Werror -fopenmp" },
{ "HAVE_VALGRIND_MEMCHECK_H", OUTSIDE_MAIN, NULL, NULL,
"#include <valgrind/memcheck.h>\n" },
};
static char *grab_fd(int fd)
@ -392,14 +414,17 @@ static struct test *find_test(const char *name)
}
#define PRE_BOILERPLATE "/* Test program generated by configurator. */\n"
#define MAIN_START_BOILERPLATE "int main(int argc, char *argv[]) {\n"
#define MAIN_START_BOILERPLATE \
"int main(int argc, char *argv[]) {\n" \
" (void)argc;\n" \
" (void)argv;\n"
#define USE_FUNC_BOILERPLATE "(void)func;\n"
#define MAIN_BODY_BOILERPLATE "return 0;\n"
#define MAIN_END_BOILERPLATE "}\n"
static bool run_test(const char *cmd, struct test *test)
{
char *output;
char *output, *newcmd;
FILE *outf;
int status;
@ -430,6 +455,9 @@ static bool run_test(const char *cmd, struct test *test)
test->done = true;
return test->answer;
}
if (deps[len])
free(dep);
deps += len;
deps += strspn(deps, " ");
}
@ -471,17 +499,30 @@ static bool run_test(const char *cmd, struct test *test)
if (verbose > 1)
if (system("cat " INPUT_FILE) == -1);
if (test->link) {
char *newcmd;
newcmd = malloc(strlen(cmd) + strlen(" ")
+ strlen(test->link) + 1);
sprintf(newcmd, "%s %s", cmd, test->link);
newcmd = strdup(cmd);
if (test->flags) {
newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+ strlen(test->flags) + 1);
strcat(newcmd, " ");
strcat(newcmd, test->flags);
if (verbose > 1)
printf("Extra link line: %s", newcmd);
cmd = newcmd;
printf("Extra flags line: %s", newcmd);
}
output = run(cmd, &status);
if (test->link) {
newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+ strlen(test->link) + 1);
strcat(newcmd, " ");
strcat(newcmd, test->link);
if (verbose > 1)
printf("Extra link line: %s", newcmd);
}
output = run(newcmd, &status);
free(newcmd);
if (status != 0 || strstr(output, "warning")) {
if (verbose)
printf("Compile %s for %s, status %i: %s\n",
@ -549,6 +590,7 @@ int main(int argc, const char *argv[])
cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE);
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
run_test(cmd, &tests[i]);
free(cmd);
unlink(OUTPUT_FILE);
unlink(INPUT_FILE);
@ -560,7 +602,9 @@ int main(int argc, const char *argv[])
printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
printf("#endif\n");
printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
printf("#define CCAN_CFLAGS \"%s\"\n\n", connect_args(argv+1, ""));
cmd = connect_args(argv+1, "");
printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd);
free(cmd);
/* This one implies "#include <ccan/..." works, eg. for tdb2.h */
printf("#define HAVE_CCAN 1\n");
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)