GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-25 22:14:36 +00:00
Code Issues Releases Wiki Activity

Only allow the mining thread to be cancelled when it is not within driver code, making for cleaner shutdown and allowing us to pthread_join the miner threads on kill_work().

Browse Source
This commit is contained in:
Con Kolivas 2013-05-18 16:56:23 +10:00
parent ac7c073c77
commit 830f30ff2d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cgminer.c
View File

@ -2801,21 +2801,13 @@ static void __kill_work(void)
thr = &control_thr[watchdog_thr_id]; thr = &control_thr[watchdog_thr_id];
thr_info_cancel(thr); thr_info_cancel(thr);
applog(LOG_DEBUG, "Stopping mining threads");
/* Stop the mining threads*/
for (i = 0; i < mining_threads; i++) {
thr = get_thread(i);
thr_info_freeze(thr);
thr->pause = true;
}
nmsleep(1000);
applog(LOG_DEBUG, "Killing off mining threads"); applog(LOG_DEBUG, "Killing off mining threads");
/* Kill the mining threads*/ /* Kill the mining threads*/
for (i = 0; i < mining_threads; i++) { for (i = 0; i < mining_threads; i++) {
thr = get_thread(i); thr = get_thread(i);
thr_info_cancel(thr); thr_info_cancel(thr);
if (thr && thr->pth)
pthread_join(thr->pth, NULL);
} }
applog(LOG_DEBUG, "Killing off stage thread"); applog(LOG_DEBUG, "Killing off stage thread");
@ -5653,8 +5645,13 @@ static void hash_sole_work(struct thr_info *mythr)
cgtime(&(work->tv_work_start)); cgtime(&(work->tv_work_start));
thread_reportin(mythr); thread_reportin(mythr);
/* Only allow the mining thread to be cancelled when
* it is not in the driver code. */
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
hashes = drv->scanhash(mythr, work, work->blk.nonce + max_nonce); hashes = drv->scanhash(mythr, work, work->blk.nonce + max_nonce);
thread_reportin(mythr); thread_reportin(mythr);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
/* tv_end is == &getwork_start */ /* tv_end is == &getwork_start */
cgtime(&getwork_start); cgtime(&getwork_start);
@ -5909,8 +5906,6 @@ void *miner_thread(void *userdata)
struct device_drv *drv = cgpu->drv; struct device_drv *drv = cgpu->drv;
char threadname[24]; char threadname[24];
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
snprintf(threadname, 24, "miner/%d", thr_id); snprintf(threadname, 24, "miner/%d", thr_id);
RenameThread(threadname); RenameThread(threadname);