Commit 5d1a45294b4dcc1ca7e1e2c1243ee4904f0f53fe
2010-11-25T04:04:30
code movement: move submit_work() above hot path
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 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
diff --git a/cpu-miner.c b/cpu-miner.c
index 2c8149e..2b404af 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -134,6 +134,48 @@ err_out:
return false;
}
+static void submit_work(struct work *work)
+{
+ char *hexstr = NULL, *s = NULL;
+ json_t *val, *res;
+
+ printf("PROOF OF WORK FOUND? submitting...\n");
+
+ /* build hex string */
+ hexstr = bin2hex(work->data, sizeof(work->data));
+ if (!hexstr)
+ goto out;
+
+ /* build JSON-RPC request */
+ if (asprintf(&s,
+ "{\"method\": \"getwork\", \"params\": [ \"%s\" ], \"id\":1}\r\n",
+ hexstr) < 0) {
+ fprintf(stderr, "asprintf failed\n");
+ goto out;
+ }
+
+ if (opt_debug)
+ fprintf(stderr, "DBG: sending RPC call:\n%s", s);
+
+ /* issue JSON-RPC request */
+ val = json_rpc_call(rpc_url, userpass, s);
+ if (!val) {
+ fprintf(stderr, "submit_work json_rpc_call failed\n");
+ goto out;
+ }
+
+ res = json_object_get(val, "result");
+
+ printf("PROOF OF WORK RESULT: %s\n",
+ json_is_true(res) ? "true (yay!!!)" : "false (booooo)");
+
+ json_decref(val);
+
+out:
+ free(s);
+ free(hexstr);
+}
+
static void inc_stats(uint64_t n_hashes)
{
pthread_mutex_lock(&stats_mutex);
@@ -198,48 +240,6 @@ static bool scanhash(unsigned char *midstate, unsigned char *data,
}
}
-static void submit_work(struct work *work)
-{
- char *hexstr = NULL, *s = NULL;
- json_t *val, *res;
-
- printf("PROOF OF WORK FOUND? submitting...\n");
-
- /* build hex string */
- hexstr = bin2hex(work->data, sizeof(work->data));
- if (!hexstr)
- goto out;
-
- /* build JSON-RPC request */
- if (asprintf(&s,
- "{\"method\": \"getwork\", \"params\": [ \"%s\" ], \"id\":1}\r\n",
- hexstr) < 0) {
- fprintf(stderr, "asprintf failed\n");
- goto out;
- }
-
- if (opt_debug)
- fprintf(stderr, "DBG: sending RPC call:\n%s", s);
-
- /* issue JSON-RPC request */
- val = json_rpc_call(rpc_url, userpass, s);
- if (!val) {
- fprintf(stderr, "submit_work json_rpc_call failed\n");
- goto out;
- }
-
- res = json_object_get(val, "result");
-
- printf("PROOF OF WORK RESULT: %s\n",
- json_is_true(res) ? "true (yay!!!)" : "false (booooo)");
-
- json_decref(val);
-
-out:
- free(s);
- free(hexstr);
-}
-
static void *miner_thread(void *dummy)
{
static const char *rpc_req =