X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring.c;h=943c350cf078791f11fe98600ca9211262caedae;hb=c7985de0a7f0769d6e4e112b18314aceecf2642c;hp=34dc20b7477c36256a88e742f3ab6ba2494fda83;hpb=ac3fb3019c5205cfce968c884d8cc010d784307b;p=dpdk.git diff --git a/app/test/test_ring.c b/app/test/test_ring.c index 34dc20b747..943c350cf0 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * 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 + * + * * 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 + * * 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 Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT - * OWNER OR 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 + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER OR 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. - * */ #include @@ -47,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -60,8 +58,6 @@ #include #include -#include - #include "test.h" /* @@ -115,7 +111,7 @@ static struct rte_ring *r; if (!(exp)) { \ printf("error at %s:%d\tcondition " #exp " failed\n", \ __func__, __LINE__); \ - rte_ring_dump(r); \ + rte_ring_dump(stdout, r); \ return (-1); \ } @@ -276,7 +272,7 @@ test_ring_basic_full_empty(void * const src[], void *dst[]) /* check data */ TEST_RING_VERIFY(0 == memcmp(src, dst, rsz)); - rte_ring_dump(r); + rte_ring_dump(stdout, r); } return (0); } @@ -344,8 +340,8 @@ test_ring_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -390,8 +386,8 @@ test_ring_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -412,8 +408,8 @@ test_ring_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -458,8 +454,8 @@ test_ring_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -475,17 +471,13 @@ test_ring_basic(void) if (ret != 0) goto fail; - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return 0; fail: - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return -1; } @@ -553,8 +545,8 @@ test_ring_burst_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -619,8 +611,8 @@ test_ring_burst_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -668,8 +660,8 @@ test_ring_burst_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -691,8 +683,8 @@ test_ring_burst_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -741,8 +733,8 @@ test_ring_burst_basic(void) /* check data */ if (memcmp(src, dst, cur_dst - dst)) { - rte_hexdump("src", src, cur_src - src); - rte_hexdump("dst", dst, cur_dst - dst); + rte_hexdump(stdout, "src", src, cur_src - src); + rte_hexdump(stdout, "dst", dst, cur_dst - dst); printf("data after dequeue is not the same\n"); goto fail; } @@ -763,17 +755,13 @@ test_ring_burst_basic(void) goto fail; /* Free memory before test completed */ - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return 0; fail: - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return -1; } @@ -1172,17 +1160,13 @@ test_ring_stats(void) memset(&r->stats[lcore_id], 0, sizeof(r->stats[lcore_id])); /* Free memory before test completed */ - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return 0; fail: - if (src) - free(src); - if (dst) - free(dst); + free(src); + free(dst); return -1; #endif } @@ -1262,7 +1246,7 @@ test_ring_basic_ex(void) struct rte_ring * rp; void **obj = NULL; - obj = (void **)rte_zmalloc("test_ring_basic_ex_malloc", (RING_SIZE * sizeof(void *)), 0); + obj = rte_calloc("test_ring_basic_ex_malloc", RING_SIZE, sizeof(void *), 0); if (obj == NULL) { printf("test_ring_basic_ex fail to rte_malloc\n"); goto fail_test; @@ -1325,7 +1309,7 @@ fail_test: return ret; } -int +static int test_ring(void) { /* some more basic operations */ @@ -1391,7 +1375,13 @@ test_ring(void) return -1; /* dump the ring status */ - rte_ring_list_dump(); + rte_ring_list_dump(stdout); return 0; } + +static struct test_command ring_cmd = { + .command = "ring_autotest", + .callback = test_ring, +}; +REGISTER_TEST_COMMAND(ring_cmd);