Re: [PATCH] Rename __clz to xenomai_count_leading_zeros to avoid namespace conflicts (e.g.: with Clang's arm_acle.h)

[Jan Kiszka via Xenomai]

On 20.11.18 23:34, Giulio Moro via Xenomai wrote:
 From de7bf8033570f15b68b00b6386097ceb8a402d6b Mon Sep 17 00:00:00 2001
From: Giulio Moro <giuliom...@yahoo.it>
Date: Tue, 20 Nov 2018 22:32:00 +0000
Subject: [PATCH] Rename __clz to xenomai_count_leading_zeros to avoid
  namespace conflicts (e.g.: with Clang's arm_acle.h)

Please split into a shorter subject (e.g. "Rename __clz to 
xenomai_count_leading_zeros") and ler the reasoning go into the commit message body.


Signed-off-by: Giulio Moro <giuliom...@yahoo.it>
---
  include/boilerplate/compiler.h    | 2 +-
  lib/boilerplate/heapmem.c         | 2 +-
  lib/copperplate/heapobj-heapmem.c | 2 +-
  lib/copperplate/heapobj-pshared.c | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boilerplate/compiler.h b/include/boilerplate/compiler.h
index ffeb6a4db..0fcc17be1 100644
--- a/include/boilerplate/compiler.h
+++ b/include/boilerplate/compiler.h
@@ -93,7 +93,7 @@ void __invalid_operand_size(void);
                __ret;                                                  \
        })

-#define __clz(__v)                                                     \
+#define xenomai_count_leading_zeros(__v)                               \
        ({                                                              \
                int __ret;                                              \
                if (!__v)                                               \
diff --git a/lib/boilerplate/heapmem.c b/lib/boilerplate/heapmem.c
index 9b5e1a636..81702d6db 100644
--- a/lib/boilerplate/heapmem.c
+++ b/lib/boilerplate/heapmem.c
@@ -435,7 +435,7 @@ void *heapmem_alloc(struct heap_memory *heap, size_t size)
                bsize = size = HEAPMEM_MIN_ALIGN;
                log2size = HEAPMEM_MIN_LOG2;
        } else {
-               log2size = sizeof(size) * CHAR_BIT - 1 - __clz(size);
+               log2size = sizeof(size) * CHAR_BIT - 1 - 
xenomai_count_leading_zeros(size);
                if (log2size < HEAPMEM_PAGE_SHIFT) {
                        if (size & (size - 1))
                                log2size++;
diff --git a/lib/copperplate/heapobj-heapmem.c 
b/lib/copperplate/heapobj-heapmem.c
index 2b99b3d39..60f16f95d 100644
--- a/lib/copperplate/heapobj-heapmem.c
+++ b/lib/copperplate/heapobj-heapmem.c
@@ -68,7 +68,7 @@ int __heapobj_init_private(struct heapobj *hobj, const char 
*name,
  int heapobj_init_array_private(struct heapobj *hobj, const char *name,
                               size_t size, int elems)
  {
-       size_t log2 = sizeof(size) * CHAR_BIT - 1 - __clz(size);
+       size_t log2 = sizeof(size) * CHAR_BIT - 1 - 
xenomai_count_leading_zeros(size);

        /*
         * Heapmem aligns individual object sizes on the next ^2
diff --git a/lib/copperplate/heapobj-pshared.c 
b/lib/copperplate/heapobj-pshared.c
index 77b45844f..5f17e6198 100644
--- a/lib/copperplate/heapobj-pshared.c
+++ b/lib/copperplate/heapobj-pshared.c
@@ -488,7 +488,7 @@ static void *sheapmem_alloc(struct shared_heap_memory 
*heap, size_t size)
                bsize = size = SHEAPMEM_MIN_ALIGN;
                log2size = SHEAPMEM_MIN_LOG2;
        } else {
-               log2size = sizeof(size) * CHAR_BIT - 1 - __clz(size);
+               log2size = sizeof(size) * CHAR_BIT - 1 - 
xenomai_count_leading_zeros(size);

Overlong lines now (80 chars is the limit, just like Linux).

                if (log2size < SHEAPMEM_PAGE_SHIFT) {
                        if (size & (size - 1))
                                log2size++;
--
2.11.0



Thanks,
Jan

--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux