Skip to content

Commit 60c0414

Browse files
JakeHillionJakeHillion
committed
gen_enums.py: explicitly reference scx_utils::scx_enums
Rust macros aren't scoped the same as functions, and this `scx_enums` reference expects you to have it already imported. Reference this with the full reference to the crate and remove the now unnecessary imports from all the usage sites. This file is generated, so adjusted the generator and re-ran it. Test plan: - `cargo build` - CI
1 parent b6a0be2 commit 60c0414

File tree

8 files changed

+42
-48
lines changed

8 files changed

+42
-48
lines changed

‎rust/scx_rustland_core/assets/bpf.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use libc::{pthread_self, pthread_setschedparam, sched_param};
3535
use libc::timespec;
3636

3737
use scx_utils::compat;
38-
use scx_utils::scx_enums;
3938
use scx_utils::scx_ops_attach;
4039
use scx_utils::scx_ops_load;
4140
use scx_utils::scx_ops_open;

‎rust/scx_utils/src/enums.rs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -102,46 +102,46 @@ lazy_static::lazy_static! {
102102
#[macro_export]
103103
macro_rules! import_enums {
104104
($skel: ident) => { 'block : {
105-
$skel.maps.rodata_data.__SCX_OPS_NAME_LEN = scx_enums.SCX_OPS_NAME_LEN;
106-
$skel.maps.rodata_data.__SCX_SLICE_DFL = scx_enums.SCX_SLICE_DFL;
107-
$skel.maps.rodata_data.__SCX_SLICE_INF = scx_enums.SCX_SLICE_INF;
108-
$skel.maps.rodata_data.__SCX_RQ_ONLINE = scx_enums.SCX_RQ_ONLINE;
109-
$skel.maps.rodata_data.__SCX_RQ_CAN_STOP_TICK = scx_enums.SCX_RQ_CAN_STOP_TICK;
110-
$skel.maps.rodata_data.__SCX_RQ_BAL_PENDING = scx_enums.SCX_RQ_BAL_PENDING;
111-
$skel.maps.rodata_data.__SCX_RQ_BAL_KEEP = scx_enums.SCX_RQ_BAL_KEEP;
112-
$skel.maps.rodata_data.__SCX_RQ_BYPASSING = scx_enums.SCX_RQ_BYPASSING;
113-
$skel.maps.rodata_data.__SCX_RQ_CLK_VALID = scx_enums.SCX_RQ_CLK_VALID;
114-
$skel.maps.rodata_data.__SCX_RQ_IN_WAKEUP = scx_enums.SCX_RQ_IN_WAKEUP;
115-
$skel.maps.rodata_data.__SCX_RQ_IN_BALANCE = scx_enums.SCX_RQ_IN_BALANCE;
116-
$skel.maps.rodata_data.__SCX_DSQ_FLAG_BUILTIN = scx_enums.SCX_DSQ_FLAG_BUILTIN;
117-
$skel.maps.rodata_data.__SCX_DSQ_FLAG_LOCAL_ON = scx_enums.SCX_DSQ_FLAG_LOCAL_ON;
118-
$skel.maps.rodata_data.__SCX_DSQ_INVALID = scx_enums.SCX_DSQ_INVALID;
119-
$skel.maps.rodata_data.__SCX_DSQ_GLOBAL = scx_enums.SCX_DSQ_GLOBAL;
120-
$skel.maps.rodata_data.__SCX_DSQ_LOCAL = scx_enums.SCX_DSQ_LOCAL;
121-
$skel.maps.rodata_data.__SCX_DSQ_LOCAL_ON = scx_enums.SCX_DSQ_LOCAL_ON;
122-
$skel.maps.rodata_data.__SCX_DSQ_LOCAL_CPU_MASK = scx_enums.SCX_DSQ_LOCAL_CPU_MASK;
123-
$skel.maps.rodata_data.__SCX_TASK_QUEUED = scx_enums.SCX_TASK_QUEUED;
124-
$skel.maps.rodata_data.__SCX_TASK_RESET_RUNNABLE_AT = scx_enums.SCX_TASK_RESET_RUNNABLE_AT;
125-
$skel.maps.rodata_data.__SCX_TASK_DEQD_FOR_SLEEP = scx_enums.SCX_TASK_DEQD_FOR_SLEEP;
126-
$skel.maps.rodata_data.__SCX_TASK_STATE_SHIFT = scx_enums.SCX_TASK_STATE_SHIFT;
127-
$skel.maps.rodata_data.__SCX_TASK_STATE_BITS = scx_enums.SCX_TASK_STATE_BITS;
128-
$skel.maps.rodata_data.__SCX_TASK_STATE_MASK = scx_enums.SCX_TASK_STATE_MASK;
129-
$skel.maps.rodata_data.__SCX_TASK_CURSOR = scx_enums.SCX_TASK_CURSOR;
130-
$skel.maps.rodata_data.__SCX_TASK_NONE = scx_enums.SCX_TASK_NONE;
131-
$skel.maps.rodata_data.__SCX_TASK_INIT = scx_enums.SCX_TASK_INIT;
132-
$skel.maps.rodata_data.__SCX_TASK_READY = scx_enums.SCX_TASK_READY;
133-
$skel.maps.rodata_data.__SCX_TASK_ENABLED = scx_enums.SCX_TASK_ENABLED;
134-
$skel.maps.rodata_data.__SCX_TASK_NR_STATES = scx_enums.SCX_TASK_NR_STATES;
135-
$skel.maps.rodata_data.__SCX_TASK_DSQ_ON_PRIQ = scx_enums.SCX_TASK_DSQ_ON_PRIQ;
136-
$skel.maps.rodata_data.__SCX_KICK_IDLE = scx_enums.SCX_KICK_IDLE;
137-
$skel.maps.rodata_data.__SCX_KICK_PREEMPT = scx_enums.SCX_KICK_PREEMPT;
138-
$skel.maps.rodata_data.__SCX_KICK_WAIT = scx_enums.SCX_KICK_WAIT;
139-
$skel.maps.rodata_data.__SCX_ENQ_WAKEUP = scx_enums.SCX_ENQ_WAKEUP;
140-
$skel.maps.rodata_data.__SCX_ENQ_HEAD = scx_enums.SCX_ENQ_HEAD;
141-
$skel.maps.rodata_data.__SCX_ENQ_PREEMPT = scx_enums.SCX_ENQ_PREEMPT;
142-
$skel.maps.rodata_data.__SCX_ENQ_REENQ = scx_enums.SCX_ENQ_REENQ;
143-
$skel.maps.rodata_data.__SCX_ENQ_LAST = scx_enums.SCX_ENQ_LAST;
144-
$skel.maps.rodata_data.__SCX_ENQ_CLEAR_OPSS = scx_enums.SCX_ENQ_CLEAR_OPSS;
145-
$skel.maps.rodata_data.__SCX_ENQ_DSQ_PRIQ = scx_enums.SCX_ENQ_DSQ_PRIQ;
105+
$skel.maps.rodata_data.__SCX_OPS_NAME_LEN = $crate::scx_enums.SCX_OPS_NAME_LEN;
106+
$skel.maps.rodata_data.__SCX_SLICE_DFL = $crate::scx_enums.SCX_SLICE_DFL;
107+
$skel.maps.rodata_data.__SCX_SLICE_INF = $crate::scx_enums.SCX_SLICE_INF;
108+
$skel.maps.rodata_data.__SCX_RQ_ONLINE = $crate::scx_enums.SCX_RQ_ONLINE;
109+
$skel.maps.rodata_data.__SCX_RQ_CAN_STOP_TICK = $crate::scx_enums.SCX_RQ_CAN_STOP_TICK;
110+
$skel.maps.rodata_data.__SCX_RQ_BAL_PENDING = $crate::scx_enums.SCX_RQ_BAL_PENDING;
111+
$skel.maps.rodata_data.__SCX_RQ_BAL_KEEP = $crate::scx_enums.SCX_RQ_BAL_KEEP;
112+
$skel.maps.rodata_data.__SCX_RQ_BYPASSING = $crate::scx_enums.SCX_RQ_BYPASSING;
113+
$skel.maps.rodata_data.__SCX_RQ_CLK_VALID = $crate::scx_enums.SCX_RQ_CLK_VALID;
114+
$skel.maps.rodata_data.__SCX_RQ_IN_WAKEUP = $crate::scx_enums.SCX_RQ_IN_WAKEUP;
115+
$skel.maps.rodata_data.__SCX_RQ_IN_BALANCE = $crate::scx_enums.SCX_RQ_IN_BALANCE;
116+
$skel.maps.rodata_data.__SCX_DSQ_FLAG_BUILTIN = $crate::scx_enums.SCX_DSQ_FLAG_BUILTIN;
117+
$skel.maps.rodata_data.__SCX_DSQ_FLAG_LOCAL_ON = $crate::scx_enums.SCX_DSQ_FLAG_LOCAL_ON;
118+
$skel.maps.rodata_data.__SCX_DSQ_INVALID = $crate::scx_enums.SCX_DSQ_INVALID;
119+
$skel.maps.rodata_data.__SCX_DSQ_GLOBAL = $crate::scx_enums.SCX_DSQ_GLOBAL;
120+
$skel.maps.rodata_data.__SCX_DSQ_LOCAL = $crate::scx_enums.SCX_DSQ_LOCAL;
121+
$skel.maps.rodata_data.__SCX_DSQ_LOCAL_ON = $crate::scx_enums.SCX_DSQ_LOCAL_ON;
122+
$skel.maps.rodata_data.__SCX_DSQ_LOCAL_CPU_MASK = $crate::scx_enums.SCX_DSQ_LOCAL_CPU_MASK;
123+
$skel.maps.rodata_data.__SCX_TASK_QUEUED = $crate::scx_enums.SCX_TASK_QUEUED;
124+
$skel.maps.rodata_data.__SCX_TASK_RESET_RUNNABLE_AT = $crate::scx_enums.SCX_TASK_RESET_RUNNABLE_AT;
125+
$skel.maps.rodata_data.__SCX_TASK_DEQD_FOR_SLEEP = $crate::scx_enums.SCX_TASK_DEQD_FOR_SLEEP;
126+
$skel.maps.rodata_data.__SCX_TASK_STATE_SHIFT = $crate::scx_enums.SCX_TASK_STATE_SHIFT;
127+
$skel.maps.rodata_data.__SCX_TASK_STATE_BITS = $crate::scx_enums.SCX_TASK_STATE_BITS;
128+
$skel.maps.rodata_data.__SCX_TASK_STATE_MASK = $crate::scx_enums.SCX_TASK_STATE_MASK;
129+
$skel.maps.rodata_data.__SCX_TASK_CURSOR = $crate::scx_enums.SCX_TASK_CURSOR;
130+
$skel.maps.rodata_data.__SCX_TASK_NONE = $crate::scx_enums.SCX_TASK_NONE;
131+
$skel.maps.rodata_data.__SCX_TASK_INIT = $crate::scx_enums.SCX_TASK_INIT;
132+
$skel.maps.rodata_data.__SCX_TASK_READY = $crate::scx_enums.SCX_TASK_READY;
133+
$skel.maps.rodata_data.__SCX_TASK_ENABLED = $crate::scx_enums.SCX_TASK_ENABLED;
134+
$skel.maps.rodata_data.__SCX_TASK_NR_STATES = $crate::scx_enums.SCX_TASK_NR_STATES;
135+
$skel.maps.rodata_data.__SCX_TASK_DSQ_ON_PRIQ = $crate::scx_enums.SCX_TASK_DSQ_ON_PRIQ;
136+
$skel.maps.rodata_data.__SCX_KICK_IDLE = $crate::scx_enums.SCX_KICK_IDLE;
137+
$skel.maps.rodata_data.__SCX_KICK_PREEMPT = $crate::scx_enums.SCX_KICK_PREEMPT;
138+
$skel.maps.rodata_data.__SCX_KICK_WAIT = $crate::scx_enums.SCX_KICK_WAIT;
139+
$skel.maps.rodata_data.__SCX_ENQ_WAKEUP = $crate::scx_enums.SCX_ENQ_WAKEUP;
140+
$skel.maps.rodata_data.__SCX_ENQ_HEAD = $crate::scx_enums.SCX_ENQ_HEAD;
141+
$skel.maps.rodata_data.__SCX_ENQ_PREEMPT = $crate::scx_enums.SCX_ENQ_PREEMPT;
142+
$skel.maps.rodata_data.__SCX_ENQ_REENQ = $crate::scx_enums.SCX_ENQ_REENQ;
143+
$skel.maps.rodata_data.__SCX_ENQ_LAST = $crate::scx_enums.SCX_ENQ_LAST;
144+
$skel.maps.rodata_data.__SCX_ENQ_CLEAR_OPSS = $crate::scx_enums.SCX_ENQ_CLEAR_OPSS;
145+
$skel.maps.rodata_data.__SCX_ENQ_DSQ_PRIQ = $crate::scx_enums.SCX_ENQ_DSQ_PRIQ;
146146
}};
147147
}

‎scheds/rust/scx_bpfland/src/main.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use scx_stats::prelude::*;
3535
use scx_utils::autopower::{fetch_power_profile, PowerProfile};
3636
use scx_utils::build_id;
3737
use scx_utils::compat;
38-
use scx_utils::scx_enums;
3938
use scx_utils::scx_ops_attach;
4039
use scx_utils::scx_ops_load;
4140
use scx_utils::scx_ops_open;

‎scheds/rust/scx_flash/src/main.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ use log::warn;
3232
use scx_stats::prelude::*;
3333
use scx_utils::build_id;
3434
use scx_utils::compat;
35-
use scx_utils::scx_enums;
3635
use scx_utils::scx_ops_attach;
3736
use scx_utils::scx_ops_load;
3837
use scx_utils::scx_ops_open;

‎scheds/rust/scx_lavd/src/main.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ use scx_stats::prelude::*;
4949
use scx_utils::autopower::{fetch_power_profile, PowerProfile};
5050
use scx_utils::build_id;
5151
use scx_utils::compat;
52-
use scx_utils::scx_enums;
5352
use scx_utils::scx_ops_attach;
5453
use scx_utils::scx_ops_load;
5554
use scx_utils::scx_ops_open;

‎scheds/rust/scx_p2dq/src/main.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use scx_stats::prelude::*;
2828
use scx_utils::build_id;
2929
use scx_utils::init_libbpf_logging;
3030
use scx_utils::pm::{cpu_idle_resume_latency_supported, update_cpu_idle_resume_latency};
31-
use scx_utils::scx_enums;
3231
use scx_utils::scx_ops_attach;
3332
use scx_utils::scx_ops_load;
3433
use scx_utils::scx_ops_open;

‎scheds/rust/scx_tickless/src/main.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use log::warn;
3434
use log::{debug, info};
3535
use scx_stats::prelude::*;
3636
use scx_utils::build_id;
37-
use scx_utils::scx_enums;
3837
use scx_utils::scx_ops_attach;
3938
use scx_utils::scx_ops_load;
4039
use scx_utils::scx_ops_open;

‎scripts/gen_enums.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def gen_enums_rs():
112112
f.write("macro_rules! import_enums {\n")
113113
f.write(" ($skel: ident) => { 'block : {\n")
114114
for _, symbol in enums:
115-
f.write(" $skel.maps.rodata_data.{} = scx_enums.{};\n".format(localvar(symbol), symbol))
115+
f.write(" $skel.maps.rodata_data.{} = $crate::scx_enums.{};\n".format(localvar(symbol), symbol))
116116
f.write(" }};\n")
117117

118118
f.write("}\n")

0 commit comments

Comments
 (0)