From patchwork Fri May 20 16:30:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 68269 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3857158qge; Fri, 20 May 2016 08:51:19 -0700 (PDT) X-Received: by 10.55.100.213 with SMTP id y204mr4341667qkb.106.1463759479767; Fri, 20 May 2016 08:51:19 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t4si18702738qkc.66.2016.05.20.08.51.19; Fri, 20 May 2016 08:51:19 -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 5D3B0616DD; Fri, 20 May 2016 15:51:19 +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 E698261881; Fri, 20 May 2016 15:35:08 +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 72AE261893; Fri, 20 May 2016 15:35:02 +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 64D61617F7 for ; Fri, 20 May 2016 15:32:21 +0000 (UTC) Received: by mail-lf0-f53.google.com with SMTP id e131so2575563lfb.0 for ; Fri, 20 May 2016 08:32:21 -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=2ZicArtInpLR+/2ldor5iBc8j0qpu/+GYK/ceYwsriA=; b=Yd7xnZo5/w/O2YbnanuJ5L7gh0Kr5sUgCsvLh9jiqjiVzK5Ps0XYhSJ0/3iwYFt71L RJN91luO2DgSUtJr+8bf6z9VXUztrElVshS9pw2q8F/S6iYmR0/vjFWaijA6lK3laL8G Unyk1wQz/Vl1IvAg9Piv+nmbTx/dj1urBTe1N+PfQssaXstuS3SdL5jfmVNQd5iT1U+a 5N2QkFQ1OnymrfFinAJvdcQboOao3p7Ftk3kfrw4PVZZaM2YDDVQpI9rKVgpQKidXc5D vJ64N6cEOHOcpiKNrdcCEO4HCO0+S9wN1RnnDtKg1nMXddNA/GA9lh+s7ver87jjac3C fvkg== X-Gm-Message-State: AOPr4FXXW8eywY2rZqe+F3r59IC3s/mozlN/DWxsMI1/SAOey9eZK5nnYZvmRruqjbxLxFbrh78= X-Received: by 10.25.18.26 with SMTP id h26mr1189823lfi.110.1463758340257; Fri, 20 May 2016 08:32:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 08:32:19 -0700 (PDT) From: Christophe Milard To: maxim.uvarov@linaro.com, lng-odp@lists.linaro.org Date: Fri, 20 May 2016 18:30:35 +0200 Message-Id: <1463761851-37121-20-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 19/35] example: generator: 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_generator is changed to use the implementation agnostic ODP thread create and join functions, from helpers. odp_generator is hence no longer aware on how the odpthread is implemented. Signed-off-by: Christophe Milard --- example/generator/odp_generator.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index fd1141a..dd3e023 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -352,7 +352,7 @@ static odp_pktio_t create_pktio(const char *dev, odp_pool_t pool) * @param arg thread arguments of type 'thread_args_t *' */ -static void *gen_send_thread(void *arg) +static int gen_send_thread(void *arg) { int thr; int ret; @@ -368,12 +368,12 @@ static void *gen_send_thread(void *arg) if (pktio == ODP_PKTIO_INVALID) { EXAMPLE_ERR(" [%02i] Error: lookup of pktio %s failed\n", thr, thr_args->pktio_dev); - return NULL; + return -1; } if (odp_pktout_queue(pktio, &pktout, 1) != 1) { EXAMPLE_ERR(" [%02i] Error: no output queue\n", thr); - return NULL; + return -1; } printf(" [%02i] created mode: SEND\n", thr); @@ -441,7 +441,7 @@ static void *gen_send_thread(void *arg) } } - return arg; + return 0; } /** @@ -515,7 +515,7 @@ static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len) * * @param arg thread arguments of type 'thread_args_t *' */ -static void *gen_recv_thread(void *arg) +static int gen_recv_thread(void *arg) { int thr; odp_pktio_t pktio; @@ -530,7 +530,7 @@ static void *gen_recv_thread(void *arg) if (pktio == ODP_PKTIO_INVALID) { EXAMPLE_ERR(" [%02i] Error: lookup of pktio %s failed\n", thr, thr_args->pktio_dev); - return NULL; + return -1; } printf(" [%02i] created mode: RECEIVE\n", thr); @@ -558,7 +558,7 @@ static void *gen_recv_thread(void *arg) odp_packet_free(pkt); } - return arg; + return 0; } /** @@ -621,7 +621,7 @@ static void print_global_stats(int num_workers) */ 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 num_workers; int i; @@ -636,7 +636,7 @@ int main(int argc, char *argv[]) odp_event_t ev; odp_pktio_t *pktio; odp_instance_t instance; - odph_linux_thr_params_t thr_params; + odph_odpthread_params_t thr_params; /* Init ODP before calling anything else */ if (odp_init_global(&instance, NULL, NULL)) { @@ -786,8 +786,7 @@ int main(int argc, char *argv[]) thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - odph_linux_pthread_create(&thread_tbl[1], &cpu_mask, - &thr_params); + odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) @@ -810,14 +809,13 @@ int main(int argc, char *argv[]) thr_params.start = gen_send_thread; thr_params.arg = &args->thread[0]; - odph_linux_pthread_create(&thread_tbl[0], &cpu_mask, - &thr_params); + odph_odpthreads_create(&thread_tbl[0], &cpu_mask, &thr_params); } else { int cpu = odp_cpumask_first(&cpumask); for (i = 0; i < num_workers; ++i) { odp_cpumask_t thd_mask; - void *(*thr_run_func) (void *); + int (*thr_run_func)(void *); int if_idx; if_idx = i % args->appl.if_count; @@ -856,8 +854,8 @@ int main(int argc, char *argv[]) thr_params.start = thr_run_func; thr_params.arg = &args->thread[i]; - 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); } @@ -866,7 +864,8 @@ int main(int argc, char *argv[]) print_global_stats(num_workers); /* 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]); for (i = 0; i < args->appl.if_count; ++i) odp_pktio_stop(pktio[i]);