Con Kolivas
634958ff1c
Merge pull request #352 from kanoi/api
...
usbutils.c uninitialised usbstat for non-primary mmqs
2012-12-09 15:44:20 -08:00
Kano
e6efec46e9
usbutils.c uninitialised usbstat for non-primary mmqs
2012-12-10 10:42:02 +11:00
Con Kolivas
2b5467c44c
Merge branch 'master' of github.com:ckolivas/cgminer
2012-12-10 10:32:50 +11:00
Con Kolivas
c5d9f3ac60
Only set the lagging flag for select_pool() on failed getwork if we're not in opt_fail_only mode.
2012-12-10 10:32:21 +11:00
Con Kolivas
6d848e27b2
Merge pull request #351 from denis2342/ztex
...
libztex: in case the selectFpga() failed set the selected fpga to unknown
2012-12-09 15:03:43 -08:00
Denis Ahrens
0559d0bb6a
libztex: in case the selectFpga() failed set the selected fpga to unknown
...
after libztex_selectFpga() failed we can not be sure which fpga is now
selected. can be the old one or maybe even the new one. so set the
selected fpga variable to unknown so that the next call must set it
again.
2012-12-09 23:56:36 +01:00
Con Kolivas
43be78cca5
Merge pull request #350 from sharky112065/master
...
Update windows-build.txt
2012-12-09 04:41:21 -08:00
sharky112065
ccbe0e6672
Modified windows-build.txt to update git instructions.
2012-12-09 04:33:33 -08:00
Con Kolivas
40f5362aff
Merge pull request #349 from denis2342/broken_fpga
...
driver-ztex: support for broken fpga on a multifpga board
2012-12-09 03:20:56 -08:00
Con Kolivas
031ba75cad
Merge pull request #348 from denis2342/ztex
...
libztex: removed an unused struct member (ztex->valid)
2012-12-09 03:20:23 -08:00
Denis Ahrens
f5a575966c
libztex: use a function for the twice called firmware reset code
2012-12-09 12:06:42 +01:00
Denis Ahrens
9b1d0c9d95
libztex: removed an unused struct member (ztex->valid)
2012-12-09 11:39:56 +01:00
Denis Ahrens
26ef730c28
driver-ztex: support for broken fpga on a multifpga board
2012-12-09 11:37:02 +01:00
Con Kolivas
383b42f23e
Set the pool lagging flag on startup to avoid it being shown initially, and only unset it once the maximum number of staged work items has been reached.
2012-12-09 17:15:13 +11:00
Con Kolivas
8feb302945
Avoid recursive locking of the stgd lock.
2012-12-09 15:38:44 +11:00
Con Kolivas
c59aeb56ff
Revert "Wake the getwork scheduler after every restart threads."
...
This reverts commit 5b03e7497d
.
Redundant.
2012-12-09 15:29:06 +11:00
Con Kolivas
31f75098b5
Selectively discard all work items if a longpoll or stratum restart is received without a new block to work on.
2012-12-09 15:28:30 +11:00
Con Kolivas
5b03e7497d
Wake the getwork scheduler after every restart threads.
2012-12-09 15:11:49 +11:00
Con Kolivas
15e5e36bcd
Return value of keep_sockalive is no longer used.
2012-12-09 14:13:24 +11:00
Con Kolivas
8fcc67f308
Remove dependency on mstcpip.h for windows build by making curl version >= 7.25.0 mandatory on windows builds, and use curl functions for keepalive whenever possible instead.
2012-12-09 13:39:37 +11:00
Con Kolivas
01b9c6dfbf
Make main() the getwork scheduler once everything is set up, so that all app exits use the kill_work and quit paths.
2012-12-09 08:22:13 +11:00
Con Kolivas
b53fa540b4
Merge pull request #347 from denis2342/ztex
...
Ztex: more whitespace and style fixes
2012-12-08 12:38:58 -08:00
Denis Ahrens
dba007287c
ztex: more style and whitespace fixes
2012-12-08 19:29:36 +01:00
Con Kolivas
c1b0143dac
Merge pull request #346 from denis2342/ztex
...
libztex: silenced another warning
2012-12-08 03:58:44 -08:00
Denis Ahrens
44c0f72a53
libztex: silenced another warning
2012-12-08 12:56:03 +01:00
Con Kolivas
68f1b2c4b5
Set successful connect to true on auth stratum to allow summary on exit from single stratum pool.
2012-12-08 22:14:47 +11:00
Con Kolivas
30f6840b5c
Only consider work stale for stratum of different job_id if it's not a share.
2012-12-08 22:08:23 +11:00
Con Kolivas
c63916da1c
Increment version preempting changed version signifying different codebase to 2.9
2012-12-08 21:56:57 +11:00
Con Kolivas
67a9af68a1
Hash_pop should signal further waiters on its own pthread conditional in case there are multiple waiters.
2012-12-08 21:53:06 +11:00
Con Kolivas
5c4c2d6786
Check the job_id has not changed on stratum work when deciding if the work is stale as might occur across disconnections.
2012-12-08 21:45:15 +11:00
Con Kolivas
fcb265322d
Perform pool_resus on getwork pool that generates work in getwork_thread.
2012-12-08 21:35:14 +11:00
Con Kolivas
3d1e9f5098
Set pool lagging message for getwork pool that falls to zero staged in getwork thread.
2012-12-08 21:32:49 +11:00
Con Kolivas
927730ae2c
Stage extra work when the primary pool is a getwork pool without rolltime.
2012-12-08 21:27:40 +11:00
Con Kolivas
24de9b8655
Do not try to clean up twice if kill message is given.
2012-12-08 21:23:33 +11:00
Con Kolivas
84b44fd852
Only recalculate total_staged in getwork thread if required.
2012-12-08 21:21:19 +11:00
Con Kolivas
77ef4c210f
Include the correct config header in libztex and include it before other includes.
2012-12-08 21:19:22 +11:00
Con Kolivas
86c08516b7
Merge branch 'master' of github.com:ckolivas/cgminer
2012-12-08 21:17:49 +11:00
Con Kolivas
b28055517e
Implement a completely new getwork scheduler.
...
Stage all work from the one thread, making it possible to serialise all requests minimising the number of getworks requested or local work generated.
Use a pthread conditional to wake up the thread whenever work is removed to generate enough work to stay above the watermark set by opt_queue.
Remove all remnants of the old queueing mechanism, deleting the now defunct queued count.
2012-12-08 21:13:04 +11:00
Con Kolivas
0aefc9b516
Merge pull request #345 from denis2342/ztex
...
libztex: fixed some warnings and removed some whitespaces
2012-12-07 12:54:51 -08:00
Denis Ahrens
b7753e3317
libztex: fixed some warnings and removed some whitespaces
2012-12-07 14:11:31 +01:00
Con Kolivas
a24483e74f
Merge pull request #344 from denis2342/ztex
...
libztex: silenced some warnings
2012-12-07 03:06:58 -08:00
Denis Ahrens
69a688f53d
libztex: silenced some warnings
2012-12-07 05:05:37 +01:00
Con Kolivas
dd65818295
Remove all references to the now unused workio_cmd structure.
2012-12-07 13:45:03 +11:00
Con Kolivas
ed1b5cae0d
Remove the old workio command queue thread, replacing it with a kill conditional to exit the program.
2012-12-07 13:40:26 +11:00
Con Kolivas
59ddfd07a7
Remove getwork command from workio_cmd queues and do them directly from queue_request.
2012-12-07 13:32:23 +11:00
Con Kolivas
c99636f21b
Begin tearing down the old workio command queues by removing submit commands from there and submit them asynchronously via their own threads.
2012-12-07 13:21:46 +11:00
Con Kolivas
5dc25882fb
Merge pull request #343 from denis2342/ztex
...
support to upload the mining firmware to all ztex mining boards
2012-12-06 15:42:55 -08:00
Con Kolivas
be5316b480
Update windows build instructions.
2012-12-07 10:40:13 +11:00
Con Kolivas
be013e9699
Set pool probed to true on successful authorisation with stratum to avoid it being pinged later with pool_getswork.
2012-12-07 09:37:37 +11:00
Luke Dashjr
1a8fe32e4c
Bugfix: Free filename entry for writing config file when done with it
2012-12-06 19:11:01 +00:00