* [dpdk-dev] [PATCH] eal: remove plural syntax for single resource
@ 2021-09-15 14:32 Thomas Monjalon
2021-09-15 14:52 ` Bruce Richardson
2021-09-16 10:32 ` [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts Thomas Monjalon
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Monjalon @ 2021-09-15 14:32 UTC (permalink / raw)
To: dev; +Cc: david.marchand, ferruh.yigit, Anatoly Burakov
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 <thomas@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" : "");
/* 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" : "");
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
* 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.
*/
if (rte_malloc_heap_socket_is_external(socket_arg) != 1 &&
!rte_eal_has_hugepages())
diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
index d97792cade..5673784186 100644
--- a/lib/eal/linux/eal_hugepage_info.c
+++ b/lib/eal/linux/eal_hugepage_info.c
@@ -117,7 +117,7 @@ get_num_hugepages(const char *subdir, size_t sz)
over_pages = 0;
if (num_pages == 0 && over_pages == 0)
- RTE_LOG(WARNING, EAL, "No available %zu kB hugepages reported\n",
+ RTE_LOG(WARNING, EAL, "No available %zu kB hugepage reported\n",
sz >> 10);
num_pages += over_pages;
@@ -158,7 +158,7 @@ get_num_hugepages_on_node(const char *subdir, unsigned int socket, size_t sz)
return 0;
if (num_pages == 0)
- RTE_LOG(WARNING, EAL, "No free %zu kB hugepages reported on node %u\n",
+ RTE_LOG(WARNING, EAL, "No free %zu kB hugepage reported on node %u\n",
sz >> 10, socket);
/*
diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
index 03a4f2dd2d..d73d233a7d 100644
--- a/lib/eal/linux/eal_memory.c
+++ b/lib/eal/linux/eal_memory.c
@@ -1002,7 +1002,7 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages)
cur = &hugepages[cur_page];
prev = cur_page == 0 ? NULL : &hugepages[cur_page - 1];
- /* if size is zero, no more pages left */
+ /* if size is zero, no more page left */
if (cur->size == 0)
break;
@@ -1550,7 +1550,7 @@ eal_legacy_hugepage_attach(void)
struct rte_memseg_list *msl;
struct rte_memseg *ms;
- /* if size is zero, no more pages left */
+ /* if size is zero, no more page left */
if (map_sz == 0)
break;
--
2.33.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] eal: remove plural syntax for single resource
2021-09-15 14:32 [dpdk-dev] [PATCH] eal: remove plural syntax for single resource Thomas Monjalon
@ 2021-09-15 14:52 ` Bruce Richardson
2021-09-16 10:32 ` [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts Thomas Monjalon
1 sibling, 0 replies; 6+ messages in thread
From: Bruce Richardson @ 2021-09-15 14:52 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev, david.marchand, ferruh.yigit, Anatoly Burakov
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 <thomas@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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts
2021-09-15 14:32 [dpdk-dev] [PATCH] eal: remove plural syntax for single resource Thomas Monjalon
2021-09-15 14:52 ` Bruce Richardson
@ 2021-09-16 10:32 ` Thomas Monjalon
2021-09-16 10:39 ` Thomas Monjalon
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2021-09-16 10:32 UTC (permalink / raw)
To: dev; +Cc: david.marchand, ferruh.yigit, bruce.richardson
Some logs about cores and nodes were using hypotetic plural (s) form.
A fixed plural form with value at the end is preferred.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: keep plural form as suggested by Bruce
---
lib/eal/common/eal_common_lcore.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
index 66d6bad1a7..b38bb46d44 100644
--- a/lib/eal/common/eal_common_lcore.c
+++ b/lib/eal/common/eal_common_lcore.c
@@ -191,9 +191,9 @@ 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);
+ "Maximum logical cores by configuration: %u\n",
+ RTE_MAX_LCORE);
+ RTE_LOG(INFO, EAL, "Detected CPU lcores: %u\n",config->lcore_count);
/* sort all socket id's in ascending order */
qsort(lcore_to_socket_id, RTE_DIM(lcore_to_socket_id),
@@ -208,7 +208,7 @@ 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 NUMA nodes: %u\n", config->numa_node_count);
return 0;
}
--
2.33.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts
2021-09-16 10:32 ` [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts Thomas Monjalon
@ 2021-09-16 10:39 ` Thomas Monjalon
2021-09-16 10:41 ` Bruce Richardson
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2021-09-16 10:39 UTC (permalink / raw)
To: dev; +Cc: david.marchand, ferruh.yigit, bruce.richardson
16/09/2021 12:32, Thomas Monjalon:
> Some logs about cores and nodes were using hypotetic plural (s) form.
> A fixed plural form with value at the end is preferred.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v2: keep plural form as suggested by Bruce
> ---
> lib/eal/common/eal_common_lcore.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
> index 66d6bad1a7..b38bb46d44 100644
> --- a/lib/eal/common/eal_common_lcore.c
> +++ b/lib/eal/common/eal_common_lcore.c
> @@ -191,9 +191,9 @@ 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);
> + "Maximum logical cores by configuration: %u\n",
> + RTE_MAX_LCORE);
> + RTE_LOG(INFO, EAL, "Detected CPU lcores: %u\n",config->lcore_count);
space missing above, consider it as fixed ;)
>
> /* sort all socket id's in ascending order */
> qsort(lcore_to_socket_id, RTE_DIM(lcore_to_socket_id),
> @@ -208,7 +208,7 @@ 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 NUMA nodes: %u\n", config->numa_node_count);
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts
2021-09-16 10:39 ` Thomas Monjalon
@ 2021-09-16 10:41 ` Bruce Richardson
2021-09-23 6:51 ` Thomas Monjalon
0 siblings, 1 reply; 6+ messages in thread
From: Bruce Richardson @ 2021-09-16 10:41 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev, david.marchand, ferruh.yigit
On Thu, Sep 16, 2021 at 12:39:20PM +0200, Thomas Monjalon wrote:
> 16/09/2021 12:32, Thomas Monjalon:
> > Some logs about cores and nodes were using hypotetic plural (s) form.
> > A fixed plural form with value at the end is preferred.
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
> > v2: keep plural form as suggested by Bruce
> > ---
> > lib/eal/common/eal_common_lcore.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts
2021-09-16 10:41 ` Bruce Richardson
@ 2021-09-23 6:51 ` Thomas Monjalon
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2021-09-23 6:51 UTC (permalink / raw)
To: dev; +Cc: david.marchand, ferruh.yigit, Bruce Richardson
16/09/2021 12:41, Bruce Richardson:
> On Thu, Sep 16, 2021 at 12:39:20PM +0200, Thomas Monjalon wrote:
> > 16/09/2021 12:32, Thomas Monjalon:
> > > Some logs about cores and nodes were using hypotetic plural (s) form.
> > > A fixed plural form with value at the end is preferred.
> > >
> > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > > ---
> > > v2: keep plural form as suggested by Bruce
>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Applied
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-23 6:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-15 14:32 [dpdk-dev] [PATCH] eal: remove plural syntax for single resource Thomas Monjalon
2021-09-15 14:52 ` Bruce Richardson
2021-09-16 10:32 ` [dpdk-dev] [PATCH v2] eal: reword logs for CPU and NUMA counts Thomas Monjalon
2021-09-16 10:39 ` Thomas Monjalon
2021-09-16 10:41 ` Bruce Richardson
2021-09-23 6:51 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).