1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 23:08:07 +00:00
Commit Graph

5974 Commits

Author SHA1 Message Date
Noel Maersk
2b75a67cdf Merge pull request #147 from troky/nfactor
Added algorithm name to "coin" API command. Changed default algo name to "scrypt".
2014-03-14 16:58:05 +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
Noel Maersk
95e397d3b5 Merge pull request #140 from troky/nfactor
Added algorithm.* and inttypes.h for MSVS build
2014-03-09 15:58:42 +02:00
unknown
201036dd92 Added algorithm.* and inttypes.h for MSVS build 2014-03-09 11:29:53 +01:00
Noel Maersk
4ed13e44a3 doc: update configuration.md with latest on --algorithm and --nfactor.
Should close https://github.com/veox/sgminer/issues/126
2014-03-07 02:35:57 +02:00
Noel Maersk
a3f9b24c69 core: set default algorithm for when neither --algorithm nor --nfactor are provided. 2014-03-07 02:27:06 +02:00
Noel Maersk
c6a27709f8 core: use global algorithm structure instead of opt_nfactor.
Also squashed:

config: add log messages to set_algo() and set_nfactor().

algorithm: use set_algorithm_nfactor() when setting default nfactor in set_algorithm().

Otherwise algorithm->n defaults to 0.

P.S. Did I already mention how this could have been C++?..
2014-03-07 02:27:06 +02:00
Noel Maersk
a0c52bf67c config: introduce set_nfactor() and use it to call set_algorithm_nfactor().
Had two bugs:

1. Will not compile due to unknown algorithm_t size.
2. nfactor is set to 0 (bad calling, fix later).

So squashed two commits:

1. algorithm: move algorithm_t definition to header.
2. config: if --nfactor is specified, properly set algorithm->nfactor.
2014-03-07 02:27:06 +02:00
Noel Maersk
92b7770212 config: add --algorithm option and documentation.
Doc in `doc/configuration.md` (has to be started sometime, no?).

Configuration function has to be lamely-named set_algo(), because
set_algorithm() is already declared in algorithm.h (prevent namespace
conflict).

algorithm has to be added as global variable due to the way the
callback is done (by CCAN/opt, which in itself is nice).

This can be cleaned up significantly by (at least) introducing a
global configuration struct, but there is no reason to do it now
just for this - better a wholesale manana.
2014-03-07 02:27:00 +02:00
Noel Maersk
50a792f2cd algorithm: initial set_algorithm() and set_algorithm_nfactor(). 2014-03-06 21:23:13 +02:00
Noel Maersk
776eec2e11 algorithm: initial structure definition. 2014-03-06 21:23:10 +02:00
Noel Maersk
11cf733ede misc: fix spaces after closing parenthesis.
sed -i 's/) $/)/' *.cl
2014-02-26 04:32:49 +02:00
Noel Maersk
e18bcc2582 kernel: use N-factor table instead of passing parameter N directly. 2014-02-26 04:30:46 +02:00
Noel Maersk
3afaaf1bfa ocl: rename nfactor to N where appropriate.
N = 2^nfactor, so `nfactor` was a bad name choice here.
2014-02-26 04:14:22 +02:00
Noel Maersk
c4c85ca71c misc: add FIXME for scrypt_test() and scanhash_scrypt(). 2014-02-25 07:39:45 +02:00
Noel Maersk
2135777cac scrypt: remove commented-out magic numbers. 2014-02-25 07:39:26 +02:00
Noel Maersk
4b3b2ef5a6 ocl: use 'nf' instead of 'n' in compiled kernel binary name.
It is used as a factor number here (e.g. 10, not 1024).
2014-02-25 06:33:53 +02:00
Noel Maersk
5b42d38f33 ocl/misc: spacing. 2014-02-25 06:33:53 +02:00
Noel Maersk
7217da3078 ocl: vectors are hard-set to 1, add appropriate "optimisation". 2014-02-25 06:33:48 +02:00
Noel Maersk
ab9fcb1a14 ocl: use same type convention for nfactor (cl_uint instead of int). 2014-02-24 16:26:50 +02:00
Noel Maersk
3640f1494f Merge remote-tracking branch 'dadiv/zuikkis-nfactor' into nfactor 2014-02-24 15:45:18 +02:00
Noel Maersk
ee70f9f2af misc: FAQ formatting. 2014-02-24 14:25:15 +02: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
Zuikkis
2b9a588e25 Update sgminer.c & scrypt.c
Default opt_nfactor was 11 instead of 10, my typo.. :) Sorry.

scrypt_1024_1_1_256_sp renamed to scrypt_n_1_1_256_sp
2014-02-23 14:39:40 -05:00
Teemu Suikki
73bb1504e9 Scrypt-nfactor support!
Added new configuration parameter "nfactor", which defaults to 10 (normal scrypt).
Use 11 for vertcoin.

Kernels modified accordingly.
2014-02-23 04:44:17 +02:00
Noel Maersk
44aed3570e Merge branch 'build-msvs2010-upd' into build-msvs2010-merge
Test in separate branch before merging into master.

Conflicts (resolved):
	api.c
	util.c
2014-02-22 17:05:07 +02:00
Noel Maersk
a38f01c9a2 misc: explain gpu-threads comment FIXME. 2014-02-22 16:38:47 +02:00
Noel Maersk
323c84970e Merge pull request #106 from sshimko/master
Fixup --help on intensities.
2014-02-22 02:53:38 +02:00
Spencer Shimko
45a16f1ac2 Fixup --help on intensities.
Current help contains conflict statements regarding intensity
priorities.

Per commit d11df698d1:
- rawintensity overrides both xintensity and intensity
- xintensity overrides intensity
2014-02-21 17:46:10 -05:00
Noel Maersk
80e6307033 Merge branch 'port-ckolivas-3.12.3'
Could be issue 88 (no reconnect to pools on network connectivity going
down for a while and then back up) is a regression introduced in pool
handling after cgminer 3.7.2. Pull in other changes to pool handling
just in case.

Tests show that this may be an issue with glibc's getaddrinfo(), and that
the last changes in cgminer might mitigate the issue somewhat.
2014-02-19 18:36:10 +02:00
Noel Maersk
edc94b07ce misc: update NEWS with what's been ported from ckolivas/cgminer. 2014-02-19 18:21:32 +02:00
Noel Maersk
fa21900837 Merge pull request #100 from gionn/patch-1
Fixed md formatting in MINING.md
2014-02-19 02:27:10 +02:00
Giovanni Toraldo
7ca09655a7 Fixed md formatting in MINING.md 2014-02-18 23:44:09 +01:00
Con Kolivas
a825524325 We shouldn't block on no work situations directly from the getwork scheduler itself. 2014-02-17 17:34:50 +02:00
Con Kolivas
b9b3abe264 Make the pthread cond wait in the getwork scheduler a timed wait in case we miss a wakeup. 2014-02-17 17:33:23 +02:00
Noel Maersk
ac3f6c5705 misc: add note about ports from ckolivas/cgminer. 2014-02-16 15:13:42 +02:00
Con Kolivas
7134cd7050 Add debug output when get_work() is blocked for an extended period and add grace time to the device's last valid work to prevent false positives for device failure. 2014-02-16 15:13:08 +02:00
Con Kolivas
26c4be818a Show device info in noffset nonce share above target message. 2014-02-16 15:12:43 +02:00
Con Kolivas
aca8a58f2e Only show one decimal place if pool diff is not an integer. 2014-02-16 15:11:59 +02:00
Con Kolivas
117c032b92 Slowly remove work even if it's not being used to keep the getwork counter incrementing even if work is not used and as a test that pools are still working. 2014-02-16 15:09:22 +02:00
Con Kolivas
5dad99caf6 Give device info with share above target message. 2014-02-16 15:08:39 +02:00
Con Kolivas
f8b9e41f28 Check for when errno is set on windows as well as the windows variant for errors. 2014-02-16 15:08:00 +02:00
Jim Jagielski
88c7720caf These may not be longs (eg: OSX)... fo a safe cast to ensure. 2014-02-16 15:05:44 +02:00
Kano
a1844cdf44 API-README correct new text format documentation 2014-02-16 15:00:52 +02:00
Kano
ae837a762f API allow multiple commands/replies in one request 2014-02-16 15:00:32 +02:00
Con Kolivas
b5abf68938 Always show the stratum share lag time in debug mode. 2014-02-16 14:45:15 +02:00
Con Kolivas
9c59fe2c31 Add stratum share response lag time to verbose output if it's greater than 1 second. 2014-02-16 14:43:53 +02:00
Con Kolivas
7731806417 Add stratum share submission lag time to verbose information if it's over 1 second. 2014-02-16 14:43:31 +02:00
Con Kolivas
f7394ff165 Check for more interrupted conditions in util.c and handle them gracefully. 2014-02-16 14:43:00 +02:00
Con Kolivas
90cc93c6cc Add the ability to display a hexadecimal 32 bit unsigned integer to the API. 2014-02-16 14:42:30 +02:00