From 13bb9d267ef17434392830c7fbf0c602f7f202fd Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Mon, 8 Sep 2014 17:43:45 +0200 Subject: [PATCH] Remove debug rpc, already exists with -P --- cpu-miner.c | 71 +++++++++++++++++++++++++++++++++------------------ cuda_helper.h | 2 ++ miner.h | 1 - util.c | 4 --- 4 files changed, 48 insertions(+), 30 deletions(-) diff --git a/cpu-miner.c b/cpu-miner.c index c03786b..0450ac7 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -172,7 +172,6 @@ static const char *algo_names[] = { }; bool opt_debug = false; -bool opt_debug_rpc = false; bool opt_protocol = false; bool opt_benchmark = false; bool want_longpoll = true; @@ -440,7 +439,7 @@ static int share_result(int result, const char *reason) (result ? CL_GRN "yay!!!" : CL_RED "booooo") : (result ? "(yay!!!)" : "(booooo)")); - if (reason && !opt_quiet) { + if (reason) { applog(LOG_WARNING, "reject reason: %s", reason); if (strncmp(reason, "low difficulty share", 20) == 0) { opt_difficulty = (opt_difficulty * 2.0) / 3.0; @@ -550,10 +549,6 @@ static bool submit_upstream_work(CURL *curl, struct work *work) json_decref(val); } - if (opt_debug_rpc) { - applog(LOG_DEBUG, "submit: %s", s); - } - rc = true; out: @@ -792,13 +787,20 @@ static void stratum_gen_work(struct stratum_ctx *sctx, struct work *work) memcpy(work->xnonce2, sctx->job.xnonce2, sctx->xnonce2_size); /* Generate merkle root */ - if (opt_algo == ALGO_HEAVY || opt_algo == ALGO_MJOLLNIR) - heavycoin_hash(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); - else - if (opt_algo == ALGO_FUGUE256 || opt_algo == ALGO_GROESTL || opt_algo == ALGO_WHC || opt_algo == ALGO_BLAKECOIN) - SHA256((unsigned char*)sctx->job.coinbase, sctx->job.coinbase_size, (unsigned char*)merkle_root); - else - sha256d(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); + switch (opt_algo) { + case ALGO_HEAVY: + case ALGO_MJOLLNIR: + heavycoin_hash(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); + break; + case ALGO_FUGUE256: + case ALGO_GROESTL: + case ALGO_BLAKECOIN: + case ALGO_WHC: + SHA256((uint8_t*)sctx->job.coinbase, sctx->job.coinbase_size, (uint8_t*)merkle_root); + break; + default: + sha256d(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); + } for (i = 0; i < sctx->job.merkle_count; i++) { memcpy(merkle_root + 32, sctx->job.merkle[i], 32); @@ -870,7 +872,9 @@ static void *miner_thread(void *userdata) uint32_t end_nonce = 0xffffffffU / opt_n_threads * (thr_id + 1) - (thr_id + 1); unsigned char *scratchbuf = NULL; bool work_done = false; + bool extrajob = false; char s[16]; + int rc = 0; memset(&work, 0, sizeof(work)); // prevent work from being used uninitialized @@ -897,8 +901,6 @@ static void *miner_thread(void *userdata) struct timeval tv_start, tv_end, diff; int64_t max64; uint64_t umax64; - bool extrajob = false; - int rc; // &work.data[19] int wcmplen = 76; @@ -907,20 +909,21 @@ static void *miner_thread(void *userdata) if (have_stratum) { uint32_t sleeptime = 0; while (!work_done && time(NULL) >= (g_work_time + opt_scantime)) { - sleeptime++; - usleep(50*1000); - if (sleeptime > 5) { + usleep(100*1000); + if (sleeptime > 4) { extrajob = true; break; } + sleeptime++; } - if (sleeptime) + if (sleeptime && opt_debug && !opt_quiet) applog(LOG_DEBUG, "sleeptime: %u ms", sleeptime*100); nonceptr = (uint32_t*) (((char*)work.data) + wcmplen); pthread_mutex_lock(&g_work_lock); extrajob |= work_done; if ((*nonceptr) >= end_nonce || extrajob) { work_done = false; + extrajob = false; stratum_gen_work(&stratum, &g_work); } } else { @@ -938,6 +941,22 @@ static void *miner_thread(void *userdata) g_work_time = time(NULL); } } +#if 0 + if (!opt_benchmark && g_work.xnonce2_len == 0) { + applog(LOG_ERR, "work data not read yet"); + extrajob = true; + work_done = true; + sleep(1); + continue; + } +#endif + if (rc > 1) { + /* if we found more than one on last loop */ + /* todo: handle an array to get them directly */ + pthread_mutex_unlock(&g_work_lock); + goto continue_scan; + } + if (memcmp(work.target, g_work.target, sizeof(work.target))) { if (opt_debug) { applog(LOG_DEBUG, "job %s target change:", g_work.job_id); @@ -947,7 +966,7 @@ static void *miner_thread(void *userdata) memcpy(work.target, g_work.target, sizeof(work.target)); (*nonceptr) = (0xffffffffUL / opt_n_threads) * thr_id; // 0 if single thr /* on new target, ignoring nonce, clear sent data (hashlog) */ - if (memcmp(work.target, g_work.target, sizeof(work.target) - 4)) { + if (memcmp(work.target, g_work.target, sizeof(work.target))) { hashlog_purge_job(work.job_id); } } @@ -1048,6 +1067,7 @@ static void *miner_thread(void *userdata) (*nonceptr) = start_nonce; hashes_done = 0; +continue_scan: gettimeofday(&tv_start, NULL); /* scan nonces for a proof-of-work hash */ @@ -1163,8 +1183,11 @@ static void *miner_thread(void *userdata) timeval_subtract(&diff, &tv_end, &tv_start); if (diff.tv_usec || diff.tv_sec) { pthread_mutex_lock(&stats_lock); - thr_hashrates[thr_id] = - hashes_done / (diff.tv_sec + 1e-6 * diff.tv_usec); + if (diff.tv_sec + 1e-6 * diff.tv_usec > 0.0) { + thr_hashrates[thr_id] = hashes_done / (diff.tv_sec + 1e-6 * diff.tv_usec); + if (rc > 1) + thr_hashrates[thr_id] = (rc * hashes_done) / (diff.tv_sec + 1e-6 * diff.tv_usec); + } pthread_mutex_unlock(&stats_lock); } if (!opt_quiet) { @@ -1372,7 +1395,6 @@ static void *stratum_thread(void *userdata) pthread_mutex_lock(&g_work_lock); stratum_gen_work(&stratum, &g_work); time(&g_work_time); - pthread_mutex_unlock(&g_work_lock); if (stratum.job.clean) { if (!opt_quiet) applog(LOG_BLUE, "%s send a new %s block %d", short_url, algo_names[opt_algo], @@ -1383,6 +1405,7 @@ static void *stratum_thread(void *userdata) applog(LOG_BLUE, "%s send job %d for block %d", short_url, strtoul(stratum.job.job_id, NULL, 16), stratum.bloc_height); } + pthread_mutex_unlock(&g_work_lock); } if (!stratum_socket_full(&stratum, 120)) { @@ -1470,11 +1493,9 @@ static void parse_arg (int key, char *arg) break; case 'D': opt_debug = true; - opt_debug_rpc = true; break; case 'q': opt_quiet = true; - opt_debug_rpc = false; break; case 'p': free(rpc_pass); diff --git a/cuda_helper.h b/cuda_helper.h index fecf531..66c8e7d 100644 --- a/cuda_helper.h +++ b/cuda_helper.h @@ -12,6 +12,8 @@ #include +extern cudaError_t MyStreamSynchronize(cudaStream_t stream, int situation, int thr_id); + extern __device__ __device_builtin__ void __syncthreads(void); #ifndef __CUDA_ARCH__ diff --git a/miner.h b/miner.h index 6bd0ae5..d9d29a8 100644 --- a/miner.h +++ b/miner.h @@ -290,7 +290,6 @@ struct work_restart { extern bool opt_benchmark; extern bool opt_debug; -extern bool opt_debug_rpc; extern bool opt_quiet; extern bool opt_protocol; extern int opt_timeout; diff --git a/util.c b/util.c index eb4af11..fe733c0 100644 --- a/util.c +++ b/util.c @@ -1222,10 +1222,6 @@ bool stratum_handle_method(struct stratum_ctx *sctx, const char *s) id = json_object_get(val, "id"); params = json_object_get(val, "params"); - if (opt_debug_rpc) { - applog(LOG_DEBUG, "method: %s", s); - } - if (!strcasecmp(method, "mining.notify")) { ret = stratum_notify(sctx, params); goto out;