Browse Source

added poolmode (-m)

master
tcatm 14 years ago
parent
commit
342ebcc8ab
  1. 7
      findnonce.c
  2. 18
      findnonce.h
  3. 34
      miner.c

7
findnonce.c

@ -13,8 +13,6 @@
#include "ocl.h" #include "ocl.h"
#include "findnonce.h" #include "findnonce.h"
int fDebug = 0;
const uint32_t SHA256_K[64] = { const uint32_t SHA256_K[64] = {
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
@ -134,7 +132,7 @@ void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data) {
R(E, F, G, H, A, B, C, D, P(u+4), SHA256_K[u+4]); \ R(E, F, G, H, A, B, C, D, P(u+4), SHA256_K[u+4]); \
R(D, E, F, G, H, A, B, C, P(u+5), SHA256_K[u+5]) R(D, E, F, G, H, A, B, C, P(u+5), SHA256_K[u+5])
uint32_t postcalc_hash(dev_blk_ctx *blk, uint32_t start, uint32_t end, uint32_t *best_nonce) { uint32_t postcalc_hash(dev_blk_ctx *blk, struct work_t *work, uint32_t start, uint32_t end, uint32_t *best_nonce, int pool_mode) {
cl_uint A, B, C, D, E, F, G, H; cl_uint A, B, C, D, E, F, G, H;
cl_uint W[16]; cl_uint W[16];
cl_uint nonce; cl_uint nonce;
@ -171,6 +169,9 @@ uint32_t postcalc_hash(dev_blk_ctx *blk, uint32_t start, uint32_t end, uint32_t
FR(48); PFR(56); FR(48); PFR(56);
if(H == 0xA41F32E7) { if(H == 0xA41F32E7) {
if (pool_mode)
submit_nonce(work, nonce);
G += 0x1f83d9ab; G += 0x1f83d9ab;
G = ByteReverse(G); G = ByteReverse(G);

18
findnonce.h

@ -16,6 +16,20 @@ typedef struct {
cl_uint fW01r; cl_uint fcty_e; cl_uint fcty_e2; cl_uint fW01r; cl_uint fcty_e; cl_uint fcty_e2;
} dev_blk_ctx; } dev_blk_ctx;
extern void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data); struct work_t {
extern uint32_t postcalc_hash(dev_blk_ctx *blk, uint32_t start, uint32_t end, uint32_t *best_nonce); unsigned char data[128];
unsigned char hash1[64];
unsigned char midstate[32];
unsigned char target[32];
unsigned char hash[32];
uint32_t output[MAXTHREADS];
uint32_t res_nonce;
uint32_t valid;
uint32_t ready;
dev_blk_ctx blk;
};
extern void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data);
extern uint32_t postcalc_hash(dev_blk_ctx *blk, struct work_t *work, uint32_t start, uint32_t end, uint32_t *best_nonce, int pool_mode);
extern void submit_nonce(struct work_t *work, uint32_t nonce);

34
miner.c

@ -41,6 +41,7 @@ enum {
int opt_debug = false; int opt_debug = false;
int opt_protocol = false; int opt_protocol = false;
int opt_ndevs = false; int opt_ndevs = false;
int opt_pool = false;
static int opt_retries = 10; static int opt_retries = 10;
static bool program_running = true; static bool program_running = true;
static const bool opt_time = true; static const bool opt_time = true;
@ -68,6 +69,9 @@ static struct option_help options_help[] = {
{ "debug", { "debug",
"(-D) Enable debug output (default: off)" }, "(-D) Enable debug output (default: off)" },
{ "pool",
"(-m) Enable pool mode (default: off)" },
{ "protocol-dump", { "protocol-dump",
"(-P) Verbose dump of protocol-level activities (default: off)" }, "(-P) Verbose dump of protocol-level activities (default: off)" },
@ -92,23 +96,10 @@ static struct option options[] = {
{ "url", 1, NULL, 1001 }, { "url", 1, NULL, 1001 },
{ "userpass", 1, NULL, 1002 }, { "userpass", 1, NULL, 1002 },
{ "ndevs", 0, NULL, 'n' }, { "ndevs", 0, NULL, 'n' },
{ "pool", 0, NULL, 'm' },
{ } { }
}; };
struct work_t {
unsigned char data[128];
unsigned char hash1[64];
unsigned char midstate[32];
unsigned char target[32];
unsigned char hash[32];
uint32_t output[MAXTHREADS];
uint32_t res_nonce;
bool valid;
uint32_t ready;
dev_blk_ctx blk;
};
static bool jobj_binary(const json_t *obj, const char *key, static bool jobj_binary(const json_t *obj, const char *key,
void *buf, size_t buflen) void *buf, size_t buflen)
{ {
@ -247,7 +238,7 @@ static bool getwork(struct work_t *work) {
return true; return true;
} }
static void submit_nonce(struct work_t *work, uint32_t nonce) { void submit_nonce(struct work_t *work, uint32_t nonce) {
work->data[64+12+0] = (nonce>>0) & 0xff; work->data[64+12+0] = (nonce>>0) & 0xff;
work->data[64+12+1] = (nonce>>8) & 0xff; work->data[64+12+1] = (nonce>>8) & 0xff;
work->data[64+12+2] = (nonce>>16) & 0xff; work->data[64+12+2] = (nonce>>16) & 0xff;
@ -358,15 +349,19 @@ static void *miner_thread(void *thr_id_int)
if(res[j]) { if(res[j]) {
uint32_t start = (work[res_frame].res_nonce + j)<<10; uint32_t start = (work[res_frame].res_nonce + j)<<10;
uint32_t my_g, my_nonce; uint32_t my_g, my_nonce;
my_g = postcalc_hash(&work[res_frame].blk, start, start + 1024, &my_nonce); my_g = postcalc_hash(&work[res_frame].blk, &work[res_frame], start, start + 1024, &my_nonce, opt_pool);
if (!opt_pool) {
if (opt_debug) if (opt_debug)
fprintf(stderr, "DEBUG: H0 within %u .. %u, best G = %08x, nonce = %08x\n", start, start + 1024, my_g, my_nonce); fprintf(stderr, "DEBUG: H0 within %u .. %u, best G = %08x, nonce = %08x\n", start, start + 1024, my_g, my_nonce);
if(my_g < bestG) { if(my_g < bestG) {
bestG = my_g; bestG = my_g;
nonce = my_nonce; nonce = my_nonce;
if (opt_debug) if (opt_debug)
fprintf(stderr, "new best\n"); fprintf(stderr, "new best\n");
} }
}
rc = true; rc = true;
} }
@ -376,7 +371,7 @@ static void *miner_thread(void *thr_id_int)
uint32_t *target = (uint32_t *)(work[res_frame].target + 24); uint32_t *target = (uint32_t *)(work[res_frame].target + 24);
if(rc && bestG <= *target) { if(!opt_pool && rc && bestG <= *target) {
printf("Found solution for %08x: %08x %u\n", *target, bestG, nonce); printf("Found solution for %08x: %08x %u\n", *target, bestG, nonce);
submit_nonce(&work[res_frame], nonce); submit_nonce(&work[res_frame], nonce);
@ -427,6 +422,9 @@ static void parse_arg (int key, char *arg)
int v, i; int v, i;
switch(key) { switch(key) {
case 'm':
opt_pool = true;
break;
case 'n': case 'n':
opt_ndevs = true; opt_ndevs = true;
break; break;
@ -466,7 +464,7 @@ static void parse_cmdline(int argc, char *argv[])
int key; int key;
while (1) { while (1) {
key = getopt_long(argc, argv, "DPh?n", options, NULL); key = getopt_long(argc, argv, "DPh?nm", options, NULL);
if (key < 0) if (key < 0)
break; break;

Loading…
Cancel
Save