Luke Dashjr
|
0054573b13
Correct API-README versions to match when BFGMiner included them
|
13 years ago |
Luke Dashjr
|
c6006ca364
Merge branch 'cgminer' into bfgminer
|
13 years ago |
Luke Dashjr
|
b7180e4fca
Merge commit 'd66742a' into bfgminer
|
13 years ago |
Luke Dashjr
|
694ab3dfeb
Merge commit 'c91a954' into bfgminer
|
13 years ago |
Luke Dashjr
|
3aa54372dd
Merge commit '07fca3e' into bfgminer
|
13 years ago |
Luke Dashjr
|
fc2725199f
(Already-Null-)Merge commit 'f27bcb8' into bfgminer
|
13 years ago |
ckolivas
|
2731622696
Don't make mandatory work and its clones last forever.
|
13 years ago |
Con Kolivas
|
391ce7097a
Merge pull request #291 from kanoi/minerphp
|
13 years ago |
Con Kolivas
|
011f822af2
Merge pull request #294 from kanoi/api
|
13 years ago |
Kano
|
c96c8eef9e
API-README update changelog
|
13 years ago |
Con Kolivas
|
d66742a8c1
Minimise locking and unlocking when getting counts by reusing shared mutex lock functions.
|
13 years ago |
Con Kolivas
|
c91a95459b
Avoid getting more work if by the time the getwork thread is spawned we find ourselves with enough work.
|
13 years ago |
Con Kolivas
|
07fca3e289
The bitforce buffer is cleared and hw error count incremented on return from a failed send_work already so no need to do it within the send_work function.
|
13 years ago |
Con Kolivas
|
f27bcb8ee5
Going back to e68ecf5eb275e1cc2dc22c7db35b0bd8d9c799de
|
13 years ago |
Con Kolivas
|
c892ded6e0
Make sure there are true pending staged work items as well in failover only mode.
|
13 years ago |
Con Kolivas
|
61003df49f
In failover-only mode we need to queue enough work for the local pool and ignore the total queued count.
|
13 years ago |
Con Kolivas
|
65f4e2af3e
The bitforce buffer is cleared and hw error count incremented on return from a failed send_work already so no need to do it within the send_work function.
|
13 years ago |
Luke Dashjr
|
b7e78c9aad
Merge branch 'mm_dbg_nonces' into bfgminer
|
13 years ago |
Luke Dashjr
|
2f3eda7c37
modminer: Log debug info for nonces found
|
13 years ago |
Con Kolivas
|
8aa61f6626
Make sure we have work from the current pool somewhere in the queue in case the queue is full of requests from a pool that has just died.
|
13 years ago |
Con Kolivas
|
c0aaf56a8d
Since all the counts use the same mutex, grab it only once.
|
13 years ago |
Con Kolivas
|
4f9394be81
When popping work, grab cloned work first if possible since original work can be reused to make further clones.
|
13 years ago |
Con Kolivas
|
8085ae6854
Further simplify the queue request mechanism.
|
13 years ago |
Con Kolivas
|
f83863a996
Keep total queued count as a fake pending staged count to account for the period a queue is in flight before it is staged.
|
13 years ago |
Luke Dashjr
|
3a1e71144f
Bump version to 2.6.4
|
13 years ago |
Luke Dashjr
|
8b995234ba
Merge branch 'bugfix_cancel_mutex' into bfgminer
|
13 years ago |
Luke Dashjr
|
3ba87a7945
Bugfix: Define my_cancellable_getch in miner.h
|
13 years ago |
Luke Dashjr
|
f99362da7f
Merge remote-tracking branch 'kanoi/main' into bfgminer
|
13 years ago |
Luke Dashjr
|
5e6a4e28ff
Merge remote-tracking branch 'kanoi/minerphp' into bfgminer
|
13 years ago |
Luke Dashjr
|
f98bbbffaa
Merge branch 'bugfix_submitting_mutexinit' into bfgminer
|
13 years ago |