Con Kolivas
ebaa615f6d
Count extra cloned work in the total queued count.
2012-06-24 22:16:04 +10:00
Con Kolivas
74cd6548a9
Use a static base measurement difference of how many items to clone since requests_staged may not climb while rolling.
2012-06-24 22:00:37 +10:00
Con Kolivas
7b57df1171
Allow 1/3 extra buffer of staged work when ageing it.
2012-06-24 21:58:52 +10:00
Con Kolivas
53269a97f3
Revert "Simplify the total_queued count to those staged not cloned and remove the locking since it's no longer a critical value."
...
This reverts commit 9f811c528f
2012-06-24 21:57:49 +10:00
Con Kolivas
a05c8e3fd9
Revert "Take into account total_queued as well when deciding whether to queue a fresh request or not."
...
This reverts commit b20089fdb7
2012-06-24 21:57:18 +10:00
Con Kolivas
750474bcfb
Revert "Further simplify the total_queued counting mechanism and do all dec_queued from the one location."
...
This reverts commit 790acad9f9
2012-06-24 21:56:53 +10:00
Con Kolivas
d2c1a6bd6b
Revert "Make sure to have at least one staged work item when deciding whether to queue another request or not and dec queued in free work not discard work."
...
This reverts commit c860172275
2012-06-24 21:56:36 +10:00
Con Kolivas
c860172275
Make sure to have at least one staged work item when deciding whether to queue another request or not and dec queued in free work not discard work.
2012-06-24 21:52:07 +10:00
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
Paul Sheppard
6ce4871b94
Merge branch 'conf_pools'
2012-06-20 15:49:51 -07:00
Paul Sheppard
0bcdc2cac4
Add ability to disable pools in config file.
...
Also fix pool writing in priorty order.
2012-06-20 15:49:07 -07:00
Paul Sheppard
57fa2be13b
Write pools in priority order
2012-06-20 11:40:28 -07:00
Paul Sheppard
e037028159
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-06-19 10:40:00 -07:00
Paul Sheppard
9bc95ab30b
Comms error trapping
...
Comms error will not disable the device permanently but put it in to
recovery mode. Here it will attempt to be re-initialised after 60s.
2012-06-19 10:36:24 -07: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
Paul Sheppard
af27b40e34
Merge branch 'master' of https://github.com/pshep/cgminer.git
2012-06-17 09:47:02 -07:00
Paul Sheppard
fe4c0869bf
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
cgminer.c
2012-06-17 09:44:42 -07: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
Paul Sheppard
68f2aaf930
fix bitforce_init return value
...
Also add filename as kernel name
2012-06-15 16:43:05 -07:00
Con Kolivas
8faf3c90b8
Fix openwrt crashing on regeneratehash() by making check_solve a noop.
2012-06-16 09:22:11 +10:00
Paul Sheppard
6ed75c96cb
Remove nDev limit in watchdog_thread
...
Can't work out why it was even there... so there could still be a reason
for it!
2012-06-15 12:11:28 -07:00
Paul Sheppard
fa3f357fc1
Sick/dead handling for non-gpus
2012-06-14 17:36:59 -07:00
Paul Sheppard
bc4a259af7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-06-14 08:13:07 -07: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
