1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-01 18:55:36 +00:00
Commit Graph

273 Commits

Author SHA1 Message Date
nelisky
608a520573 Tweaks to make ztex work on a tp-link router with openwrt 2012-04-16 11:34:54 -07: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
7c6090fbaf Cache the initial arguments passed to cgminer and implement an attempted restart option from the settings menu. 2012-04-14 15:48:31 +10:00
Con Kolivas
f3e4305620 Disable per-device status lines when there are more than 8 devices since screen output will be corrupted, enumerating them to the log output instead at startup. 2012-04-14 14:11:58 +10:00
Con Kolivas
dceaa71a7b Make sure to disable devices with any status not being DEV_ENABLED to ensure that thermal cutoff code works as it was setting the status to DEV_RECOVER. 2012-04-14 00:56:31 +10:00
Con Kolivas
0a4a2d9d65 Damping small changes in hashrate so dramatically has the tendency to always make the hashrate underread so go back to gentle damping instead. 2012-03-31 14:39:40 +11:00
Con Kolivas
c99c09d389 Merge pull request #161 from kanoi/master
When using '-m' on linux, send the forked process a SIGTERM on exit
2012-03-30 06:25:38 -07:00
Con Kolivas
7f64adc473 Merge pull request #160 from luke-jr/bugfix_realquiet_2
Bugfix: Skip enabling curses, if --real-quiet or listing devices
2012-03-30 06:25:07 -07:00
Kano
f9af5acf13 When using '-m' on linux, send the forked process a SIGTERM on exit 2012-03-30 22:28:43 +11:00
Con Kolivas
88ff55e70e Use a time constant 0.63 for when large changes in hashrate are detected to damp change in case the large change is an aliasing artefact instead of a real change. 2012-03-29 21:02:42 +11:00
Con Kolivas
a1879c8057 Only increment stale counter if the detected stales are discarded. 2012-03-29 20:53:16 +11:00
ckolivas
35de9d1e07 Use slightly more damping on the decay time function in the never-ending quest to smooth off the hashmeter. 2012-03-29 09:35:48 +11:00
Con Kolivas
eb4233d500 Merge pull request #156 from luke-jr/ignore_redundant
Ignore redundant-with-build options
2012-03-28 04:26:20 -07:00
Con Kolivas
7458927f02 Merge pull request #155 from luke-jr/no_curses
Make curses TUI support optional at compile-time.
2012-03-28 04:25:54 -07:00
Con Kolivas
2beb3500d4 Merge pull request #153 from kanoi/master
Add API support for Icarus and Bitforce + Icarus fixes ++
2012-03-28 04:24:41 -07:00
Con Kolivas
ef1eafa40a Provide locking around updates of cgpu hashrates as well to prevent multiple threads accessing data fields on the same device. 2012-03-28 21:58:04 +11:00
Con Kolivas
fa5e0675d6 Display the beginning of the new block in verbose mode in the logs. 2012-03-28 20:32:49 +11:00
Kano
eeec98098f code changes for supporting a simple device history 2012-03-23 01:50:45 +11: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
c739d0dc15 Merge branch 'bugfix_realquiet' into bugfix_realquiet_2
Conflicts:
	cgminer.c
2012-03-13 13:11:55 -04:00
Luke Dashjr
03c94c02e9 Bugfix: Skip enabling curses, if --real-quiet or listing devices 2012-03-13 13:10:31 -04:00
Luke Dashjr
e131dfab31 Unify drivers as driver-*.c and add driver name to API 2012-03-13 12:18:23 -04:00
Luke Dashjr
b6ae200dad Ignore reduntant-with-build options --disable-gpu, --no-adl, and --no-restart 2012-03-13 09:13:19 -04:00
Luke Dashjr
ed8382c88d Make curses TUI support optional at compile-time. 2012-03-12 18:38:45 -04:00
Luke Dashjr
3a003b9ab8 Bugfix: Allow enabling CPU even without OpenCL support 2012-02-25 14:43:28 -05:00
Con Kolivas
daf1eff13c Change failed-to-mine number of requested shares messge to avoid segfault on recursive calling of quit(). 2012-02-26 00:46:19 +11:00
Con Kolivas
0412ac7c21 Only send out extra longpoll requests if we want longpolls. 2012-02-24 14:14:05 +11:00
Con Kolivas
dbb04a6922 Increase the speed of hashrate adaptation. 2012-02-24 14:14:05 +11:00
Con Kolivas
50a33aa6a3 Consider extra longpoll work items as staged_extra so as to make sure we queue more work if queueing regular work items as longpolls. 2012-02-23 20:43:18 +11:00
Con Kolivas
553d53fcee Reset all hash counters at the same time as resetting start times to get accurate hashrates on exiting which is mandatory for benchmarking. 2012-02-23 17:58:06 +11:00
Con Kolivas
88a9d83e19 Report thread in during getting of work in benchmark mode. 2012-02-23 17:54:27 +11:00
Con Kolivas
49ba39627c Report thread out before it starts to avoid being flagged as sick when waiting for the first work item. 2012-02-23 17:52:01 +11: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
4dd6b649d5 Merge pull request #131 from kanoi/master
Allow configuration file to include another recursively
2012-02-22 15:40:56 -08:00
Kano
ca2b2d9b9a Don't save 'include' when saving the configuration 2012-02-23 01:44:41 +11:00
Kano
915c72d8e7 Allow configuration file to include another recursively 2012-02-23 01:31:52 +11:00
Con Kolivas
527e611b74 Fix !HAVE_OPENCL build. 2012-02-23 01:27:36 +11:00
ckolivas
0db998c5d0 Add a --benchmark feature which works on a fake item indefinitely to compare device performance without any server or networking influence. 2012-02-22 22:21:18 +11:00
ckolivas
d3ad87f5d2 Allow writing of multiple worksizes to the configuration file. 2012-02-22 20:13:23 +11:00
ckolivas
1b1fa5cd89 Allow writing of multiple vector sizes to the configuration file. 2012-02-22 20:08:29 +11:00
ckolivas
994cd77501 Allow writing of multiple kernels to the configuration file. 2012-02-22 20:01:09 +11:00
ckolivas
93efb726bb Allow multiple different kernels to be chosen per device. 2012-02-22 19:38:01 +11:00
Con Kolivas
26c59fbf0f Allow the worksize to be set per-device. 2012-02-22 16:59:28 +11:00
Con Kolivas
deff55c640 Allow different vectors to be set per device. 2012-02-22 16:54:06 +11:00
Con Kolivas
bca9814d41 Reset times after all mining threads are started to make estimating hashrates easier at startup. 2012-02-22 11:50:35 +11:00
Con Kolivas
d1cddf8bad Update licensing to GPL V3. 2012-02-21 22:23:07 +11:00
Con Kolivas
882e4d85de Merge pull request #123 from xiangfu/icarus
Add Icarus Support to Cgminer
2012-02-21 03:14:20 -08:00
Con Kolivas
2f3a4a47c8 Reset the longpoll flag after it's been used once to prevent it restarting work again. 2012-02-21 21:56:30 +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
Con Kolivas
00290a3e02 Select diablo kernel on all but GCN+SDK 2.6. 2012-02-21 21:48:10 +11:00
Kano
e3281c2643 When API shuts down cgminer don't kill itself 2012-02-21 20:03:13 +11:00
Con Kolivas
af7368daca Don't make rolled work from the longpoll be seen as other longpoll work items. 2012-02-21 16:43:24 +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
89b32b1738 Officially support diakgcn in code and docs. 2012-02-20 09:28:01 +11:00
Con Kolivas
fe4b5e1fc6 Set the lp_sent bool earlier to minimise the number of extra longpolls sent out. 2012-02-20 08:26:46 +11:00
Xiangfu
f46c2b28a0 add icarus to cgminer.c 2012-02-19 22:22:02 +08: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
56baa87437 Make sure to request on the lp url when requesting a longpoll indrectly via get upstream work. 2012-02-19 22:19:59 +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
4eca1aa05c Store the longpoll url in the pool struct and update it from the pool_active test in case it changes. This is to allow further changes to longpoll
management on switching pools.
2012-02-19 21:50:02 +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
b217cbee0d Report threads as busy waiting on getwork on startup to avoid them being flagged sick on startup during slow networking. 2012-02-19 20:33:09 +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
810ad04578 More copyright updates. 2012-02-18 23:16:08 +11:00
Con Kolivas
17cc279adb Always use a fresh connection for longpoll as prolonged persistent connections can fail for many reasons. 2012-02-18 22:41:48 +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
f0e12fc593 Consolidate all screen updates to the watchdog thread and touch both windows before refresh. 2012-02-18 00:25:48 +11:00
Con Kolivas
d2b3fbc90c Curses will be disabled in clean_up so don't do it early in kill_work, and disable_adl so that GPU settings may be restored to normal in case shutting
down curses leads to instability on windows.
2012-02-17 23:11:50 +11:00
Con Kolivas
61328a4292 Stop the mining threads before trying to kill them. 2012-02-17 23:10:01 +11:00
Con Kolivas
1c211c5f41 Plain refresh() does not give reliably screen updates so get rid of all uses of it. 2012-02-17 22:55:33 +11:00
ckolivas
9a0e4f8fac Move logwindow down once number of devices is known. 2012-02-15 15:21:43 +11:00
ckolivas
c235c7e373 Allow the refresh interval to be adjusted in dynamic intensity with a --gpu-dyninterval parameter. 2012-02-15 14:35:13 +11:00
ckolivas
e259a994f1 Make curses display visible right from the beginning and fix the window sizes so the initial messages don't get lost once the status window is drawn. 2012-02-15 13:53:26 +11:00
ckolivas
c531f1bd04 Use the max_hashes variable to determine when to abandon work. 2012-02-15 10:34:26 +11:00
monson
8047af5af4 fix strcpy NULL pointer if env HOME unset. 2012-02-14 14:20:50 +08:00
Con Kolivas
56907db2d6 Fix harmless warnings with -Wsign-compare to allow cgminer to build with -W. 2012-02-12 18:21:30 +11:00
Con Kolivas
111238489f Fix missing field initialisers warnings. 2012-02-12 17:53:50 +11:00
Con Kolivas
1885374802 Merge pull request #112 from luke-jr/jansson_compat
Restore compatibility with Jansson 1.3 and 2.0 (api.c required 2.1)
2012-02-11 22:01:51 -08:00
Luke Dashjr
fdadb0b549 Restore compatibility with Jansson 1.3 and 2.0 (api.c required 2.1) 2012-02-11 15:46:08 -05: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
405a2120f8 Remove unnecessary check for opt_debug on every invocation of applog at LOG_DEBUG and place the check in applog(). 2012-02-11 20:11:18 +11:00
Con Kolivas
81d4f620ff Various string fixes for reject reason. 2012-02-11 15:15:03 +11:00
Con Kolivas
b706da9374 Merge branch 'reject_reason' of https://github.com/luke-jr/cgminer into reject 2012-02-11 14:55:12 +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
Con Kolivas
d24ee7824a Change message from recovered to alive since it is used on startup as well as when a pool has recovered. 2012-02-11 13:57:35 +11:00
Con Kolivas
8e682a2c32 Start mining as soon as any pool is found active and rely on the watchpool thread to bring up other pools. 2012-02-11 13:53:09 +11:00
Con Kolivas
405fcd76ca Delayed responses from testing pools that are down can hold up the watchdog thread from getting to its device testing code, leading to false detection
of the GPU not checking in, and can substantially delay auto gpu/auto fan management leading to overheating. Move pool watching to its own thread.
2012-02-11 13:38:17 +11:00
Con Kolivas
5ec684ce2b Space out retrieval of extra work according to the number of mining threads. 2012-02-11 13:20:32 +11:00
Con Kolivas
37374bb44b Make shutdown more robust.
Enable the input thread only after the other threads exist.
Don't kill off the workio thread and use it to exit main() only if there is an unexpected problem.
Use kill_work() for all anticipated shutdowns where possible.
Remove unused thread entry.
2012-02-11 13:11:56 +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
Con Kolivas
6e3ad7ad25 Logic fail on queue request. 2012-02-09 22:40:33 +11:00
Con Kolivas
d40979d173 No point discarding a share even if opt_fail is enabled. 2012-02-09 22:28:59 +11:00
Con Kolivas
435e5c85f6 Work items have a tendency to expire at exactly the same time and we don't queue extra items when there are plenty in the queue, regardless of age.
Allow extra work items to be queued if adequate time has passed since we last requested work even if over the limit.
2012-02-09 22:27:20 +11:00
Con Kolivas
ffbf15ad82 Discard work when failover-only is enabled and the work has come from a different pool. 2012-02-09 22:00:04 +11:00
Con Kolivas
5b4761003c Move from the thread safe localtime_r to regular localtime which is the only one supported on newer pthread libraries on mingw32 to make it compile with
the newer ming. Thread safety is of no importance where localtime is used in this code.
2012-02-09 21:54:23 +11:00
Kano
f19e67fe3a Allow API to restrict access by IP address 2012-02-08 19:06:24 +11:00
Luke Dashjr
f7a9897e13 Display X-Reject-Reason, when provided 2012-02-06 09:44:42 -05:00
Con Kolivas
e0540bd44a Revert "Rewrite the convoluted get_work() function to be much simpler and roll work as much as possible with each new work item."
This reverts commit dec99ab739.

This seems to cause a race on work in free_work(). Presumably other threads are still accessing the structure.
2012-02-06 21:35: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
dec99ab739 Rewrite the convoluted get_work() function to be much simpler and roll work as much as possible with each new work item. 2012-02-06 17:36:51 +11:00
Con Kolivas
a3e77937c8 Roll as much work as possible from the work returned from a longpoll. 2012-02-06 16:11:53 +11:00
Con Kolivas
eff9fe43b2 Rolling work on each loop through the mining thread serves no purpose. 2012-02-06 10:42:52 +11:00
Con Kolivas
d42d0c8ebd Allow to stage more than necessary work items if we're just rolling work. 2012-02-06 10:41:05 +11:00
Con Kolivas
b9612715aa Replace divide_work with reuse_work function used twice. 2012-02-06 10:40:04 +11:00
Con Kolivas
0307f9bb4e Give rolled work a new ID to make sure there is no confusion in the hashtable lookups. 2012-02-06 10:37:29 +11:00
Con Kolivas
d991a09e53 Remove now-defunct hash_div variables. 2012-02-06 08:00:09 +11:00
Con Kolivas
36d2fa485c Silence unused parameter warnings. 2012-02-05 22:39:28 +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
Con Kolivas
82f74af533 Deprecate the --donation feature.
Needlessly complex, questionable usefulness, depends on author's server and a central pool of some kind, and was not heavily adopted.
2012-02-05 21:36:41 +11:00
Con Kolivas
488a3b7338 It's devices that report back now, not threads. 2012-02-05 17:31:19 +11:00
Con Kolivas
23685aa41e Continue auto-management of fan and engine speeds even if a device is disabled for safety reasons. 2012-02-05 17:28:53 +11:00
Con Kolivas
01659bcc6c Abstract out tests for whether work has come from a block that has been seen before and whether a string is from a previously seen block. 2012-02-05 14:35:45 +11:00
Kano
0ebc0c9d8a Add last share's pool info in cgpu_info 2012-02-04 17:49:49 +11:00
ckolivas
53c1e9ae37 Allow the OpenCL platform ID to be chosen with --gpu-platform. 2012-02-04 15:15:57 +11:00
ckolivas
cda798d91b Only enable curses on failure if curses is desired. 2012-02-04 13:05:28 +11:00
zefir
e0b0a6c030 Modularize code: main.c -> device-cpu + device-gpu
This patch is an initial attempt to re-structure cgminer source
code from its monolithic design (with nearly all code being
concentrated in main.c) to a more modular one.

In this first stage, the conditionally compiled functions for
GPU and CPU mining were extracted into dedicated files:
 * device-cpu.h and device-cpu.c covering WANT_CPUMINE functions
 * device-gpu.h and device-gpu.c covering HAVE_OPENCL functions

The main.c file is left untouched as reference, while the
remainder without the extracted parts is located in cgminer.c.

The Makefile.am has been updated to use the re-structured
source files for the build.

Above pure re-structuring *NO* functional modifications were
made. The sources were tested to compile and run on on a
current Linux system with working CPU and GPU mining
(Bitforce not tested due to loack of hardware).
2012-02-04 10:23:06 +11:00