From patchwork Fri Aug 18 02:52:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130485 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 14C3F41B5F; Fri, 18 Aug 2023 04:53:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5159143249; Fri, 18 Aug 2023 04:53:03 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id CB32940156 for ; Fri, 18 Aug 2023 04:53:01 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1bdc8081147so11300155ad.1 for ; Thu, 17 Aug 2023 19:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327181; x=1692931981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E1MtmzRczG9R8sdimGR3cF3ENkpHmb30hP1omR7gfKE=; b=uQdCbXJbIpFI5Z0xkqfebtl/6w3Wp8NlhkMPULMVboYGnQxaN4TmRX8oWIRLzIbkx9 DJ6P35fIktX9Uf7WWAdWo6PneXjBPwnzLBxwfi5w8jvaKcxMM7sK0ODefdTXlEy6REFW uo5unZAiDNK49EvVDZ9trIwXJlfLBwvQHRXA77KknQmLJKDzHGC1vzgcZZRV1yGU/zk5 +nSU3y0lxwQ2kmJdSZBRZFxA0pIQwV8/IuNHABh5iLcKB3gWey+oskp0zsZXwel9CcBJ Ohg3X5JIySq6Uz5+QtPKVU7c7WFy1gKl97P9ksBoIBLG2ymHJm2DViKRyX7egVK3ptqh PpSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327181; x=1692931981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E1MtmzRczG9R8sdimGR3cF3ENkpHmb30hP1omR7gfKE=; b=ldwuf1RMXTD4J6ijLQ3S1LTBhjciC+09OvwVsZYbQ1AkjxI7Pr3Vm0hRDhDhpxdTCC EyOcXq6plTtZvHtMlblcwJRuL1tjvn6cLHBZgEf9wscEWd53/wUGzZ8IxRcXH8NrHlUV Yn32iIGl7XOkXZCSg2HN2IFFislamcehixPYkRJJWW7Z0nthTM+ZWtd+sTHwzUwFuUYh PC7PbW+0agHMKBPIH+pXYqc04TKTr/wF5A39j3R0uN9UkQnHcCwgpj0Ee1Oxc5B/vp7W qlKv/EnbS1Mca9pajQOuCGytLGqwMBZ/AqMXTDu9hji+ayDT7kC36tdmdWJ+Rt5L0U3r HU7g== X-Gm-Message-State: AOJu0Yw6p4ZVYpdPOnpaslnmHUSr4jLtf0jVFV7DWBLHumql1IQEOwOF UGkFZ/4snYENsJ9fS6lJTus4srvhR+L7rUWyuKbSUQ== X-Google-Smtp-Source: AGHT+IE+7IFCyOGWDeNpZyPT3OOdCo2TsTrv268mY0reNh03GVMcrtkaytKd2ovaBbPNamuLMFqPtQ== X-Received: by 2002:a17:90b:1650:b0:269:4fe8:687 with SMTP id il16-20020a17090b165000b002694fe80687mr1536863pjb.19.1692327180691; Thu, 17 Aug 2023 19:53:00 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Date: Thu, 17 Aug 2023 19:52:36 -0700 Message-Id: <20230818025249.33994-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The term abort is on the "Replace now" list of words. Use cancel instead. Signed-off-by: Stephen Hemminger --- examples/l2fwd-jobstats/main.c | 2 +- lib/jobstats/rte_jobstats.c | 2 +- lib/jobstats/rte_jobstats.h | 9 ++++++++- lib/jobstats/version.map | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c index 2653db473538..a3b604e307e1 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -534,7 +534,7 @@ l2fwd_main_loop(void) if (likely(repeats != 1)) rte_jobstats_finish(&qconf->idle_job, qconf->idle_job.target); else - rte_jobstats_abort(&qconf->idle_job); + rte_jobstats_cancel(&qconf->idle_job); rte_timer_manage(); rte_jobstats_context_finish(&qconf->jobs_context); diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c index af565a14eaf3..d8c17f135471 100644 --- a/lib/jobstats/rte_jobstats.c +++ b/lib/jobstats/rte_jobstats.c @@ -139,7 +139,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job) } int -rte_jobstats_abort(struct rte_jobstats *job) +rte_jobstats_cancel(struct rte_jobstats *job) { struct rte_jobstats_context *ctx; uint64_t now, exec_time; diff --git a/lib/jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h index 45b460e6030a..89294d181592 100644 --- a/lib/jobstats/rte_jobstats.h +++ b/lib/jobstats/rte_jobstats.h @@ -218,7 +218,14 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job); * -EINVAL if job is NULL or job was not started (it have no context). */ int -rte_jobstats_abort(struct rte_jobstats *job); +rte_jobstats_cancel(struct rte_jobstats *job); + +__rte_deprecated +static inline int +rte_jobstats_abort(struct rte_jobstats *job) +{ + return rte_jobstats_cancel(job); +} /** * Mark that *job* finished its execution. Context in which it was executing diff --git a/lib/jobstats/version.map b/lib/jobstats/version.map index 3b8f9d6ac464..c334033a6048 100644 --- a/lib/jobstats/version.map +++ b/lib/jobstats/version.map @@ -1,7 +1,7 @@ DPDK_24 { global: - rte_jobstats_abort; + rte_jobstats_cancel; rte_jobstats_context_finish; rte_jobstats_context_init; rte_jobstats_context_reset;