Con Kolivas
790acad9f9
Further simplify the total_queued counting mechanism and do all dec_queued from the one location.
2012-06-24 21:42:34 +10:00
Con Kolivas
9bae0f1674
Merge branch 'master' of github.com:ckolivas/cgminer
2012-06-24 21:01:12 +10:00
Con Kolivas
b20089fdb7
Take into account total_queued as well when deciding whether to queue a fresh request or not.
2012-06-24 20:59:55 +10:00
Con Kolivas
8f333d9019
Merge pull request #232 from kanoi/master
...
api.c display Pool Av in json
2012-06-24 03:51:45 -07:00
Con Kolivas
ded16838db
Add the getwork delay time instead of subtracting it when determining if a share is stale.
2012-06-24 20:48:02 +10:00
Con Kolivas
b5757d124b
Don't count getwork delay when determining if shares are stale.
2012-06-24 20:45:47 +10:00
Con Kolivas
9f811c528f
Simplify the total_queued count to those staged not cloned and remove the locking since it's no longer a critical value.
...
Clone only anticipated difference sicne there will be a lag from the value returned by requests_staged().
Keep 1/3 buffer of extra work items when ageing them.
2012-06-24 20:38:40 +10:00
Con Kolivas
411784a99d
As work is sorted by age, we can discard the oldest work at regular intervals to keep only 1 of the newest work items per mining thread.
2012-06-24 19:53:31 +10:00
Con Kolivas
359635a8cf
Only roll enough work to have one staged work for each mining thread.
2012-06-24 18:44:09 +10:00
Con Kolivas
0c970bbd1c
Roll work again after duplicating it to prevent duplicates on return to the clone function.
2012-06-24 18:22:20 +10:00
Con Kolivas
610302afcb
Abstract out work cloning and clone $mining_threads copies whenever a rollable work item is found and return a clone instead.
2012-06-24 18:10:17 +10:00
Kano
195d915a6c
api.c display Pool Av in json
2012-06-24 16:31:11 +10:00
Con Kolivas
a8ae1a43ea
Rolltime should be used as the cutoff time for primary work as well as the rolled work, if present.
2012-06-24 14:38:31 +10:00
Con Kolivas
c20a89d998
Take into account average getwork delay as a marker of pool communications when considering work stale.
2012-06-24 14:20:29 +10:00
Con Kolivas
f32ffb8718
Work out a rolling average getwork delay stored in pool_stats.
2012-06-24 13:20:17 +10:00
Con Kolivas
4e60a62ae2
Getwork delay in stats should include retries for each getwork call.
2012-06-24 12:55:56 +10:00
ckolivas
8c4b11f276
Merge branch 'master' of https://github.com/ckolivas/cgminer
2012-06-24 00:41:03 +10:00
ckolivas
eb36f8d271
Walk through the thread list instead of searching for them when disabling threads for dynamic mode.
2012-06-24 00:12:11 +10:00
Con Kolivas
8d3eeed2e9
Merge with master
2012-06-23 23:54:05 +10:00
ckolivas
6a45cbbdfb
Merge branch 'master' of https://github.com/ckolivas/cgminer
2012-06-23 23:45:08 +10:00
ckolivas
c5a21fabf0
Extend nrolltime to support the expiry= parameter. Do this by turning the rolltime bool into an integer set to the expiry time. If the pool supports rolltime but not expiry= then set the expiry time to the standard scantime.
2012-06-23 23:43:22 +10:00
Con Kolivas
057a38eb1c
When disabling fanspeed monitoring on adl failure, remove any twin GPU association. This could have been leading to hangs on machines with dual GPU cards when ADL failed.
2012-06-22 13:38:47 +10:00
Con Kolivas
d594aaf80f
Merge pull request #227 from luke-jr/serialusb
...
FPGA - allow device detect override without an open failure
2012-06-19 04:42:32 -07:00
Con Kolivas
f70577b097
Merge pull request #229 from luke-jr/modminer_primary
...
modminer: Don't delay 2nd+ FPGAs during work restart
2012-06-19 04:38:49 -07:00
Luke Dashjr
1215da39ee
modminer: Don't delay 2nd+ FPGAs during work restart
...
Add primary_thread boolean to threads to identify a single one as the "primary" thread for shared-resource multithreading.
This is needed since ModMiners use multiple threads to interface with independent hashing components.
2012-06-18 05:51:09 +00:00
Con Kolivas
0c8eb166bc
Merge pull request #228 from pshep/disable_ocl
...
Disable OpenCL code when not available.
2012-06-17 04:06:38 -07:00
Paul Sheppard
7ae22e21e3
Disable OpenCL code when not available.
2012-06-16 20:24:40 -07:00
Con Kolivas
8faf3c90b8
Fix openwrt crashing on regeneratehash() by making check_solve a noop.
2012-06-16 09:22:11 +10:00
Kano
4dee0d049c
FPGA - allow device detect override without an open failure
2012-06-14 15:10:02 +00:00
Con Kolivas
3c0544ad55
Wordwrap NEWS.
2012-06-14 21:43:26 +10:00
Con Kolivas
bf3e15838f
Fix sign warning.
2012-06-14 21:36:23 +10:00
Con Kolivas
f462c082f8
Merge branch 'master' of github.com:ckolivas/cgminer
2012-06-14 21:28:33 +10:00
Con Kolivas
f72ed3b660
Bump version to 2.4.3
2012-06-14 21:25:59 +10:00
Con Kolivas
a668f74e64
Fix fpgautils.h distfail.
2012-06-14 21:25:59 +10:00
Con Kolivas
edb9780a19
Update NEWS.
2012-06-14 21:04:43 +10:00
Con Kolivas
83bf9f4334
can_roll and should_roll should have no bearing on the cycle period within the miner_thread so remove it.
2012-06-14 20:53:07 +10:00
Con Kolivas
2c2e36534c
Merge pull request #226 from kanoi/master
...
miner.php allow a separate user settings file
2012-06-14 03:40:18 -07:00
Kano
4e8779053d
miner.php allow a separate user settings file
2012-06-14 20:36:54 +10:00
Con Kolivas
ceec3f83c3
Check for strategy being changed to load balance when enabling LPs.
2012-06-14 20:36:17 +10:00
Con Kolivas
30bb3c62a6
Merge pull request #224 from kanoi/master
...
API add ModMinerQuad support
2012-06-14 02:38:24 -07:00
Con Kolivas
b0de3edeb8
Check that all threads on the device that called get_work are waiting on getwork before considering the pool lagging.
2012-06-14 17:28:24 +10:00
Con Kolivas
44f5d55d51
Iterate over each thread belonging to each device in the hashmeter instead of searching for them now that they're a list.
2012-06-14 17:16:37 +10:00
Con Kolivas
6e2c12eeb0
When using rotate pool strategy, ensure we only select from alive enabled pools.
2012-06-14 16:11:29 +10:00
Con Kolivas
79f4b570f7
Start longpoll from every pool when load balance strategy is in use.
2012-06-14 15:58:18 +10:00
Con Kolivas
dbe9056df4
Add mandatory and block fields to the work struct. Flag any shares that are detected as blocks as mandatory to submit, along with longpoll work from a previously rejecting pool.
2012-06-14 15:42:43 +10:00
Con Kolivas
1e3888336b
Consider the fan optimal if fanspeed is dropping but within the optimal speed window.
2012-06-14 11:24:32 +10:00
Con Kolivas
55e3217237
Merge pull request #225 from drizztbsd/patch-1
...
Fix typo in some API messages (succeess/success)
2012-06-13 17:20:53 -07:00
Con Kolivas
8f76d15fae
Merge pull request #223 from luke-jr/bugfix_warnings
...
Fix a bunch of warnings
2012-06-13 17:16:27 -07:00
drizztbsd
7dcd9f3ed2
Fix typo in some API messages (succeess/success)
2012-06-13 20:31:03 +03:00
Kano
836b76a0d6
api.c MMQ stat bugs
2012-06-14 03:14:02 +10:00
