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

688 Commits

Author SHA1 Message Date
Con Kolivas
5ea6a8eaa2 Merge branch 'master' into hashfast
Conflicts:
	Makefile.am
2013-10-23 22:45:56 +11:00
Con Kolivas
d2719e312f Implement a cglock_destroy function. 2013-10-23 20:41:12 +11:00
Con Kolivas
de4ad515e0 Implement a rwlock_destroy function. 2013-10-23 20:41:04 +11:00
Con Kolivas
6bd5139cfc Implement a mutex_destroy function. 2013-10-23 20:40:52 +11:00
Roy Badami
c69a130dc1 Improvements to support for BitBurner boards
--bitburner-fury-options allows avalon-options to be overridden for
BitBurner Fury Boards, facilitating simultanous use of BitBurner XX
and BitBurner Fury boards

More sensible defaults for BitBurner boards, so cgminer should do something
sensible without any command line args
2013-10-19 18:42:20 +01:00
Con Kolivas
f5baf9f57a Merge branch 'master' into hashfast
Conflicts:
	usbutils.h
2013-10-18 19:12:13 +11:00
ckolivas
680f014c85 Simplify queued hashtable by storing unqueued work separately in a single pointer. 2013-10-18 14:58:33 +11:00
Kano
c9adb1929c allow __work_complete() access 2013-10-18 00:54:37 +11:00
Kano
3fc7ff45e4 miner.h allow devices to tv_stamp work 2013-10-18 00:47:07 +11:00
Kano
514b3c424f API add 'MHS %ds' to 'summary' 2013-10-17 20:24:09 +11:00
Kano
d3d3fc1316 Optional lock tracking and stats via the API 2013-10-17 20:24:02 +11:00
Con Kolivas
9b5c534911 Merge branch 'master' into hashfast
Conflicts:
	api.c
	configure.ac
	miner.h
	usbutils.c
	usbutils.h
2013-10-13 16:41:53 +11:00
Con Kolivas
d3c215fda6 Provide a lower level __bin2hex function that does not allocate memory itself. 2013-10-12 09:53:21 +11:00
Con Kolivas
835ad82441 Convert the bitfury driver to use the hash_driver_work version of hash_work. 2013-10-12 09:32:07 +11:00
Con Kolivas
58008a3742 Add a hash_driver_work function to allow for drivers that wish to do their own work queueing and management. 2013-10-12 09:05:58 +11:00
Con Kolivas
b537976036 Make pthread conditional timeouts handle all bulk usb transfer timeouts performing libusb_cancel_transfer, disabling timeouts within libusb itself. 2013-10-11 23:06:40 +11:00
Con Kolivas
ef8efd6c48 Minimise the time between dropping the read devlock and grabbing the write devlock to avoid tons of logging spam in the interim. 2013-10-08 00:01:26 +11:00
Con Kolivas
7318eceef9 Make the devlock a cglock in usbutils and only grab the write lock for fundamental changes allowing us to send and receive transfers concurrently without lock contention. 2013-10-07 23:34:01 +11:00
Con Kolivas
8c0ea19e13 Submitting an ntime offset nonce needs to be done on a copy of the work instead of the original so abstract out shared components as much as possible, minimising strdups in copy_work and make submit_work_async work take copied work, cleaning up code in the process. 2013-10-07 23:33:13 +11:00
Con Kolivas
b6a97de687 Provide a way for drivers to submit work that it has internally rolled the ntime value by returning the amount it has ntime rolled to be added. 2013-10-07 23:33:13 +11:00
ckolivas
6cd7f0f1be Remove unmaintained broken ztex driver. 2013-10-07 23:33:13 +11:00
Kano
51418f79e5 Klondike update code to current git 2013-10-07 23:33:11 +11:00
Con Kolivas
585d4af4e6 Store statistics on how often we have to cancel async bulk transfers and add a debug message whenever we do. 2013-10-07 23:32:01 +11:00
Con Kolivas
f49a3c7657 Merge branch 'master' into hashfast
Conflicts:
	Makefile.am
	api.c
	cgminer.c
	configure.ac
	miner.h
	usbutils.c
	usbutils.h
2013-09-30 08:43:29 +10:00
Con Kolivas
01e3c878cf We should only yield once in cg_wunlock 2013-09-29 15:16:25 +10:00
Con Kolivas
5683a1144e Provide a function to downgrade a cglock from a write lock to an intermediate variant. 2013-09-29 15:14:06 +10:00
Con Kolivas
5e1ebd5070 Deuglify use of _PARSE_COMMANDS macro expansions. 2013-09-29 13:54:16 +10:00
Con Kolivas
1ef38f82e8 Separate out asic fpga and opencl drivers in the driver parse commands macro for use individually as needed. 2013-09-29 12:28:43 +10:00
ckolivas
fbf46c41b3 Put avalon last in the sequence of adding drivers to prevent it trying to claim similar chip devices on startup. 2013-09-28 15:14:28 +10:00
ckolivas
6d7471237d Use macro expansion to iterate over all device drivers without needing to explicitly code in support in all places. Pass a hotplug bool to the detect() function to prevent opencl trying to hogplug GPUs. 2013-09-28 15:11:06 +10:00
ckolivas
741b74309e Forward declare all device drivers in miner.h avoiding the need to export them everywhere else. 2013-09-28 14:00:18 +10:00
ckolivas
2903028e6b Use macro expansion to generate extern device_drv prototypes. 2013-09-28 11:45:58 +10:00
ckolivas
8875197466 Create a macro list of drivers to enable easier addition of further drivers. 2013-09-28 10:25:48 +10:00
Con Kolivas
b606a60349 Use submit_tested_work in bitfury driver to avoid unnecessarily re-testing the work for validity. 2013-09-26 21:20:59 +10:00
Con Kolivas
76e688aee1 Store the hash2 array in struct work for further reuse. 2013-09-26 21:14:14 +10:00
Con Kolivas
39c52b1fb4 Use the test_nonce function within submit_nonce and store the uint32 corresponding to hash2 37 for further use. 2013-09-26 20:58:47 +10:00
Con Kolivas
759e82bb98 Add in first draft for a serialised work model sending/receiving data for BF1 devices. 2013-09-25 15:30:54 +10:00
Con Kolivas
68a7e21022 Create basic placeholders for bitfury driver code. 2013-09-24 20:59:10 +10:00
Con Kolivas
118f9038a0 Merge branch 'master' into hashfast 2013-09-22 20:18:18 +10:00
Con Kolivas
466d3beca0 Provide a --disable-libcurl config option to build support for stratum mining only. 2013-09-21 22:49:28 +10:00
Con Kolivas
78932aa1ed Provide basic structure for a hashfast driver. 2013-09-19 10:38:08 +10:00
Con Kolivas
a76b09e4fc Find the greatest common denominator in quotas and use the smallest number of consecutive work items per pool in quota load balance mode to smooth hashrate across pools with large quotas. Give excess quota to priority pool 0 instead of pool 0. 2013-09-13 13:51:15 +10:00
Con Kolivas
7c19984fd6 Use quotas for load-balance pool strategy. 2013-09-07 12:12:24 +10:00
Con Kolivas
0121b75a4e Provide a mechanism for setting a pool quota to be used by load-balance. 2013-09-07 11:33:07 +10:00
Con Kolivas
b783d94c6d Extract any proxy url and port to be used by sockaddr if possible using extract_sockaddr. 2013-09-05 23:14:53 +10:00
Kano
76185ede38 API mcast add a description option with miner.php 2013-09-01 00:23:26 +10:00
ckolivas
0f42fd3f46 Remove unused HAVE_LISBUSB macro and use USE_USBUTILS everywhere. 2013-08-30 15:38:35 +10:00
Con Kolivas
572df10207 Provide a funcion that looks up queued work by midstate and then removes it from the device hash database. 2013-08-27 20:29:47 +10:00
Kano
14ac6fa5ab Initial API Multicast response v0.1 to find cgminer APIs 2013-08-22 21:31:32 +10:00
Con Kolivas
8a01f5326c Add avalon HW error% to stats and only show BTB variables if avalon is a BTB. 2013-08-21 20:46:07 +10:00
ckolivas
b12badc9f2 Thread reportin and out can be static non inline. 2013-08-21 10:47:32 +10:00
Con Kolivas
a61e41a070 Check for thr->work_restart in restart_wait. 2013-08-19 15:58:22 +10:00
Con Kolivas
98e338cc52 Provide a variant of find_work_bymidstate that returns a clone of the found work. 2013-08-14 23:05:13 +10:00
Kano
6b62c402fa API/miner.php add some % fields 2013-08-14 10:42:52 +10:00
Con Kolivas
c8aac74114 Only perform the bin2hex on nonce2 data if it's required for stratum submission, thereby removing the last conversion of that type from stratum work generation. 2013-08-13 06:09:42 +10:00
Con Kolivas
87ae66c7e6 Create a work data template when receiving stratum notification, allowing a simple memcpy of the merkle root avoiding more hex2bin conversions on each work generation. 2013-08-13 05:49:32 +10:00
Con Kolivas
34bc106d82 Export the workpadding char in miner.h 2013-08-13 04:57:04 +10:00
Con Kolivas
11bcf2b3fb Rename work gbt_coinbase to coinbase to be in line with pool variable name. 2013-08-12 11:40:17 +10:00
Con Kolivas
5237bf350d Perform merkle bin hex2bin on stratum notify to avoid doing it on each work generation. 2013-08-12 11:36:28 +10:00
Con Kolivas
8bc469e916 Reuse just the one pool coinbase variable in stratum, avoiding more string functions and storage in gen_stratum_work on each work generation. 2013-08-12 11:16:46 +10:00
Con Kolivas
8c8ef6ff9b Rename pool gbt_coinbase variable to coinbase to combine it with the stratum coinbase data. 2013-08-12 10:58:43 +10:00
Con Kolivas
c542e47aa3 Use a nonce2 offset variable for both gbt and stratum to consolidate requirements on work generation. 2013-08-12 10:49:38 +10:00
Kano
309cb2242b miner.h inline semaphores increase information on failure 2013-08-12 08:54:11 +10:00
Con Kolivas
fb94dfa098 Cache as much of the gbt coinbase as possible to avoid doing unnecessary hex2bin conversion on every work generation with gbt. 2013-08-12 01:15:22 +10:00
Con Kolivas
9552f54f43 Add the ability to downgrade a write variant of the cglocks. 2013-08-12 00:12:28 +10:00
Con Kolivas
3e84a19cda Fix --scrypt being required before scrypt intensities on command line or not working at all via config files. 2013-08-11 15:10:27 +10:00
Con Kolivas
b423fe9de8 Cache the hex2bin of pool nonce1 in stratum, avoiding hex2bin on each work generation. 2013-08-11 14:06:17 +10:00
Con Kolivas
fef649dfef Cache the binary generation of coinbase1 and 2 on stratum, avoiding a hex2bin of coinbase1 and 2 on each work generation. 2013-08-11 13:47:46 +10:00
Con Kolivas
2b171f7fae Limit intensity range according to whether scrypt is in use or not. 2013-08-09 15:12:57 +10:00
Kano
ad1572f77f size check get_datestamp/get_timestamp and remove unused cgpu->init 2013-07-06 20:17:17 +10:00
Kano
385a70bea7 make all statline overflow safe 2013-07-06 19:15:59 +10:00
Con Kolivas
563feac74e Merge pull request #446 from kanoi/master
Rework logging to mostly avoid using varargs
2013-06-15 20:15:00 -07:00
Kano
7eba963477 remove varargs from logging/quit/in general as much as possible 2013-06-15 22:03:56 +10:00
ckolivas
b8a203ab33 Don't yield when downgrading a cg ilock. 2013-06-15 21:33:12 +10:00
Con Kolivas
736dfb4075 Don't yield on grabbing the read lock variant of cglocks. 2013-06-15 12:35:16 +10:00
Con Kolivas
cd9ff7f6b8 Only display as many device rows as the maximum live existed at any time. 2013-06-15 01:28:00 +10:00
Kano
7ad9132bbe usb lock out use cg locks 2013-06-15 01:02:27 +10:00
Kano
ad30d41f79 usb lock out transfers during open/close 2013-06-14 23:48:03 +10:00
Kano
84ffcbc51b Use mining start time for device MH/U calculations 2013-06-14 01:09:50 +10:00
Con Kolivas
0aeb1b5480 Yield after releasing a lock in case we are on a device with limited CPU resources. 2013-06-13 13:28:48 +10:00
ckolivas
065d4aabf6 Fix build. 2013-06-09 13:29:38 +10:00
ckolivas
9b2e517f30 Use cgsem structures instead of the flaky pings in the work queue to start mining threads and remove the unused thr_info_freeze function. 2013-06-09 12:20:04 +10:00
ckolivas
b59c33800b Implement cgminer specific cgsem semaphores to imitate unnamed semaphore behaviour on osx which does not support them. 2013-06-06 13:08:00 +10:00
ckolivas
05123bf452 Temporarily fix apple not having semtimedop by ignoring the timeout value. 2013-06-05 15:50:30 +10:00
Con Kolivas
727184d6ef Change the --device parameter parsing and configuration to use ranges and comma separated values. 2013-06-03 11:09:36 +10:00
Con Kolivas
cc04d3abc7 Use a counting semaphore to signal the usb resource thread that it has work to do. 2013-05-30 11:01:29 +10:00
Con Kolivas
876e7e5893 Merge branch 'icarus-dev' into usbdev
Conflicts:
	usbutils.h
2013-05-29 00:01:54 +10:00
Con Kolivas
6972ec62a7 Execute driver shutdown sequence during kill_work. 2013-05-28 23:33:32 +10:00
Kano
2f94ec8025 usb separate thread for resource locking and modified windows locking code 2013-05-27 23:30:18 +10:00
Con Kolivas
269a8de977 First pass rewriting serialdev into direct usb dev for avalon driver. 2013-05-27 15:43:22 +10:00
Con Kolivas
44736b3012 Make submit_nonce return a bool for whether it's a valid share or not. 2013-05-26 20:59:40 +10:00
Kano
c9cc7445e5 miner.h remove unused device_file and add device_data 2013-05-20 02:52:07 +10:00
Kano
8fe40e98ba miner.h icarus no long uses fd 2013-05-20 02:46:58 +10:00
Con Kolivas
01fca3e756 Create a logwin_update function which mandatorily updates the logwin and use it when input is expected to prevent display refresh delays. 2013-05-19 21:28:53 +10:00
Con Kolivas
3a2008ac61 Use a persistent single separate thread for stratum share submission that uses workqueues since all stratum sends are serialised. 2013-05-19 11:25:45 +10:00
Con Kolivas
1a7a87c2a6 Use a discrete device target for scrypt that dynamically changes to ensure we still report a work utility even if no shares are submitted such as in solo mining. 2013-05-11 20:29:48 +10:00
Con Kolivas
2fb6637b5a Make set_work_target a function to set a specified char as target for use elsewhere. 2013-05-11 19:51:43 +10:00
Con Kolivas
68196588c9 Make raw sockets compile on windows 2013-05-09 11:39:09 +10:00
Con Kolivas
31aa4f6ceb Use raw sockets without curl for stratum communications. 2013-05-08 21:59:58 +10:00
Con Kolivas
009008ade7 Fix BFLSC building. 2013-04-26 12:00:44 +10:00