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

6145 Commits

Author SHA1 Message Date
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
c2c8231b9e kernel: zuikkis supports all worksizes.
Closes https://github.com/veox/sgminer/issues/130
2014-03-04 16:43:11 +02:00
Noel Maersk
28ade9f4e4 Merge remote-tracking branch 'troky/build-msvs2010-upd2' 2014-03-02 21:27:28 +02:00
Noel Maersk
ded4452316 ui: check for opt_incognito is Display settings menu. 2014-03-02 20:41:49 +02:00
Noel Maersk
8f014effeb util: add missing include. 2014-03-02 19:15:30 +02:00
Noel Maersk
9c0f912434 core: remove ifdef from opt_compact and opt_incognito declaration. 2014-03-02 19:13:08 +02:00
unknown
747efda902 MSVS2010: Added pool.c and pool.h to project. 2014-03-01 13:19:46 +01:00
Noel Maersk
428061e416 pool: display URL instead of "Pool N" if no poolname provided.
This works since get_pool_name() in pool.c checks if an empty string is
provided, and uses the URL instead if so.
2014-02-28 23:56:14 +02:00
Noel Maersk
4059780d01 pool: do not use defines, just inline strings. 2014-02-28 23:53:53 +02:00
Noel Maersk
d58de45c0e pool: use get_pool_name() where appropriate. 2014-02-28 23:22:40 +02:00
Noel Maersk
0a4f71882c pool: use get_pool_user(). 2014-02-28 22:45:07 +02:00
Noel Maersk
934c4f5f14 pool: introduce get_pool_user() for simpler opt_incognito use.
Use immediately.
2014-02-28 22:44:50 +02:00
Noel Maersk
bd6766f231 pool: define and use POOL_NAME_INCOGNITO. 2014-02-28 22:16:18 +02:00
Noel Maersk
8e4fb3c554 pool: abstract get_pool_name()
The introduction of get_pool_name() warrants a separate function
so opt_incognito does not litter everywhere.
2014-02-28 22:15:39 +02:00
Noel Maersk
0d562ffbf5 core: use opt_incognito in a few more applog() places. 2014-02-28 22:13:42 +02:00
Noel Maersk
888fab437f ui: <incognito> pool name in incognito mode, too.
Ah, what the heck. If it's a pool-related, we'll just ask.
2014-02-28 04:13:22 +02:00
Noel Maersk
2bab1d7b8a doc: update BUGS.md. 2014-02-28 04:00:58 +02:00
Noel Maersk
4c4b909be6 doc: in example.conf, remove boolean values (and ones related to them) set to non-default states.
The config parser has a bug, and can only set boolean options to
non-default state. If a default state is given to an OPT_WITHOUT_ARG
option (as defined in the config table), it is set to the non-default state
anyway, because a CCAN function opt_set_[inv]bool() is used, which is not
meant for this.

Therefore, using such options from the command line is fine, but specifying
them in the .conf file results in above-described behaviour.

E.g., a user tests

    "api-listen" : true

in the config, but changes it later to

    "api-listen" : false

The option will be set true anyway.

A previous commit (8dd1c2d4af) has allowed
this, whereas previously only setting to true was allowed.

Currently boolead options that default to true and can be set false by
the user are explicitly defined as true, e.g.:

    bool opt_restart = true;

There is no simple or right way around this. This is an issue with the
design.
2014-02-28 03:45:11 +02:00
Noel Maersk
a511266959 doc: minor fix for --help message on --incognito. 2014-02-28 03:35:32 +02:00
Noel Maersk
5a8f84b49b ui: allow switching to incognito mode through ncurses interface. 2014-02-28 03:00:12 +02:00
Noel Maersk
d78f372712 core: undo some of previous two commits and andd conditionals to display user name as <incognito> instead.
Fix whitspace (squashed).
2014-02-28 02:46:56 +02:00
Noel Maersk
2561295e3d log: do not set poolname in log in incognito mode. 2014-02-28 02:11:26 +02:00
Noel Maersk
f737992f41 core: introduce --incognito + minimal revision of --compact.
`--incognito` is for sharing output without disclosing login
information.

NCurses interface code, as stated before, is pretty lousy.
2014-02-27 23:29:03 +02:00
Noel Maersk
8ff624618f doc: verbose FAQ answer on running per-instance. 2014-02-27 17:20:48 +02:00
Noel Maersk
9eba0153e5 doc: update example.conf.
Reorder settings by category, add `poolname` and `state` to pool settings.
2014-02-27 17:15:07 +02:00
Noel Maersk
394c200c88 doc: minor FAQ update (formatting and reference a Q from another). 2014-02-27 17:14:45 +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
c159470822 doc: update Windows build references in README.md. 2014-02-25 10:59:06 +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
unknown
c4edf5028b VS2010 build: Cosmetic changes in project configuration. 2014-02-24 15:46:52 +02:00
unknown
dab737c6fe VS2010 build: Fixed compatibility with non-MSVS compilers. 2014-02-24 15:46:22 +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