From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 73F362AA0 for ; Sun, 20 May 2018 15:08:47 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 0A75121D23; Sun, 20 May 2018 09:08:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 20 May 2018 09:08:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=73wOqkBDGPrJ/Y8yY cqCqKvh/PoRaD8+VjNWx8q9Ovg=; b=SgSxtoiT8bticePO9B59+Qp47ciHSy2Zu +7TDGcH/WkveAvOknYMVX7TcC95IW4a7vDBsVqXfeZWb+tY7XIf8S1novBvbDwo2 jQ7CL/bOctc1nLOHtKnhzz6LWQHWFVFTL8x8idn1sKP+l4KXPyfrHxByHCdA3m2q UR9OcvtG6acQMaqVAIO3TN4nLqNTu4kmmtpeDNnCYnFumqOvMqnVj7xcH0PZK9h2 YLL16Y3T8/SBd2hJhsp1zJAD3na3Dw7lZu9OK6A+82WhiB4AKAw6GQLv1EkF76LG Ay9lm77M8g//i/rdsQltOnSHtiXtfEzWKymXjPvFDdodO4nlcHCUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=73wOqkBDGPrJ/Y8yYcqCqKvh/PoRaD8+VjNWx8q9Ovg=; b=bF1IVDhi /zo+xadoMwD0ztj87ULTqjuNPQxfdWq4ucqEKAq7E5Ji+So3mj87Q2R22qVdbVhl M7zZRTg6oGdk/92mn+P9jKEnI7wneVsPEdJzevVDd4rCF/3JxKwfHSe220J//eUP k7ZBFGr+SimOzhnq8a0nMSvxJRJywonvrfj1v56+PMGkeTlp0RBBZ/8DnbiEwESn yY3s/d3jNGzZvjgJjNYGKFPfKrO5jRv7q0WBGvCyGdgzi7lqYL7SG4oLrcWlQ7a3 mBml5BU6fhOFPF3947lfmuyCG/xvixBtSu7I8i91I1J3ZGQCLpjvgubcIUwLNQjE pmCLB6k2XwcNPA== X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.80]) by mail.messagingengine.com (Postfix) with ESMTPA id E68CE10262; Sun, 20 May 2018 09:08:44 -0400 (EDT) From: Yuanhan Liu To: Reshma Pattan Cc: Pablo de Lara , Thomas Monjalon , dpdk stable Date: Sun, 20 May 2018 21:02:24 +0800 Message-Id: <20180520130246.16287-8-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180520130246.16287-1-yliu@fridaylinux.org> References: <20180520130246.16287-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'examples/quota_watermark: fix return type of threads' has been queued to LTS release 17.11.3 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: Sun, 20 May 2018 13:08:47 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.3 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/27/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 3d75aa03d2004994ec0a8c66b395e94a6448fe02 Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Wed, 9 May 2018 12:35:28 +0100 Subject: [PATCH] examples/quota_watermark: fix return type of threads [ upstream commit 491cf0eaa177d6aa14f2a1e124e57d8aee134c2b ] Gcc 8.0.1 reports incompatible cast between types i.e. from `void (*)(void *)` to `(int (*)(void *)`. Change the pipeline_stage prototype to retun int type to fix the issue. Fixes: a0ffcb257a ("examples/quota_watermark: correct code indentation") Signed-off-by: Reshma Pattan Acked-by: Pablo de Lara Signed-off-by: Thomas Monjalon --- examples/quota_watermark/qw/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c index fe1745262..a9a89b98c 100644 --- a/examples/quota_watermark/qw/main.c +++ b/examples/quota_watermark/qw/main.c @@ -210,7 +210,7 @@ receive_stage(__attribute__((unused)) void *args) } } -static void +static int pipeline_stage(__attribute__((unused)) void *args) { int i, ret; @@ -272,9 +272,11 @@ pipeline_stage(__attribute__((unused)) void *args) } } } + + return 0; } -static void +static int send_stage(__attribute__((unused)) void *args) { uint16_t nb_dq_pkts; @@ -316,6 +318,8 @@ send_stage(__attribute__((unused)) void *args) /* TODO: Check if nb_dq_pkts == nb_tx_pkts? */ } } + + return 0; } int @@ -375,15 +379,13 @@ main(int argc, char **argv) if (is_bit_set(port_id, portmask)) init_ring(lcore_id, port_id); - /* typecast is a workaround for GCC 4.3 bug */ - rte_eal_remote_launch((int (*)(void *))pipeline_stage, + rte_eal_remote_launch(pipeline_stage, NULL, lcore_id); } } /* Start send_stage() on the last slave core */ - /* typecast is a workaround for GCC 4.3 bug */ - rte_eal_remote_launch((int (*)(void *))send_stage, NULL, last_lcore_id); + rte_eal_remote_launch(send_stage, NULL, last_lcore_id); /* Start receive_stage() on the master core */ receive_stage(NULL); -- 2.11.0