Con Kolivas
7046c976bc
Attempt to initialise while bitforce device returns BUSY.
2012-07-04 16:51:55 +10:00
Con Kolivas
ac8db06e46
Extend length of string that can be passed to BFL devices.
2012-07-04 16:41:28 +10:00
Con Kolivas
8b3c20bc06
Abstract out ms to timeval as a function.
2012-07-04 16:28:51 +10:00
Con Kolivas
93a7967ecb
Fix signedness warning.
2012-07-04 15:22:05 +10:00
Con Kolivas
6b11d4e4cc
Merge pull request #252 from pshep/master
...
More timing changes
2012-07-03 22:19:41 -07:00
Con Kolivas
67e92de18c
Adjust device width column to be consistent.
2012-07-04 15:16:39 +10:00
Con Kolivas
ce93c2fc62
Use cgpu-> not gpus[] in watchdog thread.
2012-07-04 14:40:02 +10:00
Paul Sheppard
c4870676c4
Add api stats (sleep time)
2012-07-03 10:40:02 -07:00
Paul Sheppard
6e6029de99
Timing tweaks
...
Added long and short timeouts, short for detecting throttling, long to give up totally.
Reset sleep time when device re-initialised
Still check results after timeout
Back up a larger time if result on first poll.
2012-07-03 10:22:11 -07:00
Con Kolivas
454607c30c
Merge pull request #251 from kanoi/notifycomms
...
Add API Notify counter 'Comms Error'
2012-07-02 21:52:58 -07:00
Kano
ff0afb94ec
Add API Notify counter 'Comms Error'
2012-07-03 13:14:30 +10:00
Con Kolivas
732783faa6
Merge branch 'bfl'
...
Conflicts:
miner.h
2012-07-03 11:35:58 +10:00
Con Kolivas
8b050083a0
Style police on api.c
2012-07-03 11:32:42 +10:00
Con Kolivas
2ec0fb9793
Merge pull request #247 from kanoi/master
...
api.c data structure + updated get_api_stats/driver-icarus.c
2012-07-02 18:26:18 -07:00
Con Kolivas
44726324c2
More style police on bitforce.
2012-07-03 11:09:33 +10:00
Con Kolivas
7ada258bbf
Merge branch 'master' into bfl
2012-07-03 11:04:44 +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
Con Kolivas
610cf0f0a5
Minor style changes.
2012-07-03 10:48:42 +10:00
Con Kolivas
336dbd5c98
Remove needless roundl define.
2012-07-03 10:44:59 +10:00
Con Kolivas
9d37d33df1
Merge branch 'master' of https://github.com/pshep/cgminer into bfl
2012-07-03 10:32:33 +10:00
Con Kolivas
6bbd753c06
Merge pull request #249 from iHateInventNames/master
...
Made JSON error message verbose.
2012-07-02 16:53:54 -07:00
Sergei Krivonos
aaa9f62b3e
Made JSON error message verbose.
2012-07-03 01:01:37 +03:00
Paul Sheppard
ad5b470b04
Fine-tune timing adjustment.
...
Also remove old work_restart timing.
2012-07-02 14:27:19 -07:00
Paul Sheppard
75519cb04b
Merge branch 'master' of git@github.com:pshep/cgminer.git
2012-07-02 14:26:11 -07:00
ckolivas
66e7dc700d
Check for gpu return times of >= 0, not just 0, to fix intensity dropping to -10.
2012-07-02 16:51:52 +10: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
ckolivas
ac45260e18
Random style cleanups.
2012-07-02 16:12:35 +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
06ec47b3bd
Must always unlock mutex after cond timedwait.
2012-07-02 12:45:16 +10:00
ckolivas
df5d196f9a
Must unlock mutex if pthread_cond_wait succeeds.
2012-07-02 12:37:15 +10: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
Kano
c8535133aa
api.c put version up to 1.14
2012-07-01 15:29:41 +10:00
Kano
080e8b24c3
API-README correct for 2.4.4
2012-07-01 15:28:27 +10:00
Paul Sheppard
a4a2000cc0
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-06-30 20:45:56 -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
ckolivas
2e0a94db21
Bump version number to 2.4.4
2012-07-01 12:17:48 +10:00
ckolivas
1a43f79547
Mingw doesn't support asprintf, use sprintf.
2012-07-01 12:02:10 +10:00
ckolivas
830f2902b9
Numerous style police clean ups in cgminer.c
2012-07-01 11:09:06 +10:00
ckolivas
1e9421475c
Timersub is supported on all build platforms so do away with custom timerval_subtract function.
2012-07-01 10:44:23 +10:00
ckolivas
75ea616422
Minor style police on util.c
2012-07-01 10:35:08 +10:00
ckolivas
a35f67aaf5
Update NEWS.
2012-07-01 10:28:20 +10:00
ckolivas
8f954d40ec
Get rid of unused result warning with asprintf.
2012-07-01 10:17:12 +10:00
Paul Sheppard
efaa7398fb
Tweak sick/dead logic
...
(remove pre-computed time calculations)
2012-06-30 11:59:53 -07:00