arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-24 00:51:05 +00:00
Code Issues Releases Wiki Activity

Move thread_monitor() to outer threads

Browse Source
This commit is contained in:
jsteube 2016-06-26 16:09:05 +02:00
parent 5c338de519
commit a5baa829c5
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/hashcat.c
View File

@ -4349,7 +4349,7 @@ static void *thread_monitor (void *p)
time (&runtime_cur); time (&runtime_cur);
int runtime_left = data.runtime_start + data.runtime - runtime_cur; int runtime_left = data.proc_start + data.runtime - runtime_cur;
if (runtime_left <= 0) if (runtime_left <= 0)
{ {
@ -4385,7 +4385,7 @@ static void *thread_monitor (void *p)
if (status_left == 0) if (status_left == 0)
{ {
//hc_thread_mutex_lock (mux_display); hc_thread_mutex_lock (mux_display);
if (data.quiet == 0) clear_prompt (); if (data.quiet == 0) clear_prompt ();
@ -4395,7 +4395,7 @@ static void *thread_monitor (void *p)
if (data.quiet == 0) log_info (""); if (data.quiet == 0) log_info ("");
//hc_thread_mutex_unlock (mux_display); hc_thread_mutex_unlock (mux_display);
status_left = data.status_timer; status_left = data.status_timer;
} }
@ -7358,18 +7358,22 @@ int main (int argc, char **argv)
data.status = status; data.status = status;
} }
uint i_threads_cnt = 0; uint outer_threads_cnt = 0;
hc_thread_t *i_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t)); hc_thread_t *outer_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
if (keyspace == 0 && benchmark == 0 && stdout_flag == 0) if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
{ {
if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK)) if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK))
{ {
hc_thread_create (i_threads[i_threads_cnt], thread_keypress, NULL); hc_thread_create (outer_threads[outer_threads_cnt], thread_keypress, NULL);
i_threads_cnt++; outer_threads_cnt++;
} }
hc_thread_create (outer_threads[outer_threads_cnt], thread_monitor, NULL);
outer_threads_cnt++;
} }
/** /**
@ -17232,16 +17236,9 @@ int main (int argc, char **argv)
data.devices_status = STATUS_STARTING; data.devices_status = STATUS_STARTING;
} }
uint ni_threads_cnt = 0; uint inner_threads_cnt = 0;
hc_thread_t *ni_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t)); hc_thread_t *inner_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
{
hc_thread_create (ni_threads[ni_threads_cnt], thread_monitor, NULL);
ni_threads_cnt++;
}
/** /**
* Outfile remove * Outfile remove
@ -17258,9 +17255,9 @@ int main (int argc, char **argv)
!((hash_mode >= 13700) && (hash_mode <= 13799)) && !((hash_mode >= 13700) && (hash_mode <= 13799)) &&
(hash_mode != 9000)) (hash_mode != 9000))
{ {
hc_thread_create (ni_threads[ni_threads_cnt], thread_outfile_remove, NULL); hc_thread_create (inner_threads[inner_threads_cnt], thread_outfile_remove, NULL);
ni_threads_cnt++; inner_threads_cnt++;
} }
else else
{ {
@ -18337,12 +18334,12 @@ int main (int argc, char **argv)
data.devices_status = STATUS_EXHAUSTED; data.devices_status = STATUS_EXHAUSTED;
} }
for (uint thread_idx = 0; thread_idx < ni_threads_cnt; thread_idx++) for (uint thread_idx = 0; thread_idx < inner_threads_cnt; thread_idx++)
{ {
hc_thread_wait (1, &ni_threads[thread_idx]); hc_thread_wait (1, &inner_threads[thread_idx]);
} }
local_free (ni_threads); local_free (inner_threads);
// we dont need restore file anymore // we dont need restore file anymore
if (data.restore_disable == 0) if (data.restore_disable == 0)
@ -18666,12 +18663,12 @@ int main (int argc, char **argv)
// wait for interactive threads // wait for interactive threads
for (uint thread_idx = 0; thread_idx < i_threads_cnt; thread_idx++) for (uint thread_idx = 0; thread_idx < outer_threads_cnt; thread_idx++)
{ {
hc_thread_wait (1, &i_threads[thread_idx]); hc_thread_wait (1, &outer_threads[thread_idx]);
} }
local_free (i_threads); local_free (outer_threads);
// destroy others mutex // destroy others mutex