Merge pull request #1249 from likewhatevs/lsp-cleanup

[scx-layered] misc. lsp cleanup
sched-ext · Jan 27, 2025 · a3607dc · a3607dc
2 parents 927a093 + 86a9dcc
commit a3607dc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/scheds/rust/scx_layered/src/bpf/main.bpf.c b/scheds/rust/scx_layered/src/bpf/main.bpf.c
@@ -1,9 +1,9 @@
 /* Copyright (c) Meta Platforms, Inc. and affiliates. */
+
 #ifdef LSP
 #ifndef __bpf__
 #define __bpf__
 #endif
-#define LSP_INC
 #include "../../../../include/scx/common.bpf.h"
 #include "../../../../include/scx/namespace_impl.bpf.h"
 #else

diff --git a/scheds/rust/scx_layered/src/bpf/timer.bpf.c b/scheds/rust/scx_layered/src/bpf/timer.bpf.c
@@ -1,10 +1,9 @@
 /* Copyright (c) Meta Platforms, Inc. and affiliates. */
 
 #ifdef LSP
+#ifndef __bpf__
 #define __bpf__
 #endif
-
-#if defined LSP && defined LSP_INC
 #include "../../../../include/scx/common.bpf.h"
 #else
 #include <scx/common.bpf.h>

diff --git a/scheds/rust/scx_layered/src/bpf/timer.bpf.h b/scheds/rust/scx_layered/src/bpf/timer.bpf.h
@@ -1,12 +1,16 @@
 /* Copyright (c) Meta Platforms, Inc. and affiliates. */
 #ifndef __LAYERED_TIMER_H
 #define __LAYERED_TIMER_H
+
 #ifdef LSP
+#ifndef __bpf__
 #define __bpf__
-#ifndef LSP_INC
-#include "../../../../include/scx/common.bpf.h"
 #endif
+#include "../../../../include/scx/common.bpf.h"
+#else
+#include <scx/common.bpf.h>
 #endif
+
 #include <bpf/bpf_core_read.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>

diff --git a/scheds/rust/scx_layered/src/bpf/util.bpf.c b/scheds/rust/scx_layered/src/bpf/util.bpf.c
@@ -1,8 +1,8 @@
+
 #ifdef LSP
 #ifndef __bpf__
 #define __bpf__
 #endif
-#define LSP_INC
 #include "../../../../include/scx/common.bpf.h"
 #else
 #include <scx/common.bpf.h>

diff --git a/scheds/rust/scx_layered/src/bpf/util.bpf.h b/scheds/rust/scx_layered/src/bpf/util.bpf.h
@@ -1,12 +1,16 @@
 /* Copyright (c) Meta Platforms, Inc. and affiliates. */
 #ifndef __LAYERED_UTIL_H
 #define __LAYERED_UTIL_H
+
 #ifdef LSP
+#ifndef __bpf__
 #define __bpf__
-#ifndef LSP_INC
-#include "../../../../include/scx/common.bpf.h"
 #endif
+#include "../../../../include/scx/common.bpf.h"
+#else
+#include <scx/common.bpf.h>
 #endif
+
 #include <bpf/bpf_core_read.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>