1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 14:58:01 +00:00
Commit Graph

543 Commits

Author SHA1 Message Date
Con Kolivas
b2b0d10a00 Merge branch 'master' into usb-dev 2013-02-28 23:37:06 +11:00
Con Kolivas
b4cac54a7e Keep stratum connections open for 2 minutes after the last work item was staged to allow stray shares to be submitted on pool switching. 2013-02-28 23:35:31 +11:00
Con Kolivas
6bf79626b8 Merge branch 'master' into usb-dev 2013-02-23 13:59:37 +11:00
ckolivas
68d691093c Move to storing the nonce1 in the work struct instead of the sessionid for the now defunct first draft mining.resume protocol. 2013-02-22 12:55:01 +11:00
Con Kolivas
fce5434975 Add a get_queued function for devices to use to retrieve work items from the queued hashtable. 2013-02-18 14:14:10 +11:00
Con Kolivas
fda6d46e95 Add the choice of hash loop to the device driver, defaulting to hash_sole_work if none is specified. 2013-02-16 14:09:44 +11:00
Con Kolivas
c80c65eac0 Add a driver specific flush_work for queued devices that may have work items already queued to abort working on them on the device and discard them. 2013-02-16 12:38:53 +11:00
Con Kolivas
e8e88beff1 Create a central point for removal of work items completed by queued device drivers. 2013-02-16 12:28:50 +11:00
Con Kolivas
95b2020263 Create a fill_queue function that creates hashtables of as many work items as is required by the device driver till it flags the queue full. 2013-02-16 12:14:13 +11:00
Con Kolivas
5e3253a7cf Create the hash queued work variant for use with devices that are fast enough to require a queue. 2013-02-16 11:54:05 +11:00
Con Kolivas
ab0cc58cb4 Merge branch 'master' into usb-dev 2013-02-15 23:15:11 +11:00
Con Kolivas
be4705a003 Provide support for mining.resume with stratum, currently re-authorising after successful resumption pending finalising of the protocol process. 2013-02-15 23:05:29 +11:00
Con Kolivas
1bf1f4a217 Add timestamps to stratum_share structs as they're generated and copy the stratum sessionid if it exists to stratum work generated. 2013-02-15 15:36:29 +11:00
Con Kolivas
c851f39598 Store session id for stratum if the pool supports it for future mining.resume support. 2013-02-15 14:46:30 +11:00
Con Kolivas
61a3e1b1d1 Merge pull request #382 from kanoi/hotplug
USB tidy up requests + Hotplug
2013-02-09 02:36:27 -08:00
Con Kolivas
5d581cb5d7 Use blank_get_statline_before for GPU devices that don't support adl monitoring. 2013-02-09 19:27:57 +11:00
Kano
bc5755233c call a separate get_devices() with locking, as required 2013-02-08 02:12:09 +11:00
Kano
983fe2b0c0 usbutils hotplug v0.1 2013-02-08 01:42:36 +11:00
Con Kolivas
0244998ef8 Merge branch 'master' into usb-dev 2013-02-04 11:23:20 +11:00
Con Kolivas
d644fdf1f4 Cache the coinbase length to speed up stratum work generation. 2013-02-04 11:19:12 +11:00
Con Kolivas
0870ab7532 Cache the header length when generating stratum work to avoid calculating it on every work generation, and to only need one alloc+sprintf, speeding up work generation. 2013-02-04 11:06:05 +11:00
Con Kolivas
5d122cad93 Provide wrappers for grabbing of thr value under the mining_thr_lock. 2013-02-03 23:41:41 +11:00
Kano
7abf30b2c0 distinguish between drv and it's id enum now called drv_id 2013-02-03 22:51:05 +11:00
Kano
61ec1fe91f mutex all access to mining_thr 2013-02-02 20:14:55 +11:00
Kano
212f32e5e0 Split thr_info array into control_thr and mining_thr pointers so more mining threads can be added later 2013-02-02 20:14:53 +11:00
Kano
7fbc3770b4 USB move usbdev info that needs to stay around into usbinfo 2013-02-02 20:14:36 +11:00
Kano
c1eae36f7b API stats - include pool network bytes + in miner.php 2013-02-02 20:14:33 +11:00
Kano
34bcc1c66d USB automatically handle losing the device and report nodev in the API 2013-02-02 20:14:29 +11:00
Kano
0b3d8c89c2 API zero - zero statistics - all or bestshare - with optional on screen summary 2013-02-02 20:14:27 +11:00
Kano
f9e04a3c5b device_drv - allow .name to be changed before add_cgpu() 2013-02-02 20:14:23 +11:00
Kano
a344deb6ac rename device_api -> device_drv and all related api -> drv and add a device_drv->drv enum for identifying which driver each is 2013-02-02 20:14:19 +11:00
Kano
1ce817d4df Merge branch 'api' 2013-01-03 21:48:22 +11:00
Kano
e3db37a64e Merge branch 'bfl' 2013-01-03 21:47:41 +11:00
Kano
03f626e68d Remember best share per pool and return in API pools 2013-01-02 21:51:09 +11:00
Kano
03c2cabab2 BFL include all USB requirements 2012-12-31 23:46:03 +11:00
Con Kolivas
e1387dc85c Change the pool stratum socket buffer to be dynamically allocated to accomodate any size coinbase and keep receiving data in recv line for up to 60s if no end of line has been received. 2012-12-29 11:29:59 +11:00
Con Kolivas
e1d7ecdd35 Do not try to generate stratum work unless the notify command has succeeded. 2012-12-29 09:45:40 +11:00
Con Kolivas
d3bfee14b3 Display the current pool diff in the status line. 2012-12-25 23:14:21 +11:00
Con Kolivas
f0c1782c03 Generate the output hash for scrypt as well and use the one function to set share_diff. 2012-12-25 14:08:27 +11:00
Kano
e931b72753 API V1.23 - new pgaset command, to be used soon 2012-12-19 10:43:27 +11:00
Kano
072909a12f MMQ count work check timeout failures 2012-12-17 13:21:24 +11:00
Kano
38ff2a7df9 MMQ allow partial work replies and count them 2012-12-17 13:20:10 +11:00
Con Kolivas
cada0d3195 Check for EWOULDBLOCK when supported in send and recv as well. 2012-12-14 21:36:42 +11:00
Con Kolivas
fd1bd9e7c3 Merge pull request #365 from kanoi/api
Pool store data transfer stats + API stats - display pool byte transfer stats
2012-12-12 15:29:51 -08:00
Kano
138465bf0c Pool store data transfer stats 2012-12-13 00:56:10 +11:00
Kano
f3f8b4fdb4 MMQ handle over temp differently and hash longer 2012-12-12 17:01:28 +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
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
8ebf4f6ecd Style changes. 2012-12-04 21:52:41 +11:00
Kano
e55fe73f9a API add Best Share to summary 2012-12-03 23:08:11 +11:00
Kano
a67e96c3e4 API lock access to some summary statistics (and copy them) 2012-12-03 11:36:15 +11:00
Kano
152e7e36a2 mmq usb v0.4 + api usb stats 2012-12-02 21:48:37 +11:00
Con Kolivas
3ab03e8ff9 Merge pull request #334 from denis2342/pkgconfig
third of version of pkg-config changes
2012-12-02 01:41:03 -08:00
Con Kolivas
33c9faae11 Pass ostate values around in scrypt to be able to extract full hashes if needed later on. 2012-12-01 21:47:27 +11:00
Peter Stuge
318ef85a9f Require pkg-config to find libusb-1.0, and fix libusb.h #includes 2012-11-25 05:42:42 +01:00
Con Kolivas
8bc60506c5 Revert "Find libusb-1.0 with pkg-config except on mingw, and fix #include path"
This reverts commit ce72dbea7d.
2012-11-25 09:47:26 +11:00
nelisky
c93e5e95cd openwrt needs roundl 2012-11-24 13:11:46 -08:00
Con Kolivas
217be6ed98 Do away with the flaky free_work api in the driver code which would often lose the work data in opencl and simply flush it before exiting the opencl scanhash. 2012-11-25 00:37:46 +11:00
Con Kolivas
2d35ac2567 Track all dynamically allocated memory within the work struct by copying work structs in a common place, creating freshly allocated heap ram for all arrays within the copied struct.
Clear all work structs from the same place to ensure memory does not leak from arrays within the struct.
Convert the gbt coinbase and stratum strings within the work struct to heap ram.
This will allow arbitrary lengths without an upper limit for the strings, preventing the overflows that happen with GBT.
2012-11-24 10:47:20 +11:00
Peter Stuge
ce72dbea7d Find libusb-1.0 with pkg-config except on mingw, and fix #include path 2012-11-21 19:56:05 +01:00
Con Kolivas
e55ef04df6 Revert "Find libusb-1.0 using pkg-config and correct the libusb.h #include path"
This reverts commit 171c3d0c72.

Rollback breakage.
2012-11-18 23:44:08 +11:00
Con Kolivas
9ad02fe303 Support workid for block submission on GBT pools that use it. 2012-11-18 21:48:44 +11:00
Peter Stuge
171c3d0c72 Find libusb-1.0 using pkg-config and correct the libusb.h #include path 2012-11-16 00:26:55 +01:00
Con Kolivas
b3864d1a94 Support for fractional diffs and the classic just-below-1 share all FFs diff target. 2012-11-15 09:18:58 +11:00
Con Kolivas
598ee76d37 Hash1 is only used by the deprecated cpu mining code and never changes so remove it from the work struct and bypass needing to process the value for all other mining. 2012-11-11 09:51:37 +11:00
Con Kolivas
6893c0be43 Get a work item once per second for all getwork and GBT pools to test they're still alive and to maintain a current GBT template. 2012-11-07 23:28:49 +11:00
Con Kolivas
a8e1ebb11c Add endian swap defines for where missing. 2012-11-06 12:01:49 +11:00
Con Kolivas
10ea5fbf97 Use existing pool submit_old bool from gbt data. 2012-11-05 16:57:48 +11:00
Con Kolivas
f71b423080 Retrieve a new block template if more than 30 seconds has elapsed since the last one to keep the data current and test the pool is still alive. 2012-11-05 16:48:19 +11:00
Con Kolivas
85f400bf80 Correct last few components of GBT block generation courtesy of Luke-jr. 2012-11-05 15:57:47 +11:00
Con Kolivas
a4e78be1ed Flip all 80 bytes in the flip function which was wrongly named flip256 for its purpose. 2012-11-05 14:56:57 +11:00
Con Kolivas
0ba5f0f94b Use a standard function for flipping bytes. 2012-11-05 14:02:43 +11:00
Con Kolivas
88b6f7924c Make gbt_coinbase large enough for submissions, swap bytes correctly to make a header from GBT and encode the number of transactions in share submission. 2012-11-04 18:01:09 +11:00
Con Kolivas
889ed23934 Store the fixed size entries as static variables in GBT in binary form, byteswapping as is required. 2012-11-04 15:28:13 +11:00
Con Kolivas
6b34faf83c Construct block for submission when using GBT. 2012-11-04 10:24:09 +11:00
Con Kolivas
c5c5fb8273 Store all the transaction hashes in pool->txn_hashes instead of separating txn0 and correct generation of merkle root, fixing memory overwrites. 2012-11-04 08:35:50 +11:00
Con Kolivas
875ca0fcc6 Create extra work fields when generating GBT work. 2012-11-04 01:07:01 +11:00
Con Kolivas
cbc246eace Generate the merkle root for gbt work generation. 2012-11-03 19:45:37 +11:00
Con Kolivas
8d0f748246 Create a store of the transactions with GBT in the minimum size form required to generate work items with a varied coinbase. 2012-11-03 13:27:41 +11:00
Con Kolivas
4a72a1574f Create a function that generates a GBT coinbase from the existing pool variables. 2012-11-01 22:34:08 +11:00
Con Kolivas
813e814f6c Extract and store the various variables GBT uses when decoding gbt work. 2012-11-01 16:56:54 +11:00
Con Kolivas
d10699d4c3 Add a gbt mutex within the pool struct for protecting the gbt values. 2012-11-01 14:24:55 +11:00
Con Kolivas
8afc1f6512 Convert work decode function to prepare for decoding block templates. 2012-11-01 14:05:25 +11:00
Con Kolivas
1c456d4fb3 Check for GBT support on first probing the pool and convert to using the GBT request as the rpc request for that pool. 2012-11-01 13:53:12 +11:00
Con Kolivas
f4cc59f25f Make the rpc request used with getwork a pool variable to allow it to be converted to/from gbt requests. 2012-11-01 13:06:34 +11:00
ckolivas
a2d5783509 server and client sockaddr_in are no longer used in struct pool. 2012-10-30 16:45:27 +11:00
Con Kolivas
e575763a80 Avoid redefining macros and align to 4 byte boundaries. 2012-10-22 22:06:00 +11:00
Con Kolivas
17251795c3 Merge pull request #319 from kanoi/mmq
MMQ new initialisation (that works) and clocking control
2012-10-17 14:09:15 -07:00
Kano
fc14b2ee07 MMQ new initialisation (that works) and clocking control 2012-10-17 09:56:42 +11:00
Con Kolivas
7adb7a30e6 Display correct share hash and share difficulty with scrypt mining. 2012-10-15 23:10:24 +11:00
Con Kolivas
7450b25e75 Dramatically simplify the dynamic intensity calculation by oversampling many runs through the opencl kernel till we're likely well within the timer resolution on windows. 2012-10-14 12:07:27 +11:00
Con Kolivas
420fdf32d6 Display the actual share diff next to the pool required diff, using a suffix creation function to prevent values of >1000 being shown in their entirety. 2012-10-12 14:17:29 +11:00
Con Kolivas
d15c70f8a8 Fix wrong byteswap macro being used on mingw32 which was breaking target generation on stratum. 2012-10-12 11:30:35 +11:00
Con Kolivas
a977fa4766 Fix lack of htobe64 on mingw32. 2012-10-11 20:53:56 +11:00
Con Kolivas
4fbc570fa4 Reinstate the history on dynamic intensity mode to damp fluctuations in intensity but use an upper limit on how much the value can increase at any time to cope with rare overflows. 2012-10-11 20:30:47 +11:00
Con Kolivas
0a90207111 Merge branch 'master' into stratum 2012-10-07 13:22:17 +11:00
Con Kolivas
aa35fbcc9a Fix sign warning in ocl.c 2012-10-07 10:21:20 +11:00
Con Kolivas
40b747bae6 Put scrypt warning on separate line to avoid 0 being shown on windows as bufsize. 2012-10-07 10:08:45 +11:00
Con Kolivas
a8d693029a Move stratum sockets to curl infrastructure with locking around send+recv to begin support for proxies and ssl. 2012-10-05 12:37:29 +10:00
Con Kolivas
deb0a9b644 Windows doesn't work with MSG_PEEK on recv so move to a continuously updating buffer for incoming messages. 2012-10-04 23:18:33 +10:00