public
/
keyfork
5
0
Fork 0
Code Issues 25 Pull Requests 2 Packages Projects Releases Wiki Activity

keyfork-qrcode: add multithreaded scanner #82

Manually merged
ryan merged 5 commits from ryansquared/test-threaded-scan into main 2025-05-10 20:21:18 +00:00
Conversation 0 Commits 5 Files Changed 1 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0737ca6907 - Show all commits

10
crates/qrcode/keyfork-qrcode/src/lib.rs
View File

@ -213,7 +213,7 @@ pub fn scan_camera(timeout: Duration, index: usize) -> Result<Option<String>, QR
let arced = Arc::new((Mutex::new(scan_queue), Condvar::new()));
let (tx, rx) = channel();
for _ in 0..thread_count {
for i in 0..thread_count {
let tx = tx.clone();
let arced = arced.clone();
@ -244,13 +244,16 @@ pub fn scan_camera(timeout: Duration, index: usize) -> Result<Option<String>, QR
}
let mut queue = condvar
.wait_while(queue, |queue| {
eprintln!("thread {i} received signal");
queue.images.is_empty() || !queue.shutdown
})
.expect(bug::bug!(POISONED_MUTEX));
if let Some(image) = queue.images.pop() {
eprintln!("thread {i} received image");
// drop the queue here since this is what's going to take time
drop(queue);
if let Some(content) = scanner.scan_image(image) {
println!("scanned: {content}");
tx.send(content).expect(
bug::bug!("A scanned image could not be sent")
);
@ -263,6 +266,7 @@ pub fn scan_camera(timeout: Duration, index: usize) -> Result<Option<String>, QR
while Instant::now().duration_since(start) < timeout {
if let Ok(content) = rx.try_recv() {
arced.0.lock().expect(bug::bug!(POISONED_MUTEX)).shutdown = true;
eprintln!("shutting down threads (good)");
arced.1.notify_all();
return Ok(Some(content));
}
@ -280,12 +284,14 @@ pub fn scan_camera(timeout: Duration, index: usize) -> Result<Option<String>, QR
.expect(bug::bug!(POISONED_MUTEX))
.images
.push(image);
eprintln!("notifying any thread");
arced.1.notify_one();
}
// dbg_elapsed(count, start);
dbg_elapsed(count, start);
arced.0.lock().expect(bug::bug!(POISONED_MUTEX)).shutdown = true;
eprintln!("shutting down threads (bad)");
arced.1.notify_all();
Ok(None)