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
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
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
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
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
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
2012-08-07 11:52:37 +10: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
Con Kolivas
25fd6cd0fd
Correct writing of scrypt parameters to config file based on command line parameters only.
2012-08-05 15:35:37 +10:00
Con Kolivas
ac131d3138
Merge pull request #279 from tyeken8/tydus
...
Add scrypt support while writing conf
2012-08-04 22:34:47 -07:00
Con Kolivas
7611499b11
Queue a request on pool switch in case we have no work from the new pool yet.
2012-08-05 14:57:46 +10:00
Con Kolivas
4efa31d2e7
Display failover only mode in pool menu and allow it to be toggled live.
2012-08-05 14:44:11 +10:00
Con Kolivas
1a041668a5
Reinstate check for system queueing lag when the current pool's queue is maxed out, there is no staged work, and the work is needed now.
2012-08-05 14:37:49 +10:00
Con Kolivas
499c594cba
There is no need for pool active testing to be mandatory any more with queue request changes.
2012-08-05 14:29:21 +10:00
Con Kolivas
e4326e3ca2
Fix harmless warnings.
2012-08-05 14:24:31 +10:00
Con Kolivas
9a45a6d993
Check the current staged and global queued as well before queueing requests.
...
Discard stales before ageing work in the watchdog thread.
Queue requests after discarding and ageing work in watchdog thread.
Display accurate global queued in curses output.
Reuse variable in age_work().
2012-08-05 14:19:49 +10:00
Con Kolivas
bf9c324752
The queueing mechanism has become a complex state machine that is no longer predictable. Rewrite it from scratch watching only current queues in flight and staged work available on a pool by pool basis.
2012-08-05 13:40:46 +10:00
Con Kolivas
b66e0241f7
Queue an extra request whenever staged work drops below mining thread count in hash_pop.
2012-08-04 09:52:18 +10:00
Con Kolivas
b70ec3cb66
Merge pull request #283 from kanoi/icarus
...
ICA support 57600 baud rate, up to 8 FPGA and partial working FPGA boards
2012-08-02 17:17:53 -07:00
Con Kolivas
15dc4bb320
Scrypt mining does not support block testing yet so don't try to print it.
2012-08-03 10:10:53 +10:00
Con Kolivas
2953aa2502
We dropped the temporary stopping of curl recruiting on submit_fail by mistake, reinstate it.
2012-08-02 22:46:49 +10:00
Con Kolivas
9410875e2f
Make threads report in either side of the scanhash function in case we miss reporting in when restarting work.
2012-08-02 22:46:13 +10:00
ckolivas
d5dffa6aad
Don't make mandatory work and its clones last forever.
2012-08-02 16:45:12 +10:00
Con Kolivas
aa52db4539
Make test work for pool_active mandatory work items to smooth out staged work counts when in failover-only mode.
2012-08-01 23:42:00 +10:00
Kano
e067be421a
ICA support 57600 baud rate, up to 8 FPGA and partial working FPGA boards
2012-08-01 22:50:30 +10:00
Con Kolivas
8414a9a7e2
Add debugging output when work is found stale as to why.
2012-08-01 22:48:38 +10:00
Con Kolivas
d37d044fb7
Add some headroom to the number of curls available per pool to allow for longpoll and sendwork curls.
2012-08-01 20:05:30 +10:00
Tydus
fd51e5ba01
Add scrypt support while writing conf
2012-07-30 18:27:33 +08:00
Con Kolivas
99204bd59a
Display scrypt as being built in as well.
2012-07-30 14:07:03 +10:00
Con Kolivas
7a07c7d04c
Fix build warning about KL_SCRYPT when built without scrypt support.
2012-07-30 14:07:03 +10:00
Con Kolivas
c91148f193
Remove the low hash count determinant of hardware being sick. A low hash rate can be for poor network connectivity or scrypt mining, neither of which are due to sick hardware.
2012-07-30 09:02:23 +10:00
Con Kolivas
d8ec6d3e23
Display kilohash when suitable, but store the global mhash value still truly in megahashes to not break the API output.
2012-07-29 21:35:24 +10:00
Con Kolivas
b5517af024
Don't try and print curses output for devices that won't fit on the screen.
2012-07-29 21:07:24 +10:00
Con Kolivas
500ed85bb3
Merge pull request #271 from luke-jr/cg_logfixes
...
Logging bugfixes
2012-07-29 03:46:49 -07:00
Con Kolivas
28ac422ab8
Merge pull request #270 from luke-jr/bugfix_procname
...
Bugfix: Copy argv[0] given to dirname()
2012-07-29 03:45:10 -07:00
Con Kolivas
b40c8b848f
Limit total number of curls recruited per pool to the number of mining threads to prevent blasting the network when we only have one pool to talk to.
2012-07-29 19:10:40 +10:00
Con Kolivas
e87ff7c177
Keep a counter of enabled pools and use that instead of iterating over the pool list. Use that value to ensure we don't set the last remaining active pool to the rejecting state.
2012-07-29 13:15:39 +10:00
Con Kolivas
5148502c1e
Reinstate help information for lookup gap and thread concurrency since tc will often need to be manually set for optimal scrypt performance.
2012-07-25 22:30:37 +10:00
Con Kolivas
9a6c082ad1
Make the thread concurrency and lookup gap options hidden on the command line and autotune parameters with a newly parsed --shaders option.
2012-07-24 20:27:37 +10:00
