1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 15:27:53 +00:00
Commit Graph

2842 Commits

Author SHA1 Message Date
Kano
95dff7363e API allow display/change failover-only setting 2012-08-14 12:54:27 +10:00
Con Kolivas
74f21129a6 Merge branch 'master' of github.com:ckolivas/cgminer 2012-08-14 09:14:37 +10:00
Con Kolivas
8e20456bc0 Check we are not lagging as well as there is enough work in getwork. 2012-08-14 09:13:59 +10:00
Con Kolivas
618ef0c801 Merge pull request #295 from kanoi/api
miner.php documentation (in API-README) v0.1
2012-08-12 17:33:25 -07:00
Kano
cf66ef871e API-README correction 6 2012-08-13 10:31:17 +10:00
Kano
7dca87da30 API-README correction 5 2012-08-13 10:24:50 +10:00
Kano
3abeace876 API-README correction 4 2012-08-13 10:13:25 +10:00
Kano
49ae1b6fa4 API-README correction 3 2012-08-13 10:12:15 +10:00
Kano
b3538697a4 API-README correction 2 2012-08-13 10:05:11 +10:00
Kano
f3dd04aec2 API-README correction 2012-08-13 09:59:32 +10:00
Kano
7011dd2116 miner.php documentation (in API-README) v0.1 2012-08-13 09:55:10 +10:00
Con Kolivas
00691ababf Merge pull request #292 from kanoi/main
Escape " and \ when writing json config file
2012-08-11 20:42:05 -07:00
Con Kolivas
391ce7097a Merge pull request #291 from kanoi/minerphp
miner.php optional single rig totals (on by default)
2012-08-11 19:48:52 -07:00
Con Kolivas
011f822af2 Merge pull request #294 from kanoi/api
API-README update changelog
2012-08-11 19:48:26 -07:00
Kano
c96c8eef9e API-README update changelog 2012-08-12 12:42:26 +10:00
Con Kolivas
d66742a8c1 Minimise locking and unlocking when getting counts by reusing shared mutex lock functions. 2012-08-12 11:04:51 +10:00
Con Kolivas
c91a95459b Avoid getting more work if by the time the getwork thread is spawned we find ourselves with enough work. 2012-08-12 10:55:18 +10:00
Con Kolivas
07fca3e289 The bitforce buffer is cleared and hw error count incremented on return from a failed send_work already so no need to do it within the send_work function. 2012-08-12 10:46:31 +10:00
Con Kolivas
f27bcb8ee5 Going back to e68ecf5eb2 2012-08-12 10:45:59 +10:00
Con Kolivas
c892ded6e0 Make sure there are true pending staged work items as well in failover only mode. 2012-08-12 10:40:58 +10:00
Con Kolivas
61003df49f In failover-only mode we need to queue enough work for the local pool and ignore the total queued count. 2012-08-12 10:33:26 +10:00
Con Kolivas
65f4e2af3e The bitforce buffer is cleared and hw error count incremented on return from a failed send_work already so no need to do it within the send_work function. 2012-08-12 10:29:34 +10:00
Con Kolivas
8aa61f6626 Make sure we have work from the current pool somewhere in the queue in case the queue is full of requests from a pool that has just died. 2012-08-11 16:47:49 +10:00
Con Kolivas
c0aaf56a8d Since all the counts use the same mutex, grab it only once. 2012-08-11 16:11:53 +10:00
Con Kolivas
4f9394be81 When popping work, grab cloned work first if possible since original work can be reused to make further clones. 2012-08-11 14:39:35 +10:00
Con Kolivas
8085ae6854 Further simplify the queue request mechanism. 2012-08-11 14:04:55 +10:00
Con Kolivas
f83863a996 Keep total queued count as a fake pending staged count to account for the period a queue is in flight before it is staged. 2012-08-11 13:30:41 +10:00
Luke Dashjr
fa3a25f876 Bugfix: bitforce: Allocate enough space for FTDI description pointers
Con's uglify of the FTDI autodetect replaced a standard C99 array with non-standard alloca that needs the developer to specify the size in bytes rather than elements, but he didn't account for pointer size at all
2012-08-10 22:19:17 +00:00
Kano
d04005aef9 miner.php allow a custom page section to select all fields with '*' - e.g. to create a STATS section on a custom page 2012-08-10 22:33:34 +10:00
Con Kolivas
e47dc87355 Clone work at the time of requesting it if an existing work item can be rolled. 2012-08-10 21:44:15 +10:00
Con Kolivas
e68ecf5eb2 Queue one request for each staged request removed, keeping the staged request count optimal at all times. 2012-08-10 20:18:04 +10:00
Kano
52e5524d7f Escape " and \ when writing json config file 2012-08-09 18:01:35 +10:00
Kano
556cc7bd3a miner.php optional single rig totals (on by default) 2012-08-09 16:30:36 +10:00
Con Kolivas
1c98e0cf21 Bump version to 2.6.4 2012-08-07 22:21:46 +10:00
Con Kolivas
d64c32ac32 Include scrypt.h in Makefile. 2012-08-07 22:21:46 +10:00
Con Kolivas
0adbcd5d07 Fix windows bitforce build. 2012-08-07 21:21:01 +10:00
Con Kolivas
be57725271 Update NEWS. 2012-08-07 21:02:56 +10:00
Con Kolivas
0a79de9375 Convert the serial autodetect functions to use int instead of char to enumerate devices. 2012-08-07 20:55:55 +10:00
Con Kolivas
9cae9a9d7f Make the serial open timeout for BFL generically 1 second on windows. 2012-08-07 20:49:47 +10:00
Con Kolivas
7dffa07ed9 Deuglify windows autodetect code for BFL. 2012-08-07 20:47:18 +10:00
Con Kolivas
e52762c57a There is no point zeroing temperature in BFL if we fail to get a response, and we should register it as a HW error, suggesting throttling. 2012-08-07 20:26:24 +10:00
Con Kolivas
b406dbfe78 Update SCRYPT README with information about HW errors. 2012-08-07 20:07:01 +10:00
Con Kolivas
e49bd98196 Use the scrypt CPU code to confirm results from OCL code, and mark failures as HW errors, making it easier to tune scrypt parameters. 2012-08-07 19:56:43 +10:00
ckolivas
3dd1658e1f We may as well leave one curl still available per pool instead of reaping the last one. 2012-08-07 12:10:01 +10:00
ckolivas
c7bcad653b Need to recheck the pool->curls count on regaining the pool lock after the pthread conditional wait returns. 2012-08-07 11:59:54 +10:00
ckolivas
ad8c4b7755 Revert "Only add to the pool curlring and increment the counter under mutex lock."
This reverts commit 8897e06575.

Wrong fix. Recursive locking now.
2012-08-07 11:52:37 +10:00
Con Kolivas
13a92bbd3c Merge pull request #290 from kanoi/api
api.c update API start message and include port number
2012-08-06 18:33:50 -07:00
Con Kolivas
28d3599041 Merge pull request #287 from kanoi/minerphp
miner.php allow pool inputs: delete, addpool, poolpriority
2012-08-06 18:33:20 -07:00
ckolivas
145f04ccc7 Display reaped debug message outside mutex lock to avoid recursive locking. 2012-08-07 11:10:59 +10:00
ckolivas
8897e06575 Only add to the pool curlring and increment the counter under mutex lock. 2012-08-07 11:05:23 +10:00