Jemalloc updated to 3.0.0.

[redis.git] / deps / jemalloc / test / allocated.c

diff --git a/deps/jemalloc/test/allocated.c b/deps/jemalloc/test/allocated.c
index b1e40e4720e33a289656980361ba83a1bb1eefb4..9884905d8100f27402bced99d53dc3c5167d9b84 100644 (file)
--- a/deps/jemalloc/test/allocated.c
+++ b/deps/jemalloc/test/allocated.c
@@ -1,17 +1,8 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <pthread.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-

 #define        JEMALLOC_MANGLE
 #include "jemalloc_test.h"
 
 void *
 #define        JEMALLOC_MANGLE
 #include "jemalloc_test.h"
 
 void *

-thread_start(void *arg)
+je_thread_start(void *arg)

 {
        int err;
        void *p;
 {
        int err;
        void *p;


@@ -20,89 +11,85 @@ thread_start(void *arg)
        size_t sz, usize;
 
        sz = sizeof(a0);
        size_t sz, usize;
 
        sz = sizeof(a0);

-       if ((err = JEMALLOC_P(mallctl)("thread.allocated", &a0, &sz, NULL,
-           0))) {
+       if ((err = mallctl("thread.allocated", &a0, &sz, NULL, 0))) {

                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif
                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif

-                       goto RETURN;
+                       goto label_return;

                }
                }

-               fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
+               malloc_printf("%s(): Error in mallctl(): %s\n", __func__,

                    strerror(err));
                exit(1);
        }
        sz = sizeof(ap0);
                    strerror(err));
                exit(1);
        }
        sz = sizeof(ap0);

-       if ((err = JEMALLOC_P(mallctl)("thread.allocatedp", &ap0, &sz, NULL,
-           0))) {
+       if ((err = mallctl("thread.allocatedp", &ap0, &sz, NULL, 0))) {

                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif
                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif

-                       goto RETURN;
+                       goto label_return;

                }
                }

-               fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
+               malloc_printf("%s(): Error in mallctl(): %s\n", __func__,

                    strerror(err));
                exit(1);
        }
        assert(*ap0 == a0);
 
        sz = sizeof(d0);
                    strerror(err));
                exit(1);
        }
        assert(*ap0 == a0);
 
        sz = sizeof(d0);

-       if ((err = JEMALLOC_P(mallctl)("thread.deallocated", &d0, &sz, NULL,
-           0))) {
+       if ((err = mallctl("thread.deallocated", &d0, &sz, NULL, 0))) {

                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif
                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif

-                       goto RETURN;
+                       goto label_return;

                }
                }

-               fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
+               malloc_printf("%s(): Error in mallctl(): %s\n", __func__,

                    strerror(err));
                exit(1);
        }
        sz = sizeof(dp0);
                    strerror(err));
                exit(1);
        }
        sz = sizeof(dp0);

-       if ((err = JEMALLOC_P(mallctl)("thread.deallocatedp", &dp0, &sz, NULL,
-           0))) {
+       if ((err = mallctl("thread.deallocatedp", &dp0, &sz, NULL, 0))) {

                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif
                if (err == ENOENT) {
 #ifdef JEMALLOC_STATS
                        assert(false);
 #endif

-                       goto RETURN;
+                       goto label_return;

                }
                }

-               fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
+               malloc_printf("%s(): Error in mallctl(): %s\n", __func__,

                    strerror(err));
                exit(1);
        }
        assert(*dp0 == d0);
 
                    strerror(err));
                exit(1);
        }
        assert(*dp0 == d0);
 

-       p = JEMALLOC_P(malloc)(1);
+       p = malloc(1);

        if (p == NULL) {
        if (p == NULL) {

-               fprintf(stderr, "%s(): Error in malloc()\n", __func__);
+               malloc_printf("%s(): Error in malloc()\n", __func__);

                exit(1);
        }
 
        sz = sizeof(a1);
                exit(1);
        }
 
        sz = sizeof(a1);

-       JEMALLOC_P(mallctl)("thread.allocated", &a1, &sz, NULL, 0);
+       mallctl("thread.allocated", &a1, &sz, NULL, 0);

        sz = sizeof(ap1);
        sz = sizeof(ap1);

-       JEMALLOC_P(mallctl)("thread.allocatedp", &ap1, &sz, NULL, 0);
+       mallctl("thread.allocatedp", &ap1, &sz, NULL, 0);

        assert(*ap1 == a1);
        assert(ap0 == ap1);
 
        assert(*ap1 == a1);
        assert(ap0 == ap1);
 

-       usize = JEMALLOC_P(malloc_usable_size)(p);
+       usize = malloc_usable_size(p);

        assert(a0 + usize <= a1);
 
        assert(a0 + usize <= a1);
 

-       JEMALLOC_P(free)(p);
+       free(p);

 
        sz = sizeof(d1);
 
        sz = sizeof(d1);

-       JEMALLOC_P(mallctl)("thread.deallocated", &d1, &sz, NULL, 0);
+       mallctl("thread.deallocated", &d1, &sz, NULL, 0);

        sz = sizeof(dp1);
        sz = sizeof(dp1);

-       JEMALLOC_P(mallctl)("thread.deallocatedp", &dp1, &sz, NULL, 0);
+       mallctl("thread.deallocatedp", &dp1, &sz, NULL, 0);

        assert(*dp1 == d1);
        assert(dp0 == dp1);
 
        assert(d0 + usize <= d1);
 
        assert(*dp1 == d1);
        assert(dp0 == dp1);
 
        assert(d0 + usize <= d1);
 

-RETURN:
+label_return:

        return (NULL);
 }
 
        return (NULL);
 }
 


@@ -110,33 +97,22 @@ int
 main(void)
 {
        int ret = 0;
 main(void)
 {
        int ret = 0;

-       pthread_t thread;
+       je_thread_t thread;

 
 

-       fprintf(stderr, "Test begin\n");
+       malloc_printf("Test begin\n");

 
 

-       thread_start(NULL);
+       je_thread_start(NULL);

 
 

-       if (pthread_create(&thread, NULL, thread_start, NULL)
-           != 0) {
-               fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
-               ret = 1;
-               goto RETURN;
-       }
-       pthread_join(thread, (void *)&ret);
+       je_thread_create(&thread, je_thread_start, NULL);
+       je_thread_join(thread, (void *)&ret);

 
 

-       thread_start(NULL);
+       je_thread_start(NULL);

 
 

-       if (pthread_create(&thread, NULL, thread_start, NULL)
-           != 0) {
-               fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
-               ret = 1;
-               goto RETURN;
-       }
-       pthread_join(thread, (void *)&ret);
+       je_thread_create(&thread, je_thread_start, NULL);
+       je_thread_join(thread, (void *)&ret);

 
 

-       thread_start(NULL);
+       je_thread_start(NULL);

 
 

-RETURN:
-       fprintf(stderr, "Test end\n");
+       malloc_printf("Test end\n");

        return (ret);
 }
        return (ret);
 }