Luke Dashjr
|
1f020d34e5
Merge commit '383b42f' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
228151f3c0
Null-Merge commit '8feb302' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
a4110aed1d
Merge branch 'submit_async2' into bfgminer
|
13 years ago |
Luke Dashjr
|
df505a2f12
Suppress warning about "succeeded" not being used in finish_req_in_progress for now
|
13 years ago |
Luke Dashjr
|
25ccb5e2ea
Bugfix: Always give the get_work thread a curl, regardless of other outstanding curls in use
|
13 years ago |
Luke Dashjr
|
43ff9fbe9c
Bugfix: Failover after even a single job-request failure (or else it takes too long on timeouts)
|
13 years ago |
Luke Dashjr
|
88afbe9c26
Bugfix: Need to remove and re-add curl easy handles from multi to start a new request
|
13 years ago |
Luke Dashjr
|
defd976edb
Access total_submitting under mutex lock to avoid any potential races, and increment it as soon as we queue the submission up
|
13 years ago |
Luke Dashjr
|
202763a460
Just leave the submit_work thread running persistently
|
13 years ago |
Luke Dashjr
|
d6b71382f9
Merge commit 'ab0e800' into bfgminer
|
13 years ago |
Luke Dashjr
|
ab0e800a1c
Bugfix: Restore work->pool after prepare_rpc_req since clean_work now clears it
|
13 years ago |
Con Kolivas
|
383b42f23e
Set the pool lagging flag on startup to avoid it being shown initially, and only unset it once the maximum number of staged work items has been reached.
|
13 years ago |
Luke Dashjr
|
60e060c89c
Merge branch 'cg_merges_20121208' into bfgminer
|
13 years ago |
Luke Dashjr
|
6276c31f4e
Bugfix: Now that stage_work is trying to manipulate staged_work in the same thread, clone_available needs to stage it outside of its own lock
|
13 years ago |
Con Kolivas
|
8feb302945
Avoid recursive locking of the stgd lock.
|
13 years ago |
Con Kolivas
|
c59aeb56ff
Revert "Wake the getwork scheduler after every restart threads."
|
13 years ago |
Con Kolivas
|
31f75098b5
Selectively discard all work items if a longpoll or stratum restart is received without a new block to work on.
|
13 years ago |
Con Kolivas
|
5b03e7497d
Wake the getwork scheduler after every restart threads.
|
13 years ago |
Con Kolivas
|
15e5e36bcd
Return value of keep_sockalive is no longer used.
|
13 years ago |
Con Kolivas
|
8fcc67f308
Remove dependency on mstcpip.h for windows build by making curl version >= 7.25.0 mandatory on windows builds, and use curl functions for keepalive whenever possible instead.
|
13 years ago |
Luke Dashjr
|
c408f6b55c
Merge branch 'cgminer' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
2fcc8b4aea
Semi-Merge commit 'b53fa54' into cg_merges_20121208 (noop, warnings were already fixed)
|
13 years ago |
Luke Dashjr
|
3a5f130677
Merge commit '68f1b2c' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
3d94278203
Semi-Merge commit '30f6840' into cg_merges_20121208 (noop, already checked)
|
13 years ago |
Luke Dashjr
|
4b2d9224b8
Null-Merge commit 'c63916d' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
2d8d9592c8
Merge commit '67a9af6' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
fb9aca57c9
Merge commit '5c4c2d6' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
2f82adc82f
Merge commit 'fcb2653' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
7eea71e5b1
Merge commit '3d1e9f5' into cg_merges_20121208
|
13 years ago |
Luke Dashjr
|
58b659e176
Merge commit '927730a' into cg_merges_20121208 (uncaught conflict)
|
13 years ago |