1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
|
use crate::plugins::plugin_map::PluginMap;
use crate::plugins::wasm_bridge::PluginCache;
use crate::ClientId;
use crate::ThreadSenders;
use std::collections::{HashMap, HashSet};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{channel, Sender};
use std::sync::{Arc, Mutex};
use std::thread;
use wasmi::Engine;
/// A dynamic thread pool that pins jobs to specific threads based on plugin_id
/// Starts with 1 thread and expands when threads are busy, shrinks when plugins unload
pub struct PinnedExecutor {
// Sparse vector - Some(thread) for active threads, None for removed threads
execution_threads: Arc<Mutex<Vec<Option<ExecutionThread>>>>,
// Maps plugin_id -> thread_index (permanent assignment)
plugin_assignments: Arc<Mutex<HashMap<u32, usize>>>,
// Maps thread_index -> set of plugin_ids assigned to it
thread_plugins: Arc<Mutex<HashMap<usize, HashSet<u32>>>>,
// Next thread index to use when spawning (monotonically increasing)
next_thread_idx: AtomicUsize,
// Maximum threads allowed
max_threads: usize,
// state to send to plugins (to be kept on execution threads)
senders: ThreadSenders,
plugin_map: Arc<Mutex<PluginMap>>,
connected_clients: Arc<Mutex<Vec<ClientId>>>,
plugin_cache: PluginCache,
engine: Engine,
}
struct ExecutionThread {
sender: Sender<Job>,
jobs_in_flight: Arc<AtomicUsize>, // Busy state tracking
}
enum Job {
Work(
Box<
dyn FnOnce(
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) + Send
+ 'static,
>,
),
Shutdown, // Signal to exit the worker loop
}
impl PinnedExecutor {
/// Creates a new pinned executor with the specified maximum number of threads
/// Starts with exactly 1 thread
pub fn new(
max_threads: usize,
senders: &ThreadSenders,
plugin_map: &Arc<Mutex<PluginMap>>,
connected_clients: &Arc<Mutex<Vec<ClientId>>>,
plugin_cache: &PluginCache,
engine: &Engine,
) -> Self {
let max_threads = max_threads.max(1); // At least 1
let thread_0 = Self::spawn_thread(
0,
senders.clone(),
plugin_map.clone(),
connected_clients.clone(),
plugin_cache.clone(),
engine.clone(),
);
PinnedExecutor {
execution_threads: Arc::new(Mutex::new(vec![Some(thread_0)])),
plugin_assignments: Arc::new(Mutex::new(HashMap::new())),
thread_plugins: Arc::new(Mutex::new(HashMap::new())),
next_thread_idx: AtomicUsize::new(1), // Next will be index 1
max_threads,
senders: senders.clone(),
plugin_map: plugin_map.clone(),
connected_clients: connected_clients.clone(),
plugin_cache: plugin_cache.clone(),
engine: engine.clone(),
}
}
fn spawn_thread(
thread_idx: usize,
senders: ThreadSenders,
plugin_map: Arc<Mutex<PluginMap>>,
connected_clients: Arc<Mutex<Vec<ClientId>>>,
plugin_cache: PluginCache,
engine: Engine,
) -> ExecutionThread {
let (sender, receiver) = channel::<Job>();
let jobs_in_flight = Arc::new(AtomicUsize::new(0));
let jobs_in_flight_clone = jobs_in_flight.clone();
let thread_handle = thread::Builder::new()
.name(format!("plugin-exec-{}", thread_idx))
.spawn({
move || {
let senders = senders;
let plugin_map = plugin_map;
let connected_clients = connected_clients;
let plugin_cache = plugin_cache;
let engine = engine;
while let Ok(job) = receiver.recv() {
match job {
Job::Work(work) => {
work(
senders.clone(),
plugin_map.clone(),
connected_clients.clone(),
plugin_cache.clone(),
engine.clone(),
);
jobs_in_flight_clone.fetch_sub(1, Ordering::SeqCst);
},
Job::Shutdown => break,
}
}
}
});
if let Err(e) = thread_handle {
log::error!("Failed to spawn plugin execution thread: {}", e);
}
ExecutionThread {
sender,
jobs_in_flight,
}
}
/// Register a plugin and assign it to a thread
/// Called from wasm_bridge when loading a plugin
pub fn register_plugin(&self, plugin_id: u32) -> usize {
let mut assignments = self.plugin_assignments.lock().unwrap();
// If already assigned (shouldn't happen, but defensive)
if let Some(&thread_idx) = assignments.get(&plugin_id) {
return thread_idx;
}
let mut thread_plugins = self.thread_plugins.lock().unwrap();
let threads = self.execution_threads.lock().unwrap();
// Find a non-busy thread with assigned plugins (prefer reusing threads)
let mut best_thread: Option<(usize, usize)> = None; // (index, load)
for (idx, thread_opt) in threads.iter().enumerate() {
if let Some(thread) = thread_opt {
let is_busy = thread.jobs_in_flight.load(Ordering::SeqCst) > 0;
if !is_busy {
let load = thread_plugins.get(&idx).map(|s| s.len()).unwrap_or(0);
if best_thread.is_none() || best_thread.map(|b| load < b.1).unwrap_or(false) {
best_thread = Some((idx, load));
}
}
}
}
let thread_idx = if let Some((idx, _)) = best_thread {
// Found a non-busy thread
idx
} else {
// All threads are busy - need to expand
if threads.len() < self.max_threads {
// Spawn a new thread
let new_idx = self.next_thread_idx.fetch_add(1, Ordering::SeqCst);
drop(threads); // Release lock before spawning
self.add_thread(new_idx);
new_idx
} else {
// At max capacity, assign to least-loaded thread
threads
.iter()
.enumerate()
.filter_map(|(idx, t)| t.as_ref().map(|_| idx))
.min_by_key(|&idx| thread_plugins.get(&idx).map(|s| s.len()).unwrap_or(0))
.unwrap_or_else(|| {
log::error!("Failed to find free thread to run the plugin!");
0 // this is a misconfiguration, but we don't want to crash the app
// if it happens
})
}
};
// Update mappings
assignments.insert(plugin_id, thread_idx);
thread_plugins
.entry(thread_idx)
.or_insert_with(HashSet::new)
.insert(plugin_id);
thread_idx
}
fn add_thread(&self, thread_idx: usize) {
let mut threads = self.execution_threads.lock().unwrap();
let new_thread = Self::spawn_thread(
thread_idx,
self.senders.clone(),
self.plugin_map.clone(),
self.connected_clients.clone(),
self.plugin_cache.clone(),
self.engine.clone(),
);
// Extend vector if needed
while threads.len() <= thread_idx {
threads.push(None);
}
threads[thread_idx] = Some(new_thread);
}
/// Execute job pinned to plugin's assigned thread
pub fn execute_for_plugin<F>(&self, plugin_id: u32, f: F)
where
F: FnOnce(
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) + Send
+ 'static,
{
// Look up assigned thread
let thread_idx = {
let assignments = self.plugin_assignments.lock().unwrap();
assignments.get(&plugin_id).copied()
};
let Some(thread_idx) = thread_idx else {
log::error!("Failed to find thread for plugin with id: {}", plugin_id);
return;
};
// Get thread and mark as busy
let threads = self.execution_threads.lock().unwrap();
let thread = threads[thread_idx].as_ref();
let Some(thread) = thread else {
log::error!("Failed to find thread for plugin with id: {}", plugin_id);
return;
};
// Increment busy counter BEFORE sending work
thread.jobs_in_flight.fetch_add(1, Ordering::SeqCst);
// Send work
let job = Job::Work(Box::new(f));
if let Err(_) = thread.sender.send(job) {
// Thread died unexpectedly - this is a critical error
thread.jobs_in_flight.fetch_sub(1, Ordering::SeqCst);
log::error!("Plugin executor thread {} has died", thread_idx);
}
}
/// Load a plugin: register it and execute the load work on its assigned thread
/// This combines registration + execution for plugin loading
pub fn execute_plugin_load<F>(&self, plugin_id: u32, f: F)
where
F: FnOnce(
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) + Send
+ 'static,
{
// Register plugin and assign to a thread
self.register_plugin(plugin_id);
// Execute the load work on the assigned thread
self.execute_for_plugin(plugin_id, f);
}
/// Unload a plugin: execute cleanup work, then unregister and potentially shrink pool
/// This combines cleanup execution + unregistration for plugin unloading
/// Requires Arc<Self> so we can clone it into the closure for unregistration
pub fn execute_plugin_unload(
self: &Arc<Self>,
plugin_id: u32,
f: impl FnOnce(
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) + Send
+ 'static,
) {
let executor = self.clone();
self.execute_for_plugin(
plugin_id,
move |senders, plugin_map, connected_clients, plugin_cache, engine| {
// Execute the cleanup work
f(senders, plugin_map, connected_clients, plugin_cache, engine);
// Unregister plugin and potentially shrink the pool
executor.unregister_plugin(plugin_id);
},
);
}
/// Unregister a plugin and potentially shrink the pool
/// Called from wasm_bridge after plugin cleanup is complete
pub fn unregister_plugin(&self, plugin_id: u32) {
let mut assignments = self.plugin_assignments.lock().unwrap();
let mut thread_plugins = self.thread_plugins.lock().unwrap();
if let Some(thread_idx) = assignments.remove(&plugin_id) {
if let Some(plugins) = thread_plugins.get_mut(&thread_idx) {
plugins.remove(&plugin_id);
}
}
drop(assignments);
drop(thread_plugins);
// Try to shrink the pool
self.try_shrink_pool();
}
fn try_shrink_pool(&self) {
let mut threads = self.execution_threads.lock().unwrap();
let thread_plugins = self.thread_plugins.lock().unwrap();
// Find threads with no assigned plugins (except thread 0, always keep it)
let threads_to_remove: Vec<usize> = threads
.iter()
.enumerate()
.skip(1) // Never remove thread 0
.filter_map(|(idx, thread_opt)| {
if thread_opt.is_some() {
let has_plugins = thread_plugins
.get(&idx)
.map(|s| !s.is_empty())
.unwrap_or(false);
if !has_plugins {
Some(idx)
} else {
None
}
} else {
None
}
})
.collect();
// Shutdown and remove idle threads
for idx in threads_to_remove {
if let Some(thread) = threads[idx].take() {
let _ = thread.sender.send(Job::Shutdown);
}
}
}
#[cfg(test)]
pub fn thread_count(&self) -> usize {
self.execution_threads
.lock()
.unwrap()
.iter()
.filter(|t| t.is_some())
.count()
}
}
impl Drop for PinnedExecutor {
fn drop(&mut self) {
let mut threads = self.execution_threads.lock().unwrap();
// Send shutdown to all threads
for thread_opt in threads.iter_mut() {
if let Some(thread) = thread_opt {
let _ = thread.sender.send(Job::Shutdown);
}
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{channel, Sender};
use std::sync::{Arc, Barrier, Mutex};
use std::thread;
use std::time::Duration;
// Test fixtures
fn create_test_dependencies() -> (
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) {
use std::path::PathBuf;
use wasmi::Module;
use zellij_utils::channels::{self, SenderWithContext};
let (send_to_pty, _receive_pty) = channels::bounded(1);
let (send_to_screen, _receive_screen) = channels::bounded(1);
let (send_to_plugin, _receive_plugin) = channels::bounded(1);
let (send_to_server, _receive_server) = channels::bounded(1);
let (send_to_pty_writer, _receive_pty_writer) = channels::bounded(1);
let (send_to_background_jobs, _receive_background_jobs) = channels::bounded(1);
let to_pty = SenderWithContext::new(send_to_pty);
let to_screen = SenderWithContext::new(send_to_screen);
let to_plugin = SenderWithContext::new(send_to_plugin);
let to_server = SenderWithContext::new(send_to_server);
let to_pty_writer = SenderWithContext::new(send_to_pty_writer);
let to_background_jobs = SenderWithContext::new(send_to_background_jobs);
let senders = ThreadSenders {
to_pty: Some(to_pty),
to_screen: Some(to_screen),
to_plugin: Some(to_plugin),
to_server: Some(to_server),
to_pty_writer: Some(to_pty_writer),
to_background_jobs: Some(to_background_jobs),
should_silently_fail: false,
};
let plugin_map = Arc::new(Mutex::new(PluginMap::default()));
let connected_clients = Arc::new(Mutex::new(vec![]));
let plugin_cache = Arc::new(Mutex::new(
std::collections::HashMap::<PathBuf, Module>::new(),
));
let engine = Engine::default();
(senders, plugin_map, connected_clients, plugin_cache, engine)
}
fn create_test_executor(max_threads: usize) -> Arc<PinnedExecutor> {
let (senders, plugin_map, clients, cache, engine) = create_test_dependencies();
Arc::new(PinnedExecutor::new(
max_threads,
&senders,
&plugin_map,
&clients,
&cache,
&engine,
))
}
// Helper to create a job that signals completion via channel
fn make_signaling_job(
tx: Sender<()>,
) -> impl FnOnce(
ThreadSenders,
Arc<Mutex<PluginMap>>,
Arc<Mutex<Vec<ClientId>>>,
PluginCache,
Engine,
) + Send
+ 'static {
move |_senders, _plugin_map, _clients, _cache, _engine| {
tx.send(()).unwrap();
}
}
// Helper to verify thread assignment by capturing thread name in job
fn get_thread_name_for_plugin(executor: &Arc<PinnedExecutor>, plugin_id: u32) -> String {
let (tx, rx) = channel();
executor.execute_for_plugin(plugin_id, move |_s, _p, _c, _ca, _e| {
let name = thread::current().name().unwrap().to_string();
tx.send(name).unwrap();
});
rx.recv_timeout(Duration::from_secs(5))
.expect("Thread name should be received")
}
#[test]
fn test_new_creates_one_thread() {
let executor = create_test_executor(4);
assert_eq!(executor.thread_count(), 1);
}
#[test]
fn test_new_respects_min_threads() {
let executor = create_test_executor(0);
assert_eq!(
executor.thread_count(),
1,
"Executor should enforce minimum of 1 thread"
);
}
#[test]
fn test_first_plugin_assigned_to_thread_zero() {
let executor = create_test_executor(4);
let thread_idx = executor.register_plugin(1);
assert_eq!(thread_idx, 0);
}
#[test]
fn test_multiple_plugins_share_thread_when_idle() {
let executor = create_test_executor(4);
let thread_idx1 = executor.register_plugin(1);
let thread_idx2 = executor.register_plugin(2);
assert_eq!(thread_idx1, 0);
assert_eq!(
thread_idx2, 0,
"Second plugin should share thread 0 when idle"
);
}
#[test]
fn test_new_thread_spawns_when_all_busy() {
let executor = create_test_executor(3);
// Register plugin 1, gets thread 0
let thread_idx1 = executor.register_plugin(1);
assert_eq!(thread_idx1, 0);
// Make thread 0 busy with a barrier
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
// Give the job a moment to start executing and block
thread::sleep(Duration::from_millis(50));
// Register plugin 2 while thread 0 is busy
let thread_idx2 = executor.register_plugin(2);
assert_eq!(
thread_idx2, 1,
"Plugin 2 should get new thread 1 when thread 0 is busy"
);
// Verify thread count
assert_eq!(executor.thread_count(), 2);
// Release barrier
barrier.wait();
}
#[test]
fn test_respects_max_threads_limit() {
let executor = create_test_executor(2);
// Register plugin 1, gets thread 0
executor.register_plugin(1);
// Make thread 0 busy
let barrier1 = Arc::new(Barrier::new(2));
let barrier1_clone = barrier1.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier1_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Register plugin 2, gets thread 1
executor.register_plugin(2);
// Make thread 1 busy
let barrier2 = Arc::new(Barrier::new(2));
let barrier2_clone = barrier2.clone();
executor.execute_for_plugin(2, move |_s, _p, _c, _ca, _e| {
barrier2_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Register plugin 3 when all threads busy
let thread_idx3 = executor.register_plugin(3);
assert!(
thread_idx3 == 0 || thread_idx3 == 1,
"Plugin 3 should be assigned to existing thread"
);
assert_eq!(executor.thread_count(), 2, "Should not exceed max_threads");
// Release barriers
barrier1.wait();
barrier2.wait();
}
#[test]
fn test_duplicate_registration_returns_same_thread() {
let executor = create_test_executor(4);
let thread_idx1 = executor.register_plugin(1);
let thread_idx2 = executor.register_plugin(1);
assert_eq!(
thread_idx1, thread_idx2,
"Duplicate registration should return same thread"
);
}
#[test]
fn test_load_balancing_prefers_least_loaded() {
let executor = create_test_executor(3);
// Register plugins 1, 2, 3 to thread 0 (when idle)
executor.register_plugin(1);
executor.register_plugin(2);
executor.register_plugin(3);
// Make thread 0 busy
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Register plugin 4 while thread 0 is busy (spawns thread 1)
let thread_idx4 = executor.register_plugin(4);
assert_eq!(thread_idx4, 1);
// Release barrier
barrier.wait();
thread::sleep(Duration::from_millis(50));
// Register plugin 5 when both threads idle
// Thread 0 has 3 plugins, thread 1 has 1 plugin
let thread_idx5 = executor.register_plugin(5);
assert_eq!(
thread_idx5, 1,
"Plugin 5 should be assigned to less loaded thread 1"
);
}
#[test]
fn test_execute_for_plugin_runs_on_correct_thread() {
let executor = create_test_executor(3);
// Register plugin 1 to thread 0
executor.register_plugin(1);
// Make thread 0 busy to force plugin 2 to thread 1
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Register plugin 2 to thread 1
executor.register_plugin(2);
// Release barrier
barrier.wait();
thread::sleep(Duration::from_millis(50));
// Get thread names for both plugins
let thread_name1 = get_thread_name_for_plugin(&executor, 1);
let thread_name2 = get_thread_name_for_plugin(&executor, 2);
assert_eq!(thread_name1, "plugin-exec-0");
assert_eq!(thread_name2, "plugin-exec-1");
}
#[test]
fn test_execute_for_plugin_unregistered() {
let executor = create_test_executor(4);
let (tx, rx) = channel();
// Execute job for unregistered plugin
executor.execute_for_plugin(999, make_signaling_job(tx));
// Try to receive with timeout - should timeout
let result = rx.recv_timeout(Duration::from_millis(100));
assert!(
result.is_err(),
"Job for unregistered plugin should not execute"
);
}
#[test]
fn test_job_execution_order_per_thread() {
let executor = create_test_executor(4);
executor.register_plugin(1);
let order = Arc::new(Mutex::new(Vec::new()));
let (tx, rx) = channel();
// Execute 3 jobs for plugin 1
for i in 1..=3 {
let order_clone = order.clone();
let tx_clone = tx.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
order_clone.lock().unwrap().push(i);
tx_clone.send(()).unwrap();
});
}
// Wait for all 3 jobs to complete
for _ in 0..3 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Job should complete");
}
assert_eq!(
*order.lock().unwrap(),
vec![1, 2, 3],
"Jobs should execute in order"
);
}
#[test]
fn test_jobs_complete_successfully() {
let executor = create_test_executor(4);
executor.register_plugin(1);
let (tx, rx) = channel();
executor.execute_for_plugin(1, make_signaling_job(tx));
let result = rx.recv_timeout(Duration::from_secs(5));
assert!(result.is_ok(), "Job should complete successfully");
}
#[test]
fn test_concurrent_jobs_on_different_threads() {
let executor = create_test_executor(3);
// Register plugin 1 to thread 0
executor.register_plugin(1);
// Make thread 0 busy to force plugin 2 to thread 1
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Register plugin 2 to thread 1
executor.register_plugin(2);
// Release barrier
barrier.wait();
thread::sleep(Duration::from_millis(50));
// Execute jobs on both threads concurrently
let sync_barrier = Arc::new(Barrier::new(3)); // 2 jobs + test thread
let (tx1, rx1) = channel();
let (tx2, rx2) = channel();
let barrier1 = sync_barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier1.wait();
tx1.send(()).unwrap();
});
let barrier2 = sync_barrier.clone();
executor.execute_for_plugin(2, move |_s, _p, _c, _ca, _e| {
barrier2.wait();
tx2.send(()).unwrap();
});
// Release both jobs simultaneously
sync_barrier.wait();
// Both should complete
assert!(rx1.recv_timeout(Duration::from_secs(5)).is_ok());
assert!(rx2.recv_timeout(Duration::from_secs(5)).is_ok());
}
#[test]
fn test_execute_plugin_load_registers_and_executes() {
let executor = create_test_executor(4);
let (tx, rx) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx));
// Wait for load to complete
rx.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Verify plugin is registered
let thread_idx = executor.register_plugin(1);
assert_eq!(thread_idx, 0, "Plugin should already be registered");
}
#[test]
fn test_execute_plugin_unload_runs_cleanup_before_unregister() {
let executor = create_test_executor(4);
// Load plugin
let (tx_load, rx_load) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx_load));
rx_load
.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Unload plugin with cleanup
let counter = Arc::new(AtomicUsize::new(0));
let counter_clone = counter.clone();
let (tx_unload, rx_unload) = channel();
executor.execute_plugin_unload(1, move |_s, _p, _c, _ca, _e| {
counter_clone.fetch_add(1, Ordering::SeqCst);
tx_unload.send(()).unwrap();
});
// Wait for unload to complete
rx_unload
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
// Verify cleanup ran
assert_eq!(counter.load(Ordering::SeqCst), 1, "Cleanup should have run");
// Give unregister a moment to complete
thread::sleep(Duration::from_millis(100));
// Plugin should be unregistered - registering again should assign new thread
let thread_idx = executor.register_plugin(1);
assert_eq!(thread_idx, 0, "Plugin should be re-registered to thread 0");
}
#[test]
fn test_unload_sequence_is_correct() {
let executor = create_test_executor(4);
// Load plugin
let (tx_load, rx_load) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx_load));
rx_load
.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Unload with sequence tracking
let sequence = Arc::new(Mutex::new(Vec::new()));
let sequence_clone = sequence.clone();
let (tx_unload, rx_unload) = channel();
executor.execute_plugin_unload(1, move |_s, _p, _c, _ca, _e| {
sequence_clone.lock().unwrap().push("cleanup");
tx_unload.send(()).unwrap();
});
// Wait for unload to complete
rx_unload
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
sequence.lock().unwrap().push("after");
assert_eq!(*sequence.lock().unwrap(), vec!["cleanup", "after"]);
}
#[test]
fn test_shrink_removes_idle_threads() {
let executor = create_test_executor(4);
// Load plugin 1 to thread 0
let (tx1, rx1) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx1));
rx1.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Make thread 0 busy to force plugin 2 to thread 1
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
// Load plugin 2 to thread 1
let (tx2, rx2) = channel();
executor.execute_plugin_load(2, make_signaling_job(tx2));
rx2.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Release barrier
barrier.wait();
thread::sleep(Duration::from_millis(50));
let thread_count_before = executor.thread_count();
assert!(thread_count_before >= 2, "Should have at least 2 threads");
// Unload plugin 2
let (tx_unload2, rx_unload2) = channel();
executor.execute_plugin_unload(2, make_signaling_job(tx_unload2));
rx_unload2
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
// Give shrinking a moment to complete
thread::sleep(Duration::from_millis(100));
// Thread count should decrease after unloading
let thread_count_after = executor.thread_count();
assert!(
thread_count_after < thread_count_before,
"Idle threads should be removed"
);
assert!(thread_count_after >= 1, "Thread 0 should remain");
}
#[test]
fn test_thread_zero_never_removed() {
let executor = create_test_executor(4);
// Load a plugin and then unload it
let (tx_load, rx_load) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx_load));
rx_load
.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
let (tx_unload, rx_unload) = channel();
executor.execute_plugin_unload(1, make_signaling_job(tx_unload));
rx_unload
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
// Give shrinking a moment
thread::sleep(Duration::from_millis(100));
// Thread 0 should remain
assert!(
executor.thread_count() >= 1,
"Thread 0 should never be removed"
);
}
#[test]
fn test_active_threads_not_removed() {
let executor = create_test_executor(4);
// Load plugin 1 to thread 0
let (tx1, rx1) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx1));
rx1.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Force plugin 2 to thread 1 by making thread 0 busy
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
let (tx2, rx2) = channel();
executor.execute_plugin_load(2, make_signaling_job(tx2));
rx2.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
barrier.wait();
thread::sleep(Duration::from_millis(100));
let thread_count_with_both = executor.thread_count();
assert!(
thread_count_with_both >= 2,
"Should have at least 2 threads with 2 plugins"
);
// Unload plugin 2
let (tx_unload, rx_unload) = channel();
executor.execute_plugin_unload(2, make_signaling_job(tx_unload));
rx_unload
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
thread::sleep(Duration::from_millis(100));
// Plugin 1's thread should still work (verify active threads not affected)
let (tx_test, rx_test) = channel();
executor.execute_for_plugin(1, make_signaling_job(tx_test));
assert!(
rx_test.recv_timeout(Duration::from_secs(5)).is_ok(),
"Plugin 1's thread should still work"
);
// Thread count should decrease after unloading
let thread_count_after = executor.thread_count();
assert!(
thread_count_after < thread_count_with_both,
"Idle thread should be removed"
);
assert!(thread_count_after >= 1, "Active threads should remain");
}
#[test]
fn test_shrink_does_not_affect_remaining_threads() {
let executor = create_test_executor(4);
// Load plugin 1 to thread 0
let (tx1, rx1) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx1));
rx1.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Force plugin 2 to thread 1
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
let (tx2, rx2) = channel();
executor.execute_plugin_load(2, make_signaling_job(tx2));
rx2.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
barrier.wait();
thread::sleep(Duration::from_millis(50));
// Unload plugin 2 (shrinks pool)
let (tx_unload, rx_unload) = channel();
executor.execute_plugin_unload(2, make_signaling_job(tx_unload));
rx_unload
.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
thread::sleep(Duration::from_millis(100));
// Execute job for plugin 1
let (tx_test, rx_test) = channel();
executor.execute_for_plugin(1, make_signaling_job(tx_test));
assert!(
rx_test.recv_timeout(Duration::from_secs(5)).is_ok(),
"Plugin 1's thread should still work"
);
}
#[test]
fn test_drop_cleans_up_gracefully() {
let executor = create_test_executor(4);
// Load multiple plugins on different threads
let (tx1, rx1) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx1));
rx1.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
thread::sleep(Duration::from_millis(50));
let (tx2, rx2) = channel();
executor.execute_plugin_load(2, make_signaling_job(tx2));
rx2.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
barrier.wait();
// Drop executor
drop(executor);
// Test completes without panic
}
#[test]
fn test_drop_with_jobs_in_flight() {
let executor = create_test_executor(4);
executor.register_plugin(1);
let barrier = Arc::new(Barrier::new(2));
let barrier_clone = barrier.clone();
executor.execute_for_plugin(1, move |_s, _p, _c, _ca, _e| {
barrier_clone.wait();
});
// Drop executor while job is blocked
drop(executor);
// Release barrier (job may or may not complete, but shouldn't panic)
barrier.wait();
// Test completes without panic
}
#[test]
fn test_concurrent_plugin_registrations() {
let executor = create_test_executor(4);
let handles: Vec<_> = (1..=10)
.map(|i| {
let exec = executor.clone();
thread::spawn(move || exec.register_plugin(i))
})
.collect();
for handle in handles {
let thread_idx = handle.join().expect("Thread should not panic");
assert!(thread_idx < 4, "Thread index should be valid");
}
}
#[test]
fn test_unregister_nonexistent_plugin() {
let executor = create_test_executor(4);
// Unregister non-existent plugin
executor.unregister_plugin(999);
// Executor should still work
let (tx, rx) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx));
assert!(rx.recv_timeout(Duration::from_secs(5)).is_ok());
}
#[test]
fn test_max_threads_one() {
let executor = create_test_executor(1);
// Register multiple plugins
let thread_idx1 = executor.register_plugin(1);
let thread_idx2 = executor.register_plugin(2);
let thread_idx3 = executor.register_plugin(3);
assert_eq!(thread_idx1, 0);
assert_eq!(thread_idx2, 0);
assert_eq!(thread_idx3, 0);
assert_eq!(executor.thread_count(), 1);
}
#[test]
fn test_rapid_load_unload_cycles() {
let executor = create_test_executor(4);
// Load plugin 1
let (tx1, rx1) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx1));
rx1.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
// Unload plugin 1
let (tx2, rx2) = channel();
executor.execute_plugin_unload(1, make_signaling_job(tx2));
rx2.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
thread::sleep(Duration::from_millis(100));
// Load plugin 1 again
let (tx3, rx3) = channel();
executor.execute_plugin_load(1, make_signaling_job(tx3));
rx3.recv_timeout(Duration::from_secs(5))
.expect("Second load should complete");
// Execute job for plugin 1
let (tx4, rx4) = channel();
executor.execute_for_plugin(1, make_signaling_job(tx4));
assert!(
rx4.recv_timeout(Duration::from_secs(5)).is_ok(),
"Executor should handle cycles correctly"
);
}
#[test]
fn test_many_plugins_limited_threads() {
let executor = create_test_executor(4);
let (tx, rx) = channel();
// Load 20 plugins
for i in 1..=20 {
let tx_clone = tx.clone();
executor.execute_plugin_load(i, make_signaling_job(tx_clone));
}
// Collect 20 completion signals
for _ in 1..=20 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
}
assert!(
executor.thread_count() <= 4,
"Should not exceed max_threads"
);
}
#[test]
fn test_full_lifecycle() {
let executor = create_test_executor(4);
let (tx, rx) = channel();
// Load 5 plugins
for i in 1..=5 {
let tx_clone = tx.clone();
executor.execute_plugin_load(i, make_signaling_job(tx_clone));
}
// Wait for all loads
for _ in 0..5 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
}
// Execute 2 jobs per plugin (10 total)
for i in 1..=5 {
for _ in 0..2 {
let tx_clone = tx.clone();
executor.execute_for_plugin(i, make_signaling_job(tx_clone));
}
}
// Wait for all jobs
for _ in 0..10 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Job should complete");
}
let thread_count_before = executor.thread_count();
// Unload 3 plugins
for i in 1..=3 {
let tx_clone = tx.clone();
executor.execute_plugin_unload(i, make_signaling_job(tx_clone));
}
// Wait for unloads
for _ in 0..3 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
}
thread::sleep(Duration::from_millis(100));
// Thread count should decrease or stay the same
let thread_count_after = executor.thread_count();
assert!(
thread_count_after <= thread_count_before,
"Thread count should decrease after unloads"
);
// Execute jobs for remaining plugins
for i in 4..=5 {
let tx_clone = tx.clone();
executor.execute_for_plugin(i, make_signaling_job(tx_clone));
}
for _ in 0..2 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Job should complete");
}
// Drop executor
drop(executor);
}
#[test]
fn test_realistic_plugin_churn() {
let executor = create_test_executor(4);
let (tx, rx) = channel();
// Load plugins 1, 2, 3
for i in 1..=3 {
let tx_clone = tx.clone();
executor.execute_plugin_load(i, make_signaling_job(tx_clone));
}
for _ in 0..3 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
}
// Execute jobs for each
for i in 1..=3 {
let tx_clone = tx.clone();
executor.execute_for_plugin(i, make_signaling_job(tx_clone));
}
for _ in 0..3 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Job should complete");
}
// Unload plugin 2
let tx_clone = tx.clone();
executor.execute_plugin_unload(2, make_signaling_job(tx_clone));
rx.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
thread::sleep(Duration::from_millis(100));
// Load plugins 4, 5
for i in 4..=5 {
let tx_clone = tx.clone();
executor.execute_plugin_load(i, make_signaling_job(tx_clone));
}
for _ in 0..2 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Load should complete");
}
// Execute jobs for plugins 1, 3, 4, 5
for i in &[1, 3, 4, 5] {
let tx_clone = tx.clone();
executor.execute_for_plugin(*i, make_signaling_job(tx_clone));
}
for _ in 0..4 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Job should complete");
}
// Unload plugins 1, 3
for i in &[1, 3] {
let tx_clone = tx.clone();
executor.execute_plugin_unload(*i, make_signaling_job(tx_clone));
}
for _ in 0..2 {
rx.recv_timeout(Duration::from_secs(5))
.expect("Unload should complete");
}
thread::sleep(Duration::from_millis(100));
// Verify thread count reflects active plugins (4 and 5)
assert!(
executor.thread_count() >= 1,
"Should have at least thread 0"
);
drop(executor);
}
}
|