Commit 063adc6434c3cf8e50065e1078928b24e5e5727a
2011-06-26T12:59:15
Implement runtime selectable numbers of GPU threads and rename CPU threads option.
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 103 104 105 106 107 108 109
diff --git a/cpu-miner.c b/cpu-miner.c
index 3bf7d65..03afedf 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -160,10 +160,6 @@ static struct option_help options_help[] = {
{ "help",
"(-h) Display this help text" },
- { "config FILE",
- "(-c FILE) JSON-format configuration file (default: none)\n"
- "See example-cfg.json for an example configuration." },
-
{ "algo XXX",
"(-a XXX) Specify sha256 implementation:\n"
"\tc\t\tLinux kernel sha256, implemented in C (default)"
@@ -182,17 +178,24 @@ static struct option_help options_help[] = {
#endif
},
- { "quiet",
- "(-q) Disable per-thread hashmeter output (default: off)" },
+ { "config FILE",
+ "(-c FILE) JSON-format configuration file (default: none)\n"
+ "See example-cfg.json for an example configuration." },
+
+ { "cpu-threads N",
+ "(-t N) Number of miner CPU threads (default: number of processors or 0 if GPU mining)" },
{ "debug",
"(-D) Enable debug output (default: off)" },
+ { "gpu-threads N",
+ "(-g N) Number of threads per-GPU (1 - 10, default: 2)" },
+
{ "intensity",
"(-I) Intensity of scanning (0 - 10, default 4)" },
{ "log",
- "(-l) Interval in seconds between log output (default 5)" },
+ "(-l) Interval in seconds between log output (default: 5)" },
{ "ndevs",
"(-n) Display number of detected GPUs" },
@@ -200,9 +203,16 @@ static struct option_help options_help[] = {
{ "no-longpoll",
"Disable X-Long-Polling support (default: enabled)" },
+ { "pass PASSWORD",
+ "(-p PASSWORD) Password for bitcoin JSON-RPC server "
+ "(default: " DEF_RPC_PASSWORD ")" },
+
{ "protocol-dump",
"(-P) Verbose dump of protocol-level activities (default: off)" },
+ { "quiet",
+ "(-q) Disable per-thread hashmeter output (default: off)" },
+
{ "retries N",
"(-r N) Number of times to retry, if JSON-RPC call fails\n"
"\t(default: 10; use -1 for \"never\")" },
@@ -220,9 +230,6 @@ static struct option_help options_help[] = {
"Use system log for output messages (default: standard error)" },
#endif
- { "threads N",
- "(-t N) Number of miner CPU threads (default: number of processors or 0 if GPU mining)" },
-
{ "url URL",
"URL for bitcoin JSON-RPC server "
"(default: " DEF_RPC_URL ")" },
@@ -241,14 +248,13 @@ static struct option_help options_help[] = {
{ "worksize N",
"(-w N) Override detected optimal worksize (default: detected)" },
- { "pass PASSWORD",
- "(-p PASSWORD) Password for bitcoin JSON-RPC server "
- "(default: " DEF_RPC_PASSWORD ")" },
};
static struct option options[] = {
{ "algo", 1, NULL, 'a' },
{ "config", 1, NULL, 'c' },
+ { "cpu-threads", 1, NULL, 't' },
+ { "gpu-threads", 1, NULL, 'g' },
{ "debug", 0, NULL, 'D' },
{ "help", 0, NULL, 'h' },
{ "intensity", 1, NULL, 'I' },
@@ -258,7 +264,6 @@ static struct option options[] = {
{ "pass", 1, NULL, 'p' },
{ "protocol-dump", 0, NULL, 'P' },
{ "quiet", 0, NULL, 'q' },
- { "threads", 1, NULL, 't' },
{ "retries", 1, NULL, 'r' },
{ "retry-pause", 1, NULL, 'R' },
{ "scantime", 1, NULL, 's' },
@@ -1128,6 +1133,13 @@ static void parse_arg (int key, char *arg)
}
break;
}
+ case 'g':
+ v = atoi(arg);
+ if (v < 1 || v > 10)
+ show_usage();
+
+ opt_g_threads = v;
+ break;
case 'D':
opt_debug = true;
break;