From patchwork Tue May 17 13:04:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 67965 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2078934qge; Tue, 17 May 2016 06:34:11 -0700 (PDT) X-Received: by 10.55.130.66 with SMTP id e63mr1522866qkd.128.1463492048651; Tue, 17 May 2016 06:34:08 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q84si2204926qkc.225.2016.05.17.06.34.08; Tue, 17 May 2016 06:34:08 -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 3709C6172C; Tue, 17 May 2016 13:34:08 +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 C2CA16182E; Tue, 17 May 2016 13:16:04 +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 0D74C61813; Tue, 17 May 2016 13:15:33 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id 72193617A2 for ; Tue, 17 May 2016 13:05:29 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id u64so6524523lff.3 for ; Tue, 17 May 2016 06:05:29 -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=Qx5LwkC0iFs8mfbNs+Pm0BiJ0O+g7gQoIlE2Y90Wpq4=; b=fix3ttHafFX9uICxAXiNJVGO+bob2IQTaTE/eJRy+lI9QCtTn2lJqycd5B6IH2SXIB HsSfjU4bt4XyLWHWRLUjhmT4+h/hVl2CJ7LK0Bm5Ys5J0PVc1FEscDzgF6yA98GwEtZD VqHu916eH2qJQZxGF0pywS3H2vozxCjKpmzqL2AAJqlaCf+Ldm9PMF6QyRyr1aA9Oo1f 9wgJRGrxiBp4veB+xfqeZSXGnjW3yR+jIDVfUGC6p8TDljvRS95PSNO2uKD3bcX085uF 6gfd+4cxhLWwcpI82ZSU/NFhDmSjKQ6u05C/5vvyrf1ByM3WhC2NveJRC1iWDFvrKswO 6s+A== X-Gm-Message-State: AOPr4FVD7t6uil0NXAHQebAICWB7tm44LPiFEWtwv1sY7/ymccmCQqnbKyf1VgNi5HfhA+REU+A= X-Received: by 10.25.83.10 with SMTP id h10mr438417lfb.39.1463490328412; Tue, 17 May 2016 06:05:28 -0700 (PDT) Received: from localhost.localdomain (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by smtp.gmail.com with ESMTPSA id q1sm506536lbo.4.2016.05.17.06.05.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 06:05:27 -0700 (PDT) From: Christophe Milard To: lng-odp@lists.linaro.org, brian.brooks@linaro.org, mike.holmes@linaro.org Date: Tue, 17 May 2016 15:04:28 +0200 Message-Id: <1463490282-23277-22-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1463490282-23277-1-git-send-email-christophe.milard@linaro.org> References: <1463490282-23277-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv7 21/35] example: ipsec: 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_ipsec is changed to use the implementation agnostic ODP thread create and join functions, from helpers. odp_ipsec is hence no longer aware on how the odpthread is implemented. Signed-off-by: Christophe Milard --- example/ipsec/odp_ipsec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index e75db61..4d08772 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1047,12 +1047,12 @@ pkt_disposition_e do_ipsec_out_finish(odp_packet_t pkt, * - Sequence number assignment queue * - Per packet crypto API completion queue * - * @param arg Required by "odph_linux_pthread_create", unused + * @param arg Required by "odph_odpthreads_create", unused * * @return NULL (should never return) */ static -void *pktio_thread(void *arg EXAMPLE_UNUSED) +int pktio_thread(void *arg EXAMPLE_UNUSED) { int thr; odp_packet_t pkt; @@ -1203,7 +1203,7 @@ void *pktio_thread(void *arg EXAMPLE_UNUSED) } /* unreachable */ - return NULL; + return 0; } /** @@ -1212,7 +1212,7 @@ void *pktio_thread(void *arg EXAMPLE_UNUSED) int main(int argc, char *argv[]) { - odph_linux_pthread_t thread_tbl[MAX_WORKERS]; + odph_odpthread_t thread_tbl[MAX_WORKERS]; int num_workers; int i; int stream_count; @@ -1221,7 +1221,7 @@ main(int argc, char *argv[]) char cpumaskstr[ODP_CPUMASK_STR_SIZE]; odp_pool_param_t params; odp_instance_t instance; - odph_linux_thr_params_t thr_params; + odph_odpthread_params_t thr_params; /* create by default scheduled queues */ queue_create = odp_queue_create; @@ -1341,8 +1341,7 @@ main(int argc, char *argv[]) thr_params.arg = NULL; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - - odph_linux_pthread_create(thread_tbl, &cpumask, &thr_params); + odph_odpthreads_create(thread_tbl, &cpumask, &thr_params); /* * If there are streams attempt to verify them else @@ -1356,7 +1355,7 @@ main(int argc, char *argv[]) } while (!done); printf("All received\n"); } else { - odph_linux_pthread_join(thread_tbl, num_workers); + odph_odpthreads_join(thread_tbl); } free(args->appl.if_names);