build: support scheduler bindings on windows

Cargo.toml

@@ -379,6 +379,7 @@ shuttle = "0.7.1"
 signal-hook = "0.4.3"
 siphasher = "1.0.2"
 slab = "0.4.12"
+slotmap = "1.0.7"
 smallvec = { version = "1.15.1", default-features = false, features = ["union"] }
 smpl_jwt = "0.9.0"
 socket2 = "0.6.3"
@@ -657,3 +658,5 @@ codegen-units = 1
 [patch.crates-io]
 # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
 crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
+shaq = { git = "https://github.com/anza-xyz/shaq", rev = "6e26410140a7d40b2ce65adc0a556e788d184877" }
+rts-alloc = { git = "https://github.com/anza-xyz/rts-alloc", rev = "0a3787adc7f4523de3515115f735de83cee01124" }

core/Cargo.toml

@@ -77,9 +77,11 @@ rand = { workspace = true }
 rand_chacha = { workspace = true }
 rayon = { workspace = true }
 rolling-file = { workspace = true }
+rts-alloc = { workspace = true }
 rustls = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
+shaq = { workspace = true }
 signal-hook = { workspace = true }
 slab = { workspace = true }
 solana-account = { workspace = true }
@@ -178,8 +180,6 @@ trees = { workspace = true }
 jemallocator = { workspace = true }
 
 [target."cfg(unix)".dependencies]
-rts-alloc = { workspace = true }
-shaq = { workspace = true }
 sysctl = { workspace = true }
 
 [dev-dependencies]

core/src/banking_stage.rs

@@ -92,9 +92,7 @@ pub mod unified_scheduler;
 #[cfg(not(feature = "dev-context-only-utils"))]
 pub(crate) mod unified_scheduler;
 
-#[cfg(unix)]
 mod progress_tracker;
-#[cfg(unix)]
 mod tpu_to_pack;
 
 /// The maximum number of worker threads that can be spawned by banking stage.
@@ -522,7 +520,6 @@ impl BankingStage {
                 }
                 BlockProductionMethod::UnifiedScheduler => self.spawn_internal_unified(),
             },
-            #[cfg(unix)]
             BankingControlMsg::External { session } => self.spawn_external(session),
         })?;
 
@@ -727,7 +724,6 @@ impl BankingStage {
     }
 }
 
-#[cfg(unix)]
 mod external {
     use {
         super::*,
@@ -848,7 +844,6 @@ pub enum BankingControlMsg {
         num_workers: NonZeroUsize,
         config: SchedulerConfig,
     },
-    #[cfg(unix)]
     External {
         session: agave_scheduling_utils::handshake::server::AgaveSession,
     },

core/src/banking_stage/consume_worker.rs

@@ -231,7 +231,7 @@ pub(crate) mod external {
     pub(crate) struct ExternalWorker {
         exit: Arc<AtomicBool>,
         consumer: Consumer,
-        sender: shaq::Producer<WorkerToPackMessage>,
+        sender: shaq::spsc::Producer<WorkerToPackMessage>,
         allocator: rts_alloc::Allocator,
 
         shared_leader_state: SharedLeaderState,
@@ -247,7 +247,7 @@ pub(crate) mod external {
             id: u32,
             exit: Arc<AtomicBool>,
             consumer: Consumer,
-            sender: shaq::Producer<WorkerToPackMessage>,
+            sender: shaq::spsc::Producer<WorkerToPackMessage>,
             allocator: rts_alloc::Allocator,
             shared_leader_state: SharedLeaderState,
             sharable_banks: SharableBanks,
@@ -269,7 +269,7 @@ pub(crate) mod external {
 
         pub fn run(
             mut self,
-            mut receiver: shaq::Consumer<PackToWorkerMessage>,
+            mut receiver: shaq::spsc::Consumer<PackToWorkerMessage>,
         ) -> Result<(), ExternalConsumeWorkerError> {
             let mut should_drain_executes = false;
             let mut did_work = false;

core/src/banking_stage/progress_tracker.rs

@@ -19,7 +19,7 @@ use {
 /// Spawns a thread to track and send progress updates.
 pub fn spawn(
     exit: Arc<AtomicBool>,
-    mut producer: shaq::Producer<ProgressMessage>,
+    mut producer: shaq::spsc::Producer<ProgressMessage>,
     shared_leader_state: SharedLeaderState,
     worker_metrics: Vec<Arc<ConsumeWorkerMetrics>>,
     ticks_per_slot: u64,
@@ -61,7 +61,7 @@ impl ProgressTracker {
         }
     }
 
-    fn run(mut self, producer: &mut shaq::Producer<ProgressMessage>) {
+    fn run(mut self, producer: &mut shaq::spsc::Producer<ProgressMessage>) {
         let mut last_published_tick_height = u64::MAX;
         while !self.exit.load(Ordering::Relaxed) {
             let (message, tick_height) = self.produce_progress_message();
@@ -85,7 +85,7 @@ impl ProgressTracker {
     /// returns true if a message was published
     fn publish(
         &mut self,
-        producer: &mut shaq::Producer<ProgressMessage>,
+        producer: &mut shaq::spsc::Producer<ProgressMessage>,
         message: ProgressMessage,
     ) -> bool {
         producer.sync();

core/src/banking_stage/tpu_to_pack.rs

@@ -50,7 +50,7 @@ fn tpu_to_pack(
     shutdown_signal: CancellationToken,
     receivers: BankingPacketReceivers,
     allocator: Allocator,
-    mut producer: shaq::Producer<TpuToPackMessage>,
+    mut producer: shaq::spsc::Producer<TpuToPackMessage>,
 ) {
     // select! requires actual receivers, so in the case of None for vote receivers,
     // we create a dummy channel that can never receive.
@@ -83,7 +83,7 @@ fn tpu_to_pack(
 
 fn handle_packet_batches(
     allocator: &Allocator,
-    producer: &mut shaq::Producer<TpuToPackMessage>,
+    producer: &mut shaq::spsc::Producer<TpuToPackMessage>,
     packet_batches: Arc<Vec<PacketBatch>>,
 ) {
     // Clean all remote frees in allocator so we have as much

dev-bins/Cargo.toml

@@ -189,3 +189,7 @@ lto = "thin"
 inherits = "release"
 lto = "fat"
 codegen-units = 1
+
+[patch.crates-io]
+shaq = { git = "https://github.com/anza-xyz/shaq", rev = "6e26410140a7d40b2ce65adc0a556e788d184877" }
+rts-alloc = { git = "https://github.com/anza-xyz/rts-alloc", rev = "0a3787adc7f4523de3515115f735de83cee01124" }

scheduling-utils/Cargo.toml

@@ -11,11 +11,21 @@ edition = { workspace = true }
 
 [features]
 agave-unstable-api = []
+dev-context-only-utils = ["dep:bincode", "dep:solana-transaction"]
 
 [dependencies]
+agave-feature-set = { workspace = true, features = ["agave-unstable-api"] }
 agave-scheduler-bindings = { workspace = true }
-ahash = { workspace = true }
+agave-transaction-view = { workspace = true }
+ahash.workspace = true
+bincode = { workspace = true, optional = true }
+rts-alloc = { workspace = true }
+shaq = { workspace = true }
+slotmap = { workspace = true }
+solana-fee = { workspace = true, features = ["agave-unstable-api"] }
+solana-packet = { workspace = true }
 solana-pubkey = { workspace = true }
+solana-transaction = { workspace = true, optional = true, features = ["serde"] }
 solana-transaction-error = { workspace = true }
 
 [target."cfg(unix)".dependencies]