From patchwork Fri Aug 18 17:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130526 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 5B0D34309A; Fri, 18 Aug 2023 19:46:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC28542FB2; Fri, 18 Aug 2023 19:46:47 +0200 (CEST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mails.dpdk.org (Postfix) with ESMTP id 765C140395 for ; Fri, 18 Aug 2023 19:46:45 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6889350bc2bso1106341b3a.0 for ; Fri, 18 Aug 2023 10:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380804; x=1692985604; 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=iUv50qfl8/mjKH1QQ3BhkkpH6/OpyLxFrO8QT3Qtm5HTEInQD2beCoKCOPC38rvycH BOeH8/25COLmnjnMH80F75Swi6+qAlL+nEobJksi2JeGR/5eeoGIWJZIGs6NyvmxJtZ7 JKZt74dct1w8dfZz+IOKClcGNLP4AYUv5OuzQw71Tc56WlSJWUBtjayCs27GyyJs5Xps K9zN/kKFAj8zpEhX1P9mUG8MD16XGXjZwM0ieFM8PPU+cSI2g4Om9v/fjOj24o/n4axd TorrLZcJsNfzRwFK/RHmtAw52YRrk6NvqQjB7eOhIOYXqYZ14DT8qNhowHDizQiJUxqe 4jdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380804; x=1692985604; 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=bbvFTUU9MUlGqAMes7abfqelGlxnK6D2IRgI7t3FF9GCiNHGUxA392Vo06YoL/tntR 60l2eIqvlpIEwHdPtkcuD/h7UvDwsViY4FMhWSw5NPbiHExKO5iuoaQZ0bQXT7YqvpzM hmmfgPKVmLDGCHXi1MXswZw3x0DV0u21m9vM7FLSb6+owP+i/PusrsOwojKufimQq9uw Z7FpIgtk2AVmpAFRobrrCUY0PTNtHVL4NLXhlZbusF2GBqfvKh5o33/sSUuH3s1Gx7es XcJuZsRfl4KeyfPcxVVm3SJhtOfET2MV2CpVdEJ5lvKVqqI7gzzbDJiETKLUkc6oG8AS JuMw== X-Gm-Message-State: AOJu0YzwyaHc7phSiG5txDa9d9/OwHZCsvt98KcHZ8hBxWVc9FTlgeha NnNxBwBwdDuuAk775gKCZPj+D8qbjYvTO/a8WyjMSw== X-Google-Smtp-Source: AGHT+IGdKXhWgaqDCOWwQeD0F5VAy31nRgqYB+eh8qhwFEhBnhun3tjrR8wY0/z3enbgMBpooVTfGw== X-Received: by 2002:a05:6a00:2d26:b0:66c:9faa:bb12 with SMTP id fa38-20020a056a002d2600b0066c9faabb12mr3547315pfb.9.1692380804366; Fri, 18 Aug 2023 10:46:44 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Date: Fri, 18 Aug 2023 10:45:25 -0700 Message-Id: <20230818174537.290222-2-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> <20230818174537.290222-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;