diff --git a/Kernel/API/POSIX/serenity.h b/Kernel/API/POSIX/serenity.h new file mode 100644 index 00000000000..eaa30095bcf --- /dev/null +++ b/Kernel/API/POSIX/serenity.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2021, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define PURGE_ALL_VOLATILE 0x1 +#define PURGE_ALL_CLEAN_INODE 0x2 + +enum { + PERF_EVENT_SAMPLE = 1, + PERF_EVENT_MALLOC = 2, + PERF_EVENT_FREE = 4, + PERF_EVENT_MMAP = 8, + PERF_EVENT_MUNMAP = 16, + PERF_EVENT_PROCESS_CREATE = 32, + PERF_EVENT_PROCESS_EXEC = 64, + PERF_EVENT_PROCESS_EXIT = 128, + PERF_EVENT_THREAD_CREATE = 256, + PERF_EVENT_THREAD_EXIT = 512, + PERF_EVENT_CONTEXT_SWITCH = 1024, + PERF_EVENT_KMALLOC = 2048, + PERF_EVENT_KFREE = 4096, + PERF_EVENT_PAGE_FAULT = 8192, + PERF_EVENT_SYSCALL = 16384, + PERF_EVENT_SIGNPOST = 32768, +}; + +#define PERF_EVENT_MASK_ALL (~0ull) + +#define THREAD_PRIORITY_MIN 1 +#define THREAD_PRIORITY_LOW 10 +#define THREAD_PRIORITY_NORMAL 30 +#define THREAD_PRIORITY_HIGH 50 +#define THREAD_PRIORITY_MAX 99 + +#ifdef __cplusplus +} +#endif diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h index 22ec9ccbd2c..0bea2516458 100644 --- a/Kernel/UnixTypes.h +++ b/Kernel/UnixTypes.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -45,25 +46,6 @@ enum { _SC_CLK_TCK, }; -enum { - PERF_EVENT_SAMPLE = 1, - PERF_EVENT_MALLOC = 2, - PERF_EVENT_FREE = 4, - PERF_EVENT_MMAP = 8, - PERF_EVENT_MUNMAP = 16, - PERF_EVENT_PROCESS_CREATE = 32, - PERF_EVENT_PROCESS_EXEC = 64, - PERF_EVENT_PROCESS_EXIT = 128, - PERF_EVENT_THREAD_CREATE = 256, - PERF_EVENT_THREAD_EXIT = 512, - PERF_EVENT_CONTEXT_SWITCH = 1024, - PERF_EVENT_KMALLOC = 2048, - PERF_EVENT_KFREE = 4096, - PERF_EVENT_PAGE_FAULT = 8192, - PERF_EVENT_SYSCALL = 16384, - PERF_EVENT_SIGNPOST = 32768, -}; - #define R_OK 4 #define W_OK 2 #define X_OK 1 @@ -157,9 +139,6 @@ struct sched_param { #define AT_FDCWD -100 #define AT_SYMLINK_NOFOLLOW 0x100 -#define PURGE_ALL_VOLATILE 0x1 -#define PURGE_ALL_CLEAN_INODE 0x2 - #define PT_TRACE_ME 1 #define PT_ATTACH 2 #define PT_CONTINUE 3 diff --git a/Userland/Libraries/LibC/serenity.h b/Userland/Libraries/LibC/serenity.h index 7f81f92f040..fd1ef5275e7 100644 --- a/Userland/Libraries/LibC/serenity.h +++ b/Userland/Libraries/LibC/serenity.h @@ -7,9 +7,8 @@ #pragma once #include +#include #include -#include -#include #include #include @@ -24,12 +23,6 @@ int profiling_enable(pid_t, uint64_t); int profiling_disable(pid_t); int profiling_free_buffer(pid_t); -#define THREAD_PRIORITY_MIN 1 -#define THREAD_PRIORITY_LOW 10 -#define THREAD_PRIORITY_NORMAL 30 -#define THREAD_PRIORITY_HIGH 50 -#define THREAD_PRIORITY_MAX 99 - int futex(uint32_t* userspace_address, int futex_op, uint32_t value, const struct timespec* timeout, uint32_t* userspace_address2, uint32_t value3); static ALWAYS_INLINE int futex_wait(uint32_t* userspace_address, uint32_t value, const struct timespec* abstime, int clockid) @@ -52,32 +45,8 @@ static ALWAYS_INLINE int futex_wake(uint32_t* userspace_address, uint32_t count) return futex(userspace_address, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, count, NULL, NULL, 0); } -#define PURGE_ALL_VOLATILE 0x1 -#define PURGE_ALL_CLEAN_INODE 0x2 - int purge(int mode); -enum { - PERF_EVENT_SAMPLE = 1, - PERF_EVENT_MALLOC = 2, - PERF_EVENT_FREE = 4, - PERF_EVENT_MMAP = 8, - PERF_EVENT_MUNMAP = 16, - PERF_EVENT_PROCESS_CREATE = 32, - PERF_EVENT_PROCESS_EXEC = 64, - PERF_EVENT_PROCESS_EXIT = 128, - PERF_EVENT_THREAD_CREATE = 256, - PERF_EVENT_THREAD_EXIT = 512, - PERF_EVENT_CONTEXT_SWITCH = 1024, - PERF_EVENT_KMALLOC = 2048, - PERF_EVENT_KFREE = 4096, - PERF_EVENT_PAGE_FAULT = 8192, - PERF_EVENT_SYSCALL = 16384, - PERF_EVENT_SIGNPOST = 32768, -}; - -#define PERF_EVENT_MASK_ALL (~0ull) - int perf_event(int type, uintptr_t arg1, uintptr_t arg2); int perf_register_string(char const* string, size_t string_length);