gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactored the thread loop

Browse Source 
a thread will break if the atomic bool is true
This commit is contained in:
Jon-Eric Cook
2020-01-28 11:07:42 -08:00
committed by Michael Vines
parent d52567933e
commit 5df0478fa3
1 changed files with 54 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
keygen/src/keygen.rs
View File

@ -429,8 +429,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
output_keypair(&keypair, &outfile, "recovered")?; output_keypair(&keypair, &outfile, "recovered")?;
} }
("grind", Some(matches)) => { ("grind", Some(matches)) => {
let mut grind_matches = Vec::<GrindMatch>::new();
let ignore_case = matches.is_present("ignore_case"); let ignore_case = matches.is_present("ignore_case");
let starts_with_args = if matches.is_present("starts_with") { let starts_with_args = if matches.is_present("starts_with") {
@ -477,67 +475,63 @@ fn main() -> Result<(), Box<dyn error::Error>> {
let start = Instant::now(); let start = Instant::now();
let done = Arc::new(AtomicBool::new(false)); let done = Arc::new(AtomicBool::new(false));
let _threads = (0..num_cpus::get()) let _threads = 0..num_cpus::get();
.map(|_| { for _ in _threads {
let done = done.clone(); let done = done.clone();
let attempts = attempts.clone(); let attempts = attempts.clone();
let found = found.clone(); let found = found.clone();
let grind_matches_thread_safe = grind_matches_thread_safe.clone(); let grind_matches_thread_safe = grind_matches_thread_safe.clone();
thread::spawn(move || loop { let handle = thread::spawn(move || loop {
if done.load(Ordering::Relaxed) { if done.load(Ordering::Relaxed) {
return; break;
}
let attempts = attempts.fetch_add(1, Ordering::Relaxed);
if attempts % 1_000_000 == 0 {
println!(
"Searched {} keypairs in {}s. {} matches found.",
attempts,
start.elapsed().as_secs(),
found.load(Ordering::Relaxed),
);
}
let keypair = Keypair::new();
let mut pubkey = bs58::encode(keypair.pubkey()).into_string();
if ignore_case {
pubkey = pubkey.to_lowercase();
}
let mut total_matches_found = 0;
for i in 0..grind_matches_thread_safe.len() {
if grind_matches_thread_safe[i].count.load(Ordering::Relaxed) == 0 {
total_matches_found += 1;
continue;
} }
let attempts = attempts.fetch_add(1, Ordering::Relaxed); if (!grind_matches_thread_safe[i].starts.is_empty()
if attempts % 1_000_000 == 0 { && grind_matches_thread_safe[i].ends.is_empty()
println!( && pubkey.starts_with(&grind_matches_thread_safe[i].starts))
"Searched {} keypairs in {}s. {} matches found.", || (grind_matches_thread_safe[i].starts.is_empty()
attempts, && !grind_matches_thread_safe[i].ends.is_empty()
start.elapsed().as_secs(), && pubkey.ends_with(&grind_matches_thread_safe[i].ends))
found.load(Ordering::Relaxed), || (!grind_matches_thread_safe[i].starts.is_empty()
); && !grind_matches_thread_safe[i].ends.is_empty()
&& pubkey.starts_with(&grind_matches_thread_safe[i].starts)
&& pubkey.ends_with(&grind_matches_thread_safe[i].ends))
{
let _found = found.fetch_add(1, Ordering::Relaxed);
grind_matches_thread_safe[i]
.count
.fetch_sub(1, Ordering::Relaxed);
println!("Wrote keypair to {}", &format!("{}.json", keypair.pubkey()));
write_keypair_file(&keypair, &format!("{}.json", keypair.pubkey()))
.unwrap();
} }
let keypair = Keypair::new(); }
let mut pubkey = bs58::encode(keypair.pubkey()).into_string(); if total_matches_found == grind_matches_thread_safe.len() {
if ignore_case { done.store(true, Ordering::Relaxed);
pubkey = pubkey.to_lowercase(); }
} });
let mut total_matches_found = 0; handle.join().unwrap();
for i in 0..grind_matches_thread_safe.len() { }
if grind_matches_thread_safe[i].count.load(Ordering::Relaxed) == 0 {
total_matches_found += 1;
continue;
}
if (!grind_matches_thread_safe[i].starts.is_empty()
&& grind_matches_thread_safe[i].ends.is_empty()
&& pubkey.starts_with(&grind_matches_thread_safe[i].starts))
|| (grind_matches_thread_safe[i].starts.is_empty()
&& !grind_matches_thread_safe[i].ends.is_empty()
&& pubkey.ends_with(&grind_matches_thread_safe[i].ends))
|| (!grind_matches_thread_safe[i].starts.is_empty()
&& !grind_matches_thread_safe[i].ends.is_empty()
&& pubkey.starts_with(&grind_matches_thread_safe[i].starts)
&& pubkey.ends_with(&grind_matches_thread_safe[i].ends))
{
let _found = found.fetch_add(1, Ordering::Relaxed);
grind_matches_thread_safe[i]
.count
.fetch_sub(1, Ordering::Relaxed);
println!(
"Wrote keypair to {}",
&format!("{}.json", keypair.pubkey())
);
write_keypair_file(&keypair, &format!("{}.json", keypair.pubkey()))
.unwrap();
}
}
if total_matches_found == grind_matches_thread_safe.len() {
done.store(true, Ordering::Relaxed);
}
});
})
.collect::<Vec<_>>();
thread::park();
} }
("verify", Some(matches)) => { ("verify", Some(matches)) => {
let keypair = get_keypair_from_matches(matches)?; let keypair = get_keypair_from_matches(matches)?;