Unused struct; volatile

xzn · Feb 14, 2024 · e1ed929 · e1ed929
1 parent 07c5e3f
commit e1ed929
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/source/nwm_rs/src/entries/work_thread/vars.rs b/source/nwm_rs/src/entries/work_thread/vars.rs
@@ -37,7 +37,7 @@ pub struct CInfo {
 
 pub type CInfosThreads = RangedArray<CInfo, RP_CORE_COUNT_MAX>;
 
-pub type CInfos = RangedArray<RangedArray<CInfosThreads, WORK_COUNT>, SCREEN_COUNT>;
+pub type CInfos = RangedArray<CInfosThreads, WORK_COUNT>;
 
 pub type CInfosAll = RangedArray<CInfo, CINFOS_COUNT>;
 
@@ -119,7 +119,7 @@ pub unsafe fn reset_vars() {
     for i in WorkIndex::all() {
         let load = load_and_progresses.get_mut(&i);
 
-        for j in ThreadId::up_to(&core_count_in_use) {
+        for j in ThreadId::up_to(&get_core_count_in_use()) {
             let info = crate::entries::thread_nwm::get_nwm_infos()
                 .get_mut(&i)
                 .get_mut(&j);
@@ -177,13 +177,14 @@ impl ThreadDoVars {
             let syn = (*syn_handles).works.get(&w);
 
             let f = syn.work_done_count.fetch_add(1, Ordering::Relaxed);
+            let core_count = get_core_count_in_use();
             if f == 0 {
                 let p = load_and_progresses.get_mut(&w);
-                for j in ThreadId::up_to(&core_count_in_use) {
+                for j in ThreadId::up_to(&core_count) {
                     *p.p_snapshot.get_mut(&j) = p.p.get_mut(&j).load(Ordering::Relaxed);
                 }
             }
-            if f == core_count_in_use.get() - 1 {
+            if f == core_count.get() - 1 {
                 ptr::write_volatile(syn.work_done_count.as_ptr(), 0);
                 ptr::write_volatile(syn.work_begin_flag.as_ptr(), false);
 
@@ -260,11 +261,7 @@ impl ThreadBeginVars {
     }
 
     pub fn cinfos(&self) -> &mut CInfosThreads {
-        unsafe {
-            cinfos
-                .get_mut(&ScreenIndex::from_bool(self.v().is_top()))
-                .get_mut(&self.v().work_index())
-        }
+        unsafe { cinfos.get_mut(&self.v().work_index()) }
     }
 
     pub fn nwm_infos(&self) -> &mut crate::entries::thread_nwm::NwmThreadInfos {
@@ -320,7 +317,7 @@ impl ThreadBeginVars {
     pub fn release_and_capture_screen(self, t: &ThreadId) -> ThreadDoVars {
         unsafe {
             let mut count = mem::MaybeUninit::uninit();
-            for j in ThreadId::up_to(&core_count_in_use) {
+            for j in ThreadId::up_to(&get_core_count_in_use()) {
                 if j != *t {
                     let res = svcReleaseSemaphore(
                         count.as_mut_ptr(),

diff --git a/source/nwm_rs/src/vars.rs b/source/nwm_rs/src/vars.rs
@@ -26,7 +26,7 @@ pub static mut thread_main_handle: Handle = 0;
 
 pub const SCREEN_COUNT: u32_ = 2;
 pub const WORK_COUNT: u32_ = 2;
-pub const CINFOS_COUNT: u32_ = SCREEN_COUNT * WORK_COUNT * RP_CORE_COUNT_MAX;
+pub const CINFOS_COUNT: u32_ = WORK_COUNT * RP_CORE_COUNT_MAX;
 
 pub type WorkIndex = Ranged<WORK_COUNT>;
 pub type ThreadId = Ranged<RP_CORE_COUNT_MAX>;