LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Code movement: move second hash time sampling to main miner loop

Browse source
This commit is contained in:
Jeff Garzik 2011-01-29 00:47:48 -05:00 committed by Jeff Garzik
parent a296799358
commit f570ffcf75
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cpu-miner.c
View file

@ -230,18 +230,13 @@ out:
free(hexstr); free(hexstr);
} }
static void hashmeter(int thr_id, struct timeval *tv_start, static void hashmeter(int thr_id, const struct timeval *diff,
unsigned long hashes_done) unsigned long hashes_done)
{ {
struct timeval tv_end, diff;
double khashes, secs; double khashes, secs;
gettimeofday(&tv_end, NULL);
timeval_subtract(&diff, &tv_end, tv_start);
khashes = hashes_done / 1000.0; khashes = hashes_done / 1000.0;
secs = (double)diff.tv_sec + ((double)diff.tv_usec / 1000000.0); secs = (double)diff->tv_sec + ((double)diff->tv_usec / 1000000.0);
if (!opt_quiet) if (!opt_quiet)
printf("HashMeter(%d): %lu hashes, %.2f khash/sec\n", printf("HashMeter(%d): %lu hashes, %.2f khash/sec\n",
@ -259,7 +254,7 @@ static void *miner_thread(void *thr_id_int)
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; struct timeval tv_start, tv_end, diff;
json_t *val; json_t *val;
bool rc; bool rc;
@ -342,7 +337,10 @@ static void *miner_thread(void *thr_id_int)
return NULL; return NULL;
} }
hashmeter(thr_id, &tv_start, hashes_done); gettimeofday(&tv_end, NULL);
timeval_subtract(&diff, &tv_end, &tv_start);
hashmeter(thr_id, &diff, hashes_done);
/* if nonce found, submit work */ /* if nonce found, submit work */
if (rc) if (rc)