Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130528/?format=api
{ "id": 130528, "url": "http://patchwork.dpdk.org/api/patches/130528/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230818174537.290222-4-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patchwork.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": "<20230818174537.290222-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230818174537.290222-4-stephen@networkplumber.org", "date": "2023-08-18T17:45:27", "name": "[v2,03/13] pipeline: remove use of term abort", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "99f38999db2f14f723432a17bedd82a53930f30e", "submitter": { "id": 27, "url": "http://patchwork.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230818174537.290222-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 29282, "url": "http://patchwork.dpdk.org/api/series/29282/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29282", "date": "2023-08-18T17:45:24", "name": "Replace us of term abort", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29282/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/130528/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130528/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 6DACB4309A;\n\tFri, 18 Aug 2023 19:47:08 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3441243247;\n\tFri, 18 Aug 2023 19:46:51 +0200 (CEST)", "from mail-pf1-f181.google.com (mail-pf1-f181.google.com\n [209.85.210.181])\n by mails.dpdk.org (Postfix) with ESMTP id B1E4E43000\n for <dev@dpdk.org>; Fri, 18 Aug 2023 19:46:47 +0200 (CEST)", "by mail-pf1-f181.google.com with SMTP id\n d2e1a72fcca58-686be3cbea0so1620423b3a.0\n for <dev@dpdk.org>; Fri, 18 Aug 2023 10:46:47 -0700 (PDT)", "from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207])\n by smtp.gmail.com with ESMTPSA id\n u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.46\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 18 Aug 2023 10:46:46 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380806;\n x=1692985606;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=;\n b=gmmDe+EDBNVMkOENEbGksg4K9e4pQxH+S7PChBNtqCkAw9OI0U0yhA/r0h68cP5z9p\n qggR/sYYgT9r5zN5ri02zdueL6H0fEW7zf677gGAb7DS10iDpvNr/ImMCuYbl+sf/Wcr\n wThCTgCpE/rAjenxCEu39Xau/qfr11sMc0yUWXfzsqzlYpgSrwS9fnwBVPaZLFRy1ln1\n S6BWO+F6W8kkZ9c9LuxF12vntvUQNv11bdt+7jISldt57tlDPP4N2N1eBSwIiVdsr9U5\n KWsrqJoNA66bAK6us/nN1oFupngg9JK+IrY2E98jZO8X++nMdVoNAprndDCJvHZh07mx\n vvJA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1692380806; x=1692985606;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=;\n b=V7JzB0sEAc8CP2BGuBKiX8++w6Nd3ilLG7g/aDHUbz0JCxOaayf56PtgQQ+xkvttqZ\n gXbR5KD2Dwopal9efeO2MR0kXTHhz3TqTVelICukyklBnQFtAIWn0nEAE+87zYPsY6Nc\n +fOXdJ0qQnF2kzverwvlrpsUXN8zQq7aEAHQt+FNLGoQ1spND+BBgGpFZAVR9a1hTytM\n AyPWuqoZ0ilIUmMHB4W/nEXfdAAXsjYo2JvQoEoz7m1PDb9inrz2ylmMmY+Tn74e2jLX\n XLu+Wz2TO3Uhc+PYQICIwpbZ8nb/vyYPGThXVns8NuK6vnaM48IgYjjG8uAoc615YZZ/\n eiHw==", "X-Gm-Message-State": "AOJu0YyeW6yl6cxjAWlURmSnsItaGTHeOMiVNRgl49AGmoExO97AhnO1\n ZfqszoD+iHwidrqWBYv2ljBlxLMa/gYVfzGCF3A3yw==", "X-Google-Smtp-Source": "\n AGHT+IFDeqkXaCtfXLk96ox0YhF4Kx254RhV5mG3JreS51CKKdCu7es1dafEjIbV6R9e1KhLv6gxRA==", "X-Received": "by 2002:a05:6a20:918e:b0:13e:debc:3657 with SMTP id\n v14-20020a056a20918e00b0013edebc3657mr3334591pzd.30.1692380806565;\n Fri, 18 Aug 2023 10:46:46 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "Subject": "[PATCH v2 03/13] pipeline: remove use of term abort", "Date": "Fri, 18 Aug 2023 10:45:27 -0700", "Message-Id": "<20230818174537.290222-4-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20230818174537.290222-1-stephen@networkplumber.org>", "References": "<20230818025249.33994-1-stephen@networkplumber.org>\n <20230818174537.290222-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Replace with cancel.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n examples/pipeline/cli.c | 20 ++++++++++----------\n lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++--------------\n lib/pipeline/rte_swx_ctl.h | 8 ++++----\n lib/pipeline/version.map | 2 +-\n 4 files changed, 30 insertions(+), 29 deletions(-)", "diff": "diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c\nindex 2ae6cc579ff2..090e5e470106 100644\n--- a/examples/pipeline/cli.c\n+++ b/examples/pipeline/cli.c\n@@ -1778,14 +1778,14 @@ cmd_pipeline_commit(char **tokens,\n \tstatus = rte_swx_ctl_pipeline_commit(ctl, 1);\n \tif (status)\n \t\tsnprintf(out, out_size, \"Commit failed. \"\n-\t\t\t\"Use \\\"commit\\\" to retry or \\\"abort\\\" to discard the pending work.\\n\");\n+\t\t\t\"Use \\\"commit\\\" to retry or \\\"cancel\\\" to discard the pending work.\\n\");\n }\n \n-static const char cmd_pipeline_abort_help[] =\n-\"pipeline <pipeline_name> abort\\n\";\n+static const char cmd_pipeline_cancel_help[] =\n+\"pipeline <pipeline_name> cancel\\n\";\n \n static void\n-cmd_pipeline_abort(char **tokens,\n+cmd_pipeline_cancel(char **tokens,\n \tuint32_t n_tokens,\n \tchar *out,\n \tsize_t out_size,\n@@ -1806,7 +1806,7 @@ cmd_pipeline_abort(char **tokens,\n \t\treturn;\n \t}\n \n-\trte_swx_ctl_pipeline_abort(ctl);\n+\trte_swx_ctl_pipeline_cancel(ctl);\n }\n \n static const char cmd_pipeline_regrd_help[] =\n@@ -3474,8 +3474,8 @@ cmd_help(char **tokens,\n \t\t\t\"\\tpipeline selector group member delete\\n\"\n \t\t\t\"\\tpipeline selector show\\n\"\n \t\t\t\"\\tpipeline learner default\\n\"\n+\t\t\t\"\\tpipeline cancel\\n\"\n \t\t\t\"\\tpipeline commit\\n\"\n-\t\t\t\"\\tpipeline abort\\n\"\n \t\t\t\"\\tpipeline regrd\\n\"\n \t\t\t\"\\tpipeline regwr\\n\"\n \t\t\t\"\\tpipeline meter profile add\\n\"\n@@ -3648,9 +3648,9 @@ cmd_help(char **tokens,\n \n \tif ((strcmp(tokens[0], \"pipeline\") == 0) &&\n \t\t(n_tokens == 2) &&\n-\t\t(strcmp(tokens[1], \"abort\") == 0)) {\n+\t\t(strcmp(tokens[1], \"cancel\") == 0)) {\n \t\tsnprintf(out, out_size, \"\\n%s\\n\",\n-\t\t\tcmd_pipeline_abort_help);\n+\t\t\tcmd_pipeline_cancel_help);\n \t\treturn;\n \t}\n \n@@ -3934,8 +3934,8 @@ cli_process(char *in, char *out, size_t out_size, void *obj)\n \t\t}\n \n \t\tif ((n_tokens >= 3) &&\n-\t\t\t(strcmp(tokens[2], \"abort\") == 0)) {\n-\t\t\tcmd_pipeline_abort(tokens, n_tokens, out,\n+\t\t\t(strcmp(tokens[2], \"cancel\") == 0)) {\n+\t\t\tcmd_pipeline_cancel(tokens, n_tokens, out,\n \t\t\t\tout_size, obj);\n \t\t\treturn;\n \t\t}\ndiff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c\nindex 857770d297a4..41d07e9b3a19 100644\n--- a/lib/pipeline/rte_swx_ctl.c\n+++ b/lib/pipeline/rte_swx_ctl.c\n@@ -2063,7 +2063,7 @@ table_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)\n * failed commit operation to remove ALL the pending work for ALL the tables.\n */\n static void\n-table_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)\n+table_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)\n {\n \tstruct table *table = &ctl->tables[table_id];\n \n@@ -2366,7 +2366,7 @@ selector_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)\n }\n \n static void\n-selector_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)\n+selector_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)\n {\n \tstruct selector *s = &ctl->selectors[selector_id];\n \tuint32_t group_id;\n@@ -2545,7 +2545,7 @@ learner_rollfwd_finalize(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)\n }\n \n static void\n-learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)\n+learner_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)\n {\n \tstruct learner *l = &ctl->learners[learner_id];\n \n@@ -2554,7 +2554,8 @@ learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)\n }\n \n int\n-rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)\n+rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,\n+\t\t\t int cancel_on_fail)\n {\n \tstruct rte_swx_table_state *ts;\n \tint status = 0;\n@@ -2622,25 +2623,25 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)\n rollback:\n \tfor (i = 0; i < ctl->info.n_tables; i++) {\n \t\ttable_rollback(ctl, i);\n-\t\tif (abort_on_fail)\n-\t\t\ttable_abort(ctl, i);\n+\t\tif (cancel_on_fail)\n+\t\t\ttable_cancel(ctl, i);\n \t}\n \n \tfor (i = 0; i < ctl->info.n_selectors; i++) {\n \t\tselector_rollback(ctl, i);\n-\t\tif (abort_on_fail)\n-\t\t\tselector_abort(ctl, i);\n+\t\tif (cancel_on_fail)\n+\t\t\tselector_cancel(ctl, i);\n \t}\n \n-\tif (abort_on_fail)\n+\tif (cancel_on_fail)\n \t\tfor (i = 0; i < ctl->info.n_learners; i++)\n-\t\t\tlearner_abort(ctl, i);\n+\t\t\tlearner_cancel(ctl, i);\n \n \treturn status;\n }\n \n void\n-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)\n+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl)\n {\n \tuint32_t i;\n \n@@ -2648,13 +2649,13 @@ rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)\n \t\treturn;\n \n \tfor (i = 0; i < ctl->info.n_tables; i++)\n-\t\ttable_abort(ctl, i);\n+\t\ttable_cancel(ctl, i);\n \n \tfor (i = 0; i < ctl->info.n_selectors; i++)\n-\t\tselector_abort(ctl, i);\n+\t\tselector_cancel(ctl, i);\n \n \tfor (i = 0; i < ctl->info.n_learners; i++)\n-\t\tlearner_abort(ctl, i);\n+\t\tlearner_cancel(ctl, i);\n }\n \n static int\ndiff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h\nindex 6ef2551ab534..14973b74172b 100644\n--- a/lib/pipeline/rte_swx_ctl.h\n+++ b/lib/pipeline/rte_swx_ctl.h\n@@ -1045,7 +1045,7 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,\n *\n * @param[in] ctl\n * Pipeline control handle.\n- * @param[in] abort_on_fail\n+ * @param[in] revert_on_fail\n * When non-zero (false), all the scheduled work is discarded after a failed\n * commit. Otherwise, the scheduled work is still kept pending for the next\n * commit.\n@@ -1056,10 +1056,10 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,\n __rte_experimental\n int\n rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,\n-\t\t\t int abort_on_fail);\n+\t\t\t int revert_on_fail);\n \n /**\n- * Pipeline abort\n+ * Pipeline cancel\n *\n * Discard all the scheduled table work.\n *\n@@ -1068,7 +1068,7 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,\n */\n __rte_experimental\n void\n-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl);\n+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl);\n \n /**\n * Pipeline table entry read\ndiff --git a/lib/pipeline/version.map b/lib/pipeline/version.map\nindex 6997b69340ef..1ddd598fa079 100644\n--- a/lib/pipeline/version.map\n+++ b/lib/pipeline/version.map\n@@ -62,7 +62,7 @@ EXPERIMENTAL {\n \t# added in 20.11\n \trte_swx_ctl_action_arg_info_get;\n \trte_swx_ctl_action_info_get;\n-\trte_swx_ctl_pipeline_abort;\n+\trte_swx_ctl_pipeline_cancel;\n \trte_swx_ctl_pipeline_commit;\n \trte_swx_ctl_pipeline_create;\n \trte_swx_ctl_pipeline_free;\n", "prefixes": [ "v2", "03/13" ] }