On Wed, Sep 15, 2021 at 04:32:32PM +0200, Thomas Monjalon wrote:
> Some comments and logs about cores, nodes and pages
> were using plural or hypotetic plural (s) form
> even if preceded by "0" or "no".
>
> It is replaced with singular form where appropriate.
>
> Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
> ---
> lib/eal/common/eal_common_lcore.c | 13 +++++++++----
> lib/eal/common/rte_malloc.c | 4 ++--
> lib/eal/linux/eal_hugepage_info.c | 4 ++--
> lib/eal/linux/eal_memory.c | 4 ++--
> 4 files changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/lib/eal/common/eal_common_lcore.c
> b/lib/eal/common/eal_common_lcore.c
> index 66d6bad1a7..6778ecc98f 100644
> --- a/lib/eal/common/eal_common_lcore.c
> +++ b/lib/eal/common/eal_common_lcore.c
> @@ -191,9 +191,12 @@ rte_eal_cpu_init(void)
> /* Set the count of enabled logical cores of the EAL configuration */
> config->lcore_count = count;
> RTE_LOG(DEBUG, EAL,
> - "Support maximum %u logical core(s) by configuration.\n",
> - RTE_MAX_LCORE);
> - RTE_LOG(INFO, EAL, "Detected %u lcore(s)\n", config->lcore_count);
> + "Support maximum %u logical core%s by configuration.\n",
> + RTE_MAX_LCORE,
> + RTE_MAX_LCORE > 1 ? "s" : "");
> + RTE_LOG(INFO, EAL, "Detected %u lcore%s\n",
> + config->lcore_count,
> + config->lcore_count > 1 ? "s" : "");
>
Personally, I'd take the view that these values are so unlikely to be ever
1, that I'd leave them always pluralized rather than add the complexity.
> /* sort all socket id's in ascending order */
> qsort(lcore_to_socket_id, RTE_DIM(lcore_to_socket_id),
> @@ -208,7 +211,9 @@ rte_eal_cpu_init(void)
> socket_id;
> prev_socket_id = socket_id;
> }
> - RTE_LOG(INFO, EAL, "Detected %u NUMA nodes\n", config->numa_node_count);
> + RTE_LOG(INFO, EAL, "Detected %u NUMA node%s\n",
> + config->numa_node_count,
> + config->numa_node_count > 1 ? "s" : "");
>
Ok.
However, as a general suggestion, is it easier to sidestep all this
singular/plural decisions just by using "label: <value>" type syntax, e.g.
for here:
"Detected NUMA nodes: 1"
When printed in such a form there is no expectation of singular ever being
used.
> return 0;
> }
> diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
> index 9d39e58c08..04cbb0078b 100644
> --- a/lib/eal/common/rte_malloc.c
> +++ b/lib/eal/common/rte_malloc.c
> @@ -65,10 +65,10 @@ malloc_socket(const char *type, size_t size, unsigned int
> align,
> if (size == 0 || (align && !rte_is_power_of_2(align)))
> return NULL;
>
> - /* if there are no hugepages and if we are not allocating from an
> + /* if there are no hugepage and if we are not allocating from an
This needs to be kept in the plural. Also applies to the instances below...
> * external heap, use memory from any socket available. checking for
> * socket being external may return -1 in case of invalid socket, but
> - * that's OK - if there are no hugepages, it doesn't matter.
> + * that's OK - if there are no hugepage, it doesn't matter.
> */
<snip for brevity>
