GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

Cleanup --cpu-threads/-t logic

Browse Source 
Currently it gets negated which means the default printed is wrong.
Use an explicit flag to tell if the user has overridden it; if they
haven't, and they turn off the GPUs, reset it to num_processors.
This commit is contained in:
Rusty Russell 2011-07-06 16:47:29 +09:30
parent 3e8181216c
commit 8d25df3c72
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main.c
View File

@ -136,7 +136,8 @@ static enum sha256_algos opt_algo = ALGO_C;
static int nDevs; static int nDevs;
static int opt_g_threads = 2; static int opt_g_threads = 2;
static int gpu_threads; static int gpu_threads;
static int opt_n_threads = 1; static bool forced_n_threads;
static int opt_n_threads;
static int num_processors; static int num_processors;
static int scan_intensity = 4; static int scan_intensity = 4;
static char *rpc_url; static char *rpc_url;
@ -206,6 +207,12 @@ static char *set_int_0_to_14(const char *arg, int *i)
return set_int_range(arg, i, 0, 14); return set_int_range(arg, i, 0, 14);
} }
static char *force_nthreads_int(const char *arg, int *i)
{
forced_n_threads = true;
return set_int_range(arg, i, 0, 9999);
}
static char *set_int_0_to_10(const char *arg, int *i) static char *set_int_0_to_10(const char *arg, int *i)
{ {
return set_int_range(arg, i, 0, 10); return set_int_range(arg, i, 0, 10);
@ -262,7 +269,7 @@ static struct opt_table opt_config_table[] = {
#endif #endif
), ),
OPT_WITH_ARG("--cpu-threads|-t", OPT_WITH_ARG("--cpu-threads|-t",
set_int_0_to_9999, opt_show_intval, &opt_n_threads, force_nthreads_int, opt_show_intval, &opt_n_threads,
"Number of miner CPU threads"), "Number of miner CPU threads"),
OPT_WITHOUT_ARG("--debug|-D", OPT_WITHOUT_ARG("--debug|-D",
enable_debug, &opt_debug, enable_debug, &opt_debug,
@ -1444,10 +1451,8 @@ int main (int argc, char *argv[])
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
nDevs = clDevicesNum(); nDevs = clDevicesNum();
#endif #endif
/* Invert the value to determine if we manually set it in cmdline
* or disable gpu threads */
if (nDevs) if (nDevs)
opt_n_threads = - opt_n_threads; opt_n_threads = 0;
rpc_url = strdup(DEF_RPC_URL); rpc_url = strdup(DEF_RPC_URL);
@ -1471,11 +1476,9 @@ int main (int argc, char *argv[])
#endif #endif
gpu_threads = nDevs * opt_g_threads; gpu_threads = nDevs * opt_g_threads;
if (opt_n_threads < 0) { if (!gpu_threads && !forced_n_threads) {
if (gpu_threads) /* Maybe they turned GPU off; restore default CPU threads. */
opt_n_threads = 0; opt_n_threads = num_processors;
else
opt_n_threads = -opt_n_threads;
} }
if (!rpc_userpass) { if (!rpc_userpass) {