This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 87dfcd1020 include/sched.h: CPU_XXX macros can also be used without
CONFIG_SMP
87dfcd1020 is described below
commit 87dfcd1020ba5b6b93d6fa3b6fdef6ba3a656fc4
Author: yanghuatao <[email protected]>
AuthorDate: Wed Dec 20 09:45:38 2023 +0800
include/sched.h: CPU_XXX macros can also be used without CONFIG_SMP
Allow CPU_XXX macros to be used without CONFIG_SMP=y
Signed-off-by: yanghuatao <[email protected]>
Co-authored-by: Bowen Wang <[email protected]>
---
include/sched.h | 46 +++++++++++++++++++++-------------------------
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/include/sched.h b/include/sched.h
index 9804e46a41..c7b5928952 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -71,112 +71,108 @@
/* These are not standard but are defined for Linux compatibility */
-#ifdef CONFIG_SMP
-
/* void CPU_ZERO(FAR cpu_set_t *set); */
-# define CPU_ZERO(s) do { *(s) = 0; } while (0)
+#define CPU_ZERO(s) do { *(s) = 0; } while (0)
/* void CPU_SET(int cpu, FAR cpu_set_t *set); */
-# define CPU_SET(c,s) do { *(s) |= (1 << (c)); } while (0)
+#define CPU_SET(c,s) do { *(s) |= (1 << (c)); } while (0)
/* void CPU_CLR(int cpu, FAR cpu_set_t *set); */
-# define CPU_CLR(c,s) do { *(s) &= ~(1 << (c)); } while (0)
+#define CPU_CLR(c,s) do { *(s) &= ~(1 << (c)); } while (0)
/* int CPU_ISSET(int cpu, FAR const cpu_set_t *set); */
-# define CPU_ISSET(c,s) ((*(s) & (1 << (c))) != 0)
+#define CPU_ISSET(c,s) ((*(s) & (1 << (c))) != 0)
/* int CPU_COUNT(FAR const cpu_set_t *set); */
-# define CPU_COUNT(s) popcountl(*s)
+#define CPU_COUNT(s) popcountl(*s)
/* void CPU_AND(FAR cpu_set_t *destset, FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_AND(d,s1,s2) do { *(d) = *(s1) & *(s2); } while (0)
+#define CPU_AND(d,s1,s2) do { *(d) = *(s1) & *(s2); } while (0)
/* void CPU_OR(FAR cpu_set_t *destset, FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_OR(d,s1,s2) do { *(d) = *(s1) | *(s2); } while (0)
+#define CPU_OR(d,s1,s2) do { *(d) = *(s1) | *(s2); } while (0)
/* void CPU_XOR(FAR cpu_set_t *destset, FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_XOR(d,s1,s2) do { *(d) = *(s1) ^ *(s2); } while (0)
+#define CPU_XOR(d,s1,s2) do { *(d) = *(s1) ^ *(s2); } while (0)
/* int CPU_EQUAL(FAR const cpu_set_t *set1, FAR const cpu_set_t *set2); */
-# define CPU_EQUAL(s1,s2) (*(s1) == *(s2))
+#define CPU_EQUAL(s1,s2) (*(s1) == *(s2))
/* REVISIT: Variably sized CPU sets are not supported */
/* FAR cpu_set_t *CPU_ALLOC(int num_cpus); */
-# define CPU_ALLOC(n) (FAR cpu_set_t *)malloc(sizeof(cpu_set_t));
+#define CPU_ALLOC(n) (FAR cpu_set_t *)malloc(sizeof(cpu_set_t));
/* void CPU_FREE(cpu_set_t *set); */
-# define CPU_FREE(s) free(s)
+#define CPU_FREE(s) free(s)
/* size_t CPU_ALLOC_SIZE(int num_cpus); */
-# define CPU_ALLOC_SIZE(n) sizeof(cpu_set_t)
+#define CPU_ALLOC_SIZE(n) sizeof(cpu_set_t)
/* void CPU_ZERO_S(size_t setsize, FAR cpu_set_t *set); */
-# define CPU_ZERO_S(n,s) CPU_ZERO_S(s)
+#define CPU_ZERO_S(n,s) CPU_ZERO_S(s)
/* void CPU_SET_S(int cpu, size_t setsize, FAR cpu_set_t *set); */
-# define CPU_SET_S(c,n,s) CPU_SET(c,s)
+#define CPU_SET_S(c,n,s) CPU_SET(c,s)
/* void CPU_CLR_S(int cpu, size_t setsize, FAR cpu_set_t *set); */
-# define CPU_CLR_S(c,n,s) CPU_CLR(c,s)
+#define CPU_CLR_S(c,n,s) CPU_CLR(c,s)
/* int CPU_ISSET_S(int cpu, size_t setsize, FAR const cpu_set_t *set); */
-# define CPU_ISSET_S(c,n,s) CPU_ISSET(c,s)
+#define CPU_ISSET_S(c,n,s) CPU_ISSET(c,s)
/* int CPU_COUNT_S(size_t setsize, FAR const cpu_set_t *set); */
-# define CPU_COUNT_S(n,s) CPU_COUNT(s)
+#define CPU_COUNT_S(n,s) CPU_COUNT(s)
/* void CPU_AND_S(size_t setsize, FAR cpu_set_t *destset,
* FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_AND_S(n,d,s1,s2) CPU_AND(d,s1,s2)
+#define CPU_AND_S(n,d,s1,s2) CPU_AND(d,s1,s2)
/* void CPU_OR_S(size_t setsize, FAR cpu_set_t *destset,
* FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_OR_S(n,d,s1,s2) CPU_OR(d,s1,s2)
+#define CPU_OR_S(n,d,s1,s2) CPU_OR(d,s1,s2)
/* void CPU_XOR_S(size_t setsize, FAR cpu_set_t *destset,
* FAR const cpu_set_t *srcset1,
* FAR const cpu_set_t *srcset2);
*/
-# define CPU_XOR_S(n,d,s1,s2) CPU_XOR(d,s1,s2)
+#define CPU_XOR_S(n,d,s1,s2) CPU_XOR(d,s1,s2)
/* int CPU_EQUAL_S(size_t setsize, FAR const cpu_set_t *set1,
* FAR const cpu_set_t *set2);
*/
-# define CPU_EQUAL_S(n,s1,s2) CPU_EQUAL(s1,s2)
-
-#endif /* CONFIG_SMP */
+#define CPU_EQUAL_S(n,s1,s2) CPU_EQUAL(s1,s2)
/****************************************************************************
* Public Type Definitions
