support config in node_or

[protos/libecoli.git] / lib / ecoli_malloc.c

diff --git a/lib/ecoli_malloc.c b/lib/ecoli_malloc.c
index 7c6f489..505f49f 100644 (file)
--- a/lib/ecoli_malloc.c
+++ b/lib/ecoli_malloc.c
@@ -1,44 +1,33 @@
-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * 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 <zer0@droids-corp.org>
  */
 
-
+#include <ecoli_init.h>
+#include <ecoli_test.h>
 #include <ecoli_malloc.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
+EC_LOG_TYPE_REGISTER(malloc);
+
+static int init_done = 0;
+
 struct ec_malloc_handler ec_malloc_handler;
 
 int ec_malloc_register(ec_malloc_t usr_malloc, ec_free_t usr_free,
        ec_realloc_t usr_realloc)
 {
-       if (usr_malloc == NULL || usr_free == NULL || usr_realloc == NULL)
+       if (usr_malloc == NULL || usr_free == NULL || usr_realloc == NULL) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       if (init_done) {
+               errno = EBUSY;
                return -1;
+       }
 
        ec_malloc_handler.malloc = usr_malloc;
        ec_malloc_handler.free = usr_free;
@@ -47,20 +36,12 @@ int ec_malloc_register(ec_malloc_t usr_malloc, ec_free_t usr_free,
        return 0;
 }
 
-void ec_malloc_unregister(void)
-{
-       /* XXX handlers must set errno on error */
-       ec_malloc_handler.malloc = NULL;
-       ec_malloc_handler.free = NULL;
-       ec_malloc_handler.realloc = NULL;
-}
-
 void *__ec_malloc(size_t size, const char *file, unsigned int line)
 {
        return ec_malloc_handler.malloc(size, file, line);
 }
 
-void *ec_malloc2(size_t size)
+void *ec_malloc_func(size_t size)
 {
        return __ec_malloc(size, __FILE__, __LINE__);
 }
@@ -70,7 +51,7 @@ void __ec_free(void *ptr, const char *file, unsigned int line)
        ec_malloc_handler.free(ptr, file, line);
 }
 
-void ec_free2(void *ptr)
+void ec_free_func(void *ptr)
 {
        __ec_free(ptr, __FILE__, __LINE__);
 }
@@ -129,3 +110,65 @@ char *__ec_strndup(const char *s, size_t n, const char *file, unsigned int line)
 
        return s2;
 }
+
+static int ec_malloc_init_func(void)
+{
+       init_done = 1;
+       return 0;
+}
+
+static struct ec_init ec_malloc_init = {
+       .init = ec_malloc_init_func,
+       .priority = 40,
+};
+
+EC_INIT_REGISTER(ec_malloc_init);
+
+/* LCOV_EXCL_START */
+static int ec_malloc_testcase(void)
+{
+       int ret, testres = 0;
+       char *ptr, *ptr2;
+
+       ret = ec_malloc_register(NULL, NULL, NULL);
+       testres |= EC_TEST_CHECK(ret == -1,
+               "should not be able to register NULL malloc handlers");
+       ret = ec_malloc_register(__ec_malloc, __ec_free, __ec_realloc);
+       testres |= EC_TEST_CHECK(ret == -1,
+               "should not be able to register after init");
+
+       /* registration is tested in the test main.c */
+
+       ptr = ec_malloc(10);
+       if (ptr == NULL)
+               return -1;
+       memset(ptr, 0, 10);
+       ptr2 = ec_realloc(ptr, 20);
+       EC_TEST_CHECK(ptr2 != NULL, "cannot realloc ptr\n");
+       if (ptr2 == NULL)
+               ec_free(ptr);
+       else
+               ec_free(ptr2);
+       ptr = NULL;
+       ptr2 = NULL;
+
+       ptr = ec_malloc_func(10);
+       if (ptr == NULL)
+               return -1;
+       memset(ptr, 0, 10);
+       ec_free_func(ptr);
+       ptr = NULL;
+
+       ptr = ec_calloc(2, (size_t)-1);
+       EC_TEST_CHECK(ptr == NULL, "bad overflow check in ec_calloc\n");
+
+       return testres;
+}
+/* LCOV_EXCL_STOP */
+
+static struct ec_test ec_malloc_test = {
+       .name = "malloc",
+       .test = ec_malloc_testcase,
+};
+
+EC_TEST_REGISTER(ec_malloc_test);