Commit d07be91aab29339a813311f1f5f92afdbea477e9
2012-12-03T15:17:44
Use a variable length string array in submit_upstream_work to cope with massive GBT submissions.
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
diff --git a/cgminer.c b/cgminer.c
index d48714b..e243f20 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2287,7 +2287,7 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
{
char *hexstr = NULL;
json_t *val, *res, *err;
- char s[1024];
+ char *s;
bool rc = false;
int thr_id = work->thr_id;
struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
@@ -2334,21 +2334,29 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
free(varint);
gbt_block = realloc_strcat(gbt_block, work->gbt_coinbase);
- if (work->job_id)
- sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {\"workid\": \"%s\"}]}", gbt_block, work->job_id);
- else
- sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {}]}", gbt_block);
-
+ s = strdup("{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"");
+ s = realloc_strcat(s, gbt_block);
+ if (work->job_id) {
+ s = realloc_strcat(s, "\", {\"workid\": \"");
+ s = realloc_strcat(s, work->job_id);
+ s = realloc_strcat(s, "\"}]}");
+ } else
+ s = realloc_strcat(s, "\", {}]}");
free(gbt_block);
- } else
- sprintf(s, "{\"method\": \"getwork\", \"params\": [ \"%s\" ], \"id\":1}", hexstr);
+ } else {
+ s = strdup("{\"method\": \"getwork\", \"params\": [ \"");
+ s = realloc_strcat(s, hexstr);
+ s = realloc_strcat(s, "\" ], \"id\":1}");
+ }
applog(LOG_DEBUG, "DBG: sending %s submit RPC call: %s", pool->rpc_url, s);
- strcat(s, "\n");
+ s = realloc_strcat(s, "\n");
gettimeofday(&tv_submit, NULL);
/* issue JSON-RPC request */
val = json_rpc_call(curl, pool->rpc_url, pool->rpc_userpass, s, false, false, &rolltime, pool, true);
gettimeofday(&tv_submit_reply, NULL);
+ free(s);
+
if (unlikely(!val)) {
applog(LOG_INFO, "submit_upstream_work json_rpc_call failed");
if (!pool_tset(pool, &pool->submit_fail)) {