ystarnaud
9d54637e3c
Fix HW Issue at startup
...
Fixed an issue where the GPUs would be initialized on first pool alive,
but the mining threads would end up being initialized on another pool
because it was selected right away.
2014-06-30 00:12:12 -04: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
Noel Maersk
78014ab0d5
work queue: verbose log as to why staged work is being discarded.
2014-06-24 19:20:32 +03:00
ystarnaud
7024d14c88
Fix high fan issue at startup/algo switch
...
Was setting fan speed to gpu_fan (which is the max) instead of min_fan on GPU settings change.
2014-06-24 10:45:43 -04:00
ystarnaud
99082f4269
GPU initialization update
...
Undo 212009a48a
as it caused some issues with some pools and configs.
2014-06-23 20:45:16 -04:00
ystarnaud
212009a48a
GPU Initialization update
...
Moved the GPU initialization block to happen when a pool is actually switched to. Sometimes the first pool alive isn't the first pool switched to. This would result in unnecessary kernel loading if the first pool detected alive isn't used right away.
2014-06-23 17:20:26 -04:00
ystarnaud
76287736e2
Fixed GPU initialization
...
Fixed the GPU initialization to happen only after the first pool alive is switched to. This way no unnecessary kernels are loaded.
2014-06-23 16:40:34 -04:00
ystarnaud
e9b82991ec
60 second quit fix after algo switch
2014-06-23 12:04:05 -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
Noel Maersk
513307c790
config: remove commented-out old config-loading code.
2014-06-20 20:43:08 +03:00
Noel Maersk
5309da57cc
config: remove unused variable.
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
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
troky
b2e500e2a6
Fixed pool name display in rejected share notice when pool name is longer than 20 chars.
2014-06-16 15:52:48 +02:00
troky
d83d7bd386
Removed original sha2 and made code use sph_sha2
2014-06-12 13:19:30 +02:00
troky
f9a8e66f70
Fixed crash when changing display modes ( #237 )
2014-06-11 11:18:36 +02:00
troky
cd9864f92b
Removed unneccessary code introduced in 954c0e6
2014-06-11 00:12:45 +02:00
troky
cbc22823df
Removed trailing slashes from folder paths to avoid kernel building under Windows (MSVS).
2014-06-10 16:40:37 +02:00
platinum4
280a64e537
Squelch "Network diff set" unless --more-notices
...
space " "
2014-06-09 17:51:01 +02:00
Jan Berdajs
2ea8f5d018
just in case, read-lock devices
2014-06-09 17:31:22 +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
2877e8d49c
of course it needs to be a write lock! fixes segfault
2014-06-09 17:02:14 +02:00
Jan Berdajs
d1f7ef6133
is already locked at this point
2014-06-09 16:33:35 +02:00
Jan Berdajs
954c0e6fbc
fix opt_kernel_path writing over the allocated memory! also some small changes for more robust hard restart
2014-06-09 15:56:39 +02:00
Jan Berdajs
77c996858b
fix compiler warning and indentation
2014-06-09 02:37:07 +02:00
platinum4
a5fd98c832
declare opt_morenotices;
2014-06-09 02:35:13 +02:00
platinum4
0f9bf18172
Add option --more-notices & shorten stale submit
2014-06-09 02:35:07 +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
6152638dd7
fix compile without ADL
2014-06-06 13:52:59 +02:00
blagodarenko
1bca4a7921
fix "diff 0.000/0.000"
2014-06-06 14:16:32 +04:00
troky
1bb452e321
Fixed kernel path bug introduced in 8198286597
2014-06-06 09:20:39 +02:00
Anatoly
32824e56a0
Total uptime drop fix
2014-06-06 08:03:30 +08:00
troky
1f73ae040e
Merge branch 'v5_0' of https://github.com/sgminer-dev/sgminer into v5_0
2014-06-05 23:12:38 +02:00
troky
8198286597
Fixed MSVS build.
2014-06-05 23:11:29 +02:00
Jan Berdajs
00d17d16fe
fix segfault (watchdog thread declares threads sick and tries to restart them while they are already being restarted)
2014-06-05 22:57:20 +02:00
Noel Maersk
4f387321ce
misc: update AUTHORS.md, add CR to sgminer.c, minor style.
2014-06-05 23:07:14 +03:00
Jan Berdajs
f0e47ec8ec
make sure reinit_device cannot happen while algo switching, which would probably result in segfault
2014-06-05 18:40:27 +02:00
Jan Berdajs
e58cd00db7
fix bug in thread_reportin (watchdog can detect getwork is false before thr->last is set), and a few cosmetic changes
2014-06-05 18:35:46 +02:00
troky
b8a1c1f660
MSVS compatibility update.
2014-06-05 10:20:43 +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
87bbca6148
only change gpu engine, memclock, fans, if ADL is enabled
2014-06-05 00:13:34 +02:00
Anatoly
8c48255802
Code cleanup
...
WATCHDOG_SICK_TIME increase reverted
Hardcode in get_work_blockdiff removed
2014-06-04 18:07:20 +02:00
Anatoly
99db17145f
show-coindiff option added
2014-06-04 18:07:13 +02:00
Anatoly
8f10cbfac5
Total uptime length
...
Conflicts:
sgminer.c
2014-06-04 18:07:12 +02:00
Anatoly
d89e53b3db
Extend time to sick state
2014-06-04 18:07:07 +02:00
Jan Berdajs
2ec09155e6
per-pool gpu-fan
2014-05-30 00:00:36 +02:00
Jan Berdajs
f596631a07
adjust ncurses interface when we change mining_threads count
2014-05-29 02:05:15 +02:00
Jan Berdajs
6c5ce535d9
fix compiler warnings
2014-05-29 01:34:29 +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
24d0ce4884
all hail SPACE
2014-05-28 23:38:58 +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
cac833e5c2
fix bug which can occur when switching from a very low diff algo (darkcoin) to a high diff algo (scrypt), which caused invalid nonces
2014-05-28 00:37:53 +02:00
Jan Berdajs
5b8adcd9a1
add todo comment if we ever fix the broken config parser
2014-05-27 04:21:41 +02:00
Jan Berdajs
efe1ebd7ae
Intensity can be set for each pool individually
2014-05-27 04:13:52 +02:00
Jan Berdajs
9d9f5b7586
Add MaxCoin support
2014-05-27 01:12:30 +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
troky
22a3c5b6fe
Reverting 83d71da
. VS2010 fix.
2014-05-22 09:55:43 +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
e32dcd7190
Mark pool as idle if stratum restart is failed
2014-05-08 00:04:01 +02:00
elbandi
98676763b9
Set the pool idle and switch pool, if need
2014-05-08 00:02:39 +02:00
Noel Maersk
5b054542db
config: Don't write commas if not needed, default to opt_algorithm
when adding pool without one set explicitly.
2014-05-05 15:34:02 +03:00
sterlingpickens
83d71da225
Update sgminer.c
2014-05-02 09:36:35 -07:00
Elbandi
973dcefa8c
Use get_pool_name everywhere
2014-04-24 12:09:56 +02:00
Noel Maersk
3d7167ce2c
config: improve pool section writing.
...
Order so JSON's not broken, write `priority` and `algorithm`.
Closes #102 .
2014-04-18 17:31:06 +03: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
92c3b5eb48
api: set algorithm properly on addpool.
2014-04-12 17:32:41 +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
01e96606f0
Fixed (pool) algo selection.
2014-04-11 10:41:37 +02:00
Noel Maersk
da667d63e0
config: write pool name and description to config.
2014-04-11 03:01:13 +03:00
Noel Maersk
2c00158216
Merge pull request #189 from Bllacky/patch-7
...
Update sgminer.c
2014-04-10 18:47:28 +03:00
Noel Maersk
b3d483a035
core: revert two of the changes in Bllacky's pull request #187 .
...
`ndigits` is actually an int, used as a field width specifier in
snprintf().
s is an extensively-used pointer.
2014-04-09 22:37:07 +03:00
Bllacky
fe64ac99d6
Update sgminer.c
...
One small change to work well with previous ones.
Number of warnings now is 151, down from 157.
Still a long way to go. Most of the serious warnings are related to variables in miner.h, which is so intertwined with everything else that I fear of breaking something or making performance worse if I touch miner.h too much.
2014-04-09 22:17:37 +03:00
Bllacky
1dc8aabda9
Update sgminer.c
...
Minor changes to variable declaration.
Should reduce the number of warnings by about 5.
2014-04-09 22:03:12 +03:00
Noel Maersk
aa5f4c713b
config: add const
qualifier to set_pool_{algorithm,nfactor}().
...
MSVS doesn't like implicit casting.
2014-04-08 14:28:50 +03:00
Noel Maersk
e7078a5e16
misc: clarify currentpool() comment.
2014-04-07 22:51:23 +03:00
Noel Maersk
f6616aa63b
config: allow specifying per-pool algorithm with --algorithm
instead of --pool-algorithm
.
...
This will probably only work with config file, though, since it relies
on json_array_index.
2014-04-07 22:43:43 +03:00
Noel Maersk
53a199a21d
config: use get_pool_name() in set_pool_algorithm() and set_pool_nfactor().
2014-04-07 22:21:57 +03:00
Noel Maersk
af879b1c77
core/misc: rename set_poolname() to set_pool_name().
2014-04-07 22:19:57 +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
7678db6801
Fixed problem with stratum support when mining FC, GRS and TWE. Added --difficulty-multiplier parameter for controlling stratum difficulty multiplier.
2014-04-05 20:55:22 +02: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
Jan Berdajs
cdb817bcbd
Change algorithm more robustly and faster, previous way was buggy
2014-03-31 21:05:20 +02: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
Noel Maersk
a57f841570
Revert "fix for mingw-w64"
...
This reverts commit 32b13ccb46
.
Reported by Wolf0 (aka wolf9466) to not break MinGW 64-bit compilation
with GCC 4.8.2 (latest stable).
2014-03-29 03:04:30 +02:00
Noel Maersk
db0f7cf6f0
core: silence gcc warning about sprintf() use in add_pool() - this time for sure.
2014-03-28 17:21:10 +02:00