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

771 Commits

Author SHA1 Message Date
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
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
ystarnaud
d9b4798e8e More options added
Added the following options to profiles/pools:
device (set devices on/off per profile), lookup-gap, shaders, worksize,
gpu-powertune, gpu-vddc
2014-06-20 16:50:06 +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
Yann St. Arnaud
9faa8fa59f Updated the config parser
Updated the config parser to provide better readability and flexibility
in config files. The latest features introduced a really messy way to
handle config files and this update alleviates this by adding the
ability to create profiles and associate them to pools.

Todo: Update the config file writer, in-program options and continue to
break off the config parsing/command line option code out of sgminer.c
to reduce clutter.
2014-06-20 16:49:07 +03:00
Elbandi
3b298478a3 Made opt_algorithm to simple variable 2014-06-17 18:11:59 +02:00
Elbandi
e86b72e6e9 Remove unused enum 2014-06-17 18:11:48 +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
ff05aacdc3 attempt to fix memory issues when doing curl calls
From curl CURLOPT_ERRORBUFFER docs: You must keep the associated storage available until libcurl no longer needs it. Failing to do so will cause very odd behavior or even crashes. libcurl will need it until you call curl_easy_cleanup(3) or you set the same option again to use a different pointer.
2014-06-09 01:17:29 +02:00
Jan Berdajs
881355d873 add --hamsi-expand-big option for setting EXPAND_BIG in X13 kernels 2014-06-08 20:36:39 +02:00
Jan Berdajs
5e3142cf68 remove unused code (mostly intended for ASICs which are not supported in sgminer), fix some compiler warnings 2014-06-08 20:36:33 +02:00
Jan Berdajs
e4a4efdb42 fix some potential memory leaks, remove a few old unused functions 2014-06-05 00:13:43 +02:00
Jan Berdajs
2ec09155e6 per-pool gpu-fan 2014-05-30 00:00:36 +02:00
Jan Berdajs
13cdc33809 pool-gpu-threads setting 2014-05-29 00:52:07 +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
Jan Berdajs
c4f2b78d65 per-pool gpu-engine, gpu-memclock and thread_concurrency 2014-05-28 23:19:04 +02:00
Jan Berdajs
06d8e1d1dc extranonce - some cleanup and better description for pool setting 2014-05-28 23:18:14 +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
efe1ebd7ae Intensity can be set for each pool individually 2014-05-27 04:13:52 +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
ecfd497467 core: remove second-to-last remnants of hotplug.
If you grep hotplug, you'll find two more occurences as a function
argument, but it's unused.
2014-05-11 17:28:25 +03:00
elbandi
98676763b9 Set the pool idle and switch pool, if need 2014-05-08 00:02:39 +02:00
phm
0001517ac0 Merge branch 'marucoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-04-15 19:43:30 +02:00
phm
67cf41a50c Added support for MaruCoin 2014-04-15 00:20:05 +02: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
Bllacky
942c6714fa Update miner.h
Variable declaration. VS seems to like size_t instead of int for certain variables.
2014-04-10 18:39:38 +03:00
Noel Maersk
3ddf6baad9 core: rename default_algorithm to opt_algorithm.
... So it's easier to find when refactoring the configuration system
later on.
2014-04-07 22:09:05 +03: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
phm
769c9f8036 Merge branch 'twecoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
	sph/Makefile.am
2014-04-05 17:41:42 +02:00
phm
474091c426 Added support for Twecoin 2014-04-05 17:27:59 +02:00
Noel Maersk
cc735db550 misc: don't violate reserved identifier naming convention.
Closes https://github.com/veox/sgminer/issues/177
2014-04-03 19:12:35 +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
phm
a683f935a4 Merge branch 'sifcoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-03-31 17:06:16 +02:00
phm
0f88162c39 Added support for Sifcoin 2014-03-31 17:02:06 +02:00
troky
bcb78ed91b Added --coin pool parameter. 2014-03-26 11:10:41 +01:00
Martin Danielsen
01b3f70b63 A new --no-client-reconnect command that disables the 'client.reconnect' function.
It looks like there's an exploit that abuses said command, but it is still not clear exactly how.

There's also an additional message when the reconnect happens: "WARNING: POTENTIAL CLIENT.EXPLOIT!", but it requires you to be actively monitoring your log to catch it, and in which case you already get a "Reconnect requested from Pool 0 to 127.0.0.1" message.

Note that disabling 'client.reconnect' might affect some pools that rely on the feature, like pools that you lease your rig to.

Oh and this is dry-coded. :)
2014-03-24 15:12:40 +02:00
phm
983eae1142 Merge branch 'groestlcoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-03-22 23:58:10 +01:00
phm
764d8706b4 Added support for GroestlCoin. 2014-03-22 23:50:21 +01:00
phm
a0c0975bb8 Merge branch 'animecoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-03-20 18:36:28 +01:00
phm
35744a86c2 Merge branch 'inkcoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-03-20 17:52:31 +01:00
Noel Maersk
87801c2578 opencl: rename cgpu_info->kname to cgpu_info->kernelname. 2014-03-17 21:57:00 +02:00
Noel Maersk
3787f47155 misc: add comment on what cgpu_info->{,k}name are. 2014-03-17 21:57:00 +02:00
Noel Maersk
c9ccf551d7 opencl: remove cl_kernels structure definition and mention.
No longer used.

TODO: check if clState would benefit from having kernel name.
2014-03-17 21:57:00 +02:00
Noel Maersk
1333ed576d core: simplify kernel selection code.
WIP!

Use a string instead of a state-machine-ey kernel selection mechanism
where kernel names have to be predefined. This should allow just dropping
new kernels into dir `kernel` without bloating the code in three other
places.

Is in dire need of a cleanup, function parameter check, edge case check -
all the usual testing.

In particular, checking these definitions/keywords:

* enum cl_kernels
* kname
* [c]gpu[s]->kernel (and similar)
* memory cleanup after strdup()?..
* chosen_kernel
* queue_scrypt_kernel
* strbuf
* initCl
2014-03-17 21:56:43 +02:00
phm
e260e79ab2 Added support for FugueCoin 2014-03-17 19:25:43 +01:00
troky
49aef7100f Reverting "poolname" to "name". 2014-03-15 19:08:24 +02:00
Noel Maersk
8079d054d6 Merge branch 'nfactor'
Conflicts (resolved):
	Makefile.am
	winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +02:00