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

Use copy_time helper throughout cgminer.c

nfactor-troky
Con Kolivas 12 years ago
parent
d2abaa8317
commit
856aa49c9c
1 changed files with 8 additions and 8 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. 16
      cgminer.c

16
cgminer.c
Unescape View File

@ -2724,7 +2724,7 @@ static void get_benchmark_work(struct work *work)
work->mandatory = true; work->mandatory = true;
work->pool = pools[0]; work->pool = pools[0];
cgtime(&work->tv_getwork); cgtime(&work->tv_getwork);
memcpy(&(work->tv_getwork_reply), &(work->tv_getwork), sizeof(struct timeval)); copy_time(&work->tv_getwork_reply, &work->tv_getwork);
work->getwork_mode = GETWORK_MODE_BENCHMARK; work->getwork_mode = GETWORK_MODE_BENCHMARK;
calc_diff(work, 0); calc_diff(work, 0);
} }
@ -5180,8 +5180,8 @@ retry_stratum:
pool->pool_no, pool->rpc_url); pool->pool_no, pool->rpc_url);
work->pool = pool; work->pool = pool;
work->rolltime = rolltime; work->rolltime = rolltime;
memcpy(&(work->tv_getwork), &tv_getwork, sizeof(struct timeval)); copy_time(&work->tv_getwork, &tv_getwork);
memcpy(&(work->tv_getwork_reply), &tv_getwork_reply, sizeof(struct timeval)); copy_time(&work->tv_getwork_reply, &tv_getwork_reply);
work->getwork_mode = GETWORK_MODE_TESTPOOL; work->getwork_mode = GETWORK_MODE_TESTPOOL;
calc_diff(work, 0); calc_diff(work, 0);
applog(LOG_DEBUG, "Pushing pooltest work to base pool"); applog(LOG_DEBUG, "Pushing pooltest work to base pool");
@ -5502,7 +5502,7 @@ void submit_work_async(struct work *work_in, struct timeval *tv_work_found)
pthread_t submit_thread; pthread_t submit_thread;
if (tv_work_found) if (tv_work_found)
memcpy(&(work->tv_work_found), tv_work_found, sizeof(struct timeval)); copy_time(&work->tv_work_found, tv_work_found);
applog(LOG_DEBUG, "Pushing submit work to work thread"); applog(LOG_DEBUG, "Pushing submit work to work thread");
if (unlikely(pthread_create(&submit_thread, NULL, submit_work_thread, (void *)work))) if (unlikely(pthread_create(&submit_thread, NULL, submit_work_thread, (void *)work)))
quit(1, "Failed to create submit_work_thread"); quit(1, "Failed to create submit_work_thread");
@ -5723,7 +5723,7 @@ static void hash_sole_work(struct thr_info *mythr)
if (diff.tv_sec > 0 || diff.tv_usec > 200) { if (diff.tv_sec > 0 || diff.tv_usec > 200) {
hashmeter(thr_id, &diff, hashes_done); hashmeter(thr_id, &diff, hashes_done);
hashes_done = 0; hashes_done = 0;
memcpy(&tv_lastupdate, tv_end, sizeof(struct timeval)); copy_time(&tv_lastupdate, tv_end);
} }
if (unlikely(mythr->work_restart)) { if (unlikely(mythr->work_restart)) {
@ -5909,7 +5909,7 @@ void hash_queued_work(struct thr_info *mythr)
if (diff.tv_sec > 0 || diff.tv_usec > 200) { if (diff.tv_sec > 0 || diff.tv_usec > 200) {
hashmeter(thr_id, &diff, hashes_done); hashmeter(thr_id, &diff, hashes_done);
hashes_done = 0; hashes_done = 0;
memcpy(&tv_start, &tv_end, sizeof(struct timeval)); copy_time(&tv_start, &tv_end);
} }
if (unlikely(mythr->pause || cgpu->deven != DEV_ENABLED)) if (unlikely(mythr->pause || cgpu->deven != DEV_ENABLED))
@ -5979,8 +5979,8 @@ static void convert_to_work(json_t *val, int rolltime, struct pool *pool, struct
pool->getwork_requested++; pool->getwork_requested++;
work->pool = pool; work->pool = pool;
work->rolltime = rolltime; work->rolltime = rolltime;
memcpy(&(work->tv_getwork), tv_lp, sizeof(struct timeval)); copy_time(&work->tv_getwork, tv_lp);
memcpy(&(work->tv_getwork_reply), tv_lp_reply, sizeof(struct timeval)); copy_time(&work->tv_getwork_reply, tv_lp_reply);
calc_diff(work, 0); calc_diff(work, 0);
if (pool->enabled == POOL_REJECTING) if (pool->enabled == POOL_REJECTING)

Write Preview
Loading…
Cancel
Save