GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-31 08:54:19 +00:00
Code Issues Releases Wiki Activity

Changed the way hard restart is done for better compatibility with windows pthread.

Browse Source
This commit is contained in:
ystarnaud 2014-07-02 15:09:31 -04:00
parent a0e95b3687
commit 69ab3a8cf4
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sgminer.c
View File

@ -6561,29 +6561,10 @@ static void get_work_prepare_thread(struct thr_info *mythr, struct work *work)
n_threads = mining_threads; n_threads = mining_threads;
#endif #endif
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
if (unlikely(pthread_create(&restart_thr, NULL, restart_mining_threads_thread, (void *) (intptr_t) n_threads))) if (unlikely(pthread_create(&restart_thr, NULL, restart_mining_threads_thread, (void *) (intptr_t) n_threads)))
quit(1, "restart_mining_threads create thread failed"); quit(1, "restart_mining_threads create thread failed");
sleep(60); // go wait with the other threads...
#ifdef __TEMP_ALGO_SWITCH_FIX__
//if restart thread is done, then abort...
if(!thread_fix_search(restart_thr))
{
applog(LOG_DEBUG, "thread %d not found in fix list, don't exit sgminer", restart_thr);
pthread_cancel(restart_thr);
mutex_lock(&algo_switch_wait_lock);
algo_switch_n = 0;
pthread_cond_broadcast(&algo_switch_wait_cond);
mutex_unlock(&algo_switch_wait_lock);
return;
}
#endif /* __TEMP_ALGO_SWITCH_FIX__ */
quit(1, "thread was not cancelled in 60 seconds after restart_mining_threads");
} }
else else
{ {
@ -6594,22 +6575,24 @@ static void get_work_prepare_thread(struct thr_info *mythr, struct work *work)
mutex_unlock(&algo_switch_wait_lock); mutex_unlock(&algo_switch_wait_lock);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
// no need to wait, exit
return;
} }
} }
else else
{
mutex_unlock(&algo_switch_lock); mutex_unlock(&algo_switch_lock);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
// Wait for signal to start working again pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
mutex_lock(&algo_switch_wait_lock);
// Set cleanup instructions in the event that the thread is cancelled // Set cleanup instructions in the event that the thread is cancelled
pthread_cleanup_push(mutex_unlock_cleanup_handler, (void *)&algo_switch_wait_lock); pthread_cleanup_push(mutex_unlock_cleanup_handler, (void *)&algo_switch_wait_lock);
while(algo_switch_n > 0) // Wait for signal to start working again
pthread_cond_wait(&algo_switch_wait_cond, &algo_switch_wait_lock); mutex_lock(&algo_switch_wait_lock);
// Non-zero argument will execute the cleanup handler after popping it while(algo_switch_n > 0)
pthread_cleanup_pop(1); pthread_cond_wait(&algo_switch_wait_cond, &algo_switch_wait_lock);
} // Non-zero argument will execute the cleanup handler after popping it
pthread_cleanup_pop(1);
} }
struct work *get_work(struct thr_info *thr, const int thr_id) struct work *get_work(struct thr_info *thr, const int thr_id)