1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-01 18:55:36 +00:00
Commit Graph

150 Commits

Author SHA1 Message Date
Con Kolivas
44726324c2 More style police on bitforce. 2012-07-03 11:09:33 +10:00
Con Kolivas
8783db0dc3 Do all logging outside of the bitforce mutex locking to avoid deadlocks. 2012-07-03 11:01:57 +10:00
Con Kolivas
0f405c7c18 Remove applog call from bfwrite to prevent grabbing nested mutexes. 2012-07-03 10:59:37 +10:00
Con Kolivas
978ec0d805 Bitforce style changes. 2012-07-03 10:58:30 +10:00
Paul Sheppard
ad5b470b04 Fine-tune timing adjustment.
Also remove old work_restart timing.
2012-07-02 14:27:19 -07:00
Paul Sheppard
ce850883e7 Merge branch 'master' of git://github.com/ckolivas/cgminer.git
Conflicts:
	driver-bitforce.c
2012-07-01 23:39:09 -07:00
Paul Sheppard
cc0ad5eaa7 Merge branch 'master' of git://github.com/ckolivas/cgminer.git
Conflicts:
	driver-bitforce.c
2012-07-01 23:35:06 -07:00
ckolivas
391e1f7eb1 Restart is zeroed in the mining thread so no need to do it inside the bitforce code. 2012-07-02 16:13:53 +10:00
Paul Sheppard
04a6c3b188 More improvements to comms.
BFL return nothing when throttling, so should not be considered an error. Instead repeat with a longer delay.
2012-07-01 21:47:18 -07:00
ckolivas
efcce5bbb8 Remove unused tdiff value. 2012-07-02 11:30:20 +10:00
ckolivas
b1cdacdead Polling every 10ms there's not much point checking the pthread_cond_timedwait as it just adds overhead. Simply check the value of work_restart in the bfl main polling loop. 2012-07-02 11:28:26 +10:00
ckolivas
fd7b21ed56 Use a pthread conditional that is broadcast whenever work restarts are required. Create a generic wait function waiting a specified time on that conditional that returns if the condition is met or a specified time passed to it has elapsed. Use this to do smarter polling in bitforce to abort work, queue more work, and check for results to minimise time spent working needlessly. 2012-07-02 10:54:20 +10:00
Paul Sheppard
855d1bb3e3 Add busy time to wait time. 2012-07-01 17:35:53 -07:00
Paul Sheppard
a11a322ba6 Add tiny delay after writing to BFL
Change BFL errors to something more human readable
Send work busy re-tries after 10ms delay
2012-06-30 20:45:08 -07:00
Paul Sheppard
adc26f0e3f Add facility to clear BFL read buffer.
Reduce timeout to 10s.
2012-06-29 17:20:57 -07:00
Paul Sheppard
75a651c13f Revert "Check for submit_stale before checking for work_restart"
Makes no sense to continue working on the old block whether submit_stale is enabled or not.
2012-06-28 16:08:10 -07:00
Paul Sheppard
f225392990 Add low hash threshold in sick/dead processing
Add check for fd in comms procedures
2012-06-28 08:20:45 -07:00
Paul Sheppard
01a7e912c8 Lock comms around entire bitforce_init, and move setting of fd to end.
Make sleep occur everytime in scanhash.
2012-06-27 08:25:25 -07:00
Paul Sheppard
d3e2b62c54 Change sick/dead processing to use device pointer, not gpu array.
Change BFL timing to adjust only when hashing complete (not error/idle etc.).
2012-06-26 14:45:48 -07:00
Paul Sheppard
1ef52e0bac Check for submit_stale before checking for work_restart
(to keep Kano happy)
2012-06-25 19:23:10 -07:00
Paul Sheppard
f149aea91e Redo recover removal.
FML.
2012-06-25 10:33:18 -07:00
Paul Sheppard
90d82aa61d Revert to pre pool merge 2012-06-25 10:27:08 -07:00
Paul Sheppard
50e996c753 Get rid of recover mode. Not useful at all.
Change zero hash to no start error. Neither is accurate, but zero hash makes less sense than no start.
2012-06-25 10:01:34 -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
Paul Sheppard
68f2aaf930 fix bitforce_init return value
Also add filename as kernel name
2012-06-15 16:43:05 -07:00
Kano
4dee0d049c FPGA - allow device detect override without an open failure 2012-06-14 15:10:02 +00:00
Paul Sheppard
4fd53c9eb1 thread init fix 2012-06-14 00:04:37 -07:00
Paul Sheppard
2ec612e0b4 Added startup delay to worker threads.
Prevents devices from making calls at the same time.
2012-06-13 17:26:37 -07:00
Paul Sheppard
1b63a75d2c Simple auto sleep-time calibration.
Optimises the sleep time while waiting for the BFL work to finish.
Takes ~5 mins to settle to the correct time for each unit, then will continue to make adjustments.
2012-06-13 12:26:03 -07: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
Paul Sheppard
861388f960 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-12 09:04:42 -07:00
Luke Dashjr
d3fa59d76f Abstract generally useful FPGA code into fpgautils.c 2012-06-12 02:35:45 +00:00
Paul Sheppard
2dd7c4e1c0 Added checking of work_reset while waiting for BFL to return results 2012-06-11 13:17:59 -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
036a97c21a Added bitforce init and shutdown.
bitforce_init closes/reopens the com port and re-initialises the unit.
2012-06-09 20:03:18 -07:00
Paul Sheppard
ec394533a2 Idle mode for bitforce 2012-06-09 19:47:54 -07:00
Paul Sheppard
ed06c97e2e Added 30s BFL hashing timeout 2012-06-09 19:12:29 -07:00
Paul Sheppard
652326c2a1 Scanhash split into separate functions
Some adjustment of log reporting
2012-06-09 19:08:10 -07:00
Paul Sheppard
8d2936730b Fix return values 2012-05-22 15:35:10 -07:00
Paul Sheppard
cebd647f50 Messing with BFL code 2012-05-22 08:10:00 -07:00
Paul Sheppard
4db47aa57a Return error if BFL take longer then 10s 2012-05-18 17:41:18 -07:00
Luke Dashjr
06023e549e Bugfix: Return failure, rather than quit, if BFwrite fails 2012-05-03 10:49:42 +10:00
Kano
20676694f3 Ensure everyone sees the same screen/api name as the previous version for Bitforce 2012-04-23 18:07:13 +10:00
Luke Dashjr
0f74ba059e Implement and document "-S noauto" to inhibit autoscanning without specifying a serial device 2012-04-22 01:03:38 -04:00
Luke Dashjr
b8778839e9 Merge branch 'master' into unify_drivers
Conflicts:
	cgminer.c
2012-04-21 02:36:19 -04:00
Luke Dashjr
f05a319e01 CGPU API for device names 2012-03-18 21:32:01 -04:00
Luke Dashjr
303dbf4664 Abstract add_cgpu function, to handle device id numbering and devices array 2012-03-18 20:09:03 -04:00
Luke Dashjr
e131dfab31 Unify drivers as driver-*.c and add driver name to API 2012-03-13 12:18:23 -04:00