]> git.ozlabs.org Git - ccan/blobdiff - tools/configurator/configurator.c
configurator: Reimplement run using popen
[ccan] / tools / configurator / configurator.c
index 6fa88e5b071fa6d80faf1fb4cfdeca8565e77b55..2ad3fffa254b277130ad4e34c545f91aef886f03 100644 (file)
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#define _POSIX_C_SOURCE 200809L                /* For pclose, popen, strdup */
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <err.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+#define popen _popen
+#define pclose _pclose
+#endif
+
 #define DEFAULT_COMPILER "cc"
 #define DEFAULT_FLAGS "-g3 -ggdb -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
 
 #define OUTPUT_FILE "configurator.out"
 #define INPUT_FILE "configuratortest.c"
 
+#ifdef _WIN32
+#define DIR_SEP   "\\"
+#else
+#define DIR_SEP   "/"
+#endif
+
 static int verbose;
 
 enum test_style {
@@ -55,20 +63,24 @@ 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;
 };
 
 static struct test tests[] = {
-       { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+       { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, 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"
@@ -87,7 +99,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,
@@ -113,10 +125,18 @@ static struct test tests[] = {
          "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZ", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZL", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CONSTANT_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_constant_p(1) ? 0 : 1;" },
        { "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL, NULL,
          "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFS", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ffs(0) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL, NULL,
@@ -125,6 +145,11 @@ static struct test tests[] = {
          "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
        { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" },
+       { "HAVE_ICCARM_INTRINSICS", DEFINES_FUNC, NULL, NULL,
+         "#include <intrinsics.h>\n"
+         "int func(int v) {\n"
+         "     return __CLZ(__RBIT(v));\n"
+         "}" },
        { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, NULL,
          "#include <byteswap.h>\n" },
        { "HAVE_CLOCK_GETTIME",
@@ -144,11 +169,13 @@ static struct test tests[] = {
          "     struct timespec ts;\n"
          "     clock_gettime(CLOCK_REALTIME, &ts);\n"
          "     return ts;\n"
-         "}\n" },
+         "}\n",
+         /* This means HAVE_CLOCK_GETTIME, too */
+         "HAVE_CLOCK_GETTIME" },
        { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
          "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
-       { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+       { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <sys/stat.h>\n"
          "#include <fcntl.h>\n"
@@ -169,23 +196,26 @@ static struct test tests[] = {
          "     if (arg == 4)\n"
          "             warnx(\"warn %u\", arg);\n"
          "}\n" },
-       { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
+       { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
          "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,
-         "for (int i = 0; i < argc; i++) { return 0; };\n"
-         "return 1;" },
+         "int ret = 1;\n"
+         "for (int i = 0; i < argc; i++) { ret = 0; };\n"
+         "return ret;" },
        { "HAVE_FLEXIBLE_ARRAY_MEMBER", OUTSIDE_MAIN, NULL, NULL,
          "struct foo { unsigned int x; int arr[]; };" },
        { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL, NULL,
          "#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,
@@ -193,17 +223,27 @@ 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);"
+         "}\n", },
        { "HAVE_MMAP", DEFINES_FUNC, NULL, NULL,
          "#include <sys/mman.h>\n"
          "static void *func(int fd) {\n"
          "     return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
          "}" },
-       { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+       { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <sys/stat.h>\n"
          "#include <fcntl.h>\n"
@@ -212,7 +252,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"
@@ -238,14 +280,16 @@ static struct test tests[] = {
          "     return __stop_mysec - __start_mysec;\n"
          "}\n" },
        { "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
-         "static long nest(const void *base, unsigned int i)\n"
+         "#include <stddef.h>\n"
+         "static ptrdiff_t nest(const void *base, unsigned int i)\n"
          "{\n"
          "     if (i == 0)\n"
          "             return (const char *)&i - (const char *)base;\n"
          "     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; });" },
@@ -255,6 +299,15 @@ static struct test tests[] = {
          "#include <sys/termios.h>\n" },
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
+       { "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"
+         "     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"
          "#include <utime.h>\n"
@@ -268,22 +321,75 @@ 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" },
+       { "HAVE_UCONTEXT", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
+         NULL, NULL,
+         "#include <ucontext.h>\n"
+         "static int x = 0;\n"
+         "static char stack[2048];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void) {\n"
+         "     x |= 2;\n"
+         "     setcontext(&b);\n"
+         "     x |= 4;\n"
+         "}\n"
+         "int main(void) {\n"
+         "     x |= 1;\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, fn, 0);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return (x == 3) ? 0 : 1;\n"
+         "}\n"
+       },
+       { "HAVE_POINTER_SAFE_MAKECONTEXT", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
+         "HAVE_UCONTEXT", NULL,
+         "#include <stddef.h>\n"
+         "#include <ucontext.h>\n"
+         "static int worked = 0;\n"
+         "static char stack[1024];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void *p, void *q) {\n"
+         "     void *cp = &worked;\n"
+         "     void *cq = (void *)(~((ptrdiff_t)cp));\n"
+         "     if ((p == cp) && (q == cq))\n"
+         "             worked = 1;\n"
+         "     setcontext(&b);\n"
+         "}\n"
+         "int main(void) {\n"
+         "     void *ap = &worked;\n"
+         "     void *aq = (void *)(~((ptrdiff_t)ap));\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, (void (*)(void))fn, 2, ap, aq);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return worked ? 0 : 1;\n"
+         "}\n"
+       },
 };
 
-static char *grab_fd(int fd)
+static char *grab_stream(FILE *file)
 {
-       int ret;
-       size_t max, size = 0;
+       size_t max, ret, size = 0;
        char *buffer;
 
-       max = 16384;
-       buffer = malloc(max+1);
-       while ((ret = read(fd, buffer + size, max - size)) > 0) {
+       max = BUFSIZ;
+       buffer = malloc(max);
+       while ((ret = fread(buffer+size, 1, max - size, file)) == max - size) {
                size += ret;
-               if (size == max)
-                       buffer = realloc(buffer, max *= 2);
+               buffer = realloc(buffer, max *= 2);
        }
-       if (ret < 0)
+       size += ret;
+       if (ferror(file))
                err(1, "reading from command");
        buffer[size] = '\0';
        return buffer;
@@ -291,43 +397,25 @@ static char *grab_fd(int fd)
 
 static char *run(const char *cmd, int *exitstatus)
 {
-       pid_t pid;
-       int p[2];
+       static const char redir[] = " 2>&1";
+       size_t cmdlen;
+       char *cmdredir;
+       FILE *cmdout;
        char *ret;
-       int status;
 
-       if (pipe(p) != 0)
-               err(1, "creating pipe");
-
-       pid = fork();
-       if (pid == -1)
-               err(1, "forking");
-
-       if (pid == 0) {
-               if (dup2(p[1], STDOUT_FILENO) != STDOUT_FILENO
-                   || dup2(p[1], STDERR_FILENO) != STDERR_FILENO
-                   || close(p[0]) != 0
-                   || close(STDIN_FILENO) != 0
-                   || open("/dev/null", O_RDONLY) != STDIN_FILENO)
-                       exit(128);
-
-               status = system(cmd);
-               if (WIFEXITED(status))
-                       exit(WEXITSTATUS(status));
-               /* Here's a hint... */
-               exit(128 + WTERMSIG(status));
-       }
+       cmdlen = strlen(cmd);
+       cmdredir = malloc(cmdlen + sizeof(redir));
+       memcpy(cmdredir, cmd, cmdlen);
+       memcpy(cmdredir + cmdlen, redir, sizeof(redir));
+
+       cmdout = popen(cmdredir, "r");
+       if (!cmdout)
+               err(1, "popen \"%s\"", cmdredir);
 
-       close(p[1]);
-       ret = grab_fd(p[0]);
-       /* This shouldn't fail... */
-       if (waitpid(pid, &status, 0) != pid)
-               err(1, "Failed to wait for child");
-       close(p[0]);
-       if (WIFEXITED(status))
-               *exitstatus = WEXITSTATUS(status);
-       else
-               *exitstatus = -WTERMSIG(status);
+       free(cmdredir);
+
+       ret = grab_stream(cmdout);
+       *exitstatus = pclose(cmdout);
        return ret;
 }
 
@@ -363,14 +451,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;
 
@@ -383,7 +474,7 @@ static bool run_test(const char *cmd, struct test *test)
                char *dep;
 
                /* Space-separated dependencies, could be ! for inverse. */
-               while ((len = strcspn(deps, " "))) {
+               while ((len = strcspn(deps, " ")) != 0) {
                        bool positive = true;
                        if (deps[len]) {
                                dep = strdup(deps);
@@ -401,6 +492,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, " ");
                }
@@ -440,19 +534,33 @@ static bool run_test(const char *cmd, struct test *test)
        fclose(outf);
 
        if (verbose > 1)
-               if (system("cat " INPUT_FILE) == -1);
+               if (system("cat " INPUT_FILE) == -1)
+                       ;
+
+       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 flags line: %s", newcmd);
+       }
 
        if (test->link) {
-               char *newcmd;
-               newcmd = malloc(strlen(cmd) + strlen(" ")
+               newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
                                + strlen(test->link) + 1);
-               sprintf(newcmd, "%s %s", cmd, test->link);
+               strcat(newcmd, " ");
+               strcat(newcmd, test->link);
                if (verbose > 1)
                        printf("Extra link line: %s", newcmd);
-               cmd = newcmd;
        }
 
-       output = run(cmd, &status);
+       output = run(newcmd, &status);
+
+       free(newcmd);
+
        if (status != 0 || strstr(output, "warning")) {
                if (verbose)
                        printf("Compile %s for %s, status %i: %s\n",
@@ -468,7 +576,7 @@ static bool run_test(const char *cmd, struct test *test)
                free(output);
                /* We run INSIDE_MAIN tests for sanity checking. */
                if ((test->style & EXECUTE) || (test->style & INSIDE_MAIN)) {
-                       output = run("./" OUTPUT_FILE, &status);
+                       output = run("." DIR_SEP OUTPUT_FILE, &status);
                        if (!(test->style & EXECUTE) && status != 0)
                                errx(1, "Test for %s failed with %i:\n%s",
                                     test->name, status, output);
@@ -479,6 +587,12 @@ static bool run_test(const char *cmd, struct test *test)
                test->answer = (status == 0);
        }
        test->done = true;
+
+       if (test->answer && test->overrides) {
+               struct test *override = find_test(test->overrides);
+               override->done = true;
+               override->answer = true;
+       }
        return test->answer;
 }
 
@@ -514,9 +628,10 @@ 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);
+       remove(OUTPUT_FILE);
+       remove(INPUT_FILE);
 
        printf("/* Generated by CCAN configurator */\n"
               "#ifndef CCAN_CONFIG_H\n"
@@ -525,7 +640,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++)