From fd3cd1b6e6e58f2dcac8efdd22e6c19f20780323 Mon Sep 17 00:00:00 2001
From: Zachary Levy <zachary@sunforge.is>
Date: Thu, 2 Apr 2026 18:30:12 -0700
Subject: [PATCH] Cleaned up phased_executor test

---
 phased_executor/phased_executor.odin | 63 ++++++++++++----------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/phased_executor/phased_executor.odin b/phased_executor/phased_executor.odin
index 0c88c09..f52b148 100644
--- a/phased_executor/phased_executor.odin
+++ b/phased_executor/phased_executor.odin
@@ -243,63 +243,54 @@ exec_join :: proc(executor: ^Executor($T)) {
 import "core:fmt"
 import "core:testing"
 
-when ODIN_TEST {
-	@(private = "file")
+@(test)
+stress_test_executor :: proc(t: ^testing.T) {
 	STRESS_TOTAL_CMDS :: 200_000
-	@(private = "file")
 	STRESS_NUM_THREADS :: 8
-	@(private = "file")
 	STRESS_NUM_ROUNDS :: 100
-	@(private = "file")
 	STRESS_CMDS_PER_ROUND :: STRESS_TOTAL_CMDS / STRESS_NUM_ROUNDS
 
-	@(private = "file")
 	Stress_Cmd :: union {
 		Stress_Payload,
 	}
 
-	@(private = "file")
 	Stress_Payload :: struct {
 		exec_counts: ^[STRESS_TOTAL_CMDS]uint,
 		id:          int,
 	}
 
-	@(private = "file")
 	stress_handler :: proc(command: Stress_Cmd) {
 		payload := command.(Stress_Payload)
 		intrinsics.atomic_add_explicit(&payload.exec_counts[payload.id], 1, .Release)
 	}
 
-	@(test)
-	stress_test_executor :: proc(t: ^testing.T) {
-		exec_counts := new([STRESS_TOTAL_CMDS]uint)
-		defer free(exec_counts)
+	exec_counts := new([STRESS_TOTAL_CMDS]uint)
+	defer free(exec_counts)
 
-		executor: Executor(Stress_Cmd)
-		init_executor(&executor, STRESS_NUM_THREADS, stress_handler, spin_limit = 500)
+	executor: Executor(Stress_Cmd)
+	init_executor(&executor, STRESS_NUM_THREADS, stress_handler, spin_limit = 500)
 
-		for round in 0 ..< STRESS_NUM_ROUNDS {
-			base := round * STRESS_CMDS_PER_ROUND
-			for i in 0 ..< STRESS_CMDS_PER_ROUND {
-				exec_command(&executor, Stress_Payload{exec_counts = exec_counts, id = base + i})
-			}
-			exec_join(&executor)
+	for round in 0 ..< STRESS_NUM_ROUNDS {
+		base := round * STRESS_CMDS_PER_ROUND
+		for i in 0 ..< STRESS_CMDS_PER_ROUND {
+			exec_command(&executor, Stress_Payload{exec_counts = exec_counts, id = base + i})
 		}
-
-		missed, duped: int
-		for i in 0 ..< STRESS_TOTAL_CMDS {
-			count := exec_counts[i]
-			if count == 0 do missed += 1
-			else if count > 1 do duped += 1
-		}
-
-		testing.expect(t, missed == 0, fmt.tprintf("Missed %d / %d commands", missed, STRESS_TOTAL_CMDS))
-		testing.expect(t, duped == 0, fmt.tprintf("Duplicated %d / %d commands", duped, STRESS_TOTAL_CMDS))
-
-		// Explicitly destroy to verify clean shutdown.
-		// If destroy_executor returns, all threads received the nil sentinel and exited,
-		// and thread.pool_join completed without deadlock.
-		destroy_executor(&executor)
-		testing.expect(t, !executor.initialized, "Executor still marked initialized after destroy")
+		exec_join(&executor)
 	}
+
+	missed, duped: int
+	for i in 0 ..< STRESS_TOTAL_CMDS {
+		count := exec_counts[i]
+		if count == 0 do missed += 1
+		else if count > 1 do duped += 1
+	}
+
+	testing.expect(t, missed == 0, fmt.tprintf("Missed %d / %d commands", missed, STRESS_TOTAL_CMDS))
+	testing.expect(t, duped == 0, fmt.tprintf("Duplicated %d / %d commands", duped, STRESS_TOTAL_CMDS))
+
+	// Explicitly destroy to verify clean shutdown.
+	// If destroy_executor returns, all threads received the nil sentinel and exited,
+	// and thread.pool_join completed without deadlock.
+	destroy_executor(&executor)
+	testing.expect(t, !executor.initialized, "Executor still marked initialized after destroy")
 }