GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 15:27:53 +00:00
Code Issues Releases Wiki Activity

Use cgtime in driver-icarus.c

Browse Source
This commit is contained in:
Con Kolivas 2013-04-21 19:18:15 +10:00
parent 9eb851cd53
commit 79df6b9f79
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
driver-icarus.c
View File

@ -244,7 +244,7 @@ static int icarus_gets(unsigned char *buf, int fd, struct timeval *tv_finish, st
return ICA_GETS_ERROR; return ICA_GETS_ERROR;
if (first) if (first)
gettimeofday(tv_finish, NULL); cgtime(tv_finish);
if (ret >= read_amount) if (ret >= read_amount)
return ICA_GETS_OK; return ICA_GETS_OK;
@ -546,7 +546,7 @@ static bool icarus_detect_one(const char *devpath)
hex2bin(ob_bin, golden_ob, sizeof(ob_bin)); hex2bin(ob_bin, golden_ob, sizeof(ob_bin));
icarus_write(fd, ob_bin, sizeof(ob_bin)); icarus_write(fd, ob_bin, sizeof(ob_bin));
gettimeofday(&tv_start, NULL); cgtime(&tv_start);
memset(nonce_bin, 0, sizeof(nonce_bin)); memset(nonce_bin, 0, sizeof(nonce_bin));
icarus_gets(nonce_bin, fd, &tv_finish, NULL, 1); icarus_gets(nonce_bin, fd, &tv_finish, NULL, 1);
@ -630,7 +630,7 @@ static bool icarus_prepare(struct thr_info *thr)
icarus->device_fd = fd; icarus->device_fd = fd;
applog(LOG_INFO, "Opened Icarus on %s", icarus->device_path); applog(LOG_INFO, "Opened Icarus on %s", icarus->device_path);
gettimeofday(&now, NULL); cgtime(&now);
get_datestamp(icarus->init, &now); get_datestamp(icarus->init, &now);
return true; return true;
@ -693,7 +693,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
return 0; /* This should never happen */ return 0; /* This should never happen */
} }
gettimeofday(&tv_start, NULL); cgtime(&tv_start);
if (opt_debug) { if (opt_debug) {
ob_hex = bin2hex(ob_bin, sizeof(ob_bin)); ob_hex = bin2hex(ob_bin, sizeof(ob_bin));
@ -769,7 +769,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
&& !was_hw_error && !was_hw_error
&& ((nonce & info->nonce_mask) > END_CONDITION) && ((nonce & info->nonce_mask) > END_CONDITION)
&& ((nonce & info->nonce_mask) < (info->nonce_mask & ~END_CONDITION))) { && ((nonce & info->nonce_mask) < (info->nonce_mask & ~END_CONDITION))) {
gettimeofday(&tv_history_start, NULL); cgtime(&tv_history_start);
history0 = &(info->history[0]); history0 = &(info->history[0]);
@ -857,7 +857,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
icarus->device_id, Hs, W, read_count, fullnonce); icarus->device_id, Hs, W, read_count, fullnonce);
} }
info->history_count++; info->history_count++;
gettimeofday(&tv_history_finish, NULL); cgtime(&tv_history_finish);
timersub(&tv_history_finish, &tv_history_start, &tv_history_finish); timersub(&tv_history_finish, &tv_history_start, &tv_history_finish);
timeradd(&tv_history_finish, &(info->history_time), &(info->history_time)); timeradd(&tv_history_finish, &(info->history_time), &(info->history_time));