From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id 1E4D81B703 for ; Tue, 15 May 2018 19:20:16 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id b18-v6so1371399lfa.9 for ; Tue, 15 May 2018 10:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rgk8hjFTEob30GVfmkA0n4q3kG7C5YQ/XoBXrp7nF6Q=; b=A7pTCxse1UYrXZVE47uUTKoVHsRObek6MkOSgZwxcuHdbq9NrimtdvYKqNzSBBG7Vi r7Ibodm1w4j226Mg9sUS1hdSdpCu8W8ZnTdymgkTHsoQk4Wia6yLLuFb70leNPqwsqgJ lt2tk2owffhUaW+xEyoG3TbHtUaX4YbFOxHoocMI1sKsKWP35GQljLC8jv4GsnR6+Vxa cMbQkwuHw9NULogRP5IrY+TtRoLoK/KGlvw0XM/asJEkycDE425pTxGItRW1PgmgiIqk EGhG2WTzMgfNBP9yR+TU3KTWlrBbzVfEkd3JO/wz5nH6WA79o29ccb/zFl4zjLXSHK70 WiCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rgk8hjFTEob30GVfmkA0n4q3kG7C5YQ/XoBXrp7nF6Q=; b=VYGbyqTU+Kc3hIK3RkDlSuJKqblxOSR2M6iyV5LurWXP1yeK2FIVmMqE+rkypqLABb Sx1uugY9Hz2a6w/WnQPG6EuQcLVFk2OXiPtLhztO/fMLqcBYTQUTgRgA6jHxMkqPciAl Ld85798y1n+SbTEjOzr+0sDWKO+keHiN+7OocpXcZpkHVAtMdCGRo8WT5gHFJJO0nd0J rLwSV05UySv1Z//R6Cn3rOIsMucKfGOGMD87WEjq+0tKwyG0k/2jN59oB6L2xaD7luTf GUYKvPDr4nPkJmrpcnf7U3WcHC/0qQMewuIV8Ax6SVdud7ntBJVL5yQty4qMLEdbzjcx vXHg== X-Gm-Message-State: ALKqPwfZxCCRt10fV/jWdYj+pRWHKgA7gqLy/gFTVhGjxGwhGfzA2+Dt iaYtWZs9sK8C/q4LfCcMDhZdlXC2kLo= X-Google-Smtp-Source: AB8JxZovQotZ/qBulLWfmBsadd7hxIG93gMRYbiOiiCkiWwev6+RDVqmsNyMPv+PkfRhusDvVIGqBQ== X-Received: by 2002:a2e:638f:: with SMTP id s15-v6mr7533088lje.78.1526404815630; Tue, 15 May 2018 10:20:15 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id 31-v6sm129737lfs.35.2018.05.15.10.20.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 10:20:14 -0700 (PDT) From: luca.boccassi@gmail.com To: David Hunt Cc: Pablo de Lara , dpdk stable Date: Tue, 15 May 2018 18:19:20 +0100 Message-Id: <20180515171933.12882-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515171933.12882-1-luca.boccassi@gmail.com> References: <20180501104509.17238-46-luca.boccassi@gmail.com> <20180515171933.12882-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'examples/performance-thread: fix return type of threads' has been queued to LTS release 16.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 17:20:16 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/16/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From c1368ebb17ae5aa0c5a6ed7e18708723558ddf50 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Mon, 14 May 2018 03:53:15 +0100 Subject: [PATCH] examples/performance-thread: fix return type of threads [ upstream commit 803ee2ebd32d019d54011f185819f3b76b113c4f ] The function pthread_create() expects void *(*func) (void *) for function pointer, however, lthread_func_t was defined as void (*func) (void *), so now gcc 8.1 warns that the cast is incorrect, causing a compilation failure. This patch changes the declaration of lthread_func_t from returning a void to returning a void*, and then changes the sample app in the relevant places that are affected by the typedef change. Fixes: 116819b9ed0d ("examples/performance-thread: add lthread subsystem") Signed-off-by: David Hunt Acked-by: Pablo de Lara --- examples/performance-thread/common/lthread.c | 3 ++- examples/performance-thread/common/lthread_api.h | 2 +- examples/performance-thread/l3fwd-thread/main.c | 20 +++++++++++++------- examples/performance-thread/pthread_shim/main.c | 6 ++---- .../performance-thread/pthread_shim/pthread_shim.c | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/examples/performance-thread/common/lthread.c b/examples/performance-thread/common/lthread.c index 062275a43..77c870fcc 100644 --- a/examples/performance-thread/common/lthread.c +++ b/examples/performance-thread/common/lthread.c @@ -327,13 +327,14 @@ struct lthread *lthread_current(void) /* * Tasklet to cancel a thread */ -static void +static void * _cancel(void *arg) { struct lthread *lt = (struct lthread *) arg; lt->state |= BIT(ST_LT_CANCELLED); lthread_detach(); + return NULL; } diff --git a/examples/performance-thread/common/lthread_api.h b/examples/performance-thread/common/lthread_api.h index ec976103f..903ca7c0d 100644 --- a/examples/performance-thread/common/lthread_api.h +++ b/examples/performance-thread/common/lthread_api.h @@ -139,7 +139,7 @@ struct lthread_mutex; struct lthread_condattr; struct lthread_mutexattr; -typedef void (*lthread_func_t) (void *); +typedef void *(*lthread_func_t) (void *); /* * Define the size of stack for an lthread diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index dd403ca86..125d976cf 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -1981,17 +1981,18 @@ cpu_load_collector(__rte_unused void *arg) { * * This loop is used to start empty scheduler on lcore. */ -static void +static void * lthread_null(__rte_unused void *args) { int lcore_id = rte_lcore_id(); RTE_LOG(INFO, L3FWD, "Starting scheduler on lcore %d.\n", lcore_id); lthread_exit(NULL); + return NULL; } /* main processing loop */ -static void +static void * lthread_tx_per_ring(void *dummy) { int nb_rx; @@ -2036,6 +2037,7 @@ lthread_tx_per_ring(void *dummy) lthread_cond_wait(ready, 0); } + return NULL; } /* @@ -2044,7 +2046,7 @@ lthread_tx_per_ring(void *dummy) * This lthread is used to spawn one new lthread per ring from producers. * */ -static void +static void * lthread_tx(void *args) { struct lthread *lt; @@ -2089,9 +2091,10 @@ lthread_tx(void *args) } } + return NULL; } -static void +static void * lthread_rx(void *dummy) { int ret; @@ -2114,7 +2117,7 @@ lthread_rx(void *dummy) if (rx_conf->n_rx_queue == 0) { RTE_LOG(INFO, L3FWD, "lcore %u has nothing to do\n", rte_lcore_id()); - return; + return NULL; } RTE_LOG(INFO, L3FWD, "Entering main Rx loop on lcore %u\n", rte_lcore_id()); @@ -2185,6 +2188,7 @@ lthread_rx(void *dummy) lthread_yield(); } } + return NULL; } /* @@ -2193,8 +2197,9 @@ lthread_rx(void *dummy) * This lthread loop spawns all rx and tx lthreads on master lcore */ -static void -lthread_spawner(__rte_unused void *arg) { +static void * +lthread_spawner(__rte_unused void *arg) +{ struct lthread *lt[MAX_THREAD]; int i; int n_thread = 0; @@ -2235,6 +2240,7 @@ lthread_spawner(__rte_unused void *arg) { for (i = 0; i < n_thread; i++) lthread_join(lt[i], NULL); + return NULL; } /* diff --git a/examples/performance-thread/pthread_shim/main.c b/examples/performance-thread/pthread_shim/main.c index febae39be..5811cff8d 100644 --- a/examples/performance-thread/pthread_shim/main.c +++ b/examples/performance-thread/pthread_shim/main.c @@ -149,8 +149,7 @@ void *helloworld_pthread(void *arg) */ __thread pthread_t tid[HELLOW_WORLD_MAX_LTHREADS]; -static void initial_lthread(void *args); -static void initial_lthread(void *args __attribute__((unused))) +static void *initial_lthread(void *args __attribute__((unused))) { int lcore = (int) rte_lcore_id(); /* @@ -225,6 +224,7 @@ static void initial_lthread(void *args __attribute__((unused))) /* shutdown the lthread scheduler */ lthread_scheduler_shutdown(rte_lcore_id()); lthread_detach(); + return NULL; } @@ -235,8 +235,6 @@ static void initial_lthread(void *args __attribute__((unused))) * in the core mask */ static int -lthread_scheduler(void *args); -static int lthread_scheduler(void *args __attribute__((unused))) { /* create initial thread */ diff --git a/examples/performance-thread/pthread_shim/pthread_shim.c b/examples/performance-thread/pthread_shim/pthread_shim.c index 113bafa00..7e6d7230e 100644 --- a/examples/performance-thread/pthread_shim/pthread_shim.c +++ b/examples/performance-thread/pthread_shim/pthread_shim.c @@ -397,7 +397,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) int pthread_create(pthread_t *__restrict tid, const pthread_attr_t *__restrict attr, - void *(func) (void *), + lthread_func_t func, void *__restrict arg) { if (override) { @@ -422,7 +422,7 @@ pthread_create(pthread_t *__restrict tid, } } return lthread_create((struct lthread **)tid, lcore, - (void (*)(void *))func, arg); + func, arg); } return _sys_pthread_funcs.f_pthread_create(tid, attr, func, arg); } -- 2.14.2