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

Add local thread count to info, store hw error count, and make share submission debug only.

Browse Source
This commit is contained in:
ckolivas 2011-06-29 09:22:21 +10:00 committed by Con Kolivas
parent e016d0c8f3
commit f490143a9a
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cpu-miner.c
View File

@ -149,6 +149,7 @@ static pthread_mutex_t get_lock;
static double total_mhashes_done; static double total_mhashes_done;
static struct timeval total_tv_start, total_tv_end; static struct timeval total_tv_start, total_tv_end;
static int accepted, rejected; static int accepted, rejected;
int hw_errors;
struct option_help { struct option_help {
@ -336,6 +337,7 @@ static bool submit_upstream_work(CURL *curl, const struct work *work)
json_t *val, *res; json_t *val, *res;
char s[345]; char s[345];
bool rc = false; bool rc = false;
const int thr_id = work->thr_id;
/* build hex string */ /* build hex string */
hexstr = bin2hex(work->data, sizeof(work->data)); hexstr = bin2hex(work->data, sizeof(work->data));
@ -365,12 +367,17 @@ static bool submit_upstream_work(CURL *curl, const struct work *work)
* rejected values but the chance of two submits completing at the * rejected values but the chance of two submits completing at the
* same time is zero so there is no point adding extra locking */ * same time is zero so there is no point adding extra locking */
if (json_is_true(res)) { if (json_is_true(res)) {
thr_info[thr_id].accepted++;
accepted++; accepted++;
applog(LOG_INFO, "PROOF OF WORK RESULT: true (yay!!!)"); if (opt_debug)
applog(LOG_DEBUG, "PROOF OF WORK RESULT: true (yay!!!)");
} else { } else {
thr_info[thr_id].rejected++;
rejected++; rejected++;
applog(LOG_INFO, "PROOF OF WORK RESULT: false (booooo)"); if (opt_debug)
applog(LOG_DEBUG, "PROOF OF WORK RESULT: false (booooo)");
} }
applog(LOG_INFO, "Thread: %d Accepted: %d Rejected: %d HW errors: %d", thr_id, thr_info[thr_id].accepted, thr_info[thr_id].rejected, thr_info[thr_id].hw_errors);
json_decref(val); json_decref(val);
@ -561,9 +568,9 @@ static void hashmeter(int thr_id, struct timeval *diff,
timeval_subtract(&total_diff, &total_tv_end, &total_tv_start); timeval_subtract(&total_diff, &total_tv_end, &total_tv_start);
total_secs = (double)total_diff.tv_sec + total_secs = (double)total_diff.tv_sec +
((double)total_diff.tv_usec / 1000000.0); ((double)total_diff.tv_usec / 1000000.0);
applog(LOG_INFO, "[%.2f | %.2f Mhash/s] [%d Accepted] [%d Rejected]", applog(LOG_INFO, "[%.2f | %.2f Mhash/s] [%d Accepted] [%d Rejected] [%d HW errors]",
local_mhashes_done / local_secs, local_mhashes_done / local_secs,
total_mhashes_done / total_secs, accepted, rejected); total_mhashes_done / total_secs, accepted, rejected, hw_errors);
local_mhashes_done = 0; local_mhashes_done = 0;
} }
@ -677,6 +684,8 @@ static bool submit_work_async(struct thr_info *thr, const struct work *work_in)
} }
memcpy(&sd->work_in, work_in, sizeof(struct work)); memcpy(&sd->work_in, work_in, sizeof(struct work));
/* Pass the thread id to the work struct for per-thread accounting */
sd->work_in.thr_id = thr->id;
if (pthread_create(&sd->pth, NULL, submit_work, (void *)sd)) { if (pthread_create(&sd->pth, NULL, submit_work, (void *)sd)) {
applog(LOG_ERR, "Failed to create submit_thread"); applog(LOG_ERR, "Failed to create submit_thread");
@ -810,7 +819,8 @@ static void *miner_thread(void *userdata)
/* if nonce found, submit work */ /* if nonce found, submit work */
if (unlikely(rc)) { if (unlikely(rc)) {
applog(LOG_INFO, "CPU %d found something?", cpu_from_thr_id(thr_id)); if (opt_debug)
applog(LOG_DEBUG, "CPU %d found something?", cpu_from_thr_id(thr_id));
if (!submit_work_async(mythr, &work)) if (!submit_work_async(mythr, &work))
break; break;
} }
@ -960,7 +970,8 @@ static void *gpuminer_thread(void *userdata)
{ applog(LOG_ERR, "Error: clEnqueueWriteBuffer failed."); goto out; } { applog(LOG_ERR, "Error: clEnqueueWriteBuffer failed."); goto out; }
for (i = 0; i < 127; i++) { for (i = 0; i < 127; i++) {
if (res[i]) { if (res[i]) {
applog(LOG_INFO, "GPU %d found something?", gpu_from_thr_id(thr_id)); if (opt_debug)
applog(LOG_DEBUG, "GPU %d found something?", gpu_from_thr_id(thr_id));
postcalc_hash_async(mythr, work, res[i]); postcalc_hash_async(mythr, work, res[i]);
} else } else
break; break;

8
findnonce.c
View File

@ -200,8 +200,12 @@ static void *postcalc_hash(void *userdata)
} }
} }
out: out:
if (unlikely(best_g == ~0)) if (unlikely(best_g == ~0)) {
applog(LOG_ERR, "No best_g found! Error in OpenCL code?"); if (opt_debug)
applog(LOG_DEBUG, "No best_g found! Error in OpenCL code?");
hw_errors++;
thr->hw_errors++;
}
free(pcd); free(pcd);
} }

6
miner.h
View File

@ -114,6 +114,9 @@ struct thr_info {
int id; int id;
pthread_t pth; pthread_t pth;
struct thread_q *q; struct thread_q *q;
int accepted;
int rejected;
int hw_errors;
}; };
static inline uint32_t swab32(uint32_t v) static inline uint32_t swab32(uint32_t v)
@ -195,6 +198,7 @@ struct work_restart {
}; };
extern pthread_mutex_t time_lock; extern pthread_mutex_t time_lock;
extern int hw_errors;
extern bool use_syslog; extern bool use_syslog;
extern struct thr_info *thr_info; extern struct thr_info *thr_info;
extern int longpoll_thr_id; extern int longpoll_thr_id;
@ -224,6 +228,8 @@ struct work {
uint32_t res_nonce; uint32_t res_nonce;
uint32_t valid; uint32_t valid;
dev_blk_ctx blk; dev_blk_ctx blk;
int thr_id;
}; };
bool submit_nonce(struct thr_info *thr, struct work *work, uint32_t nonce); bool submit_nonce(struct thr_info *thr, struct work *work, uint32_t nonce);