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