From patchwork Fri May 20 16:30:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 68263 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3854857qge; Fri, 20 May 2016 08:47:38 -0700 (PDT) X-Received: by 10.140.98.117 with SMTP id n108mr3936913qge.16.1463759258330; Fri, 20 May 2016 08:47:38 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v14si18709619qka.53.2016.05.20.08.47.38; Fri, 20 May 2016 08:47:38 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0708F616F0; Fri, 20 May 2016 15:47:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 27BA96185E; Fri, 20 May 2016 15:34:27 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DE3EE61851; Fri, 20 May 2016 15:34:22 +0000 (UTC) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by lists.linaro.org (Postfix) with ESMTPS id A5CAB6178E for ; Fri, 20 May 2016 15:32:14 +0000 (UTC) Received: by mail-lf0-f53.google.com with SMTP id e131so2574093lfb.0 for ; Fri, 20 May 2016 08:32:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h0LCIAISiuC1atOoOHALbK2dyIicx7tddSi+8UWwerw=; b=G+n6uAj3ZTtGV5bHBH4CH6iI/CA4s5rHoYoQsjts68oll+7ogGGjjb+Rz4JkJtvpvB z/kZYm0kHhV92+z+JZc9Tp51FUy1lUCOYbgIGNXB6NIbkFpS57Hcog0mPCLbVmwNZ18o f4qc+vlDw8j0boKiaEYYorP5DySp0HdwOb05VskEydlhFzBcFp3buiyNYKH6/vCXWgNb lqyokHTYB3J/qTjqV/8EIp48h0bD6bPUSUIkpA1icixQKKu9EAfP/x83JCFyPMAAdzhL PhcpiKENopZwLePBCfK98BJtqskMmxn6GZvc/BBCVQbVJTQUVNortH44khZ/3puTJjJj kjjg== X-Gm-Message-State: AOPr4FUx2lHGygbPT40bIg/4wa2S/q5mSv+sRAPSsWne2graHpv3DyL0V2lL58I8LVO4xNEPdsw= X-Received: by 10.25.28.66 with SMTP id c63mr1186493lfc.79.1463758333497; Fri, 20 May 2016 08:32:13 -0700 (PDT) Received: from erachmi-ericsson.ki.sw.ericsson.se (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by smtp.gmail.com with ESMTPSA id tg1sm3348847lbb.7.2016.05.20.08.32.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 08:32:12 -0700 (PDT) From: Christophe Milard To: maxim.uvarov@linaro.com, lng-odp@lists.linaro.org Date: Fri, 20 May 2016 18:30:29 +0200 Message-Id: <1463761851-37121-14-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1463761851-37121-1-git-send-email-christophe.milard@linaro.org> References: <1463761851-37121-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv9 13/35] performance: odp_l2fwd: using agnostic function for ODP threads X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" odp_l2fwd is changed to use the implementation agnostic ODP thread create and join functions, from helpers. odp_l2fwd is hence no longer aware on how the odpthread is implemented. Signed-off-by: Christophe Milard --- test/performance/odp_l2fwd.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 8b83475..9a8d578 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -296,7 +296,7 @@ static inline int event_queue_send(odp_queue_t queue, odp_packet_t *pkt_tbl, * * @param arg thread arguments of type 'thread_args_t *' */ -static void *run_worker_sched_mode(void *arg) +static int run_worker_sched_mode(void *arg) { odp_event_t ev_tbl[MAX_PKT_BURST]; odp_packet_t pkt_tbl[MAX_PKT_BURST]; @@ -398,7 +398,7 @@ static void *run_worker_sched_mode(void *arg) /* Make sure that latest stat writes are visible to other threads */ odp_mb_full(); - return NULL; + return 0; } /** @@ -406,7 +406,7 @@ static void *run_worker_sched_mode(void *arg) * * @param arg thread arguments of type 'thread_args_t *' */ -static void *run_worker_plain_queue_mode(void *arg) +static int run_worker_plain_queue_mode(void *arg) { int thr; int pkts; @@ -497,7 +497,7 @@ static void *run_worker_plain_queue_mode(void *arg) /* Make sure that latest stat writes are visible to other threads */ odp_mb_full(); - return NULL; + return 0; } /** @@ -505,7 +505,7 @@ static void *run_worker_plain_queue_mode(void *arg) * * @param arg thread arguments of type 'thread_args_t *' */ -static void *run_worker_direct_mode(void *arg) +static int run_worker_direct_mode(void *arg) { int thr; int pkts; @@ -591,7 +591,7 @@ static void *run_worker_direct_mode(void *arg) /* Make sure that latest stat writes are visible to other threads */ odp_mb_full(); - return NULL; + return 0; } /** @@ -1287,7 +1287,7 @@ static void gbl_args_init(args_t *args) */ int main(int argc, char *argv[]) { - odph_linux_pthread_t thread_tbl[MAX_WORKERS]; + odph_odpthread_t thread_tbl[MAX_WORKERS]; odp_pool_t pool; int i; int cpu; @@ -1300,7 +1300,7 @@ int main(int argc, char *argv[]) int ret; stats_t *stats; int if_count; - void *(*thr_run_func)(void *); + int (*thr_run_func)(void *); odp_instance_t instance; /* Init ODP before calling anything else */ @@ -1435,7 +1435,7 @@ int main(int argc, char *argv[]) cpu = odp_cpumask_first(&cpumask); for (i = 0; i < num_workers; ++i) { odp_cpumask_t thd_mask; - odph_linux_thr_params_t thr_params; + odph_odpthread_params_t thr_params; memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = thr_run_func; @@ -1447,8 +1447,8 @@ int main(int argc, char *argv[]) odp_cpumask_zero(&thd_mask); odp_cpumask_set(&thd_mask, cpu); - odph_linux_pthread_create(&thread_tbl[i], &thd_mask, - &thr_params); + odph_odpthreads_create(&thread_tbl[i], &thd_mask, + &thr_params); cpu = odp_cpumask_next(&cpumask, cpu); } @@ -1470,7 +1470,8 @@ int main(int argc, char *argv[]) exit_threads = 1; /* Master thread waits for other threads to exit */ - odph_linux_pthread_join(thread_tbl, num_workers); + for (i = 0; i < num_workers; ++i) + odph_odpthreads_join(&thread_tbl[i]); free(gbl_args->appl.if_names); free(gbl_args->appl.if_str);