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

336 Commits

Author SHA1 Message Date
elbandi
17f2478edd Some other minor fixes from theLosers106 2016-02-11 21:53:24 +01:00
elbandi
4a96caafd8 Merge branch 'master' of https://github.com/sgminer-dev/sgminer 2015-11-09 15:57:26 +01:00
ystarnaud
8a6168fa4b Fix for UI/API intensity changes
The API and UI functions to change intensity would update the gpu
settings directly without updating the config option strings. This
resulted in the intensity updates not saving in config files. This
update should resolve that problem.

Also added API functions to change xintensity and rawintensity.
2014-11-19 12:21:11 +01:00
ystarnaud
f8fcbbcd0a Config writer fix
Reworked how the config writer works to properly save the config file.
Sometimes settings would get lost in profiles.

Also changed algorithm switch to only perform a soft reset and lowered
the verbosity of the algorithm switcher.
2014-07-09 14:23:07 -04:00
Jan Berdajs
eb6f47e503 Add debug-log setting to log everything when stderr is redirected to file
Based on code from BFGMiner
2014-07-06 01:07:32 +02:00
Jan Berdajs
485ec9ac88 rename poorly named variable 2014-07-06 00:03:11 +02:00
Jan Berdajs
1c2de13498 fix broken disabled devices when remove-disabled is set 2014-07-01 02:08:58 +02:00
Jan Berdajs
d9b1f2065d unused preprocessor directive 2014-07-01 01:29:27 +02:00
Jan Berdajs
50483e35cb spaces/indent 2014-07-01 01:29:15 +02:00
ystarnaud
3ae5f97b94 Algorithm Switcher Update
Updated Algorithm switcher to change on pool rather than on algorithm.
This way if, for example, 2 pools use the same algorithm but different
GPU settings, the settings will be applied when changing pool.

Additionally:
* Included a "common" algorithm type in API pool/profile listing. For
example using "marucoin-mod" will return "X13", "darkcoin-mod" will
return "X11", scrypt + nfactor != 10 will return "NScrypt", etc...

* Added "kernel" config option to be backwards compatible with other
miners' configs.

* Added a few algorithm aliases: x11mod -> darkcoin-mod, x13mod ->
marucoin-mod...

* New config keyword: "includes", which holds an array of include files.
This is to counter the JSON limitation not allowing multiple values with
the same name, thus preventing inclusion of multiple files.
2014-06-28 00:54:17 -04:00
ystarnaud
1914cef959 Fixed x13 and other issues
Corrected the x13 errors and fixed a few issues with the config parser's
handling of the default_profile.
2014-06-21 15:18:20 -04:00
troky
3f83f221fb Moved (reverted) some struct definitions to api.c. MSVS doesn't like them in .h 2014-06-20 20:08:50 +02:00
ystarnaud
fae56ceeeb Added API function to change pool profile
Added the API function changepoolprofile to change a pool's profile to
the specified profile name.
2014-06-20 16:53:00 +03:00
ystarnaud
ea1aba07d8 API Update
Ability to add/remove profiles via API.
2014-06-20 16:53:00 +03:00
Noel Maersk
832ac82bf6 Updated API functionality
Fixed addpool to specify a profile or algorithm and sets defaults if
nothing specified. Also added a new API function to change multipool
strategy.

Conflicts (resolved):
	sgminer.c
2014-06-20 16:52:59 +03:00
Noel Maersk
9fe5272c92 Updated config writer
Config writer now supports profiles and pool specific values. In
addition, the config writer now makes use of the jansson library to
create proper json objects and save them to the config file. This is
much better than trying to write our own json code.

Conflicts (resolved):
	sgminer.c
2014-06-20 16:49:51 +03:00
troky
c92443384b Lock tracking code fixed for MSVS. 2014-06-15 13:44:50 +02:00
Jan Berdajs
25d7d426fd convert tabs to spaces in most commonly modified files 2014-06-09 17:45:06 +02:00
Jan Berdajs
9fdd23e6ff since mining_threads count can change, we need to lock more carefully and get_thread function is not helpful anymore 2014-06-09 17:25:24 +02:00
Jan Berdajs
19fc4cc93c remove gpu_threads which is identical to mining_threads. refactor mining threads init code 2014-05-29 00:07:32 +02:00
elbandi
91a26c46b7 Protect pool name with lock
Disconnect from pool, if auth is failed

handle mining.set_extranonce method

subscribe for mining.extranonce

Allow disable extranonce subscribe

Send subscribe request before auth

Change mining.set_extranonce method as stratum notification

Set extranonce.subscribe timeout to 2sec

Some tweaks for extranonce

Handle pool response, who send errors in invalid format

Move no-extranonce-subscribe parameter to a pool config

Include pool.h

Set the pool idle and switch pool, if need

Mark pool as idle if stratum restart is failed

Conflicts:
	sgminer.c
2014-05-28 23:17:51 +02:00
Jan Berdajs
c0baf790f6 making new algorithms and other changes merged from sph-sgminer work with current version of sgminer 2014-05-27 01:11:54 +02:00
Jan Berdajs
93e3a6d107 Merge branch 'master' into sph
Not working yet, need to upgrade algorithm_t

Conflicts:
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
	util.c
2014-05-24 21:22:04 +02:00
Noel Maersk
3eb22b215e api: write xintensity and rawintensity using api_add_int(). 2014-05-08 00:08:25 +03:00
Noel Maersk
d27e8691e1 api: Add XIntensity and RawIntensity to devs output. 2014-05-07 23:39:06 +03:00
elbandi
08b7ab1dd4 Add build_number to version string 2014-05-04 01:29:28 +02:00
elbandi
c2af5fec1d Include pool.h 2014-04-27 20:20:14 +02:00
elbandi
f9a2c8b929 Protect pool name with lock 2014-04-26 00:58:41 +02:00
Luke Dashjr
3a6c1c8bb0 RPC: Provide a full status section for quit/restart commands 2014-04-25 17:40:52 +03:00
Noel Maersk
2f3e08a12c Merge branch 'api-compatibility' 2014-04-25 01:22:05 +03:00
Noel Maersk
47d00ee524 api: add missing header.
Imlicit declarations (using get_pool_name() without including pool.h)
produces a warning for me and AFAIR breaks compilation for someone else.
2014-04-24 21:54:02 +03:00
Luke Dashjr
5bd5b07e15 RPC: Add "Miner" to version response to include software name along with version 2014-04-24 21:28:35 +03:00
Elbandi
973dcefa8c Use get_pool_name everywhere 2014-04-24 12:09:56 +02:00
Noel Maersk
f5709910fb api: Bugfix, bump version to 4.1.271, initialise name/desc/algo in addpool() so checks for NULL work.
Otherwise API "addpool|a,b,c" command segfaults (access uninitialised
memory address).
2014-04-12 19:28:23 +03:00
Noel Maersk
5409ffc2a4 api: check if name/desc/algo are NULL and fill with defaults if so.
Defaults should probably be specified elsewhere.
There should be a constructor for stuff like this.
This shit is really bringing me down.
2014-04-11 15:27:58 +03:00
Noel Maersk
9aaff8ccf5 api: bump version, but allow name/desc/algo to be missing when adding pool details.
This will have unintended consequences, since API clients are sure to
send pool details without name/desc/algo. pooldetails() will allow them
to do that, and add_pool_details() will fill the pool structure with
NULLs.
2014-04-11 15:17:42 +03:00
Noel Maersk
3c3a58475e ui+api: ask for pool name/description/algorithm when adding pool from NCurses/API.
Closes #116.

This is trivial and shouldn't be so hard: it required modifying
functions in both sgminer.c (for NCurses stuff) and api.c. There is
much code repetition, since the NCurses interface is hard-coded in.
Removing it would simplify things greatly.
2014-04-11 15:06:36 +03:00
troky
2a087a7dae Added algorithm name to 'pools' API command. 2014-04-11 10:58:05 +02:00
Noel Maersk
0793c96074 Merge remote-tracking branch 'mrbrdo/poolalgo' into poolalgo
Conflicts (resolved):
	ocl.h
	sgminer.c
2014-04-07 22:05:33 +03:00
Noel Maersk
b6218e20c1 config: rename --pool-priority to --priority, --coin to --description.
There are now get_current_pool() and current_pool(), which is confusing.
Moved them closer together, so it's at least obvious.
2014-04-07 21:14:17 +03:00
Jan Berdajs
c2131df6aa add support for setting algorithm/nfactor for each pool separately, and fix bugged OpenCL thread cleanup (thread shutdown) 2014-03-31 21:05:20 +02:00
troky
bcb78ed91b Added --coin pool parameter. 2014-03-26 11:10:41 +01:00
Noel Maersk
aa471a2dfd api: remove unused SCRYPTSTR.
Gets rid of compiler warning.
2014-03-23 15:14:18 +02:00
troky
9414592539 Added pool name to API "pools" command 2014-03-20 20:54:52 +01:00
Noel Maersk
87801c2578 opencl: rename cgpu_info->kname to cgpu_info->kernelname. 2014-03-17 21:57:00 +02:00
unknown
6b0b424c0a Fixed API timeval formatting again. Use of snprintf() causes problems in MSVS. 2014-03-15 12:45:40 +01:00
Noel Maersk
8079d054d6 Merge branch 'nfactor'
Conflicts (resolved):
	Makefile.am
	winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +02:00
unknown
0e37fc24b0 Added algorrithm name to "coin" API command. Changed default algo name to "scrypt". 2014-03-13 23:02:51 +01:00
unknown
25242861c7 API: Fixed timeval struct formatting . 2014-03-12 09:32:00 +01:00
Noel Maersk
ae23d25086 api: proper type casting for MSVS support.
Closes https://github.com/veox/sgminer/issues/113
2014-02-24 13:54:06 +02:00