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

CPU mining is spending too much time in the work thread and not receiving restart messages.

Browse Source 
Update the code to return at log interval / 5 and only get work at the right time.
This commit is contained in:
Con Kolivas 2011-07-03 09:32:15 +10:00
parent 8999bea110
commit e4f9ea68a9
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cpu-miner.c
View File

@ -823,6 +823,11 @@ static void *miner_thread(void *userdata)
struct thr_info *mythr = userdata; struct thr_info *mythr = userdata;
const int thr_id = mythr->id; const int thr_id = mythr->id;
uint32_t max_nonce = 0xffffff; uint32_t max_nonce = 0xffffff;
bool needs_work = true;
unsigned long cycle;
/* Try to cycle approximately 5 times before each log update */
cycle = opt_log_interval / 5 ? : 1;
/* Set worker threads to nice 19 and then preferentially to SCHED_IDLE /* Set worker threads to nice 19 and then preferentially to SCHED_IDLE
* and if that fails, then SCHED_BATCH. No need for this to be an * and if that fails, then SCHED_BATCH. No need for this to be an
@ -838,18 +843,21 @@ static void *miner_thread(void *userdata)
while (1) { while (1) {
struct work work __attribute__((aligned(128))); struct work work __attribute__((aligned(128)));
unsigned long hashes_done; unsigned long hashes_done;
struct timeval tv_start, tv_end, diff; struct timeval tv_workstart, tv_start, tv_end, diff;
uint64_t max64; uint64_t max64;
bool rc; bool rc;
/* obtain new work from internal workio thread */ if (needs_work) {
if (unlikely(!get_work(&work))) { gettimeofday(&tv_workstart, NULL);
applog(LOG_ERR, "work retrieval failed, exiting " /* obtain new work from internal workio thread */
"mining thread %d", mythr->id); if (unlikely(!get_work(&work))) {
goto out; applog(LOG_ERR, "work retrieval failed, exiting "
"mining thread %d", mythr->id);
goto out;
}
work.thr_id = thr_id;
needs_work = false;
} }
work.thr_id = thr_id;
hashes_done = 0; hashes_done = 0;
gettimeofday(&tv_start, NULL); gettimeofday(&tv_start, NULL);
@ -915,13 +923,14 @@ static void *miner_thread(void *userdata)
timeval_subtract(&diff, &tv_end, &tv_start); timeval_subtract(&diff, &tv_end, &tv_start);
hashmeter(thr_id, &diff, hashes_done); hashmeter(thr_id, &diff, hashes_done);
work.blk.nonce += hashes_done;
/* adjust max_nonce to meet target scan time */ /* adjust max_nonce to meet target cycle time */
if (diff.tv_usec > 500000) if (diff.tv_usec > 500000)
diff.tv_sec++; diff.tv_sec++;
if (diff.tv_sec > 0) { if (diff.tv_sec > 0) {
max64 = max64 =
((uint64_t)hashes_done * (opt_log_interval ? : opt_scantime)) / diff.tv_sec; ((uint64_t)hashes_done * cycle) / diff.tv_sec;
if (max64 > 0xfffffffaULL) if (max64 > 0xfffffffaULL)
max64 = 0xfffffffaULL; max64 = 0xfffffffaULL;
max_nonce = max64; max_nonce = max64;
@ -934,6 +943,11 @@ static void *miner_thread(void *userdata)
if (unlikely(!submit_work_sync(mythr, &work))) if (unlikely(!submit_work_sync(mythr, &work)))
break; break;
} }
timeval_subtract(&diff, &tv_end, &tv_workstart);
if (diff.tv_sec > opt_scantime || work_restart[thr_id].restart ||
work.blk.nonce >= MAXTHREADS - hashes_done)
needs_work = true;
} }
out: out: