upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorbitflash-maintainer <noreply@bitflash.invalid>2026-08-19 22:46:53 +0000
committerbitflash-maintainer <noreply@bitflash.invalid>2026-08-19 22:48:27 +0000
commitbe63e83d79e7e00e6b8ca889a70e6a19886aa1d8 (patch)
treedddbb629a288d4fdf8f4f145454ff70517b5a852 /src/main.cpp
parentad41b7a151f2f4b7f483dfc8c6eae74d8292f97a (diff)
mine: one pool session in participant mode, not one per core
StartMinerThreads() sizes its pool with MinerThreadCount(), which is right for solo mining -- each thread hashes a template of its own -- and wrong for participant mode, where every thread entering BitcoinMiner() is a whole miner: its own Stratum session, its own payout address off the rotation, its own pool of /hashthreads workers. The two counts multiplied instead of dividing. Measured on the pool box with /hashthreads=2: a container with no cpuset logged "Mining with 11 thread(s) of 12 core(s)" -- 11 sessions, 22 hash threads on 12 cores, 1058% CPU, load 22.68 -- while the same binary under --cpuset-cpus 10,11 logged one session and 199%. The second miner (8 cores, /hashthreads=1) ran 7 sessions and went 74C to 89C. No code differed between those runs. Only the cpuset did, which means the cpuset was holding the thread count down by accident and every deployment without one was oversubscribed. Participant mode now starts exactly one session, so /hashthreads means what it says instead of being multiplied by the core count. The worker count moves to ParticipantHashThreadCount(), next to MinerThreadCount() where the two are easy to confuse, so what is printed at startup and what actually hashes cannot drift apart -- and it IS printed now. It was only ever visible under -debug, which is how eleven sessions ran unnoticed. Same host, same cpuset (0-3), same arguments, measured as a delta over 20 s more than four minutes after start: before 399% CPU, 6-7 threads hot, 3 sessions after 201% CPU, exactly 2 threads at 99.9%, 1 session Solo mining is untouched: /gen without /participant still starts MinerThreadCount() threads. (cherry picked from commit 45bc9ed5bc132712092f3e7902fef746c6cae898)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp32
1 files changed, 25 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index efff96c..77aba89 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,6 +170,26 @@ int MinerThreadCount()
170 return (int)(nCores - 1); 170 return (int)(nCores - 1);
171} 171}
172 172
173// Hash threads one participant session runs.
174//
175// Explicit /hashthreads=N is honored exactly, including 1 -- a miner who says
176// one means one. Automatic leaves a core to the node, the Stratum I/O loop and
177// everything else the process still has to do, for the same reason
178// MinerThreadCount() does.
179//
180// Lives here, next to that function, because the two are easy to confuse and
181// StartMinerThreads() needs to be able to tell them apart: only ONE session
182// runs in participant mode, and this is what sizes it.
183int ParticipantHashThreadCount()
184{
185 if (nHashThreads > 0)
186 return nHashThreads;
187 int nWorkers = (int)AvailableCoreCount();
188 if (nWorkers < 2)
189 nWorkers = 2;
190 return nWorkers - 1;
191}
192
173bool AddKey(const CKey& key) 193bool AddKey(const CKey& key)
174{ 194{
175 if (IsWalletEncrypted()) 195 if (IsWalletEncrypted())
@@ -3828,13 +3848,11 @@ connected:
3828 // shared dataset), then run the I/O loop below: receive pool messages, 3848 // shared dataset), then run the I/O loop below: receive pool messages,
3829 // publish jobs to the threads, submit the shares they find. 3849 // publish jobs to the threads, submit the shares they find.
3830 // ------------------------------------------------------------------ 3850 // ------------------------------------------------------------------
3831 int nWorkers = nHashThreads > 0 ? nHashThreads 3851 // One count, decided in one place (main.cpp:MinerThreadCount's neighbour),
3832 : (int)AvailableCoreCount(); 3852 // so that what StartMinerThreads() reports at startup and what actually
3833 if (nHashThreads <= 0) { 3853 // hashes here can never drift apart. Explicit /hashthreads=N is honored
3834 if (nWorkers < 2) nWorkers = 2; 3854 // exactly, including 1; automatic leaves one core for node + I/O threads.
3835 nWorkers -= 1; // leave one core for node + I/O threads 3855 int nWorkers = ParticipantHashThreadCount();
3836 }
3837 // explicit /hashthreads=N is honored exactly (including 1)
3838 ParticipantJobShared jobShared; 3856 ParticipantJobShared jobShared;
3839 std::vector<ParticipantShareHit> shareHits; 3857 std::vector<ParticipantShareHit> shareHits;
3840 std::mutex shareHitsMtx; 3858 std::mutex shareHitsMtx;