Rather than sleep-loop, main thread waits for all threads to exit.
This commit is contained in:
parent
2f9a6deef9
commit
16006f9037
1 changed files with 11 additions and 11 deletions
22
cpu-miner.c
22
cpu-miner.c
|
@ -31,8 +31,6 @@
|
||||||
#define DEF_RPC_USERPASS "rpcuser:rpcpass"
|
#define DEF_RPC_USERPASS "rpcuser:rpcpass"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
STAT_SLEEP_INTERVAL = 100,
|
|
||||||
STAT_CTR_INTERVAL = 10000000,
|
|
||||||
FAILURE_INTERVAL = 30,
|
FAILURE_INTERVAL = 30,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -62,7 +60,6 @@ bool opt_debug = false;
|
||||||
bool opt_protocol = false;
|
bool opt_protocol = false;
|
||||||
bool opt_quiet = false;
|
bool opt_quiet = false;
|
||||||
static int opt_retries = 10;
|
static int opt_retries = 10;
|
||||||
static bool program_running = true;
|
|
||||||
static const bool opt_time = true;
|
static const bool opt_time = true;
|
||||||
static enum sha256_algos opt_algo = ALGO_C;
|
static enum sha256_algos opt_algo = ALGO_C;
|
||||||
static int opt_n_threads = 1;
|
static int opt_n_threads = 1;
|
||||||
|
@ -446,6 +443,7 @@ static void parse_cmdline(int argc, char *argv[])
|
||||||
int main (int argc, char *argv[])
|
int main (int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
pthread_t *t_all;
|
||||||
|
|
||||||
/* parse command line */
|
/* parse command line */
|
||||||
parse_cmdline(argc, argv);
|
parse_cmdline(argc, argv);
|
||||||
|
@ -454,11 +452,13 @@ int main (int argc, char *argv[])
|
||||||
if (setpriority(PRIO_PROCESS, 0, 19))
|
if (setpriority(PRIO_PROCESS, 0, 19))
|
||||||
perror("setpriority");
|
perror("setpriority");
|
||||||
|
|
||||||
|
t_all = calloc(opt_n_threads, sizeof(pthread_t));
|
||||||
|
if (!t_all)
|
||||||
|
return 1;
|
||||||
|
|
||||||
/* start mining threads */
|
/* start mining threads */
|
||||||
for (i = 0; i < opt_n_threads; i++) {
|
for (i = 0; i < opt_n_threads; i++) {
|
||||||
pthread_t t;
|
if (pthread_create(&t_all[i], NULL, miner_thread,
|
||||||
|
|
||||||
if (pthread_create(&t, NULL, miner_thread,
|
|
||||||
(void *)(unsigned long) i)) {
|
(void *)(unsigned long) i)) {
|
||||||
fprintf(stderr, "thread %d create failed\n", i);
|
fprintf(stderr, "thread %d create failed\n", i);
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -472,11 +472,11 @@ int main (int argc, char *argv[])
|
||||||
opt_n_threads,
|
opt_n_threads,
|
||||||
algo_names[opt_algo]);
|
algo_names[opt_algo]);
|
||||||
|
|
||||||
/* main loop */
|
/* main loop - simply wait for all threads to exit */
|
||||||
while (program_running) {
|
for (i = 0; i < opt_n_threads; i++)
|
||||||
sleep(STAT_SLEEP_INTERVAL);
|
pthread_join(t_all[i], NULL);
|
||||||
/* do nothing */
|
|
||||||
}
|
fprintf(stderr, "all threads dead, fred. exiting.\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue