GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 06:48:05 +00:00
Code Issues Releases Wiki Activity
6,055 Commits 12 Branches 10 Tags 44 MiB
bcb78ed91b
Commit Graph

718 Commits

Author SHA1 Message Date
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
Con Kolivas
c113534feb Begin support for mingw stratum build. 
Conflicts:
	configure.ac
 2012-10-04 17:52:35 +10:00
Con Kolivas
2fae906440 Don't try to parse unneeded parameters in response to mining.subscribe. 2012-10-03 21:10:30 +10:00
Con Kolivas
284b786da7 Check the stratum pool difference has not changed compared to the work diff when testing whether a share meets the target or not and retarget if necessary. 2012-10-03 11:18:08 +10:00
Con Kolivas
fdaabf59c6 Make target on stratum scale to any size by clearing sequential bits according to diff. 2012-10-03 00:35:08 +10:00
Con Kolivas
2941febd05 Store a sockaddr url of the stripped url used in determining sockaddr to not confuse it with the stratum url and fix build warnings. 2012-10-02 00:00:55 +10:00
Con Kolivas
b97a33a58a Use statically allocated stratum strings in struct work to cope with the inability to safely deallocate dynamically allocated ram. 2012-10-01 14:44:44 +10:00
Con Kolivas
7415d7aaa0 Begin implementing a hash database of submissions and attempt sending results. 2012-09-29 16:10:13 +10:00
Con Kolivas
aa93fa336c Copy parameters from stratum work required for share submission. 2012-09-29 15:02:23 +10:00
Con Kolivas
ac47f7f3a6 Store and display stripped url in its own variable. 2012-09-29 14:16:16 +10:00
Con Kolivas
3db6fb4fac Create machinery to divert work requests to stratum. 2012-09-29 13:07:00 +10:00
Con Kolivas
1f6fe55152 Generate the coinbase for generation of stratum based work. 2012-09-29 02:16:22 +10:00
Con Kolivas
1f64491f62 The number of transactions is variable so make merkle a variable length dynamically allocated array and track how many there are for stratum. 2012-09-29 01:48:01 +10:00
Con Kolivas
1221a80d41 Rename nonce2 to n2size reflecting that it's a size variable and not the actual nonce. 2012-09-29 01:03:23 +10:00
Con Kolivas
56255a0c86 Create a stratum thread per pool that has stratum that monitors the socket and serves received data. 2012-09-28 18:01:33 +10:00
Con Kolivas
9d4a44e88e Create helper functions for duplicating json strings to avoid keeping json references in use. 2012-09-28 09:57:42 +10:00
Con Kolivas
a6f1a62220 Create helper functions for checking when a socket is ready to read on and receive a single line at a time. 
Begin stratum authorisation process.
 2012-09-28 04:35:16 +10:00
Con Kolivas
64df34cd4e Create a stratum work structure to store current work variables. 2012-09-27 13:26:09 +10:00
Con Kolivas
f6f43500c0 Detect stratum in common place when adding urls, and use a bool to tell us when it's active. 2012-09-27 09:06:56 +10:00
Con Kolivas
e3f1b02e9a Extract and store various parameters on stratum init confirming successful mining notify. 2012-09-26 16:49:51 +10:00
Con Kolivas
58873c1dfa Get detailed addressinfo from the parsed URL for future raw socket usage when possible. IPV4 only for now. 2012-09-25 20:23:59 +10:00
Con Kolivas
144a016097 Add data structures to pool struct for socket communications. 2012-09-24 16:50:04 +10:00
Kano
7c32562d80 API stats add some pool getwork difficulty stats 2012-09-24 11:34:50 +10:00
Con Kolivas
57a73dce34 Test for sequential getwork failures on a pool that might actually be up but failing to deliver work as we may end up hammering it repeatedly by mistake. 2012-09-24 08:30:07 +10:00
Con Kolivas
3243b91e2d Merge pull request #310 from kanoi/master 
API debug, API-README, API Correct diff1 name, Device diff1, API diff1 etc.
 2012-09-20 23:23:15 -07:00
Con Kolivas
618999026f As we average gpu time over 5 work intervals for dynamic GPU intensity, there is no need to maintain a rolling average and it avoids the potential long term corruption of a single overflow value. 2012-09-21 16:10:34 +10:00
Kano
a6bf276f6b API - Add last share difficulty for devices and pool 2012-09-19 01:14:43 +10:00
Kano
89b6989fb3 Store and report Accepted,Rejected,Stale difficulty in the summary and API 2012-09-19 00:54:55 +10:00
Kano
923b9e0d86 Calculate work difficulty for each getwork and display with WorkTime debug 2012-09-18 11:19:57 +10:00
Kano
796f3906c1 WorkTime - multiple nonce per work and identify the work source 2012-09-16 07:57:43 +10:00
Kano
bd3c98aaaf Optional WorkTime details with each Accepted/Rejected work item 2012-09-15 14:04:57 +10:00
Kano
99f0607fb2 API add display of and setting queue,scantime,expiry 2012-09-12 23:26:43 +10:00
Kano
cef9731fbc CURL support for individual proxy per pool and all proxy types 2012-09-12 07:44:00 +10:00
Kano
307d8da034 HW: error counter auto for all devices - ztex code not fixed 2012-09-04 15:57:11 +10:00
Kano
9487ba05cd API/BFL identify a device - currently only BFL to flash the led 2012-09-04 12:52:11 +10:00
Kano
7a2407f15c BFL add throttle count to internal stats + API 2012-09-04 02:26:17 +10:00
Kano
4023872b76 count device diff1 shares 2012-09-01 23:51:51 +10:00
Kano
a178039a65 miner.h max_hashes -> int64_t 2012-08-30 23:22:37 +10:00
Con Kolivas
3acc064be3 Merge pull request #306 from kanoi/api 
Pools: add RollTime info to API 'stats' and 'Stats' button in miner.php (to display it)
 2012-08-23 07:50:28 -07:00
Con Kolivas
618b3e8b11 Track queued and staged per pool once again for future use. 2012-08-23 23:50:38 +10:00
Kano
d5f485c517 Pools: add RollTime info to API 'stats' and 'Stats' button in miner.php 2012-08-23 19:20:12 +10:00
ckolivas
edd9b81622 Do not add time to dynamic opencl calculations over a getwork. 2012-08-22 10:07:20 +10:00
Kano
b3e9858c9f API new command 'coin' with mining information 2012-08-20 16:07:20 +10:00
Kano
9210abdf60 API V1.17 show Work Utility and Diff1 Shares 2012-08-19 15:09:45 +10:00
Con Kolivas
26ab7346e3 Implement a new pool strategy, BALANCE, which monitors work performed per pool as a rolling average every 10 minutes to try and distribute work evenly over all the pools. 
Do this by monitoring diff1 solutions to allow different difficulty target pools to be treated equally, along with solo mining.
Update the documentation to describe this strategy and more accurately describe the load-balance one.
 2012-08-18 15:27:53 +10:00
Con Kolivas
d8c76bbd08 Getwork fail was not being detected. Remove a vast amount of unused variables and functions used in the old queue request mechanism and redefine the getfail testing. 2012-08-18 11:26:11 +10:00
Con Kolivas
c3e32274ee Cull all the early queue requests since we request every time work is popped now. 2012-08-18 10:37:05 +10:00
Con Kolivas
5fadfdb219 Overlap queued decrementing with staged incrementing. 2012-08-18 10:37:05 +10:00
Con Kolivas
611f1cec7c Roll work whenever we can on getwork. 2012-08-18 10:37:05 +10:00
Con Kolivas
fd0be1bb51 Queue requests for getwork regardless and test whether we should send for a getwork from the getwork thread itself. 2012-08-18 10:37:04 +10:00
Con Kolivas
2480cf23cc Don't try to get bitforce temperature if we're polling for a result to minimise the chance of interleaved responses. 2012-08-15 10:54:38 +10:00
Con Kolivas
8745ba1e6d Windows' timer resolution is limited to 15ms accuracy. This was breaking dynamic intensity since it tries to measure below this. 
Since we are repeatedly sampling similar timeframes, we can average the gpu_us result over 5 different values to get very fine precision.
 2012-08-15 09:38:45 +10:00
Kano
95dff7363e API allow display/change failover-only setting 2012-08-14 12:54:27 +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
8085ae6854 Further simplify the queue request mechanism. 2012-08-11 14:04:55 +10:00
Con Kolivas
3576abf8a7 Make pool_disabled the first in the enums == 0, fixing the pool enabled count which compares if value is not enabled before enabling it. 2012-08-05 15:43:27 +10:00
Con Kolivas
fc44b6d7a1 Use different variables for command line specified lookup gap and thread concurrency to differentiate user defined versus auto chosen values. 2012-08-05 15:32:44 +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
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
7fa794a499 It is not critical getting the temperature response in bitforce so don't mandatorily wait on the mutex lock. 2012-08-03 09:26:43 +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
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
500ed85bb3 Merge pull request #271 from luke-jr/cg_logfixes 
Logging bugfixes
 2012-07-29 03:46:49 -07: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
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
Luke Dashjr
da4ff2bde1 Bugfix: Use a mutex to control non-curses output 
Without this, there is no guarantee writes won't overlap (and it happens quite a bit on Windows with the bitforce driver)
 2012-07-23 20:29:06 +00:00
Luke Dashjr
d98e561a0a Simplify code to a single vprintf path for curses-less printing 2012-07-23 20:29:02 +00:00
Luke Dashjr
80593c47fc Move opt_quiet check to my_log_curses, so it works for curses-less builds 2012-07-23 20:28:57 +00:00
Con Kolivas
89eb1fa393 Check the maximum allocable memory size per opencl device. 2012-07-23 17:41:31 +10:00
Con Kolivas
17dfe74f96 Allow intensities up to 20 if scrypt is compiled in. 2012-07-22 00:49:47 +10:00
Con Kolivas
39f7d2fa74 Allow lookup gap and thread concurrency to be passed per device and store details in kernel binary filename. 2012-07-21 17:31:06 +10:00
Con Kolivas
6ac14f4280 Don't enqueuewrite buffer at all for pad8 and pass work details around for scrypt in dev_blk. 2012-07-16 13:14:21 +10:00
Con Kolivas
0f43eb5eb7 Don't test nonce with sha and various fixes for scrypt. 2012-07-13 20:35:44 +10:00
Con Kolivas
b085c338f6 Make scrypt buffers and midstate compatible with cgminer. 2012-07-13 20:28:36 +10:00
Con Kolivas
dd740caa98 Provide initial support for the scrypt kernel to compile with and mine scrypt with the --scrypt option. 2012-07-13 19:02:43 +10:00
Con Kolivas
5a65415b1e Enable completely compiling scrypt out. 2012-07-13 14:47:02 +10:00
Con Kolivas
176cdf8bbc Begin import of scrypt opencl kernel from reaper. 2012-07-13 14:44:52 +10:00
Con Kolivas
c1c99f1dd2 Merge https://github.com/pshep/cgminer into pshep 2012-07-12 23:09:05 +10:00
Paul Sheppard
d4d5b28e5f Abbrv. correction 2012-07-11 14:46:09 -07:00
Luke Dashjr
c57c308d1f Bugfix: Don't declare devices SICK if they're just busy initializing 
This mainly applies to ModMiner since it takes 4-5 minutes to upload the bitstream
 2012-07-11 20:29:06 +00:00
Paul Sheppard
5f0a22d230 Remove superfluous ave_wait 2012-07-11 08:32:41 -07:00
Paul Sheppard
2c54522d7d Add average wait time to api stats 2012-07-11 08:11:53 -07:00
Paul Sheppard
01a69ee45e Revert "Merge branch 'ave_time' of https://github.com/pshep/cgminer.git" 
This reverts commit 242e52cdf9, reversing
changes made to 4dc1bf2319.
 2012-07-11 08:07:39 -07:00
ckolivas
5c7e03084a Modify te scanhash API to use an int64_t and return -1 on error, allowing zero to be a valid return value. 2012-07-11 22:59:58 +10:00
Paul Sheppard
3cc0aa76ad Add average return time to api stats 2012-07-10 15:34:01 -07:00
Paul Sheppard
953ecd9e6a Change timeouts to time-vals for accuracy. 2012-07-08 23:25:02 -07:00
Con Kolivas
2ce7f28bbc Merge pull request #254 from luke-jr/work_restart2 
Turn work_restart array into a bool in thr_info
 2012-07-08 04:24:55 -07:00
Con Kolivas
fd55fab96a Make bitforce nonce range support a command line option --bfl-range since enabling it decrease hashrate by 1%. 2012-07-06 16:54:00 +10:00
Luke Dashjr
d4af2d0535 Turn work_restart array into a bool in thr_info 2012-07-06 05:13:05 +00:00
Con Kolivas
3271be145f Provide a ms based sleep function that uses nanosleep to avoid the inaccuracy of usleep on SMP systems. 2012-07-06 15:01:39 +10:00
Con Kolivas
75eca07823 Restart_wait is only called with a ms value so incorporate that into the function. 2012-07-05 09:15:21 +10:00
Con Kolivas
e5aba76042 Fix off-by-one error in nonce increment in bfl. 2012-07-05 00:40:01 +10:00
Con Kolivas
6314a12b31 Initially enable support for nonce range support on bfl, splitting nonces up into 3/4 size and only disable it if it fails on work submit. 2012-07-04 23:53:55 +10:00
Con Kolivas
96fba30b6b Attempt to detect nonce range support in BFL by sending work requring its support. 2012-07-04 17:31:02 +10:00
Kano
ff0afb94ec Add API Notify counter 'Comms Error' 2012-07-03 13:14:30 +10:00
Con Kolivas
732783faa6 Merge branch 'bfl' 
Conflicts:
	miner.h
 2012-07-03 11:35:58 +10:00
Con Kolivas
2ec0fb9793 Merge pull request #247 from kanoi/master 
api.c data structure + updated get_api_stats/driver-icarus.c
 2012-07-02 18:26:18 -07:00
Con Kolivas
336dbd5c98 Remove needless roundl define. 2012-07-03 10:44:59 +10:00
Paul Sheppard
cc0ad5eaa7 Merge branch 'master' of git://github.com/ckolivas/cgminer.git 
Conflicts:
	driver-bitforce.c
 2012-07-01 23:35:06 -07:00
ckolivas
fd7b21ed56 Use a pthread conditional that is broadcast whenever work restarts are required. Create a generic wait function waiting a specified time on that conditional that returns if the condition is met or a specified time passed to it has elapsed. Use this to do smarter polling in bitforce to abort work, queue more work, and check for results to minimise time spent working needlessly. 2012-07-02 10:54:20 +10:00
Paul Sheppard
a4a2000cc0 Merge branch 'master' of git://github.com/ckolivas/cgminer.git 2012-06-30 20:45:56 -07:00
ckolivas
1e9421475c Timersub is supported on all build platforms so do away with custom timerval_subtract function. 2012-07-01 10:44:23 +10:00
Kano
eab9debc72 api.c data structure - all testing attempted successful 2012-06-30 23:41:22 +10:00
Kano
d8abfb713e api.c data structure - tested + updated get_api_stats/driver-icarus.c 2012-06-30 15:58:31 +10:00
Kano
538653a53e api.c data structure - 2nd - untested 2012-06-30 12:44:57 +10:00
Kano
21e4cd85ea api.c data structure rather than raw sprintf - 1st test 2012-06-30 02:49:01 +10:00
Paul Sheppard
3be662a270 Merge branch 'old_gcc' 2012-06-28 18:35:32 -07:00
Paul Sheppard
123058b587 Add macro roundl for compilers without said function. 2012-06-28 11:02:03 -07:00
Paul Sheppard
baa480c137 Merge branch 'master' of git://github.com/ckolivas/cgminer.git 
Conflicts:
	cgminer.c
 2012-06-28 08:22:55 -07:00
Paul Sheppard
f225392990 Add low hash threshold in sick/dead processing 
Add check for fd in comms procedures
 2012-06-28 08:20:45 -07:00
Con Kolivas
3267b534a8 Implement rudimentary X-Mining-Hashrate support. 2012-06-28 10:43:52 +10:00
Kano
c21fc06560 define API option --api-groups 2012-06-27 21:28:18 +10:00
Paul Sheppard
78d5a81d70 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-26 12:32:09 -07:00
ckolivas
dffda2382f Increase GPU timing resolution to microsecond and add sanity check to ensure times are positive. 2012-06-26 12:50:52 +10:00
Paul Sheppard
df9e76bd73 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-25 10:56:04 -07:00
Con Kolivas
c027492fa4 Make the pools array a dynamically allocated array to allow unlimited pools to be added. 2012-06-25 17:06:26 +10:00
Con Kolivas
5cf4b7c432 Make the devices array a dynamically allocated array of pointers to allow unlimited devices. 2012-06-25 16:59:29 +10:00
Con Kolivas
eaf1505381 Dynamic intensity for GPUs should be calculated on a per device basis. Clean up the code to only calculate it if required as well. 2012-06-25 13:31:52 +10:00
Con Kolivas
f32ffb8718 Work out a rolling average getwork delay stored in pool_stats. 2012-06-24 13:20:17 +10:00
ckolivas
6a45cbbdfb Merge branch 'master' of https://github.com/ckolivas/cgminer 2012-06-23 23:45:08 +10:00
ckolivas
c5a21fabf0 Extend nrolltime to support the expiry= parameter. Do this by turning the rolltime bool into an integer set to the expiry time. If the pool supports rolltime but not expiry= then set the expiry time to the standard scantime. 2012-06-23 23:43:22 +10:00
Paul Sheppard
e037028159 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 
Conflicts:
	driver-bitforce.c
 2012-06-19 10:40:00 -07:00
Con Kolivas
f70577b097 Merge pull request #229 from luke-jr/modminer_primary 
modminer: Don't delay 2nd+ FPGAs during work restart
 2012-06-19 04:38:49 -07:00
Luke Dashjr
1215da39ee modminer: Don't delay 2nd+ FPGAs during work restart 
Add primary_thread boolean to threads to identify a single one as the "primary" thread for shared-resource multithreading.
This is needed since ModMiners use multiple threads to interface with independent hashing components.
 2012-06-18 05:51:09 +00:00
Paul Sheppard
fe4c0869bf Merge branch 'master' of git://github.com/ckolivas/cgminer.git 
Conflicts:
	cgminer.c
 2012-06-17 09:44:42 -07:00
Paul Sheppard
7ae22e21e3 Disable OpenCL code when not available. 2012-06-16 20:24:40 -07:00
Paul Sheppard
bc4a259af7 Merge branch 'master' of git://github.com/ckolivas/cgminer.git 2012-06-14 08:13:07 -07:00
Con Kolivas
30bb3c62a6 Merge pull request #224 from kanoi/master 
API add ModMinerQuad support
 2012-06-14 02:38:24 -07:00
Paul Sheppard
2d1f961046 Merge branch 'master' of git://github.com/ckolivas/cgminer.git 2012-06-14 00:05:31 -07:00
Con Kolivas
dbe9056df4 Add mandatory and block fields to the work struct. Flag any shares that are detected as blocks as mandatory to submit, along with longpoll work from a previously rejecting pool. 2012-06-14 15:42:43 +10:00
Paul Sheppard
b94e199649 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-13 17:31:20 -07:00
Paul Sheppard
eff2d04df0 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 
Conflicts:
	cgminer.c
 2012-06-13 12:31:33 -07:00
Paul Sheppard
1b63a75d2c Simple auto sleep-time calibration. 
Optimises the sleep time while waiting for the BFL work to finish.
Takes ~5 mins to settle to the correct time for each unit, then will continue to make adjustments.
 2012-06-13 12:26:03 -07:00
Luke Dashjr
4eb23c7ea3 Bugfix: slay a variety of warnings 2012-06-13 17:03:26 +00:00
Kano
913221c373 API add ModMinerQuad support 2012-06-14 02:57:37 +10:00
Paul Sheppard
2384d0fbc6 Removed idle mode... again!? 
Changed work_reset rate to every 100ms & use defines rather than numerics.
Change total sleep time to 4300ms after performance testing/measurement (now good to 916MH/s).
Changed timeout to 15s - Throttle time is 15s.
Added support for 'Busy' when submitting work.
Improved logging text to include device identifier.
Added a thread_enable api function, called when a thread is re-enabled.
... and removed useless re-init inside scanhash.
Use modminer introduced mutex.
 2012-06-12 18:20:18 -07:00
Luke Dashjr
a78d616bc5 modminer: Temperature sensor improvements 
Display the temperature of each of the (up to) 4 FPGAs
 2012-06-12 17:04:03 +00:00
Paul Sheppard
861388f960 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-12 09:04:42 -07:00
Luke Dashjr
76f96f4717 New driver: BTCFPGA ModMiner 2012-06-12 02:38:36 +00:00
Luke Dashjr
d3fa59d76f Abstract generally useful FPGA code into fpgautils.c 2012-06-12 02:35:45 +00:00
Paul Sheppard
bf4d6c3483 Merge branch 'master' of https://github.com/ckolivas/cgminer.git 2012-06-11 13:36:35 -07:00
Paul Sheppard
4889d7ecb2 Merge branch 'master' of git@github.com:pshep/cgminer.git 
Conflicts:
	driver-bitforce.c
 2012-06-11 13:09:27 -07:00
Paul Sheppard
820d662c9d Removed idle mode. 
Added watchdog thread BFL temperature monitoring.
 2012-06-10 23:11:59 -07:00
Paul Sheppard
ebeaf15f18 Added idle mode 
Idle is only set by pgadisable, so GPU/CPU is unaffected.
For Icarus/Ztex, in scanhash the thread is immediately set disabled then returns.
 2012-06-09 19:30:32 -07:00
Kano
fdcd72b9ae API add stats for pool getworks 2012-06-10 11:19:21 +10:00
Kano
3cb3f09a50 API save default config file if none specified 2012-05-31 23:18:55 +10:00
Con Kolivas
598476cae1 Merge pull request #204 from kanoi/icarus-timer 
Icarus: high accuracy timing and other bitstream speed support
 2012-05-30 18:02:00 -07:00
Con Kolivas
85210ee7a8 If shares are known stale, don't use them to decide to disable a pool for sequential rejects. 2012-05-31 08:41:56 +10:00
Paul Sheppard
cebd647f50 Messing with BFL code 2012-05-22 08:10:00 -07:00
Kano
b5ed958e84 Icarus: high accuracy timing and other bitstream speed support 2012-05-16 22:25:21 +10:00
Con Kolivas
e195a31c02 Fix win32 build. 2012-05-06 20:49:06 +10:00
Con Kolivas
61696c072c In the unlikely event of finding a block, display the block solved count with the pool it came from for auditing. 2012-05-06 16:22:18 +10:00
Con Kolivas
85c9e0c4b6 Merge pull request #198 from kanoi/stats 
API add getwork stats to cgminer - accesable from API 'stats' - and devices can add stats also
 2012-05-05 06:38:30 -07:00
Kano
00158c3a1f API 'stats' allow devices to add their own stats also for testing/debug 2012-05-05 16:25:19 +10:00
Kano
976e27c4cb API add getwork stats to cgminer - accesable from API 'stats' 2012-05-05 15:04:15 +10:00
Con Kolivas
46a679f39e Revert "Provide simple macros for the repeated use of checking the first value of the input char with strncasecmp." 
This reverts commit 87708a6a0e.

Broken.
 2012-05-05 12:55:00 +10:00
Con Kolivas
c8e1026dfb Get rid of unitialised variable warning when it's false. 2012-05-05 09:37:33 +10:00
Con Kolivas
87708a6a0e Provide simple macros for the repeated use of checking the first value of the input char with strncasecmp. 2012-05-04 23:05:00 +10:00
Con Kolivas
4987958e6a Add a temporarily disabled state for enabled pools called POOL_REJECTING and use the work from each longpoll to help determine when a rejecting pool has started working again. 
Switch pools based on the multipool strategy once a pool is re-enabled.
 2012-05-04 20:10:38 +10:00
Kano
44fc698750 API add last share time to each pool 2012-05-04 00:13:42 +10:00
Con Kolivas
a4f1af1733 Detect pools that have issues represented by endless rejected shares and disable them, with a parameter to optionally disable this feature. 2012-05-03 15:35:13 +10:00
Con Kolivas
5081c1824a Limit the number of curls we recruit on communication failures and with delaynet enabled to 5 by maintaining a per-pool curl count, and using a pthread conditional that wakes up when one is returned to the ring buffer. 2012-05-03 10:49:42 +10:00
Con Kolivas
d4405de704 Generalise add_pool() functions since they're repeated in add_pool_details. 2012-05-03 10:49:42 +10:00
ckolivas
85008a7853 Reap curls that are unused for over a minute. 
This allows connections to be closed, thereby allowing the number of curl handles to always be the minimum necessary to not delay networking.
 2012-05-03 10:48:05 +10:00
Con Kolivas
7d288eac9f Implement a scaleable networking framework designed to cope with any sized network requirements, yet minimise the number of connections being reoped. 
Do this by create a ring buffer linked list of curl handles to be used by getwork, recruiting extra handles when none is immediately available.
 2012-05-03 10:41:57 +10:00
Con Kolivas
89053c78da There is no need for the submit and getwork curls to be tied to the pool struct. 2012-05-01 19:12:37 +10:00
Con Kolivas
1ab318d0f3 Start longpoll only after we have tried to extract the longpoll URL. 2012-04-27 13:11:19 +10:00
Con Kolivas
eda382990a Create one longpoll thread per pool, using backup pools for those pools that don't have longpoll. 
Use the work created from the longpoll return only if we don't have failover-enabled, and only flag the work as a longpoll if it is the current pool.
This will work around the problem of trying to restart the single longpoll thread on pool changes that was leading to race conditions.
It will also have less work restarts from the multiple longpolls received from different pools.
 2012-04-27 11:58:47 +10:00
Con Kolivas
4cd973264f Create discrete persistent submit and get work threads per pool, thus allowing all submitworks belonging to the same pool to reuse the same curl handle, and all getworks to reuse their own handle. 
Use separate handles for submission to not make getwork potentially delay share submission which is time critical.
This will allow much more reusing of persistent connections instead of opening new ones which can flood routers.
This mandated a rework of the extra longpoll support (for when pools are switched) and this is managed by restarting longpoll cleanly and waiting for a thread join.
 2012-04-26 23:29:21 +10:00
Luke Dashjr
4648330c9d Support for share logging 2012-04-25 12:05:33 +10:00
Con Kolivas
f5f089f5b4 Add a --gpu-map option which will allow arbitrarily mapping ADL devices to OpenCL devices for instances where association by enumeration alone fails. 2012-04-23 17:40:47 +10:00
Luke Dashjr
730849c988 Make a union for cgpu device handles, and rename "device" to "device_ztex" since it's Ztex-specific 2012-04-21 03:01:42 -04:00
Luke Dashjr
657716e563 Merge branch 'master' into ztex 2012-04-21 02:56:20 -04:00
Luke Dashjr
b8778839e9 Merge branch 'master' into unify_drivers 
Conflicts:
	cgminer.c
 2012-04-21 02:36:19 -04:00
Con Kolivas
c7cc2e4226 Merge branch 'master' into ztex 2012-04-21 14:03:41 +10:00
Kano
2e1d2017de API add removepool like the screen interface 2012-04-21 03:15:41 +10:00
nelisky
c3bda2b709 adding path to libusb include 2012-04-16 04:07:19 -07:00
nelisky
99a188f94f initial commit with some support for ztex 1.15x board. 
This version is just a rough draft, but it does alredy mine.

Conflicts:

	cgminer.c
	configure.ac
 2012-04-16 04:01:51 -07:00
Con Kolivas
dc70fe9ce0 Do a complete cgminer restart if the ATI Display Library fails, as it does on windows after running for some time, when fanspeed reporting fails. 2012-04-14 17:38:31 +10:00
Kano
0be2b9e9b6 Increase max devices to 64 (for FPGA support) 2012-03-30 22:28:44 +11:00
Kano
18a8b5506e API returns the simple device history with the 'notify' command 2012-03-23 03:17:20 +11:00
Kano
eeec98098f code changes for supporting a simple device history 2012-03-23 01:50:45 +11:00
Luke Dashjr
eca996547b CGPU API for device kernel name 2012-03-18 21:39:20 -04:00
Luke Dashjr
f05a319e01 CGPU API for device names 2012-03-18 21:32:01 -04:00
Luke Dashjr
303dbf4664 Abstract add_cgpu function, to handle device id numbering and devices array 2012-03-18 20:09:03 -04:00
Luke Dashjr
e131dfab31 Unify drivers as driver-*.c and add driver name to API 2012-03-13 12:18:23 -04:00
Con Kolivas
f4df8c82a7 Merge pull request #135 from kanoi/master 
API new commands enablepool and disablepool
 2012-02-22 21:56:48 -08:00
Kano
60c5ac6844 API new commands enablepool and disablepool (version already incremented) 2012-02-23 16:10:17 +11:00
Kano
4458f3d5c7 Modify cgminer.c pool control to allow API to call it 2012-02-23 13:58:33 +11:00
Con Kolivas
527e611b74 Fix !HAVE_OPENCL build. 2012-02-23 01:27:36 +11:00
ckolivas
93efb726bb Allow multiple different kernels to be chosen per device. 2012-02-22 19:38:01 +11:00
Con Kolivas
deff55c640 Allow different vectors to be set per device. 2012-02-22 16:54:06 +11:00
Con Kolivas
2ca8d38e0e Merge pull request #124 from kanoi/master 
API commits - IP 0/0 means all, add "Log Interval" to config, restrict access to modify commands
 2012-02-21 02:49:25 -08:00
Kano
e3281c2643 When API shuts down cgminer don't kill itself 2012-02-21 20:03:13 +11:00
Con Kolivas
f4284a21a8 Set the lp_sent variable under lock since there will almost always be a race on setting this variable, potentially leading to multiple LPs being sent 
out.
 2012-02-21 09:22:04 +11:00
Con Kolivas
3cdac04f4f Flag the pool that is the longpoll thread to avoid sending multiple longpolls during the slight delays between requesting and setting the lp_sent flag. 2012-02-19 23:13:02 +11:00
Con Kolivas
79e95dd95c Store whether a work item is the result of a longpoll or not in struct work and use it to help determine block changes directly from the work longpoll 
bool.
 2012-02-19 22:15:55 +11:00
Con Kolivas
39906718d2 Keep track of when a longpoll has been sent for a pool and if the current pool is requesting work but has not sent a longpoll request, convert one of 
the work items to a longpoll as we may have switched pools but still be using the longpoll from the previous pool.
 2012-02-19 22:07:31 +11:00
Con Kolivas
f85b85d244 Re-check for a longpoll supporting pool every 30 seconds if none is found initially. 2012-02-19 21:28:23 +11:00
Con Kolivas
02295c69c8 Allow devices that are disabled due to overheating to be flagged as recovering instead of disabling them and re-enable them if they're below ideal 
temperatures and --no-restart has not been set.
 2012-02-19 20:19:47 +11:00
Con Kolivas
fa4ce8daf2 Keep track of intended engine clock speed and only adjust up if it's higher than the last intended speed. This avoids setting the clock speed to one 
relative to a lower profile one by mistake.
 2012-02-18 22:29:12 +11:00
Con Kolivas
06721957a0 Freeze the queues on all threads that are sent the pause message to prevent them trying to start up again with saved pings in their queues. 2012-02-18 16:34:06 +11:00
Con Kolivas
83dde50f9d Updates to diakgcn kernel courtesy of Philip Kaufmann <phil.kaufmann@t-online.de> 2012-02-18 15:17:50 +11:00
ckolivas
29f0b2714c The amount of work scanned can fluctuate when intensity changes and since we do this one cycle behind, we increment the work more than enough to prevent repeating work. 2012-02-15 08:51:59 +11:00
Con Kolivas
07c2ee5317 Put win32 equivalents of nanosleep and sleep into compat.h fixing sleep() for adl.c. 2012-02-12 17:00:44 +11:00
zefir
e0fec35751 modularized logging, support for priority based logging 
Functions related to logging are extracted into dedicated source files
for better maintainability.

The existing low-level logging API is extended with a generalized scheme
providing log functions log_{error, warning, notice, info, debug} that
log messages based on a global opt_log_level.

opt_log_level for now is set to LOG_NOTICE and might be modified via
command line options or config files in future releases.
 2012-02-11 20:26:25 +01:00
zefir
713e8be629 move CPU chipset specific optimization into device-cpu 2012-02-11 20:25:41 +01:00
Con Kolivas
52bb99c3ea Fix double definition of A0 B0 to zeroA zeroB. 2012-02-11 21:42:02 +11:00
Luke Dashjr
543265d66a Generalize --temp-cutoff and implement support for reading temperature from BitFORCE FPGAs 2012-02-10 22:14:27 -05:00
Con Kolivas
8c609579f4 Merge pull request #107 from kanoi/master 
Allow API to restrict access by IP address + other commits
 2012-02-10 19:07:53 -08:00
ckolivas
59d3d0112b Implement diablo kernel support and try to make it work. 2012-02-11 11:48:12 +11:00
ckolivas
95a989da4d Conflicting entries of cl_kernel may have been causing problems, and automatically chosen kernel type was not being passed on. Rename the enum to cl_kernels and store the chosen kernel in each clState. 2012-02-11 11:48:12 +11:00
ckolivas
033913ca8e First working port of the diakgcn kernel. 2012-02-11 11:48:11 +11:00
ckolivas
cb7145b179 Add basic build ability with diakgcn and put all kernel names in configure.ac to avoid changing them in mutliple places. 2012-02-11 11:48:11 +11:00
Kano
f19e67fe3a Allow API to restrict access by IP address 2012-02-08 19:06:24 +11:00
Con Kolivas
de4c6c29d7 Provide support for the submitold extension on a per-pool basis based on the value being detected in a longpoll. 2012-02-06 18:12:22 +11:00
Con Kolivas
e57ac0177f Remove unused get_dondata function. 2012-02-05 22:43:42 +11:00
Con Kolivas
294ac0b6bf Stagger the restart of every next thread per device to keep devices busy ahead of accessory threads per device. 2012-02-05 22:33:58 +11:00
Kano
42fcbf7c9c Remove most compiler warnings from api.c 2012-02-04 18:19:30 +11:00
Kano
0ebc0c9d8a Add last share's pool info in cgpu_info 2012-02-04 17:49:49 +11:00
ckolivas
7d97ed6dd6 Fix various build issues. 2012-02-04 10:23:06 +11:00
Con Kolivas
10b697f0da Revert "Fix compile warnings in api.c" 
This reverts commit 8a90f1a756.

Breaks windows build.
 2012-01-30 23:56:54 +11:00
Kano
98d789bd93 Merge remote-tracking branch 'conman/master' 2012-01-30 15:23:23 +11:00
Con Kolivas
09184720c2 As share submission is usually staggered, and delays can be costly, submit shares without delay even when --net-delay is enabled. 2012-01-30 15:09:58 +11:00
Con Kolivas
430a19543e Revert "Read off lpThermalControllerInfo from each ADL device." 
This reverts commit 2d29cdb611.
 2012-01-30 08:06:00 +11:00
Kano
8a90f1a756 Fix compile warnings in api.c 2012-01-29 23:13:23 +11:00