lib: 32/64-bit cleanups

[dpdk.git] / app / test / test_memzone.c

diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index ccc8b1e..4eccbd6 100644 (file)
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -118,7 +118,7 @@ test_memzone_reserving_zone_size_bigger_than_the_maximum(void)
                return -1;
        }
 
-       mz = rte_memzone_reserve("zone_size_bigger_than_the_maximum", 0x1900000000ULL,
+       mz = rte_memzone_reserve("zone_size_bigger_than_the_maximum", (size_t)-1,
                        SOCKET_ID_ANY, 0);
        if (mz != NULL) {
                printf("It is impossible to reserve such big a memzone\n");
@@ -268,9 +268,9 @@ test_memzone_reserve_max(void)
        const struct rte_memseg *ms;
        int memseg_idx = 0;
        int memzone_idx = 0;
-       uint64_t len = 0;
+       size_t len = 0;
        void* last_addr;
-       uint64_t maxlen = 0;
+       size_t maxlen = 0;
 
        /* get pointer to global configuration */
        config = rte_eal_get_configuration();
@@ -285,7 +285,7 @@ test_memzone_reserve_max(void)
                /* align everything */
                last_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE);
                len = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr);
-               len &= ~((uint64_t) CACHE_LINE_MASK);
+               len &= ~((size_t) CACHE_LINE_MASK);
 
                /* cycle through all memzones */
                for (memzone_idx = 0; memzone_idx < RTE_MAX_MEMZONE; memzone_idx++) {
@@ -298,8 +298,7 @@ test_memzone_reserve_max(void)
                        if ((config->mem_config->memzone[memzone_idx].addr >=
                                        ms[memseg_idx].addr) &&
                                        (config->mem_config->memzone[memzone_idx].addr <=
-                                       (RTE_PTR_ADD(ms[memseg_idx].addr,
-                                       (size_t)ms[memseg_idx].len)))) {
+                                       (RTE_PTR_ADD(ms[memseg_idx].addr, ms[memseg_idx].len)))) {
                                /* since the zones can now be aligned and occasionally skip
                                 * some space, we should calculate the length based on
                                 * reported length and start addresses difference. Addresses
@@ -336,7 +335,7 @@ test_memzone_reserve_max(void)
 
        if (mz->len != maxlen) {
                printf("Memzone reserve with 0 size did not return bigest block\n");
-               printf("Expected size = %" PRIu64 ", actual size = %" PRIu64 "\n",
+               printf("Expected size = %zu, actual size = %zu\n",
                                maxlen, mz->len);
                rte_dump_physmem_layout();
                rte_memzone_dump();
@@ -354,9 +353,10 @@ test_memzone_reserve_max_aligned(void)
        const struct rte_memseg *ms;
        int memseg_idx = 0;
        int memzone_idx = 0;
-       uint64_t addr_offset, len = 0;
+       uintptr_t addr_offset;
+       size_t len = 0;
        void* last_addr;
-       uint64_t maxlen = 0;
+       size_t maxlen = 0;
 
        /* random alignment */
        rte_srand((unsigned)rte_rdtsc());
@@ -378,7 +378,7 @@ test_memzone_reserve_max_aligned(void)
                /* align everything */
                last_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE);
                len = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr);
-               len &= ~((uint64_t) CACHE_LINE_MASK);
+               len &= ~((size_t) CACHE_LINE_MASK);
 
                /* cycle through all memzones */
                for (memzone_idx = 0; memzone_idx < RTE_MAX_MEMZONE; memzone_idx++) {
@@ -391,8 +391,7 @@ test_memzone_reserve_max_aligned(void)
                        if ((config->mem_config->memzone[memzone_idx].addr >=
                                        ms[memseg_idx].addr) &&
                                        (config->mem_config->memzone[memzone_idx].addr <=
-                                       (RTE_PTR_ADD(ms[memseg_idx].addr,
-                                       (size_t) ms[memseg_idx].len)))) {
+                                       (RTE_PTR_ADD(ms[memseg_idx].addr, ms[memseg_idx].len)))) {
                                /* since the zones can now be aligned and occasionally skip
                                 * some space, we should calculate the length based on
                                 * reported length and start addresses difference.
@@ -433,7 +432,7 @@ test_memzone_reserve_max_aligned(void)
        if (mz->len != maxlen) {
                printf("Memzone reserve with 0 size and alignment %u did not return"
                                " bigest block\n", align);
-               printf("Expected size = %" PRIu64 ", actual size = %" PRIu64 "\n",
+               printf("Expected size = %zu, actual size = %zu\n",
                                maxlen, mz->len);
                rte_dump_physmem_layout();
                rte_memzone_dump();