GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #191 from luke-jr/bugfix_64bit_hashcount 

Bugfix: Use a 64-bit type for hashes_done (miner_thread) since it can overflow 32-bit on some FPGAs
nfactor-troky
Con Kolivas 13 years ago
parent
d5d8c2cc5b 068018225c
commit
55480a6baa
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      cgminer.c

6
cgminer.c
Unescape View File

@ -3141,7 +3141,7 @@ static inline void thread_reportout(struct thr_info *thr)
} }
static void hashmeter(int thr_id, struct timeval *diff, static void hashmeter(int thr_id, struct timeval *diff,
unsigned long hashes_done) unsigned long long hashes_done)
{ {
struct timeval temp_tv_end, total_diff; struct timeval temp_tv_end, total_diff;
double secs; double secs;
@ -3171,7 +3171,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
double thread_rolling = 0.0; double thread_rolling = 0.0;
int i; int i;
applog(LOG_DEBUG, "[thread %d: %lu hashes, %.0f khash/sec]", applog(LOG_DEBUG, "[thread %d: %llu hashes, %.0f khash/sec]",
thr_id, hashes_done, hashes_done / secs); thr_id, hashes_done, hashes_done / secs);
/* Rolling average for each thread and each device */ /* Rolling average for each thread and each device */
@ -3672,7 +3672,7 @@ void *miner_thread(void *userdata)
struct timeval tv_start, tv_end, tv_workstart, tv_lastupdate; struct timeval tv_start, tv_end, tv_workstart, tv_lastupdate;
struct timeval diff, sdiff, wdiff; struct timeval diff, sdiff, wdiff;
uint32_t max_nonce = api->can_limit_work ? api->can_limit_work(mythr) : 0xffffffff; uint32_t max_nonce = api->can_limit_work ? api->can_limit_work(mythr) : 0xffffffff;
uint32_t hashes_done = 0; unsigned long long hashes_done = 0;
uint32_t hashes; uint32_t hashes;
struct work *work = make_work(); struct work *work = make_work();
unsigned const int request_interval = opt_scantime * 2 / 3 ? : 1; unsigned const int request_interval = opt_scantime * 2 / 3 ? : 1;

Write Preview
Loading…
Cancel
Save