mirror of
https://github.com/132nd-vWing/tacview-splitter.git
synced 2026-08-26 10:28:36 +02:00
remove rayon, manual parallelization
This commit is contained in:
+21
-11
@@ -4,9 +4,8 @@ mod reader;
|
||||
mod tacview;
|
||||
mod writer;
|
||||
|
||||
use rayon::prelude::*;
|
||||
use std::process;
|
||||
use std::sync::Arc;
|
||||
use std::{process, thread};
|
||||
|
||||
use crate::{tacview::Coalition, writer::StringWriter};
|
||||
|
||||
@@ -22,22 +21,33 @@ fn main_inner() -> Result<(), Box<dyn std::error::Error>> {
|
||||
println!("Processing {}", input_filename);
|
||||
|
||||
let lines = reader::read_data(&input_filename, is_zip)?;
|
||||
let (header, body) = processor::split_into_header_and_body(&lines)?;
|
||||
let (header, body) = processor::split_into_header_and_body(lines)?;
|
||||
|
||||
let coalition_per_line = Arc::new(processor::divide_body_by_coalition(&body)?);
|
||||
|
||||
let coalition_per_line = Arc::new(processor::divide_body_by_coalition(body)?);
|
||||
let header = Arc::new(header);
|
||||
let body = Arc::new(body);
|
||||
let input_filename = Arc::new(input_filename);
|
||||
|
||||
let _: Vec<_> = vec![Coalition::Blue, Coalition::Red, Coalition::Purple]
|
||||
.into_par_iter()
|
||||
let handles: Vec<_> = vec![Coalition::Blue, Coalition::Red, Coalition::Purple]
|
||||
.into_iter()
|
||||
.map(|c| {
|
||||
let mut writer = writer::create_writer(is_zip, &input_filename.clone(), &c).unwrap();
|
||||
writer.write_strings(&header).unwrap();
|
||||
writer
|
||||
.write_for_coalition(&body, &coalition_per_line.clone(), c)
|
||||
.unwrap();
|
||||
let z = is_zip;
|
||||
let b = body.clone();
|
||||
let coalitions = coalition_per_line.clone();
|
||||
let h = header.clone();
|
||||
let i = input_filename.clone();
|
||||
thread::spawn(move || {
|
||||
let mut writer = writer::create_writer(z, &*i.clone(), &c).unwrap();
|
||||
writer.write_strings(&*h).unwrap();
|
||||
writer.write_for_coalition(&*b, &*coalitions, c).unwrap();
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
for handle in handles {
|
||||
handle.join().unwrap();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user