Update ThreadPool

The ThredPool object now works. The threads are managed in queue and
activate at the correct times.

Author: algebrato

src/main.rs

@@ -1,5 +1,9 @@
 extern crate mapmaking;
-pub mod threadpool;
+// pub mod threadpool;
+pub mod threadpool2;
+use colored::Colorize;
+use threadpool2::ThreadPool;
+
 
 use std::{slice::SliceIndex, sync::{Arc, Barrier, atomic::AtomicUsize, mpsc::channel}, thread, time::Duration};
 use clap::{App, Arg};
@@ -25,48 +29,40 @@ fn main() {
 					 .arg(Arg::with_name("mc_id").short("i").long("mc_id").takes_value(true).help("Returns the map at the `mc_id` Monte Carlo iteration"))
 					 .get_matches();
 
-	const NUM_THREADS: usize = 11;
-	const NUM_MC_ITER: usize = 12;
-	let th_pool = threadpool::Builder::new().num_threads(NUM_THREADS).thread_name(String::from("MapMaker MC threads")).build();
-	//let th_pool = rayon::ThreadPoolBuilder::new().num_threads(NUM_THREADS).build().unwrap();
+	const NUM_THREADS: usize = 6;
+	const NUM_MC_ITER: usize = 50;
+	// let th_pool = threadpool::Builder::new().num_threads(NUM_THREADS).thread_name(String::from("MapMaker MC threads")).build();
+	// let th_pool = rayon::ThreadPoolBuilder::new().num_threads(NUM_THREADS).build().unwrap();
+	let my_pool = ThreadPool::new(NUM_THREADS);
+
 
+	let mc_id_set = ["000000", "000001", "000002", "000003", "000004", "000005", "000006", "000007", "000008", "000009", "000010", "000011",
+                              "000012", "000013", "000014", "000015", "000016", "000017", "000018", "000019", "000020", "000021", "000022", "000023",
+                              "000024", "000025", "000026", "000027", "000028", "000029", "000030", "000031", "000032", "000033", "000034", "000035",
+                              "000036", "000037", "000038", "000039", "000040", "000041", "000042", "000043", "000044", "000045", "000046", "000047",
+                              "000048", "000049"];
 
-	let mc_id_set = ["000000", "000001", "000002", "000003", "000004", "000005", "000006", "000007", "000008", "000009", "000010", "000011"];
-                    //["000012", "000013", "000014", "000015", "000016", "000017", "000018", "000019", "000020", "000021", "000022", "000023"];
-                    //["000024", "000025", "000026", "000027", "000028", "000029", "000030", "000031", "000032", "000033", "000034", "000035"];
-                    //["000036", "000037", "000038", "000039", "000040", "000041", "000042", "000043", "000044", "000045", "000046", "000047"];
-                    //["000048", "000049"];
 	let directory_path = program.value_of("tod_path").unwrap();
 
-	let (tx, rx) = channel();
+	//let (tx, rx) = channel(); (possiamo far tornare cose al thread 0, in modo tale da tener traccia di quello che sta iniziando/finendo)
 
 	for _th in 0..NUM_MC_ITER {
-		let tx = tx.clone();
 		let path = String::from(directory_path.clone());
-		th_pool.execute(move || {
+		let id = mc_id_set[_th];
 
-			tx.send(split_mc(String::from(path), mc_id_set[_th])).unwrap();
+		my_pool.execute(move || {
+			split_mc(path, id);
+			sleep(std::time::Duration::from_millis(500));
 		});
 	}
-	println!("Active: {}", th_pool.active_count());
-	println!("Queue:  {}", th_pool.queued_count());
-
-	for _ in 0..NUM_MC_ITER {
-		println!("Ricevuto: {}", rx.recv().unwrap());
-		
-		println!("Active: {}", th_pool.active_count());
-		println!("Queue:  {}", th_pool.queued_count());
-		println!("Queue:  {}", th_pool.max_count());
-	}
-
-	//th_pool.join();
-
 
 }
 
 pub fn split_mc(p: String, id: &str) -> &str {
+	println!("New thread. MC ID: {}", id.bright_green().bold());
 	let directory_tree = DirStruct::new(Path::new(&*p), String::from("1")).unwrap();
 	let _my_obs = directory_tree.create_observations(id);
 	_my_obs.binning();
+	println!("MC ID {} completed.", id.red().bold());
 	id
 }