Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77459/?format=api
{ "id": 77459, "url": "http://patches.dpdk.org/api/patches/77459/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911161002.19816-7-feifei.wang2@arm.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200911161002.19816-7-feifei.wang2@arm.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911161002.19816-7-feifei.wang2@arm.com", "date": "2020-09-11T16:10:02", "name": "[v3,6/6] test/ring: improve the application of macro", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c8687b36b192b02937a5eac835fc27c401ee5424", "submitter": { "id": 1771, "url": "http://patches.dpdk.org/api/people/1771/?format=api", "name": "Feifei Wang", "email": "feifei.wang2@arm.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911161002.19816-7-feifei.wang2@arm.com/mbox/", "series": [ { "id": 12156, "url": "http://patches.dpdk.org/api/series/12156/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12156", "date": "2020-09-11T16:09:56", "name": "fix wrong passed pointer and add check", "version": 3, "mbox": "http://patches.dpdk.org/series/12156/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77459/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/77459/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 50F28A04BB;\n\tFri, 11 Sep 2020 18:11:38 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A526C1C11A;\n\tFri, 11 Sep 2020 18:10:53 +0200 (CEST)", "from foss.arm.com (foss.arm.com [217.140.110.172])\n by dpdk.org (Postfix) with ESMTP id 52E901C11A\n for <dev@dpdk.org>; Fri, 11 Sep 2020 18:10:52 +0200 (CEST)", "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])\n by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BF0D7113E;\n Fri, 11 Sep 2020 09:10:51 -0700 (PDT)", "from net-arm-n1sdp.shanghai.arm.com (net-arm-n1sdp.shanghai.arm.com\n [10.169.208.213])\n by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8F0B83F73C;\n Fri, 11 Sep 2020 09:10:49 -0700 (PDT)" ], "From": "Feifei Wang <feifei.wang2@arm.com>", "To": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>", "Cc": "dev@dpdk.org,\n\tnd@arm.com,\n\tFeifei Wang <feifei.wang2@arm.com>", "Date": "Fri, 11 Sep 2020 11:10:02 -0500", "Message-Id": "<20200911161002.19816-7-feifei.wang2@arm.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200911161002.19816-1-feifei.wang2@arm.com>", "References": "<20200729063105.11299-1-feifei.wang2@arm.com>\n <20200911161002.19816-1-feifei.wang2@arm.com>", "Subject": "[dpdk-dev] [PATCH v3 6/6] test/ring: improve the application of\n\tmacro", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add more parameters into the macro TEST_RING_VERIFY and expand the scope of\napplication for it. Furthermore, replace all ring APIs check with\nTEST_RING_VERIFY to facilitate debugging.\n\nSuggested-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nSigned-off-by: Feifei Wang <feifei.wang2@arm.com>\nReviewed-by: Phil Yang <phil.yang@arm.com>\nReviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>\n---\n app/test/test_ring.c | 264 ++++++++++++++++---------------------------\n 1 file changed, 98 insertions(+), 166 deletions(-)", "diff": "diff --git a/app/test/test_ring.c b/app/test/test_ring.c\nindex 4a2bd39fc..bbfdff4bd 100644\n--- a/app/test/test_ring.c\n+++ b/app/test/test_ring.c\n@@ -46,15 +46,25 @@\n #define RING_SIZE 4096\n #define MAX_BULK 32\n \n-#define\tTEST_RING_VERIFY(exp)\t\t\t\t\t\t\\\n+/*\n+ * Validate the return value of test cases and print details of the\n+ * ring if validation fails\n+ *\n+ * @param exp\n+ * Expression to validate return value.\n+ * @param r\n+ * A pointer to the ring structure.\n+ */\n+#define TEST_RING_VERIFY(exp, r) do {\t\t\t\t\t\\\n \tif (!(exp)) {\t\t\t\t\t\t\t\\\n \t\tprintf(\"error at %s:%d\\tcondition \" #exp \" failed\\n\",\t\\\n \t\t __func__, __LINE__);\t\t\t\t\\\n-\t\trte_ring_dump(stdout, r);\t\t\t\t\\\n-\t\treturn -1;\t\t\t\t\t\t\\\n-\t}\n+\t\trte_ring_dump(stdout, (r));\t\t\t\t\\\n+\t\tgoto fail;\t\t\t\t\t\t\\\n+\t}\t\t\t\t\t\t\t\t\\\n+} while (0)\n \n-#define\tTEST_RING_FULL_EMTPY_ITER\t8\n+#define TEST_RING_FULL_EMTPY_ITER\t8\n \n static const int esize[] = {-1, 4, 8, 16, 20};\n \n@@ -316,7 +326,7 @@ test_ring_negative_tests(void)\n \t\t\t\tRING_SIZE + 1, SOCKET_ID_ANY, 0);\n \tif (rp != NULL) {\n \t\tprintf(\"Test failed to detect invalid element size\\n\");\n-\t\tgoto test_fail;\n+\t\tgoto fail;\n \t}\n \n \n@@ -326,7 +336,7 @@ test_ring_negative_tests(void)\n \t\t\t\t\tRING_SIZE + 1, SOCKET_ID_ANY, 0);\n \t\tif (rp != NULL) {\n \t\t\tprintf(\"Test failed to detect odd count\\n\");\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/* Test if ring size is exceeding the limit */\n@@ -334,14 +344,14 @@ test_ring_negative_tests(void)\n \t\t\t\t\tRTE_RING_SZ_MASK + 1, SOCKET_ID_ANY, 0);\n \t\tif (rp != NULL) {\n \t\t\tprintf(\"Test failed to detect limits\\n\");\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/* Tests if lookup returns NULL on non-existing ring */\n \t\trp = rte_ring_lookup(\"ring_not_found\");\n \t\tif (rp != NULL && rte_errno != ENOENT) {\n \t\t\tprintf(\"Test failed to detect NULL ring lookup\\n\");\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/* Test to if a non-power of 2 count causes the create\n@@ -350,23 +360,19 @@ test_ring_negative_tests(void)\n \t\trp = test_ring_create(\"test_ring_count\", esize[i], 4097,\n \t\t\t\t\tSOCKET_ID_ANY, 0);\n \t\tif (rp != NULL)\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \n \t\trp = test_ring_create(\"test_ring_negative\", esize[i], RING_SIZE,\n \t\t\t\t\tSOCKET_ID_ANY,\n \t\t\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n \t\tif (rp == NULL) {\n \t\t\tprintf(\"test_ring_negative fail to create ring\\n\");\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \n-\t\tif (rte_ring_lookup(\"test_ring_negative\") != rp)\n-\t\t\tgoto test_fail;\n+\t\tTEST_RING_VERIFY(rte_ring_lookup(\"test_ring_negative\") == rp, rp);\n \n-\t\tif (rte_ring_empty(rp) != 1) {\n-\t\t\tprintf(\"test_ring_nagative ring is not empty but it should be\\n\");\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_empty(rp) == 1, rp);\n \n \t\t/* Tests if it would always fail to create ring with an used\n \t\t * ring name.\n@@ -374,7 +380,7 @@ test_ring_negative_tests(void)\n \t\trt = test_ring_create(\"test_ring_negative\", esize[i], RING_SIZE,\n \t\t\t\t\tSOCKET_ID_ANY, 0);\n \t\tif (rt != NULL)\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \n \t\trte_ring_free(rp);\n \t\trp = NULL;\n@@ -382,7 +388,7 @@ test_ring_negative_tests(void)\n \n \treturn 0;\n \n-test_fail:\n+fail:\n \n \trte_ring_free(rp);\n \treturn -1;\n@@ -433,37 +439,38 @@ test_ring_burst_bulk_tests1(unsigned int test_idx)\n \t\t\t __func__, i, rand);\n \t\t\tret = test_ring_enq_impl(r, cur_src, esize[i], rand,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tTEST_RING_VERIFY(ret != 0);\n+\t\t\tTEST_RING_VERIFY(ret != 0, r);\n \n \t\t\tret = test_ring_deq_impl(r, cur_dst, esize[i], rand,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tTEST_RING_VERIFY(ret == rand);\n+\t\t\tTEST_RING_VERIFY(ret == rand, r);\n \n \t\t\t/* fill the ring */\n \t\t\tret = test_ring_enq_impl(r, cur_src, esize[i], rsz,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tTEST_RING_VERIFY(ret != 0);\n+\t\t\tTEST_RING_VERIFY(ret != 0, r);\n \n-\t\t\tTEST_RING_VERIFY(rte_ring_free_count(r) == 0);\n-\t\t\tTEST_RING_VERIFY(rsz == rte_ring_count(r));\n-\t\t\tTEST_RING_VERIFY(rte_ring_full(r));\n-\t\t\tTEST_RING_VERIFY(rte_ring_empty(r) == 0);\n+\t\t\tTEST_RING_VERIFY(rte_ring_free_count(r) == 0, r);\n+\t\t\tTEST_RING_VERIFY(rsz == rte_ring_count(r), r);\n+\t\t\tTEST_RING_VERIFY(rte_ring_full(r), r);\n+\t\t\tTEST_RING_VERIFY(rte_ring_empty(r) == 0, r);\n \n \t\t\t/* empty the ring */\n \t\t\tret = test_ring_deq_impl(r, cur_dst, esize[i], rsz,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tTEST_RING_VERIFY(ret == (int)rsz);\n-\t\t\tTEST_RING_VERIFY(rsz == rte_ring_free_count(r));\n-\t\t\tTEST_RING_VERIFY(rte_ring_count(r) == 0);\n-\t\t\tTEST_RING_VERIFY(rte_ring_full(r) == 0);\n-\t\t\tTEST_RING_VERIFY(rte_ring_empty(r));\n+\t\t\tTEST_RING_VERIFY(ret == (int)rsz, r);\n+\n+\t\t\tTEST_RING_VERIFY(rsz == rte_ring_free_count(r), r);\n+\t\t\tTEST_RING_VERIFY(rte_ring_count(r) == 0, r);\n+\t\t\tTEST_RING_VERIFY(rte_ring_full(r) == 0, r);\n+\t\t\tTEST_RING_VERIFY(rte_ring_empty(r), r);\n \n \t\t\t/* check data */\n \t\t\ttemp_sz = rsz * sizeof(void *);\n \t\t\tif (esize[i] != -1)\n \t\t\t\ttemp_sz = rsz * esize[i];\n \t\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n-\t\t\t\t\t\ttemp_sz) == 0);\n+\t\t\t\t\t\ttemp_sz) == 0, r);\n \t\t}\n \n \t\t/* Free memory before test completed */\n@@ -520,45 +527,39 @@ test_ring_burst_bulk_tests2(unsigned int test_idx)\n \n \t\tprintf(\"enqueue 1 obj\\n\");\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], 1, test_idx);\n-\t\tif (ret != 1)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 1, r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \n \t\tprintf(\"enqueue 2 objs\\n\");\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], 2, test_idx);\n-\t\tif (ret != 2)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 2, r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n \t\tprintf(\"enqueue MAX_BULK objs\\n\");\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK,\n \t\t\t\t\t\ttest_idx);\n-\t\tif (ret != MAX_BULK)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], MAX_BULK);\n \n \t\tprintf(\"dequeue 1 obj\\n\");\n \t\tret = test_ring_deq_impl(r, cur_dst, esize[i], 1, test_idx);\n-\t\tif (ret != 1)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 1, r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 1);\n \n \t\tprintf(\"dequeue 2 objs\\n\");\n \t\tret = test_ring_deq_impl(r, cur_dst, esize[i], 2, test_idx);\n-\t\tif (ret != 2)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 2, r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n \n \t\tprintf(\"dequeue MAX_BULK objs\\n\");\n \t\tret = test_ring_deq_impl(r, cur_dst, esize[i], MAX_BULK,\n \t\t\t\t\t\ttest_idx);\n-\t\tif (ret != MAX_BULK)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], MAX_BULK);\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_dst, dst)))\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0, r);\n \n \t\t/* Free memory before test completed */\n \t\trte_ring_free(r);\n@@ -615,22 +616,20 @@ test_ring_burst_bulk_tests3(unsigned int test_idx)\n \t\tfor (j = 0; j < RING_SIZE / MAX_BULK; j++) {\n \t\t\tret = test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tif (ret != MAX_BULK)\n-\t\t\t\tgoto fail;\n+\t\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i],\n \t\t\t\t\t\t\t\tMAX_BULK);\n \n \t\t\tret = test_ring_deq_impl(r, cur_dst, esize[i], MAX_BULK,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tif (ret != MAX_BULK)\n-\t\t\t\tgoto fail;\n+\t\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i],\n \t\t\t\t\t\t\t\tMAX_BULK);\n \t\t}\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_dst, dst)))\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0, r);\n \n \t\t/* Free memory before test completed */\n \t\trte_ring_free(r);\n@@ -690,16 +689,14 @@ test_ring_burst_bulk_tests4(unsigned int test_idx)\n \t\tfor (j = 0; j < (RING_SIZE/MAX_BULK - 1); j++) {\n \t\t\tret = test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tif (ret != MAX_BULK)\n-\t\t\t\tgoto fail;\n+\t\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i],\n \t\t\t\t\t\t\t\tMAX_BULK);\n \t\t}\n \n \t\tprintf(\"Enqueue 2 objects, free entries = MAX_BULK - 2\\n\");\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], 2, test_idx);\n-\t\tif (ret != 2)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 2, r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n \t\tprintf(\"Enqueue the remaining entries = MAX_BULK - 3\\n\");\n@@ -711,34 +708,29 @@ test_ring_burst_bulk_tests4(unsigned int test_idx)\n \t\t/* Always one free entry left */\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], num_elems,\n \t\t\t\t\t\ttest_idx);\n-\t\tif (ret != MAX_BULK - 3)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == MAX_BULK - 3, r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], MAX_BULK - 3);\n \n \t\tprintf(\"Test if ring is full\\n\");\n-\t\tif (rte_ring_full(r) != 1)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(rte_ring_full(r) == 1, r);\n \n \t\tprintf(\"Test enqueue for a full entry\\n\");\n \t\tret = test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK,\n \t\t\t\t\t\ttest_idx);\n-\t\tif (ret != 0)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 0, r);\n \n \t\tprintf(\"Test dequeue without enough objects\\n\");\n \t\tfor (j = 0; j < RING_SIZE / MAX_BULK - 1; j++) {\n \t\t\tret = test_ring_deq_impl(r, cur_dst, esize[i], MAX_BULK,\n \t\t\t\t\t\t\ttest_idx);\n-\t\t\tif (ret != MAX_BULK)\n-\t\t\t\tgoto fail;\n+\t\t\tTEST_RING_VERIFY(ret == MAX_BULK, r);\n \t\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i],\n \t\t\t\t\t\t\t\tMAX_BULK);\n \t\t}\n \n \t\t/* Available memory space for the exact MAX_BULK entries */\n \t\tret = test_ring_deq_impl(r, cur_dst, esize[i], 2, test_idx);\n-\t\tif (ret != 2)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == 2, r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n \n \t\t/* Bulk APIs enqueue exact number of elements */\n@@ -748,18 +740,16 @@ test_ring_burst_bulk_tests4(unsigned int test_idx)\n \t\t\tnum_elems = MAX_BULK;\n \t\tret = test_ring_deq_impl(r, cur_dst, esize[i], num_elems,\n \t\t\t\t\t\ttest_idx);\n-\t\tif (ret != MAX_BULK - 3)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(ret == MAX_BULK - 3, r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], MAX_BULK - 3);\n \n \t\tprintf(\"Test if ring is empty\\n\");\n \t\t/* Check if ring is empty */\n-\t\tif (rte_ring_empty(r) != 1)\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(rte_ring_empty(r) == 1, r);\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_dst, dst)))\n-\t\t\tgoto fail;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0, r);\n \n \t\t/* Free memory before test completed */\n \t\trte_ring_free(r);\n@@ -795,14 +785,14 @@ test_ring_basic_ex(void)\n \t\t\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n \t\tif (rp == NULL) {\n \t\t\tprintf(\"%s: failed to create ring\\n\", __func__);\n-\t\t\tgoto fail_test;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/* alloc dummy object pointers */\n \t\tsrc = test_ring_calloc(RING_SIZE, esize[i]);\n \t\tif (src == NULL) {\n \t\t\tprintf(\"%s: failed to alloc src memory\\n\", __func__);\n-\t\t\tgoto fail_test;\n+\t\t\tgoto fail;\n \t\t}\n \t\ttest_ring_mem_init(src, RING_SIZE, esize[i]);\n \t\tcur_src = src;\n@@ -811,20 +801,13 @@ test_ring_basic_ex(void)\n \t\tdst = test_ring_calloc(RING_SIZE, esize[i]);\n \t\tif (dst == NULL) {\n \t\t\tprintf(\"%s: failed to alloc dst memory\\n\", __func__);\n-\t\t\tgoto fail_test;\n+\t\t\tgoto fail;\n \t\t}\n \t\tcur_dst = dst;\n \n-\t\tif (rte_ring_lookup(\"test_ring_basic_ex\") != rp) {\n-\t\t\tprintf(\"%s: failed to find ring\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_lookup(\"test_ring_basic_ex\") == rp, rp);\n \n-\t\tif (rte_ring_empty(rp) != 1) {\n-\t\t\tprintf(\"%s: ring is not empty but it should be\\n\",\n-\t\t\t\t__func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_empty(rp) == 1, rp);\n \n \t\tprintf(\"%u ring entries are now free\\n\",\n \t\t\trte_ring_free_count(rp));\n@@ -832,40 +815,24 @@ test_ring_basic_ex(void)\n \t\tfor (j = 0; j < RING_SIZE - 1; j++) {\n \t\t\tret = test_ring_enqueue(rp, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\t\tif (ret != 0) {\n-\t\t\t\tprintf(\"%s: rte_ring_enqueue fails\\n\",\n-\t\t\t\t\t__func__);\n-\t\t\t\tgoto fail_test;\n-\t\t\t}\n+\t\t\tTEST_RING_VERIFY(ret == 0, rp);\n \t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \t\t}\n \n-\t\tif (rte_ring_full(rp) != 1) {\n-\t\t\tprintf(\"%s: ring is not full but it should be\\n\",\n-\t\t\t\t__func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_full(rp) == 1, rp);\n \n \t\tfor (j = 0; j < RING_SIZE - 1; j++) {\n \t\t\tret = test_ring_dequeue(rp, cur_dst, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\t\tif (ret != 0) {\n-\t\t\t\tprintf(\"%s: rte_ring_dequeue fails\\n\",\n-\t\t\t\t\t__func__);\n-\t\t\t\tgoto fail_test;\n-\t\t\t}\n+\t\t\tTEST_RING_VERIFY(ret == 0, rp);\n \t\t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 1);\n \t\t}\n \n-\t\tif (rte_ring_empty(rp) != 1) {\n-\t\t\tprintf(\"%s: ring is not empty but it should be\\n\",\n-\t\t\t\t__func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_empty(rp) == 1, rp);\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_src, src)))\n-\t\t\tgoto fail_test;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0, rp);\n \n \t\t/* Following tests use the configured flags to decide\n \t\t * SP/SC or MP/MC.\n@@ -880,40 +847,28 @@ test_ring_basic_ex(void)\n \t\t/* Covering the ring burst operation */\n \t\tret = test_ring_enqueue(rp, cur_src, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n-\t\tif (ret != 2) {\n-\t\t\tprintf(\"%s: rte_ring_enqueue_burst fails\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == 2, rp);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n \t\tret = test_ring_dequeue(rp, cur_dst, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n-\t\tif (ret != 2) {\n-\t\t\tprintf(\"%s: rte_ring_dequeue_burst fails\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == 2, rp);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n \n \t\t/* Covering the ring bulk operation */\n \t\tret = test_ring_enqueue(rp, cur_src, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BULK);\n-\t\tif (ret != 2) {\n-\t\t\tprintf(\"%s: rte_ring_enqueue_bulk fails\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == 2, rp);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 2);\n \n \t\tret = test_ring_dequeue(rp, cur_dst, esize[i], 2,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BULK);\n-\t\tif (ret != 2) {\n-\t\t\tprintf(\"%s: rte_ring_dequeue_bulk fails\\n\", __func__);\n-\t\t\tgoto fail_test;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == 2, rp);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], 2);\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_dst, dst)))\n-\t\t\tgoto fail_test;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0, rp);\n \n \t\trte_ring_free(rp);\n \t\trte_free(src);\n@@ -925,7 +880,7 @@ test_ring_basic_ex(void)\n \n \treturn 0;\n \n-fail_test:\n+fail:\n \trte_ring_free(rp);\n \trte_free(src);\n \trte_free(dst);\n@@ -955,7 +910,7 @@ test_ring_with_exact_size(void)\n \t\t\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n \t\tif (std_r == NULL) {\n \t\t\tprintf(\"%s: error, can't create std ring\\n\", __func__);\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \t\texact_sz_r = test_ring_create(\"exact sz\", esize[i], ring_sz,\n \t\t\t\trte_socket_id(),\n@@ -964,7 +919,7 @@ test_ring_with_exact_size(void)\n \t\tif (exact_sz_r == NULL) {\n \t\t\tprintf(\"%s: error, can't create exact size ring\\n\",\n \t\t\t\t\t__func__);\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/* alloc object pointers. Allocate one extra object\n@@ -972,14 +927,14 @@ test_ring_with_exact_size(void)\n \t\t */\n \t\tsrc_orig = test_ring_calloc(17, esize[i]);\n \t\tif (src_orig == NULL)\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\ttest_ring_mem_init(src_orig, 17, esize[i]);\n \t\tsrc = (void **)((uintptr_t)src_orig + 1);\n \t\tcur_src = src;\n \n \t\tdst_orig = test_ring_calloc(17, esize[i]);\n \t\tif (dst_orig == NULL)\n-\t\t\tgoto test_fail;\n+\t\t\tgoto fail;\n \t\tdst = (void **)((uintptr_t)dst_orig + 1);\n \t\tcur_dst = dst;\n \n@@ -987,13 +942,9 @@ test_ring_with_exact_size(void)\n \t\t * Check that the exact size ring is bigger than the\n \t\t * standard ring\n \t\t */\n-\t\tif (rte_ring_get_size(std_r) >= rte_ring_get_size(exact_sz_r)) {\n-\t\t\tprintf(\"%s: error, std ring (size: %u) is not smaller than exact size one (size %u)\\n\",\n-\t\t\t\t\t__func__,\n-\t\t\t\t\trte_ring_get_size(std_r),\n-\t\t\t\t\trte_ring_get_size(exact_sz_r));\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_get_size(std_r) <=\n+\t\t\t\trte_ring_get_size(exact_sz_r), std_r);\n+\n \t\t/*\n \t\t * check that the exact_sz_ring can hold one more element\n \t\t * than the standard ring. (16 vs 15 elements)\n@@ -1001,53 +952,34 @@ test_ring_with_exact_size(void)\n \t\tfor (j = 0; j < ring_sz - 1; j++) {\n \t\t\tret = test_ring_enqueue(std_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\t\tif (ret != 0) {\n-\t\t\t\tprintf(\"%s: error, enqueue failed\\n\", __func__);\n-\t\t\t\tgoto test_fail;\n-\t\t\t}\n+\t\t\tTEST_RING_VERIFY(ret == 0, std_r);\n \t\t\tret = test_ring_enqueue(exact_sz_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\t\tif (ret != 0) {\n-\t\t\t\tprintf(\"%s: error, enqueue failed\\n\", __func__);\n-\t\t\t\tgoto test_fail;\n-\t\t\t}\n+\t\t\tTEST_RING_VERIFY(ret == 0, exact_sz_r);\n \t\t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \t\t}\n \t\tret = test_ring_enqueue(std_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\tif (ret != -ENOBUFS) {\n-\t\t\tprintf(\"%s: error, unexpected successful enqueue\\n\",\n-\t\t\t\t__func__);\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == -ENOBUFS, std_r);\n \t\tret = test_ring_enqueue(exact_sz_r, cur_src, esize[i], 1,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE);\n-\t\tif (ret == -ENOBUFS) {\n-\t\t\tprintf(\"%s: error, enqueue failed\\n\", __func__);\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret != -ENOBUFS, exact_sz_r);\n \t\tcur_src = test_ring_inc_ptr(cur_src, esize[i], 1);\n \n \t\t/* check that dequeue returns the expected number of elements */\n \t\tret = test_ring_dequeue(exact_sz_r, cur_dst, esize[i], ring_sz,\n \t\t\t\tTEST_RING_THREAD_DEF | TEST_RING_ELEM_BURST);\n-\t\tif (ret != (int)ring_sz) {\n-\t\t\tprintf(\"%s: error, failed to dequeue expected nb of elements\\n\",\n-\t\t\t\t__func__);\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(ret == (int)ring_sz, exact_sz_r);\n \t\tcur_dst = test_ring_inc_ptr(cur_dst, esize[i], ring_sz);\n \n \t\t/* check that the capacity function returns expected value */\n-\t\tif (rte_ring_get_capacity(exact_sz_r) != ring_sz) {\n-\t\t\tprintf(\"%s: error, incorrect ring capacity reported\\n\",\n-\t\t\t\t\t__func__);\n-\t\t\tgoto test_fail;\n-\t\t}\n+\t\tTEST_RING_VERIFY(rte_ring_get_capacity(exact_sz_r) == ring_sz,\n+\t\t\t\t\texact_sz_r);\n \n \t\t/* check data */\n-\t\tif (test_ring_mem_cmp(src, dst, RTE_PTR_DIFF(cur_dst, dst)))\n-\t\t\tgoto test_fail;\n+\t\tTEST_RING_VERIFY(test_ring_mem_cmp(src, dst,\n+\t\t\t\t\tRTE_PTR_DIFF(cur_dst, dst)) == 0,\n+\t\t\t\t\texact_sz_r);\n \n \t\trte_free(src_orig);\n \t\trte_free(dst_orig);\n@@ -1061,7 +993,7 @@ test_ring_with_exact_size(void)\n \n \treturn 0;\n \n-test_fail:\n+fail:\n \trte_free(src_orig);\n \trte_free(dst_orig);\n \trte_ring_free(std_r);\n", "prefixes": [ "v3", "6/6" ] }