Skip to content

Remove the resubmission guard #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebastianrusu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the resubmission guard #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions cpu-miner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ Options:\n\
scrypt scrypt(1024, 1, 1) (default)\n\
scrypt:N scrypt(N, 1, 1)\n\
sha256d SHA-256d\n\
paicoin SHA-256/SHAKE256 per Project PAI\n\
shake256 SHAKE-256 (Keccak)\n\
paicoin SHA-256d until Hybrid Consensus height and\
SHAKE-256 (Keccak) afterwards\n\
-o, --url=URL URL of mining server\n\
-O, --userpass=U:P username:password pair for mining server\n\
-u, --user=USERNAME username for mining server\n\
Expand Down Expand Up @@ -1304,7 +1306,6 @@ static void *miner_thread(void *userdata)
}
}

int alreadySubmitted = 0;
while (1) {
unsigned long hashes_done;
struct timeval tv_start, tv_end, diff;
Expand All @@ -1317,7 +1318,6 @@ static void *miner_thread(void *userdata)
pthread_mutex_lock(&g_work_lock);
if (work.data[19] >= end_nonce && !memcmp(work.data, g_work.data, 76) && (!is_hyc_work(&work) || !memcmp(((uint8_t*)work.data)+80, ((uint8_t*)g_work.data)+80, 60))) {
stratum_gen_work(&stratum, &g_work);
alreadySubmitted = 0;
}
} else {
int min_scantime = have_longpoll ? LP_SCANTIME : opt_scantime;
Expand All @@ -1334,7 +1334,6 @@ static void *miner_thread(void *userdata)
goto out;
}
g_work_time = have_stratum ? 0 : time(NULL);
alreadySubmitted = 0;
}
if (have_stratum) {
pthread_mutex_unlock(&g_work_lock);
Expand All @@ -1345,7 +1344,6 @@ static void *miner_thread(void *userdata)
work_free(&work);
work_copy(&work, &g_work);
work.data[19] = 0xffffffffU / opt_n_threads * thr_id;
alreadySubmitted = 0;
} else
work.data[19]++;
pthread_mutex_unlock(&g_work_lock);
Expand Down Expand Up @@ -1440,16 +1438,9 @@ static void *miner_thread(void *userdata)
}
}

if (alreadySubmitted && is_hyc_work(&work)) {
usleep(1000);
continue;
}

/* if nonce found, submit work */
if (rc && !opt_benchmark && !submit_work(mythr, &work))
break;

alreadySubmitted = 1;
}

out:
Expand Down