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
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
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
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
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
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
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
Con Kolivas
bf3e15838f
Fix sign warning.
2012-06-14 21:36:23 +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
ceec3f83c3
Check for strategy being changed to load balance when enabling LPs.
2012-06-14 20:36:17 +10: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
Paul Sheppard
2d1f961046
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-06-14 00:05:31 -07: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
Paul Sheppard
b94e199649
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
2012-06-13 17:31:20 -07:00
Paul Sheppard
eff2d04df0
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
...
Conflicts:
cgminer.c
2012-06-13 12:31:33 -07:00
Luke Dashjr
4eb23c7ea3
Bugfix: slay a variety of warnings
2012-06-13 17:03:26 +00:00
Paul Sheppard
2384d0fbc6
Removed idle mode... again!?
...
Changed work_reset rate to every 100ms & use defines rather than numerics.
Change total sleep time to 4300ms after performance testing/measurement (now good to 916MH/s).
Changed timeout to 15s - Throttle time is 15s.
Added support for 'Busy' when submitting work.
Improved logging text to include device identifier.
Added a thread_enable api function, called when a thread is re-enabled.
... and removed useless re-init inside scanhash.
Use modminer introduced mutex.
2012-06-12 18:20:18 -07:00
Luke Dashjr
a78d616bc5
modminer: Temperature sensor improvements
...
Display the temperature of each of the (up to) 4 FPGAs
2012-06-12 17:04:03 +00:00
Paul Sheppard
861388f960
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
2012-06-12 09:04:42 -07:00
Luke Dashjr
76f96f4717
New driver: BTCFPGA ModMiner
2012-06-12 02:38:36 +00:00
Luke Dashjr
d3fa59d76f
Abstract generally useful FPGA code into fpgautils.c
2012-06-12 02:35:45 +00:00
Paul Sheppard
bf4d6c3483
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
2012-06-11 13:36:35 -07:00
Paul Sheppard
4889d7ecb2
Merge branch 'master' of git@github.com:pshep/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-06-11 13:09:27 -07:00
Paul Sheppard
820d662c9d
Removed idle mode.
...
Added watchdog thread BFL temperature monitoring.
2012-06-10 23:11:59 -07:00
Paul Sheppard
ebeaf15f18
Added idle mode
...
Idle is only set by pgadisable, so GPU/CPU is unaffected.
For Icarus/Ztex, in scanhash the thread is immediately set disabled then returns.
2012-06-09 19:30:32 -07:00
Kano
fdcd72b9ae
API add stats for pool getworks
2012-06-10 11:19:21 +10:00
Paul Sheppard
7f54adb4c9
Merge remote-tracking branch 'upstream/master'
2012-06-08 19:48:42 -07:00
Kano
3cb3f09a50
API save default config file if none specified
2012-05-31 23:18:55 +10:00
Con Kolivas
84064a2b1e
Must unlock mutex within loop.
2012-05-31 19:25:33 +10:00
Con Kolivas
85bddde1c0
Must unlock mutex after waking up on pthread conditional.
2012-05-31 19:20:40 +10:00
Con Kolivas
598476cae1
Merge pull request #204 from kanoi/icarus-timer
...
Icarus: high accuracy timing and other bitstream speed support
2012-05-30 18:02:00 -07:00
Con Kolivas
624948e246
Open a longpoll connection if a pool is in the REJECTING state as it's the only way to re-enable it automatically.
2012-05-31 09:44:51 +10:00
Con Kolivas
2586bda59a
Use only one longpoll as much as possible by using a pthread conditional broadcast that each longpoll thread waits on and checks if it's the current pool before opening its longpoll connection.
2012-05-31 09:40:32 +10:00
Con Kolivas
5c3a252b6d
Merge branch 'master' of github.com:ckolivas/cgminer
2012-05-31 08:42:46 +10:00
