[dpdk-stable] patch 'examples/quota_watermark: fix return type of threads' has been queued to LTS release 17.11.3
Yuanhan Liu
yliu at fridaylinux.org
Sun May 20 15:02:24 CEST 2018
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 <reshma.pattan at intel.com>
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 <reshma.pattan at intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
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
More information about the stable
mailing list