Commit 856aa49c9cf75c3a1a81dabdf292ab01f742d219
2013-04-22T10:59:55
Use copy_time helper throughout cgminer.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/cgminer.c b/cgminer.c
index 9547fa8..ec61e5e 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2724,7 +2724,7 @@ static void get_benchmark_work(struct work *work)
work->mandatory = true;
work->pool = pools[0];
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;
calc_diff(work, 0);
}
@@ -5180,8 +5180,8 @@ retry_stratum:
pool->pool_no, pool->rpc_url);
work->pool = pool;
work->rolltime = rolltime;
- memcpy(&(work->tv_getwork), &tv_getwork, sizeof(struct timeval));
- memcpy(&(work->tv_getwork_reply), &tv_getwork_reply, sizeof(struct timeval));
+ copy_time(&work->tv_getwork, &tv_getwork);
+ copy_time(&work->tv_getwork_reply, &tv_getwork_reply);
work->getwork_mode = GETWORK_MODE_TESTPOOL;
calc_diff(work, 0);
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;
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");
if (unlikely(pthread_create(&submit_thread, NULL, submit_work_thread, (void *)work)))
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) {
hashmeter(thr_id, &diff, hashes_done);
hashes_done = 0;
- memcpy(&tv_lastupdate, tv_end, sizeof(struct timeval));
+ copy_time(&tv_lastupdate, tv_end);
}
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) {
hashmeter(thr_id, &diff, hashes_done);
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))
@@ -5979,8 +5979,8 @@ static void convert_to_work(json_t *val, int rolltime, struct pool *pool, struct
pool->getwork_requested++;
work->pool = pool;
work->rolltime = rolltime;
- memcpy(&(work->tv_getwork), tv_lp, sizeof(struct timeval));
- memcpy(&(work->tv_getwork_reply), tv_lp_reply, sizeof(struct timeval));
+ copy_time(&work->tv_getwork, tv_lp);
+ copy_time(&work->tv_getwork_reply, tv_lp_reply);
calc_diff(work, 0);
if (pool->enabled == POOL_REJECTING)