GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-03-09 20:21:01 +00:00
Code Issues Releases Wiki Activity

Use the forcelog function on shutdown to cope with indeterminate console lock states due to killing of threads.

Browse Source
This commit is contained in:
Con Kolivas 2013-10-18 23:34:55 +11:00
parent 8e9f32a81b
commit 06776af000
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cgminer.c
View File

@ -3159,7 +3159,7 @@ static void kill_mining(void)
struct thr_info *thr; struct thr_info *thr;
int i; int i;
applog(LOG_DEBUG, "Killing off mining threads"); forcelog(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++) {
pthread_t *pth = NULL; pthread_t *pth = NULL;
@ -3186,29 +3186,29 @@ static void __kill_work(void)
if (!successful_connect) if (!successful_connect)
return; return;
applog(LOG_INFO, "Received kill message"); forcelog(LOG_INFO, "Received kill message");
#ifdef USE_USBUTILS #ifdef USE_USBUTILS
/* Best to get rid of it first so it doesn't /* Best to get rid of it first so it doesn't
* try to create any new devices */ * try to create any new devices */
if (!opt_scrypt) { if (!opt_scrypt) {
applog(LOG_DEBUG, "Killing off HotPlug thread"); forcelog(LOG_DEBUG, "Killing off HotPlug thread");
thr = &control_thr[hotplug_thr_id]; thr = &control_thr[hotplug_thr_id];
kill_timeout(thr); kill_timeout(thr);
} }
#endif #endif
applog(LOG_DEBUG, "Killing off watchpool thread"); forcelog(LOG_DEBUG, "Killing off watchpool thread");
/* Kill the watchpool thread */ /* Kill the watchpool thread */
thr = &control_thr[watchpool_thr_id]; thr = &control_thr[watchpool_thr_id];
kill_timeout(thr); kill_timeout(thr);
applog(LOG_DEBUG, "Killing off watchdog thread"); forcelog(LOG_DEBUG, "Killing off watchdog thread");
/* Kill the watchdog thread */ /* Kill the watchdog thread */
thr = &control_thr[watchdog_thr_id]; thr = &control_thr[watchdog_thr_id];
kill_timeout(thr); kill_timeout(thr);
applog(LOG_DEBUG, "Shutting down mining threads"); forcelog(LOG_DEBUG, "Shutting down mining threads");
for (i = 0; i < mining_threads; i++) { for (i = 0; i < mining_threads; i++) {
struct cgpu_info *cgpu; struct cgpu_info *cgpu;
@ -3226,12 +3226,12 @@ static void __kill_work(void)
cg_completion_timeout(&kill_mining, NULL, 3000); cg_completion_timeout(&kill_mining, NULL, 3000);
applog(LOG_DEBUG, "Killing off stage thread"); forcelog(LOG_DEBUG, "Killing off stage thread");
/* Stop the others */ /* Stop the others */
thr = &control_thr[stage_thr_id]; thr = &control_thr[stage_thr_id];
kill_timeout(thr); kill_timeout(thr);
applog(LOG_DEBUG, "Killing off API thread"); forcelog(LOG_DEBUG, "Killing off API thread");
thr = &control_thr[api_thr_id]; thr = &control_thr[api_thr_id];
kill_timeout(thr); kill_timeout(thr);
@ -3239,10 +3239,10 @@ static void __kill_work(void)
/* Release USB resources in case it's a restart /* Release USB resources in case it's a restart
* and not a QUIT */ * and not a QUIT */
if (!opt_scrypt) { if (!opt_scrypt) {
applog(LOG_DEBUG, "Releasing all USB devices"); forcelog(LOG_DEBUG, "Releasing all USB devices");
cg_completion_timeout(&usb_cleanup, NULL, 1000); cg_completion_timeout(&usb_cleanup, NULL, 1000);
applog(LOG_DEBUG, "Killing off usbres thread"); forcelog(LOG_DEBUG, "Killing off usbres thread");
thr = &control_thr[usbres_thr_id]; thr = &control_thr[usbres_thr_id];
kill_timeout(thr); kill_timeout(thr);
} }