[libc-commits] [libc] [libc][sched] Fix cpuset includes (PR #126303)
Krishna Pandey via libc-commits
libc-commits at lists.llvm.org
Tue Feb 11 06:47:40 PST 2025
https://github.com/krishna2803 updated https://github.com/llvm/llvm-project/pull/126303
>From 1a2fe1322737b1d627bbb0d81180bf4fa5bee18a Mon Sep 17 00:00:00 2001
From: krishna2803 <kpandey81930 at gmail.com>
Date: Sat, 8 Feb 2025 01:01:25 +0530
Subject: [PATCH 1/5] feat: add proxy header for `cpu_set_t`
---
libc/hdr/types/cpu_set_t.h | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 libc/hdr/types/cpu_set_t.h
diff --git a/libc/hdr/types/cpu_set_t.h b/libc/hdr/types/cpu_set_t.h
new file mode 100644
index 0000000000000..26aed7592fa2c
--- /dev/null
+++ b/libc/hdr/types/cpu_set_t.h
@@ -0,0 +1,22 @@
+//===-- Proxy for cpu_set_t -----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_TYPES_CPU_SET_T_H
+#define LLVM_LIBC_HDR_TYPES_CPU_SET_T_H
+
+#ifdef LIBC_FULL_BUILD
+
+#include "include/llvm-libc-types/cpu_set_t.h"
+
+#else // Overlay mode
+
+#include <sched.h>
+
+#endif // LLVM_LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_TYPES_CPU_SET_T_H
>From ba8c535683ab3602042d49de3ce7ea3dc169bd33 Mon Sep 17 00:00:00 2001
From: krishna2803 <kpandey81930 at gmail.com>
Date: Sat, 8 Feb 2025 01:30:23 +0530
Subject: [PATCH 2/5] fix: replace <sched.h> with proxy headers
---
libc/src/sched/linux/sched_getaffinity.cpp | 2 +-
libc/src/sched/linux/sched_getcpucount.cpp | 2 +-
libc/src/sched/linux/sched_setaffinity.cpp | 2 +-
libc/src/sched/sched_getaffinity.h | 2 +-
libc/src/sched/sched_getcpucount.h | 2 +-
libc/src/sched/sched_getparam.h | 2 +-
libc/src/sched/sched_getscheduler.h | 2 +-
libc/src/sched/sched_rr_get_interval.h | 2 +-
libc/src/sched/sched_setaffinity.h | 2 +-
libc/src/sched/sched_setparam.h | 2 +-
libc/src/sched/sched_setscheduler.h | 2 +-
libc/test/src/sched/affinity_test.cpp | 2 +-
libc/test/src/sched/cpu_count_test.cpp | 2 +-
libc/test/src/sched/get_priority_test.cpp | 2 +-
libc/test/src/sched/param_and_scheduler_test.cpp | 2 +-
libc/test/src/sched/sched_rr_get_interval_test.cpp | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libc/src/sched/linux/sched_getaffinity.cpp b/libc/src/sched/linux/sched_getaffinity.cpp
index 7b1fd8c5aa2af..41c7731142aeb 100644
--- a/libc/src/sched/linux/sched_getaffinity.cpp
+++ b/libc/src/sched/linux/sched_getaffinity.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <stdint.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sched/linux/sched_getcpucount.cpp b/libc/src/sched/linux/sched_getcpucount.cpp
index dbda4b2c789ad..849123d9b960e 100644
--- a/libc/src/sched/linux/sched_getcpucount.cpp
+++ b/libc/src/sched/linux/sched_getcpucount.cpp
@@ -11,7 +11,7 @@
#include "src/__support/common.h"
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <stddef.h>
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/linux/sched_setaffinity.cpp b/libc/src/sched/linux/sched_setaffinity.cpp
index cad48c26bf938..a131bda2bb5eb 100644
--- a/libc/src/sched/linux/sched_setaffinity.cpp
+++ b/libc/src/sched/linux/sched_setaffinity.cpp
@@ -13,7 +13,7 @@
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getaffinity.h b/libc/src/sched/sched_getaffinity.h
index 52ec5bca6b22a..de8a14d51daa9 100644
--- a/libc/src/sched/sched_getaffinity.h
+++ b/libc/src/sched/sched_getaffinity.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getcpucount.h b/libc/src/sched/sched_getcpucount.h
index 8f35301ca6c0d..f04099f8db0c4 100644
--- a/libc/src/sched/sched_getcpucount.h
+++ b/libc/src/sched/sched_getcpucount.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <stddef.h>
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getparam.h b/libc/src/sched/sched_getparam.h
index e1b23656d5859..03bfc008be95b 100644
--- a/libc/src/sched/sched_getparam.h
+++ b/libc/src/sched/sched_getparam.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getscheduler.h b/libc/src/sched/sched_getscheduler.h
index d29e902180ea8..970b96097d33d 100644
--- a/libc/src/sched/sched_getscheduler.h
+++ b/libc/src/sched/sched_getscheduler.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_rr_get_interval.h b/libc/src/sched/sched_rr_get_interval.h
index ff093298a3bb3..b8bf17497cb32 100644
--- a/libc/src/sched/sched_rr_get_interval.h
+++ b/libc/src/sched/sched_rr_get_interval.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setaffinity.h b/libc/src/sched/sched_setaffinity.h
index cb2303dd813e2..368aac0cc5bf9 100644
--- a/libc/src/sched/sched_setaffinity.h
+++ b/libc/src/sched/sched_setaffinity.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setparam.h b/libc/src/sched/sched_setparam.h
index e4691a7912000..cf5b2840c4551 100644
--- a/libc/src/sched/sched_setparam.h
+++ b/libc/src/sched/sched_setparam.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setscheduler.h b/libc/src/sched/sched_setscheduler.h
index e745002c0d961..5c99aa2d10a00 100644
--- a/libc/src/sched/sched_setscheduler.h
+++ b/libc/src/sched/sched_setscheduler.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
#include "src/__support/macros/config.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/test/src/sched/affinity_test.cpp b/libc/test/src/sched/affinity_test.cpp
index b5085203e5ce0..5f7d6571b481e 100644
--- a/libc/test/src/sched/affinity_test.cpp
+++ b/libc/test/src/sched/affinity_test.cpp
@@ -12,7 +12,7 @@
#include "src/sched/sched_setaffinity.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <sys/syscall.h>
TEST(LlvmLibcSchedAffinityTest, SmokeTest) {
diff --git a/libc/test/src/sched/cpu_count_test.cpp b/libc/test/src/sched/cpu_count_test.cpp
index 5250368a26162..b0c7cfe8614a0 100644
--- a/libc/test/src/sched/cpu_count_test.cpp
+++ b/libc/test/src/sched/cpu_count_test.cpp
@@ -12,7 +12,7 @@
#include "src/sched/sched_getcpucount.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
#include <sys/syscall.h>
TEST(LlvmLibcSchedCpuCountTest, SmokeTest) {
diff --git a/libc/test/src/sched/get_priority_test.cpp b/libc/test/src/sched/get_priority_test.cpp
index 59205c51e4a16..fe437cda4d7b6 100644
--- a/libc/test/src/sched/get_priority_test.cpp
+++ b/libc/test/src/sched/get_priority_test.cpp
@@ -11,7 +11,7 @@
#include "src/sched/sched_get_priority_min.h"
#include "test/UnitTest/Test.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
TEST(LlvmLibcSchedGetPriorityTest, HandleBadPolicyTest) {
diff --git a/libc/test/src/sched/param_and_scheduler_test.cpp b/libc/test/src/sched/param_and_scheduler_test.cpp
index 747c7e3409e41..c5d6217e75b32 100644
--- a/libc/test/src/sched/param_and_scheduler_test.cpp
+++ b/libc/test/src/sched/param_and_scheduler_test.cpp
@@ -16,7 +16,7 @@
#include "src/unistd/getuid.h"
#include "test/UnitTest/Test.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
// We Test:
// SCHED_OTHER, SCHED_FIFO, SCHED_RR
diff --git a/libc/test/src/sched/sched_rr_get_interval_test.cpp b/libc/test/src/sched/sched_rr_get_interval_test.cpp
index c22a2c76d743c..2dadf8bd7df3a 100644
--- a/libc/test/src/sched/sched_rr_get_interval_test.cpp
+++ b/libc/test/src/sched/sched_rr_get_interval_test.cpp
@@ -14,7 +14,7 @@
#include "src/unistd/getuid.h"
#include "test/UnitTest/Test.h"
-#include <sched.h>
+#include "hdr/types/cpu_set_t.h"
TEST(LlvmLibcSchedRRGetIntervalTest, SmokeTest) {
LIBC_NAMESPACE::libc_errno = 0;
>From c6a14a1c2c095a909899f24ee87f9ae62f1cb76b Mon Sep 17 00:00:00 2001
From: krishna2803 <kpandey81930 at gmail.com>
Date: Tue, 11 Feb 2025 20:05:41 +0530
Subject: [PATCH 3/5] fix: rename `__mask` to `__bits` for compatibility with
glibc cpu_set_t
Signed-off-by: krishna2803 <kpandey81930 at gmail.com>
---
libc/include/llvm-libc-types/cpu_set_t.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/include/llvm-libc-types/cpu_set_t.h b/libc/include/llvm-libc-types/cpu_set_t.h
index e7f52597e147e..10c0f13a0603e 100644
--- a/libc/include/llvm-libc-types/cpu_set_t.h
+++ b/libc/include/llvm-libc-types/cpu_set_t.h
@@ -12,7 +12,7 @@
typedef struct {
// If a processor with more than 1024 CPUs is to be supported in future,
// we need to adjust the size of this array.
- unsigned long __mask[128 / sizeof(unsigned long)];
+ unsigned long __bits[128 / sizeof(unsigned long)];
} cpu_set_t;
#endif // LLVM_LIBC_TYPES_CPU_SET_T_H
>From 822bdb0c0735f7224111fda9ae4e1212ab225ae2 Mon Sep 17 00:00:00 2001
From: krishna2803 <kpandey81930 at gmail.com>
Date: Tue, 11 Feb 2025 20:16:12 +0530
Subject: [PATCH 4/5] fix: change to proxy headers for `cpu_set_t`, `size_t`
and `pid_t` types
Signed-off-by: krishna2803 <kpandey81930 at gmail.com>
---
libc/src/sched/linux/sched_getaffinity.cpp | 7 +++++--
libc/src/sched/linux/sched_getcpucount.cpp | 8 ++++----
libc/src/sched/linux/sched_getparam.cpp | 6 ++++--
libc/src/sched/linux/sched_getscheduler.cpp | 6 ++++--
libc/src/sched/linux/sched_rr_get_interval.cpp | 7 +++++--
libc/src/sched/linux/sched_setaffinity.cpp | 6 ++++--
libc/src/sched/linux/sched_setparam.cpp | 6 ++++--
libc/src/sched/linux/sched_setscheduler.cpp | 6 ++++--
libc/src/sched/sched_getaffinity.h | 4 +++-
libc/src/sched/sched_getcpucount.h | 4 ++--
libc/src/sched/sched_getparam.h | 4 ++--
libc/src/sched/sched_getscheduler.h | 4 ++--
libc/src/sched/sched_rr_get_interval.h | 5 +++--
libc/src/sched/sched_setaffinity.h | 4 +++-
libc/src/sched/sched_setparam.h | 3 ++-
libc/src/sched/sched_setscheduler.h | 4 ++--
16 files changed, 53 insertions(+), 31 deletions(-)
diff --git a/libc/src/sched/linux/sched_getaffinity.cpp b/libc/src/sched/linux/sched_getaffinity.cpp
index 41c7731142aeb..aa34b96e14eb3 100644
--- a/libc/src/sched/linux/sched_getaffinity.cpp
+++ b/libc/src/sched/linux/sched_getaffinity.cpp
@@ -9,11 +9,14 @@
#include "src/sched/sched_getaffinity.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
#include "hdr/types/cpu_set_t.h"
+#include "hdr/types/pid_t.h"
+#include "hdr/types/size_t.h"
+
#include <stdint.h>
#include <sys/syscall.h> // For syscall numbers.
diff --git a/libc/src/sched/linux/sched_getcpucount.cpp b/libc/src/sched/linux/sched_getcpucount.cpp
index 849123d9b960e..28945476691ce 100644
--- a/libc/src/sched/linux/sched_getcpucount.cpp
+++ b/libc/src/sched/linux/sched_getcpucount.cpp
@@ -8,11 +8,11 @@
#include "src/sched/sched_getcpucount.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "hdr/types/cpu_set_t.h"
-#include <stddef.h>
+#include "hdr/types/size_t.h"
namespace LIBC_NAMESPACE_DECL {
@@ -20,7 +20,7 @@ LLVM_LIBC_FUNCTION(int, __sched_getcpucount,
(size_t cpuset_size, const cpu_set_t *mask)) {
int result = 0;
for (size_t i = 0; i < cpuset_size / sizeof(long); ++i) {
- result += __builtin_popcountl(mask->__mask[i]);
+ result += __builtin_popcountl(mask->__bits[i]);
}
return result;
}
diff --git a/libc/src/sched/linux/sched_getparam.cpp b/libc/src/sched/linux/sched_getparam.cpp
index 75756a65f0ede..38ce720ef9e9d 100644
--- a/libc/src/sched/linux/sched_getparam.cpp
+++ b/libc/src/sched/linux/sched_getparam.cpp
@@ -9,10 +9,12 @@
#include "src/sched/sched_getparam.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
+#include "hdr/types/pid_t.h"
+
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/linux/sched_getscheduler.cpp b/libc/src/sched/linux/sched_getscheduler.cpp
index 545cda8e7484b..7be5c72aa765a 100644
--- a/libc/src/sched/linux/sched_getscheduler.cpp
+++ b/libc/src/sched/linux/sched_getscheduler.cpp
@@ -9,10 +9,12 @@
#include "src/sched/sched_getscheduler.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
+#include "hdr/types/pid_t.h"
+
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/linux/sched_rr_get_interval.cpp b/libc/src/sched/linux/sched_rr_get_interval.cpp
index 1f0ef69dfc893..42b9ea87df3b5 100644
--- a/libc/src/sched/linux/sched_rr_get_interval.cpp
+++ b/libc/src/sched/linux/sched_rr_get_interval.cpp
@@ -9,10 +9,13 @@
#include "src/sched/sched_rr_get_interval.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
+#include "hdr/types/pid_t.h"
+#include "hdr/types/struct_timespec.h"
+
#include <sys/syscall.h> // For syscall numbers.
#ifdef SYS_sched_rr_get_interval_time64
diff --git a/libc/src/sched/linux/sched_setaffinity.cpp b/libc/src/sched/linux/sched_setaffinity.cpp
index a131bda2bb5eb..a8f0a4d70e7c4 100644
--- a/libc/src/sched/linux/sched_setaffinity.cpp
+++ b/libc/src/sched/linux/sched_setaffinity.cpp
@@ -9,11 +9,13 @@
#include "src/sched/sched_setaffinity.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
#include "hdr/types/cpu_set_t.h"
+#include "hdr/types/pid_t.h"
+#include "hdr/types/size_t.h"
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/linux/sched_setparam.cpp b/libc/src/sched/linux/sched_setparam.cpp
index e78e78a707e05..0051c272003e8 100644
--- a/libc/src/sched/linux/sched_setparam.cpp
+++ b/libc/src/sched/linux/sched_setparam.cpp
@@ -9,10 +9,12 @@
#include "src/sched/sched_setparam.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
+#include "hdr/types/pid_t.h"
+
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/linux/sched_setscheduler.cpp b/libc/src/sched/linux/sched_setscheduler.cpp
index b6b6f667b3f9e..0f867230a45de 100644
--- a/libc/src/sched/linux/sched_setscheduler.cpp
+++ b/libc/src/sched/linux/sched_setscheduler.cpp
@@ -9,10 +9,12 @@
#include "src/sched/sched_setscheduler.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "src/errno/libc_errno.h"
+#include "hdr/types/pid_t.h"
+
#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getaffinity.h b/libc/src/sched/sched_getaffinity.h
index de8a14d51daa9..03ce790717080 100644
--- a/libc/src/sched/sched_getaffinity.h
+++ b/libc/src/sched/sched_getaffinity.h
@@ -9,8 +9,10 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
-#include "src/__support/macros/config.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "hdr/types/cpu_set_t.h"
+#include "hdr/types/size_t.h"
+#include "hdr/types/pid_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getcpucount.h b/libc/src/sched/sched_getcpucount.h
index f04099f8db0c4..d57b779991c2f 100644
--- a/libc/src/sched/sched_getcpucount.h
+++ b/libc/src/sched/sched_getcpucount.h
@@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
-#include "src/__support/macros/config.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "hdr/types/cpu_set_t.h"
-#include <stddef.h>
+#include "hdr/types/size_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getparam.h b/libc/src/sched/sched_getparam.h
index 03bfc008be95b..28c75619bee92 100644
--- a/libc/src/sched/sched_getparam.h
+++ b/libc/src/sched/sched_getparam.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
-#include "src/__support/macros/config.h"
-#include "hdr/types/cpu_set_t.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
+#include "hdr/types/pid_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_getscheduler.h b/libc/src/sched/sched_getscheduler.h
index 970b96097d33d..a250132445656 100644
--- a/libc/src/sched/sched_getscheduler.h
+++ b/libc/src/sched/sched_getscheduler.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
-#include "src/__support/macros/config.h"
-#include "hdr/types/cpu_set_t.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
+#include "hdr/types/pid_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_rr_get_interval.h b/libc/src/sched/sched_rr_get_interval.h
index b8bf17497cb32..73997a9efefce 100644
--- a/libc/src/sched/sched_rr_get_interval.h
+++ b/libc/src/sched/sched_rr_get_interval.h
@@ -9,8 +9,9 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
#define LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
-#include "src/__support/macros/config.h"
-#include "hdr/types/cpu_set_t.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
+#include "hdr/types/pid_t.h"
+#include "hdr/types/struct_timespec.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setaffinity.h b/libc/src/sched/sched_setaffinity.h
index 368aac0cc5bf9..4612eafc222e3 100644
--- a/libc/src/sched/sched_setaffinity.h
+++ b/libc/src/sched/sched_setaffinity.h
@@ -9,8 +9,10 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
-#include "src/__support/macros/config.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "hdr/types/cpu_set_t.h"
+#include "hdr/types/pid_t.h"
+#include "hdr/types/size_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setparam.h b/libc/src/sched/sched_setparam.h
index cf5b2840c4551..b08b8409657d9 100644
--- a/libc/src/sched/sched_setparam.h
+++ b/libc/src/sched/sched_setparam.h
@@ -9,8 +9,9 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
-#include "src/__support/macros/config.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
#include "hdr/types/cpu_set_t.h"
+#include "hdr/types/pid_t.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/sched/sched_setscheduler.h b/libc/src/sched/sched_setscheduler.h
index 5c99aa2d10a00..085ada2d9bbad 100644
--- a/libc/src/sched/sched_setscheduler.h
+++ b/libc/src/sched/sched_setscheduler.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
-#include "src/__support/macros/config.h"
-#include "hdr/types/cpu_set_t.h"
+#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
+#include "hdr/types/pid_t.h"
namespace LIBC_NAMESPACE_DECL {
>From 00b5943cb279d64e4d15849ca75a453afd417e54 Mon Sep 17 00:00:00 2001
From: krishna2803 <kpandey81930 at gmail.com>
Date: Tue, 11 Feb 2025 20:17:11 +0530
Subject: [PATCH 5/5] fix: update CMakeLists for proxy header dependencies
Signed-off-by: krishna2803 <kpandey81930 at gmail.com>
---
libc/hdr/types/CMakeLists.txt | 8 ++++++++
libc/src/sched/linux/CMakeLists.txt | 14 ++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt
index dfc90009ef54a..9e5f13e022cdb 100644
--- a/libc/hdr/types/CMakeLists.txt
+++ b/libc/hdr/types/CMakeLists.txt
@@ -241,6 +241,14 @@ add_proxy_header_library(
libc.include.stdio
)
+add_proxy_header_library(
+ cpu_set_t
+ HDRS
+ cpu_set_t.h
+ FULL_BUILD_DEPENDS
+ libc.include.llvm-libc-types.cpu_set_t
+)
+
add_proxy_header_library(
locale_t
HDRS
diff --git a/libc/src/sched/linux/CMakeLists.txt b/libc/src/sched/linux/CMakeLists.txt
index ac95bf85da534..97657e4a40889 100644
--- a/libc/src/sched/linux/CMakeLists.txt
+++ b/libc/src/sched/linux/CMakeLists.txt
@@ -6,6 +6,9 @@ add_entrypoint_object(
../sched_getaffinity.h
DEPENDS
libc.include.sched
+ libc.hdr.types.cpu_set_t
+ libc.hdr.types.pid_t
+ libc.hdr.types.size_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -18,6 +21,9 @@ add_entrypoint_object(
../sched_setaffinity.h
DEPENDS
libc.include.sched
+ libc.hdr.types.cpu_set_t
+ libc.hdr.types.pid_t
+ libc.hdr.types.size_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -29,6 +35,8 @@ add_entrypoint_object(
HDRS
../sched_getcpucount.h
DEPENDS
+ libc.hdr.types.cpu_set_t
+ libc.hdr.types.size_t
libc.include.sched
)
@@ -54,6 +62,7 @@ add_entrypoint_object(
libc.include.sys_syscall
libc.include.time
libc.include.sched
+ libc.hdr.types.pid_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -68,6 +77,7 @@ add_entrypoint_object(
libc.include.sys_syscall
libc.include.time
libc.include.sched
+ libc.hdr.types.pid_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -82,6 +92,7 @@ add_entrypoint_object(
libc.include.sys_syscall
libc.include.time
libc.include.sched
+ libc.hdr.types.pid_t
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
@@ -94,6 +105,7 @@ add_entrypoint_object(
../sched_getscheduler.h
DEPENDS
libc.include.sched
+ libc.hdr.types.pid_t
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
@@ -132,6 +144,8 @@ add_entrypoint_object(
DEPENDS
libc.include.sys_syscall
libc.include.sched
+ libc.hdr.types.pid_t
+ libc.hdr.types.struct_timespec
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
More information about the libc-commits
mailing list