Commit 69d8c339aae12d09837ad0762bb8f22ede6934d5
2012-08-20T11:08:56
Add message to share if it's a resubmit.
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
diff --git a/cgminer.c b/cgminer.c
index 4d1ce4b..a844576 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -1742,7 +1742,7 @@ static void reject_pool(struct pool *pool)
pool->enabled = POOL_REJECTING;
}
-static bool submit_upstream_work(const struct work *work, CURL *curl)
+static bool submit_upstream_work(const struct work *work, CURL *curl, bool resubmit)
{
char *hexstr = NULL;
json_t *val, *res;
@@ -1817,11 +1817,11 @@ static bool submit_upstream_work(const struct work *work, CURL *curl)
applog(LOG_DEBUG, "PROOF OF WORK RESULT: true (yay!!!)");
if (!QUIET) {
if (total_pools > 1)
- applog(LOG_NOTICE, "Accepted %s %s %d pool %d",
- hashshow, cgpu->api->name, cgpu->device_id, work->pool->pool_no);
+ applog(LOG_NOTICE, "Accepted %s %s %d pool %d %s",
+ hashshow, cgpu->api->name, cgpu->device_id, work->pool->pool_no, resubmit ? "(resubmit)" : "");
else
- applog(LOG_NOTICE, "Accepted %s %s %d",
- hashshow, cgpu->api->name, cgpu->device_id);
+ applog(LOG_NOTICE, "Accepted %s %s %d %s",
+ hashshow, cgpu->api->name, cgpu->device_id, resubmit ? "(resubmit)" : "");
}
sharelog("accept", work);
if (opt_shares && total_accepted >= opt_shares) {
@@ -1870,8 +1870,8 @@ static bool submit_upstream_work(const struct work *work, CURL *curl)
} else
strcpy(reason, "");
- applog(LOG_NOTICE, "Rejected %s %s %d %s%s",
- hashshow, cgpu->api->name, cgpu->device_id, where, reason);
+ applog(LOG_NOTICE, "Rejected %s %s %d %s%s %s",
+ hashshow, cgpu->api->name, cgpu->device_id, where, reason, resubmit ? "(resubmit)" : "");
sharelog(disposition, work);
}
@@ -2520,6 +2520,7 @@ static void *submit_work_thread(void *userdata)
struct workio_cmd *wc = (struct workio_cmd *)userdata;
struct work *work = wc->work;
struct pool *pool = work->pool;
+ bool resubmit = false;
struct curl_ent *ce;
pthread_detach(pthread_self());
@@ -2545,7 +2546,8 @@ static void *submit_work_thread(void *userdata)
ce = pop_curl_entry(pool);
/* submit solution to bitcoin via JSON-RPC */
- while (!submit_upstream_work(work, ce->curl)) {
+ while (!submit_upstream_work(work, ce->curl, resubmit)) {
+ resubmit = true;
if (stale_work(work, true)) {
applog(LOG_NOTICE, "Share became stale while retrying submit, discarding");
total_stale++;