X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmain.c;h=1b2b7efc87c54e2b39fb2ec739633f04729d1345;hb=eaaf443bad651bd0b01f0bde3668a0f7d7f2dff0;hp=1f36b69d383e90ca5f800576fd58dd154d26d3d6;hpb=fd55c75d4ece51751ae95d98706458615e5b4776;p=protos%2Flibecoli.git diff --git a/lib/main.c b/lib/main.c index 1f36b69..1b2b7ef 100644 --- a/lib/main.c +++ b/lib/main.c @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016, Olivier MATZ */ #include @@ -31,17 +8,23 @@ #include #include #include +#include +#include #include #include #include +/* LCOV_EXCL_START */ +EC_LOG_TYPE_REGISTER(main); + #define COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / \ ((size_t)(!(sizeof(x) % sizeof(0[x]))))) static int log_level = EC_LOG_INFO; static int alloc_fail_proba = 0; static int seed = 0; +static size_t alloc_success = 0; static const char ec_short_options[] = "h" /* help */ @@ -65,8 +48,7 @@ static const struct option ec_long_options[] = { static void usage(const char *prgname) { - /* XXX add a parameter to test only one testcase */ - printf("%s [options]\n" + printf("%s [options] [test1 test2 test3...]\n" " -h\n" " --"EC_OPT_HELP"\n" " Show this help.\n" @@ -160,6 +142,7 @@ static struct debug_alloc_hdr_list debug_alloc_hdr_list = struct debug_alloc_hdr { TAILQ_ENTRY(debug_alloc_hdr) next; const char *file; + unsigned int seq; unsigned int line; size_t size; void *stack[STACK_SZ]; @@ -171,15 +154,17 @@ struct debug_alloc_ftr { unsigned int cookie; } __attribute__((packed)); +static int malloc_seq; + static void *debug_malloc(size_t size, const char *file, unsigned int line) { struct debug_alloc_hdr *hdr; struct debug_alloc_ftr *ftr; size_t new_size = size + sizeof(*hdr) + sizeof(*ftr); void *ret; + int r = random(); - - if (alloc_fail_proba != 0 && (random() % 100) < alloc_fail_proba) + if (alloc_fail_proba != 0 && (r % 100) < alloc_fail_proba) hdr = NULL; else hdr = malloc(new_size); @@ -187,6 +172,7 @@ static void *debug_malloc(size_t size, const char *file, unsigned int line) if (hdr == NULL) { ret = NULL; } else { + hdr->seq = malloc_seq; hdr->file = file; hdr->line = line; hdr->size = size; @@ -199,9 +185,11 @@ static void *debug_malloc(size_t size, const char *file, unsigned int line) ftr->cookie = 0x87654321; } - ec_log(EC_LOG_DEBUG, "%s:%d: info: malloc(%zd) -> %p\n", - file, line, size, ret); + EC_LOG(EC_LOG_DEBUG, "%s:%d: info: malloc(%zd) -> %p seq=%d\n", + file, line, size, ret, malloc_seq++); + if (ret) + alloc_success++; return ret; } @@ -213,21 +201,21 @@ static void debug_free(void *ptr, const char *file, unsigned int line) (void)file; (void)line; - ec_log(EC_LOG_DEBUG, "%s:%d: info: free(%p)\n", file, line, ptr); + EC_LOG(EC_LOG_DEBUG, "%s:%d: info: free(%p)\n", file, line, ptr); if (ptr == NULL) return; hdr = (ptr - sizeof(*hdr)); if (hdr->cookie != 0x12345678) { - ec_log(EC_LOG_ERR, "%s:%d: error: free(%p): bad start cookie\n", + EC_LOG(EC_LOG_ERR, "%s:%d: error: free(%p): bad start cookie\n", file, line, ptr); abort(); } ftr = (ptr + hdr->size); if (ftr->cookie != 0x87654321) { - ec_log(EC_LOG_ERR, "%s:%d: error: free(%p): bad end cookie\n", + EC_LOG(EC_LOG_ERR, "%s:%d: error: free(%p): bad end cookie\n", file, line, ptr); abort(); } @@ -238,7 +226,7 @@ static void debug_free(void *ptr, const char *file, unsigned int line) } if (h == NULL) { - ec_log(EC_LOG_ERR, "%s:%d: error: free(%p): bad ptr\n", + EC_LOG(EC_LOG_ERR, "%s:%d: error: free(%p): bad ptr\n", file, line, ptr); abort(); } @@ -258,7 +246,7 @@ static void *debug_realloc(void *ptr, size_t size, const char *file, if (ptr != NULL) { hdr = (ptr - sizeof(*hdr)); if (hdr->cookie != 0x12345678) { - ec_log(EC_LOG_ERR, + EC_LOG(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad start cookie\n", file, line, ptr); abort(); @@ -266,7 +254,7 @@ static void *debug_realloc(void *ptr, size_t size, const char *file, ftr = (ptr + hdr->size); if (ftr->cookie != 0x87654321) { - ec_log(EC_LOG_ERR, + EC_LOG(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad end cookie\n", file, line, ptr); abort(); @@ -278,7 +266,7 @@ static void *debug_realloc(void *ptr, size_t size, const char *file, } if (h == NULL) { - ec_log(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad ptr\n", + EC_LOG(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad ptr\n", file, line, ptr); abort(); } @@ -300,6 +288,7 @@ static void *debug_realloc(void *ptr, size_t size, const char *file, } if (hdr != NULL) { + hdr->seq = malloc_seq; hdr->file = file; hdr->line = line; hdr->size = size; @@ -311,9 +300,11 @@ static void *debug_realloc(void *ptr, size_t size, const char *file, ftr->cookie = 0x87654321; } - ec_log(EC_LOG_DEBUG, "%s:%d: info: realloc(%p, %zd) -> %p\n", - file, line, ptr, size, ret); + EC_LOG(EC_LOG_DEBUG, "%s:%d: info: realloc(%p, %zd) -> %p seq=%d\n", + file, line, ptr, size, ret, malloc_seq++); + if (ret) + alloc_success++; return ret; } @@ -323,39 +314,46 @@ static int debug_alloc_dump_leaks(void) int i; char **buffer; + EC_LOG(EC_LOG_INFO, "%zd successful allocations\n", alloc_success); + if (TAILQ_EMPTY(&debug_alloc_hdr_list)) return 0; TAILQ_FOREACH(hdr, &debug_alloc_hdr_list, next) { - ec_log(EC_LOG_ERR, - "%s:%d: error: memory leak size=%zd ptr=%p\n", - hdr->file, hdr->line, hdr->size, hdr + 1); + EC_LOG(EC_LOG_ERR, + "%s:%d: error: memory leak seq=%u size=%zd ptr=%p\n", + hdr->file, hdr->line, hdr->seq, hdr->size, hdr + 1); buffer = backtrace_symbols(hdr->stack, hdr->stacklen); if (buffer == NULL) { for (i = 0; i < hdr->stacklen; i++) - ec_log(EC_LOG_ERR, " %p\n", hdr->stack[i]); + EC_LOG(EC_LOG_ERR, " %p\n", hdr->stack[i]); } else { for (i = 0; i < hdr->stacklen; i++) - ec_log(EC_LOG_ERR, " %s\n", + EC_LOG(EC_LOG_ERR, " %s\n", buffer ? buffer[i] : "unknown"); } free(buffer); } - ec_log(EC_LOG_ERR, + EC_LOG(EC_LOG_ERR, " missing static syms, use: addr2line -f -e \n"); return -1; } -static int debug_log(unsigned int level, void *opaque, const char *str) +static int debug_log(int type, unsigned int level, void *opaque, + const char *str) { + (void)type; (void)opaque; if (level > (unsigned int)log_level) return 0; - return printf("%s", str); + if (printf("%s", str) < 0) + return -1; + + return 0; } int main(int argc, char **argv) @@ -371,14 +369,18 @@ int main(int argc, char **argv) srandom(seed); - ec_log_register(debug_log, NULL); - /* register a new malloc to track memleaks */ TAILQ_INIT(&debug_alloc_hdr_list); if (ec_malloc_register(debug_malloc, debug_free, debug_realloc) < 0) { - ec_log(EC_LOG_ERR, "cannot register new malloc\n"); - return -1; + EC_LOG(EC_LOG_ERR, "cannot register new malloc\n"); + return 1; + } + + if (ec_init() < 0) { + fprintf(stderr, "cannot init ecoli: %s\n", strerror(errno)); + return 1; } + ec_log_fct_register(debug_log, NULL); ret = 0; if (argc <= 1) { @@ -388,7 +390,6 @@ int main(int argc, char **argv) ret |= ec_test_one(argv[i]); } - ec_malloc_unregister(); leaks = debug_alloc_dump_leaks(); if (alloc_fail_proba == 0 && ret != 0) { @@ -403,3 +404,4 @@ int main(int argc, char **argv) return 0; } +/* LCOV_EXCL_STOP */