X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmain.c;h=1b2b7efc87c54e2b39fb2ec739633f04729d1345;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=56bc9d9168fcdbe767df821439b30ed14f50efa8;hpb=7284aef1f5f33a170cbd04aee7ed0a43608982d6;p=protos%2Flibecoli.git diff --git a/lib/main.c b/lib/main.c index 56bc9d9..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,11 +8,14 @@ #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])) / \ @@ -162,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]; @@ -173,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); @@ -189,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; @@ -201,8 +185,8 @@ 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++; @@ -304,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; @@ -315,8 +300,8 @@ 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++; @@ -336,8 +321,8 @@ static int debug_alloc_dump_leaks(void) 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); + "%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++) @@ -365,7 +350,10 @@ static int debug_log(int type, unsigned int level, 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) @@ -381,14 +369,18 @@ int main(int argc, char **argv) srandom(seed); - if (0) ec_log_fct_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; + 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) { @@ -398,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) { @@ -413,3 +404,4 @@ int main(int argc, char **argv) return 0; } +/* LCOV_EXCL_STOP */