Commit 6d8c6e9230e5eb0128573f77ef0c45142418714f
2014-03-18T17:28:21
Create a work item and stage it when updating the gbt solo template to allow new block detection and restart code to work.
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
diff --git a/cgminer.c b/cgminer.c
index e0f01ab..338f427 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -6398,6 +6398,15 @@ static bool stratum_works(struct pool *pool)
return true;
}
+static void __setup_gbt_solo(struct pool *pool)
+{
+ cg_wlock(&pool->gbt_lock);
+ memcpy(pool->coinbase, scriptsig_header_bin, 41);
+ pool->coinbase[41 + 50 + 4 + 1 + 8] = 25;
+ memcpy(pool->coinbase + 41 + 50 + 4 + 1 + 8 + 1, pool->script_pubkey, 25);
+ cg_wunlock(&pool->gbt_lock);
+}
+
static bool setup_gbt_solo(CURL *curl, struct pool *pool)
{
char s[256];
@@ -6424,9 +6433,7 @@ static bool setup_gbt_solo(CURL *curl, struct pool *pool)
ret = true;
address_to_pubkeyhash(pool->script_pubkey, opt_btc_address);
hex2bin(scriptsig_header_bin, scriptsig_header, 41);
- memcpy(pool->coinbase, scriptsig_header_bin, 41);
- pool->coinbase[41 + 50 + 4 + 1 + 8] = 25;
- memcpy(pool->coinbase + 41 + 50 + 4 + 1 + 8 + 1, pool->script_pubkey, 25);
+ __setup_gbt_solo(pool);
if (opt_debug) {
char *cb = bin2hex(pool->coinbase, pool->coinbase_len);
@@ -6876,6 +6883,8 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
cgtime(&work->tv_staged);
}
+static void gen_solo_work(struct pool *pool, struct work *work);
+
static void update_gbt_solo(struct pool *pool)
{
struct work *work = make_work();
@@ -6890,9 +6899,12 @@ static void update_gbt_solo(struct pool *pool)
if (likely(val)) {
bool rc = work_decode(pool, work, val);
- if (rc)
- setup_gbt_solo(ce->curl, pool);
- free_work(work);
+ if (rc) {
+ __setup_gbt_solo(pool);
+ gen_solo_work(pool, work);
+ stage_work(work);
+ } else
+ free_work(work);
}
push_curl_entry(ce, pool);
}