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

46 Commits

Author SHA1 Message Date
Tanguy Pruvot
0618c2abc3 fix for vstudio 2015-05-26 09:51:46 +02:00
Tanguy Pruvot
bbd2c704f9 multipool: Squashed commit (v2)
commit a9d3c1ffdb71d2a4985749acba3d424161154ab4
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 05:39:24 2015 +0200

    multipool: last changes before squashed merge

    and fix net diff on wallets.. was longpoll specific

commit a63f0024f3f1fb52d2c4369518bf87c33a9e16ae
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 05:02:27 2015 +0200

    update api sample for the protocol 1.5

commit adda14b22edde6485932be56550166478f6f00dd
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 04:43:25 2015 +0200

    stats: store pool number in scanlog

commit e1a0274b01c29409ce16f9096b9985a35cf78ba7
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 03:36:15 2015 +0200

    api: switchpool and new pool stats variables (API v1.5)

    add accepted/rej by pool, wait time on conditional, net diff and rate

    also add scantime per pool config option and do some pool cleanup..

commit 1a30450ad2a5e068983531b9d2a96629b970c1e8
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 06:39:09 2015 +0200

    prevent concurrent pool switching

    and limit condtionnal wait messages to the first thread/device

commit e3922c7a331a3ad2730bc83082fcd6b2547542f5
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 05:39:45 2015 +0200

    add some pool rotate options, like pool time-limit

    update sample pools.conf for time rotation

commit 312bd905412d49fd5a9f9e7ff2bc72b23edf38ed
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 04:31:19 2015 +0200

    do not try to restart threads from threads

    Start inconditionally the stratum and longpoll threads,
    these threads are just waiting a tq_push() if unused...

    so add some checks to know if vars are set for the right pool

commit d4a9428fefdd9e9d70c3c8231f10961e7cd41760
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 01:06:31 2015 +0200

    pools: add name and removed attributes

    also increase max defined pools to 8

    to be tested on windows..

commit d840d683ecb2cc4767f0a0612b8359c52d4bad29
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue May 19 22:33:11 2015 +0200

    parse json config file pools array

commit d6c29b1f7f6b786c56e1f0cb8a90305f06cc7aec
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue May 19 03:29:30 2015 +0200

    multi-pools: prepare storage/switch of credentials

    for the moment:
    - allow the storage of multiple -o params (and user/pass)
    - allow a failover pool on connection failed
    - switch to the next pool with the "seturl" api remote command
    - longpoll to stratum switch (reverse to check...)

    todo: mix stratum/getwork, new api commands, json config...

commit 2d6b3fddf6631d7df1ac6ca74eee91c33a3c09ee
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri May 22 08:26:40 2015 +0200

    multipool: increase stability, but not 100% perfect

    several problems fixed:
    - submit to the pool set in work (source pool)
    - longpoll curl timeout could be too high and could lock the switch
    - mutexes cant be copied on windows (stratum global var to fully remove later)

    I linked the -T timeout option to curl and tried to remove all fixed timeout values

commit 6fd935c369cf33949dab98c8b09b2ca8cab3e7ea
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri May 22 11:23:07 2015 +0200

    stratum: remove last rpc_ vars in stratum thread

commit ee9c821525be303282e5dab512ffd2ae81ad524f
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Sat May 23 03:53:50 2015 +0200

    stratum: do not alloc empty merkle tree

commit 69852a2874bd18c4ed1daa9180a10d12976424dc
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Sat May 23 04:25:12 2015 +0200

    stratum: properly free jobs on disconnect

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-05-23 05:28:12 +02:00
Tanguy Pruvot
298573b45d Drop Whirlpool and whirpoolx algos, no more used...
Vanillacoin is now PoS only
2015-05-19 01:05:38 +02:00
Tanguy Pruvot
a2b6488c01 Compute and display network diff (nbits) if max-diff
was only made on the wallets with getmininginfo

Todo: double check for all algos/pools

tested ok on x11, lyra2, skein, skein2, zr5 stratum/longpoll

Scrypt-Jane pool net diff seems incorrect, disabled
Neoscrypt could be different also (untested, disabled)...
2015-05-18 08:17:45 +02:00
Tanguy Pruvot
d9b0312897 x64: fix some size_t warnings 2015-05-17 04:56:42 +02:00
Tanguy Pruvot
809cd3dc42 Allow to retrieve benchmark results with a time-limit
sample command line :
ccminer -a x11 -d 0 --benchmark --time-limit 30 2>result.txt
2015-05-15 22:09:28 +02:00
Tanguy Pruvot
51abf151ee internal opt_extranonce param, not linked to cmdline... 2015-05-14 21:22:00 +02:00
Tanguy Pruvot
15584e4f05 neoscrypt: adapt for visual studio compat
todo: fix SM 3.0 builds
2015-05-03 15:53:02 +02:00
Tanguy Pruvot
65c1d787e7 add neoscrypt based on djm34 work
indent, link --intensity, and some clean up

Tested speed on linux ~= 160kH/s on a 750Ti (Black Edition)

To be continued...
2015-05-03 14:38:15 +02:00
Tanguy Pruvot
a6d88abbc9 scrypt: finish scrypt-jane algo import 2015-04-21 13:20:35 +02:00
Tanguy Pruvot
9dc78da2ee import and adapt scrypt from cudaminer project
scrypt-jane under work...
2015-04-18 18:24:55 +02:00
Tanguy Pruvot
d58d53f2b2 update README, small changes, prepare release 1.6.1
still need a SM 3.0 fix for skein...
2015-04-14 23:28:00 +02:00
Tanguy Pruvot
7963dbb438 skein2 algo for woodcoin
Also known as Double Skein

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-04-14 02:03:58 +02:00
Tanguy Pruvot
4f43abb402 bmw512: indent and restore SM 3.0 compat
could be also the source of the problem seen with CUDA 7

restored the code before sp/klaus changes for SM 3.0 devices...
2015-03-28 12:01:50 +01:00
Tanguy Pruvot
f86784ee56 Add skein algo (Skeincoin, Myriad, Unat...)
SKEIN512 + SHA256

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-03-27 15:24:27 +01:00
Tanguy Pruvot
a37e909db9 Add zr5 algo (for SM 3.5+)
uint4 copy + keccak cleanup, groestl: small uint4 opt

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-03-27 15:16:25 +01:00
Tanguy Pruvot
5988e945ef some cleanup and longpoll changes 2015-03-27 08:03:26 +01:00
Tanguy Pruvot
35cc5908ee windows: return to normal priority, fix json decref
the jansson error seems only seen in windows debug mode
2015-03-10 19:14:15 +01:00
Tanguy Pruvot
7f00bce5ae longpoll: auto disable gbt when not supported 2015-03-10 01:09:47 +01:00
Tanguy Pruvot
86a31172b0 cputest: dont share mem of buf and scratchpad
and change algo names color to green...
2015-03-09 03:08:51 +01:00
Tanguy Pruvot
2c2269dcb6 cputest: cleanup + calloc 2015-03-09 02:49:11 +01:00
Tanguy Pruvot
5e42389b4b pluck: finish the algo, add cpu validation 2015-03-09 02:21:44 +01:00
Tanguy Pruvot
77c737ff72 various small changes and update readme 2015-03-08 16:33:53 +01:00
Tanguy Pruvot
f8f46bfe5b whirlpoolx: fix for multi-gpu support
add also cputest entry and do some cleanup...
2015-03-07 16:33:04 +01:00
Tanguy Pruvot
9c4158aadb debug: x11 algo traces for cuda 7 problem 2015-03-02 16:29:46 +01:00
Tanguy Pruvot
81fd04a208 hashrate: Remove some extra units and allow 4 digits
to keep current X11 output (sample: 2950.01 kH/s)
2015-02-22 11:46:21 +00:00
Erik Mossberg
c41d9e7bb6 hashrate: format units based on the value size 2015-02-22 11:46:21 +00:00
Tanguy Pruvot
5dd2534df9 Handle a default config file (ccminer.conf)
This allow to "debug" easily in visual studio (without project changes)

Prepare version 1.5.3, update README
2015-02-11 01:34:56 +01:00
Tanguy Pruvot
3938dce740 api: one decimal is enough for intensity
and fix windows build... missing __func define
2015-01-24 12:45:06 +01:00
Tanguy Pruvot
bec89724d5 logs: prevent multiple warnings 2015-01-22 05:55:50 +01:00
Tanguy Pruvot
70743eb48d solo: get bloc height and trap more errors
and disable multiple nonce on wallets,
a bloc cant be resolved twice ;)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-12-07 16:53:05 +01:00
Tanguy Pruvot
f9bba0ff1a lyra2: small changes and code cleanup 2014-12-07 09:04:03 +01:00
Tanguy Pruvot
5db46b74b5 lyra2: fix cpu hash + validation 2014-12-06 11:51:25 +01:00
Tanguy Pruvot
c5b349e079 Add Lyra2 algo, based on Vertcoin published code
Seems to be djm34 work, i recognize the code style ;)

Code was cleaned/indented and adapted to my fork...

Only usable on the test pool until 16 december 2014!
2014-12-06 11:28:26 +01:00
Tanguy Pruvot
1b65cd05cc heavy: add error checks, fix strict aliasing and linux
The core problem was the cuda hefty Thread per block set to high
but took me several hours to find that...

btw... +25% in heavy 12500 with 256 threads per block... vs 128 & 512
if max reg count is set to 80...
2014-11-27 09:14:59 +01:00
Tanguy Pruvot
7e15f31706 api: pool query (uptime, ping, discon., url and user) 2014-11-25 17:39:02 +01:00
Tanguy Pruvot
d7c13b0611 stratum: handle standard method if extranonce is ignored
seen on yamp.com pools
2014-11-23 09:22:25 +01:00
Tanguy Pruvot
3be08ad944 update readme (api, current changes, credits) 2014-11-22 16:43:49 +01:00
Tanguy Pruvot
5a869d1c63 stratum: difficulty can be buggy with values close to zero
bug seen on windows with xpool.ca (x11)
2014-11-22 14:01:03 +01:00
Tanguy Pruvot
2ea9da1415 stratum: add more checks on request id 2014-11-22 13:30:42 +01:00
Tanguy Pruvot
7ce3fed611 extranonce: ignore subscribe timeout, not the parse errors 2014-11-22 03:25:49 +01:00
Tanguy Pruvot
5ddc8de9da stratum: handle optional mining.set_extranonce
allow pools to switch more coins without reconnect

Tested ok on a nicehash x11 pool

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-22 01:42:55 +01:00
Tanguy Pruvot
6a9b8a5ab2 hashlog: use work objects, put struct in miner.h 2014-11-17 15:58:11 +01:00
Tanguy Pruvot
3652c708b9 api: add histo command and difficulty
enhance multi-gpu stats and fix nvapi indexes

change syslog prefix to ccminer (cpuminer remains)

api 1.1 modified - not officially released yet
2014-11-14 19:09:48 +01:00
Tanguy Pruvot
e82f5d4d75 restore divided hashrate for quark and jackpot
The previous way it was done was not correct (hashdone divided/2)

So add a factor 0.5 to the computed hashrate... to stay comparable
2014-11-14 13:45:02 +01:00
Tanguy Pruvot
e40a7a720c ccminer: rename main file and switch to C++
There was a different behavior on linux and visual studio

That was making it hard to link functions correctly

That remove some ifdef / extern "C" requirements

note about x86 releases, x86 nvml.dll is not installed on Windows x64!
2014-11-13 16:11:35 +01:00