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

115 Commits

Author SHA1 Message Date
Noel Maersk
106dbee1f9 core: check if GPU thread is disabled before checking if it's waiting on getwork.
Otherwise the watchdog thread segfaults on checking an uninitialised
thr->getwork value.
2014-03-17 21:57:00 +02:00
Noel Maersk
87801c2578 opencl: rename cgpu_info->kname to cgpu_info->kernelname. 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
Noel Maersk
fc902f0f41 pool: add back --poolname as hidden option for backward compatibility.
+ Udate NEWS.
2014-03-15 19:08:24 +02:00
troky
49aef7100f Reverting "poolname" to "name". 2014-03-15 19:08:24 +02:00
unknown
958764fecc MSVS build: Fixed debug build. MSVS doesn't like uninitialized variables. 2014-03-15 12:47:32 +01:00
Noel Maersk
8079d054d6 Merge branch 'nfactor'
Conflicts (resolved):
	Makefile.am
	winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +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
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
ded4452316 ui: check for opt_incognito is Display settings menu. 2014-03-02 20:41:49 +02:00
Noel Maersk
9c0f912434 core: remove ifdef from opt_compact and opt_incognito declaration. 2014-03-02 19:13:08 +02: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
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
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
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
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
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
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
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
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
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
95ac0c4356 Export the flush_queue function for use by drivers. 2014-02-16 14:41:02 +02:00
Con Kolivas
ab805ec146 Remove wrong goto 2014-02-16 14:40:42 +02:00
Con Kolivas
d5d34f2168 Remove the unqueued work reference when we discard work from get queued as well. 2014-02-16 14:40:23 +02:00
Con Kolivas
ee7fb11cfb Wake the global work scheduler when we remove a work item from the unqueued work pointer. 2014-02-16 14:39:47 +02:00
Con Kolivas
2cea7ce439 Discard work that is stale in the get_queued() function, returning NULL instead. 2014-02-16 14:39:18 +02:00
ckolivas
8592226ad2 Add a get and queue helper work function. 2014-02-16 14:37:16 +02:00
Con Kolivas
011512561a Add a call to a driver specific zero stats function when zero stats is called to allow each driver to reset its own stats as well if desired. 2014-02-16 14:24:06 +02:00
Con Kolivas
dc767487e2 Fix displayed diff when solo mining at >2^32 diff. 2014-02-16 14:21:29 +02:00
Con Kolivas
c31de2601b Store when the last getwork was retrieved and display it in the API summary. 2014-02-16 14:14:40 +02:00
ckolivas
d1e2bfaf7f Make submit_tested_work return a bool about whether it meets the work target or not. 2014-02-16 14:10:31 +02:00
ckolivas
a58ef1b8c7 Provide a helper function for determining dev runtime and use it in the hashmeters used. 2014-02-16 14:09:51 +02:00