Query the archive to provide a complete KEYS list.

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

diff --git a/deps/jemalloc/test/allocm.c b/deps/jemalloc/test/allocm.c
index 59d0002e7be87a86bb39463ac8b5c69d7d45fdcc..80be673b8fdb50cc46d5b99fe34495d26431fb67 100644 (file)
--- a/deps/jemalloc/test/allocm.c
+++ b/deps/jemalloc/test/allocm.c
@@ -1,13 +1,9 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-

 #define        JEMALLOC_MANGLE
 #include "jemalloc_test.h"
 
 #define CHUNK 0x400000
 #define        JEMALLOC_MANGLE
 #include "jemalloc_test.h"
 
 #define CHUNK 0x400000

-/* #define MAXALIGN ((size_t)0x80000000000LLU) */
-#define MAXALIGN ((size_t)0x2000000LLU)
+/* #define MAXALIGN ((size_t)UINT64_C(0x80000000000)) */
+#define MAXALIGN ((size_t)0x2000000LU)

 #define NITER 4
 
 int
 #define NITER 4
 
 int


@@ -15,79 +11,122 @@ main(void)
 {
        int r;
        void *p;
 {
        int r;
        void *p;

-       size_t sz, alignment, total, tsz;
+       size_t nsz, rsz, sz, alignment, total;

        unsigned i;
        void *ps[NITER];
 
        unsigned i;
        void *ps[NITER];
 

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

 
 

-       sz = 0;
-       r = JEMALLOC_P(allocm)(&p, &sz, 42, 0);
+       sz = 42;
+       nsz = 0;
+       r = nallocm(&nsz, sz, 0);

        if (r != ALLOCM_SUCCESS) {
        if (r != ALLOCM_SUCCESS) {

-               fprintf(stderr, "Unexpected allocm() error\n");
+               malloc_printf("Unexpected nallocm() error\n");

                abort();
        }
                abort();
        }

-       if (sz < 42)
-               fprintf(stderr, "Real size smaller than expected\n");
-       if (JEMALLOC_P(dallocm)(p, 0) != ALLOCM_SUCCESS)
-               fprintf(stderr, "Unexpected dallocm() error\n");
+       rsz = 0;
+       r = allocm(&p, &rsz, sz, 0);
+       if (r != ALLOCM_SUCCESS) {
+               malloc_printf("Unexpected allocm() error\n");
+               abort();
+       }
+       if (rsz < sz)
+               malloc_printf("Real size smaller than expected\n");
+       if (nsz != rsz)
+               malloc_printf("nallocm()/allocm() rsize mismatch\n");
+       if (dallocm(p, 0) != ALLOCM_SUCCESS)
+               malloc_printf("Unexpected dallocm() error\n");

 
 

-       r = JEMALLOC_P(allocm)(&p, NULL, 42, 0);
+       r = allocm(&p, NULL, sz, 0);

        if (r != ALLOCM_SUCCESS) {
        if (r != ALLOCM_SUCCESS) {

-               fprintf(stderr, "Unexpected allocm() error\n");
+               malloc_printf("Unexpected allocm() error\n");

                abort();
        }
                abort();
        }

-       if (JEMALLOC_P(dallocm)(p, 0) != ALLOCM_SUCCESS)
-               fprintf(stderr, "Unexpected dallocm() error\n");
+       if (dallocm(p, 0) != ALLOCM_SUCCESS)
+               malloc_printf("Unexpected dallocm() error\n");

 
 

-       r = JEMALLOC_P(allocm)(&p, NULL, 42, ALLOCM_ZERO);
+       nsz = 0;
+       r = nallocm(&nsz, sz, ALLOCM_ZERO);
+       if (r != ALLOCM_SUCCESS) {
+               malloc_printf("Unexpected nallocm() error\n");
+               abort();
+       }
+       rsz = 0;
+       r = allocm(&p, &rsz, sz, ALLOCM_ZERO);

        if (r != ALLOCM_SUCCESS) {
        if (r != ALLOCM_SUCCESS) {

-               fprintf(stderr, "Unexpected allocm() error\n");
+               malloc_printf("Unexpected allocm() error\n");

                abort();
        }
                abort();
        }

-       if (JEMALLOC_P(dallocm)(p, 0) != ALLOCM_SUCCESS)
-               fprintf(stderr, "Unexpected dallocm() error\n");
+       if (nsz != rsz)
+               malloc_printf("nallocm()/allocm() rsize mismatch\n");
+       if (dallocm(p, 0) != ALLOCM_SUCCESS)
+               malloc_printf("Unexpected dallocm() error\n");

 
 #if LG_SIZEOF_PTR == 3
 
 #if LG_SIZEOF_PTR == 3

-       alignment = 0x8000000000000000LLU;
-       sz        = 0x8000000000000000LLU;
+       alignment = UINT64_C(0x8000000000000000);
+       sz        = UINT64_C(0x8000000000000000);

 #else
        alignment = 0x80000000LU;
        sz        = 0x80000000LU;
 #endif
 #else
        alignment = 0x80000000LU;
        sz        = 0x80000000LU;
 #endif

-       r = JEMALLOC_P(allocm)(&p, NULL, sz, ALLOCM_ALIGN(alignment));
+       nsz = 0;
+       r = nallocm(&nsz, sz, ALLOCM_ALIGN(alignment));
+       if (r == ALLOCM_SUCCESS) {
+               malloc_printf(
+                   "Expected error for nallocm(&nsz, %zu, %#x)\n",
+                   sz, ALLOCM_ALIGN(alignment));
+       }
+       rsz = 0;
+       r = allocm(&p, &rsz, sz, ALLOCM_ALIGN(alignment));

        if (r == ALLOCM_SUCCESS) {
        if (r == ALLOCM_SUCCESS) {

-               fprintf(stderr,
-                   "Expected error for allocm(&p, %zu, 0x%x)\n",
+               malloc_printf(
+                   "Expected error for allocm(&p, %zu, %#x)\n",

                    sz, ALLOCM_ALIGN(alignment));
        }
                    sz, ALLOCM_ALIGN(alignment));
        }

+       if (nsz != rsz)
+               malloc_printf("nallocm()/allocm() rsize mismatch\n");

 
 #if LG_SIZEOF_PTR == 3
 
 #if LG_SIZEOF_PTR == 3

-       alignment = 0x4000000000000000LLU;
-       sz        = 0x8400000000000001LLU;
+       alignment = UINT64_C(0x4000000000000000);
+       sz        = UINT64_C(0x8400000000000001);

 #else
        alignment = 0x40000000LU;
        sz        = 0x84000001LU;
 #endif
 #else
        alignment = 0x40000000LU;
        sz        = 0x84000001LU;
 #endif

-       r = JEMALLOC_P(allocm)(&p, NULL, sz, ALLOCM_ALIGN(alignment));
+       nsz = 0;
+       r = nallocm(&nsz, sz, ALLOCM_ALIGN(alignment));
+       if (r != ALLOCM_SUCCESS)
+               malloc_printf("Unexpected nallocm() error\n");
+       rsz = 0;
+       r = allocm(&p, &rsz, sz, ALLOCM_ALIGN(alignment));

        if (r == ALLOCM_SUCCESS) {
        if (r == ALLOCM_SUCCESS) {

-               fprintf(stderr,
-                   "Expected error for allocm(&p, %zu, 0x%x)\n",
+               malloc_printf(
+                   "Expected error for allocm(&p, %zu, %#x)\n",

                    sz, ALLOCM_ALIGN(alignment));
        }
 
                    sz, ALLOCM_ALIGN(alignment));
        }
 

-       alignment = 0x10LLU;
+       alignment = 0x10LU;

 #if LG_SIZEOF_PTR == 3
 #if LG_SIZEOF_PTR == 3

-       sz   = 0xfffffffffffffff0LLU;
+       sz = UINT64_C(0xfffffffffffffff0);

 #else
 #else

-       sz   = 0xfffffff0LU;
+       sz = 0xfffffff0LU;

 #endif
 #endif

-       r = JEMALLOC_P(allocm)(&p, NULL, sz, ALLOCM_ALIGN(alignment));
+       nsz = 0;
+       r = nallocm(&nsz, sz, ALLOCM_ALIGN(alignment));

        if (r == ALLOCM_SUCCESS) {
        if (r == ALLOCM_SUCCESS) {

-               fprintf(stderr,
-                   "Expected error for allocm(&p, %zu, 0x%x)\n",
+               malloc_printf(
+                   "Expected error for nallocm(&nsz, %zu, %#x)\n",

                    sz, ALLOCM_ALIGN(alignment));
        }
                    sz, ALLOCM_ALIGN(alignment));
        }

+       rsz = 0;
+       r = allocm(&p, &rsz, sz, ALLOCM_ALIGN(alignment));
+       if (r == ALLOCM_SUCCESS) {
+               malloc_printf(
+                   "Expected error for allocm(&p, %zu, %#x)\n",
+                   sz, ALLOCM_ALIGN(alignment));
+       }
+       if (nsz != rsz)
+               malloc_printf("nallocm()/allocm() rsize mismatch\n");

 
        for (i = 0; i < NITER; i++)
                ps[i] = NULL;
 
        for (i = 0; i < NITER; i++)
                ps[i] = NULL;


@@ -96,38 +135,60 @@ main(void)
            alignment <= MAXALIGN;
            alignment <<= 1) {
                total = 0;
            alignment <= MAXALIGN;
            alignment <<= 1) {
                total = 0;

-               fprintf(stderr, "Alignment: %zu\n", alignment);
+               malloc_printf("Alignment: %zu\n", alignment);

                for (sz = 1;
                    sz < 3 * alignment && sz < (1U << 31);
                    sz += (alignment >> (LG_SIZEOF_PTR-1)) - 1) {
                        for (i = 0; i < NITER; i++) {
                for (sz = 1;
                    sz < 3 * alignment && sz < (1U << 31);
                    sz += (alignment >> (LG_SIZEOF_PTR-1)) - 1) {
                        for (i = 0; i < NITER; i++) {

-                               r = JEMALLOC_P(allocm)(&ps[i], NULL, sz,
+                               nsz = 0;
+                               r = nallocm(&nsz, sz,
+                                   ALLOCM_ALIGN(alignment) | ALLOCM_ZERO);
+                               if (r != ALLOCM_SUCCESS) {
+                                       malloc_printf(
+                                           "nallocm() error for size %zu"
+                                           " (%#zx): %d\n",
+                                           sz, sz, r);
+                                       exit(1);
+                               }
+                               rsz = 0;
+                               r = allocm(&ps[i], &rsz, sz,

                                    ALLOCM_ALIGN(alignment) | ALLOCM_ZERO);
                                if (r != ALLOCM_SUCCESS) {
                                    ALLOCM_ALIGN(alignment) | ALLOCM_ZERO);
                                if (r != ALLOCM_SUCCESS) {

-                                       fprintf(stderr,
-                                           "Error for size %zu (0x%zx): %d\n",
+                                       malloc_printf(
+                                           "allocm() error for size %zu"
+                                           " (%#zx): %d\n",

                                            sz, sz, r);
                                        exit(1);
                                }
                                            sz, sz, r);
                                        exit(1);
                                }

+                               if (rsz < sz) {
+                                       malloc_printf(
+                                           "Real size smaller than"
+                                           " expected\n");
+                               }
+                               if (nsz != rsz) {
+                                       malloc_printf(
+                                           "nallocm()/allocm() rsize"
+                                           " mismatch\n");
+                               }

                                if ((uintptr_t)p & (alignment-1)) {
                                if ((uintptr_t)p & (alignment-1)) {

-                                       fprintf(stderr,
+                                       malloc_printf(

                                            "%p inadequately aligned for"
                                            " alignment: %zu\n", p, alignment);
                                }
                                            "%p inadequately aligned for"
                                            " alignment: %zu\n", p, alignment);
                                }

-                               JEMALLOC_P(sallocm)(ps[i], &tsz, 0);
-                               total += tsz;
+                               sallocm(ps[i], &rsz, 0);
+                               total += rsz;

                                if (total >= (MAXALIGN << 1))
                                        break;
                        }
                        for (i = 0; i < NITER; i++) {
                                if (ps[i] != NULL) {
                                if (total >= (MAXALIGN << 1))
                                        break;
                        }
                        for (i = 0; i < NITER; i++) {
                                if (ps[i] != NULL) {

-                                       JEMALLOC_P(dallocm)(ps[i], 0);
+                                       dallocm(ps[i], 0);

                                        ps[i] = NULL;
                                }
                        }
                }
        }
 
                                        ps[i] = NULL;
                                }
                        }
                }
        }
 

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

        return (0);
 }
        return (0);
 }