[PATCH 03/14] pipeline: remove use of term abort

[Stephen Hemminger]

Replace with cancel.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++--------------
 lib/pipeline/rte_swx_ctl.h |  8 ++++----
 lib/pipeline/version.map   |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index 857770d297a4..41d07e9b3a19 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -2063,7 +2063,7 @@ table_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t 
table_id)
  * failed commit operation to remove ALL the pending work for ALL the tables.
  */
 static void
-table_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
+table_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
 {
        struct table *table = &ctl->tables[table_id];
 
@@ -2366,7 +2366,7 @@ selector_rollback(struct rte_swx_ctl_pipeline *ctl, 
uint32_t selector_id)
 }
 
 static void
-selector_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
+selector_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
 {
        struct selector *s = &ctl->selectors[selector_id];
        uint32_t group_id;
@@ -2545,7 +2545,7 @@ learner_rollfwd_finalize(struct rte_swx_ctl_pipeline 
*ctl, uint32_t learner_id)
 }
 
 static void
-learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
+learner_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
 {
        struct learner *l = &ctl->learners[learner_id];
 
@@ -2554,7 +2554,8 @@ learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t 
learner_id)
 }
 
 int
-rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int 
abort_on_fail)
+rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
+                           int cancel_on_fail)
 {
        struct rte_swx_table_state *ts;
        int status = 0;
@@ -2622,25 +2623,25 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline 
*ctl, int abort_on_fail)
 rollback:
        for (i = 0; i < ctl->info.n_tables; i++) {
                table_rollback(ctl, i);
-               if (abort_on_fail)
-                       table_abort(ctl, i);
+               if (cancel_on_fail)
+                       table_cancel(ctl, i);
        }
 
        for (i = 0; i < ctl->info.n_selectors; i++) {
                selector_rollback(ctl, i);
-               if (abort_on_fail)
-                       selector_abort(ctl, i);
+               if (cancel_on_fail)
+                       selector_cancel(ctl, i);
        }
 
-       if (abort_on_fail)
+       if (cancel_on_fail)
                for (i = 0; i < ctl->info.n_learners; i++)
-                       learner_abort(ctl, i);
+                       learner_cancel(ctl, i);
 
        return status;
 }
 
 void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl)
 {
        uint32_t i;
 
@@ -2648,13 +2649,13 @@ rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline 
*ctl)
                return;
 
        for (i = 0; i < ctl->info.n_tables; i++)
-               table_abort(ctl, i);
+               table_cancel(ctl, i);
 
        for (i = 0; i < ctl->info.n_selectors; i++)
-               selector_abort(ctl, i);
+               selector_cancel(ctl, i);
 
        for (i = 0; i < ctl->info.n_learners; i++)
-               learner_abort(ctl, i);
+               learner_cancel(ctl, i);
 }
 
 static int
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 6ef2551ab534..14973b74172b 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -1045,7 +1045,7 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct 
rte_swx_ctl_pipeline *ctl,
  *
  * @param[in] ctl
  *   Pipeline control handle.
- * @param[in] abort_on_fail
+ * @param[in] revert_on_fail
  *   When non-zero (false), all the scheduled work is discarded after a failed
  *   commit. Otherwise, the scheduled work is still kept pending for the next
  *   commit.
@@ -1056,10 +1056,10 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct 
rte_swx_ctl_pipeline *ctl,
 __rte_experimental
 int
 rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
-                           int abort_on_fail);
+                           int revert_on_fail);
 
 /**
- * Pipeline abort
+ * Pipeline cancel
  *
  * Discard all the scheduled table work.
  *
@@ -1068,7 +1068,7 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline 
*ctl,
  */
 __rte_experimental
 void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl);
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl);
 
 /**
  * Pipeline table entry read
diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map
index 6997b69340ef..1ddd598fa079 100644
--- a/lib/pipeline/version.map
+++ b/lib/pipeline/version.map
@@ -62,7 +62,7 @@ EXPERIMENTAL {
        # added in 20.11
        rte_swx_ctl_action_arg_info_get;
        rte_swx_ctl_action_info_get;
-       rte_swx_ctl_pipeline_abort;
+       rte_swx_ctl_pipeline_cancel;
        rte_swx_ctl_pipeline_commit;
        rte_swx_ctl_pipeline_create;
        rte_swx_ctl_pipeline_free;
-- 
2.39.2