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

49 Commits

Author SHA1 Message Date
Tanguy Pruvot
9a13624c2e check abort_flag in threads loops
This flag was added recently (scrypt) from cudaminer code,
and i missed some...

and prevent multiple calls to proper_exit(), one is enough...
2015-08-24 13:33:03 +02:00
Tanguy Pruvot
b5b9b1f2db api: show power in threads and hwinfo 2015-06-24 07:31:37 +02:00
Tanguy Pruvot
b72b4c5a5f api: fix summary sums with multi pools
and allow to get pool infos with the pool number as parameter

samples telnet queries: pool|0 pool|1
2015-06-12 18:05:53 +02:00
Tanguy Pruvot
e99ff6c15b nvml: clocks cleanup + pstate check (still not supported) 2015-05-28 06:47:23 +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
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
c418eff4e9 api: auto bind to first available port
when default port is used, else keep trying for one minute

This allow to auto-detect processes iterating 4068,69,70...
2015-05-16 04:56:01 +02:00
Tanguy Pruvot
ff27ccb80e stats: simplify the storage filter
the gpu id key filter was useless, use thread ids...
2015-05-12 02:40:50 +02:00
Tanguy Pruvot
0f604439f5 api: fix high port numbers
and convert ccminer.rc from utf-16 to Latin1 (doesnt want utf-8),
required for git diff/merge/rebase...
2015-03-05 18:29:17 +01:00
Tanguy Pruvot
9c4158aadb debug: x11 algo traces for cuda 7 problem 2015-03-02 16:29:46 +01:00
Tanguy Pruvot
a537fa304c Add basic API remote control
only allowed if --api-remote parameter or config key is set

and fix possible problem with urls containing user:password@

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-02-13 06:57:44 +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
26b51a557b Allow different intensity per device
and clean the old variables, no more required
2015-01-24 11:17:29 +01:00
Tanguy Pruvot
dfa9f63886 api: report intensity and throughput for each thread
even when no parameter is set (default set in each algo code)
2015-01-22 06:36:22 +01:00
Tanguy Pruvot
2a5233f56e api: report throughput when default 2015-01-22 06:28:59 +01:00
Tanguy Pruvot
6500160fe1 api: add cuda threads count 2015-01-19 00:59:25 +01:00
Tanguy Pruvot
ec454dd78c api: add fan rpm (windows nvapi only) 2014-12-26 15:33:55 +01:00
Tanguy Pruvot
5cbf239d8a api: add kernel version for linux 2014-12-26 15:20:03 +00:00
Tanguy Pruvot
d09ec41251 api: allow -b <ip>, and set bind retry to 20sec
before, only -b <ip:port>, <port> or 0 (disable) was allowed

easier to set -b 0.0.0.0 with default port
2014-12-08 04:13:41 +01:00
Tanguy Pruvot
543de0a73c api: add support for websocket calls
Allow to directly get api data in HTML5

Tested on Chrome... IE>=10 required, not tested

IE11 seems buggy on connection close...  todo

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-12-03 08:35:27 +01:00
Tanguy Pruvot
8ad180cc70 various small changes
heavy: reduce by 256 threads default intensity to all -i 20
cuda: put static thread init bools outside the code (made once)
api: fix nvml header to build without
2014-11-28 20:57:35 +01:00
Tanguy Pruvot
1032f191bf api: update sample php ui with pool
and report pstate in hwinfo only
2014-11-27 00:48:40 +01:00
Tanguy Pruvot
6ae28162db various extern cleanup + api history uids and gpu SM
uids could be useful to create graphes from history data

Note: please do a clean build after this commit (changes in miner.h)
2014-11-26 11:55:42 +01:00
Tanguy Pruvot
9a97f0cf6e api: fix size_t printf exception in vstudio 2014-11-25 18:24:01 +01:00
Tanguy Pruvot
7e15f31706 api: pool query (uptime, ping, discon., url and user) 2014-11-25 17:39:02 +01:00
Tanguy Pruvot
3e8457d76c api: add device uuid (nvml), and OS in hwinfo
move nvdriver to sys infos (unique on system)

prepare pool query
2014-11-24 21:20:26 +01:00
Tanguy Pruvot
dc5d1b112d api: add scanlog command to monitor scan ranges
will be used for external debugging...
2014-11-24 20:26:41 +01:00
Tanguy Pruvot
484bbc4b15 api: restore bios, can be useful to identify
We have no way yet to identify a MSI 750 from a Gigabyte one...
2014-11-24 14:32:34 +01:00
Tanguy Pruvot
d0ad1017e9 nvapi: get vid/pid like nvml + driver version
remove vbios revision, goal was to find the vendor...
2014-11-24 00:08:14 +01:00
Tanguy Pruvot
e2ac7a2a75 api: add nvapi and nvml ids for C# tools 2014-11-23 11:12:58 +01:00
Tanguy Pruvot
aa74aa33e2 api: fix hwinfo gpus 2014-11-23 10:50:25 +01:00
Tanguy Pruvot
9a8b7ff0d7 api: add cpu temp/freq (linux) 2014-11-23 08:26:38 +01:00
Tanguy Pruvot
73f22b237a Prepare trap of hardware/mem failures 2014-11-20 18:44:25 +01:00
Tanguy Pruvot
1bc4e7e942 api: add mem size and freq to hwinfo query 2014-11-20 15:54:56 +01:00
Tanguy Pruvot
3ad4be7de0 api: export gpu freq on linux too + hwinfo command 2014-11-19 16:16:27 +01:00
Tanguy Pruvot
b24b65a9c9 api: add gpu pci bus id, unified id + bloc height 2014-11-18 16:25:44 +01:00
Tanguy Pruvot
17cf3767e9 api: also fix nvapi mapping and double swap on histo 2014-11-18 03:34:23 +01:00
Tanguy Pruvot
582c971f2b api: fix histo gpu/thr id mismatch 2014-11-17 19:11:26 +01:00
Tanguy Pruvot
047e79a9fc api: add meminfo query to debug mem storages 2014-11-17 16:17:53 +01:00
Tanguy Pruvot
59391e25ec api: fix includes after a test on mingw (cpuminer) 2014-11-16 17:34:50 +01:00
Tanguy Pruvot
3e43553735 api: export card labels and count, renames stats command
renammed to "threads", stats was too much generic
2014-11-14 23:38:16 +01:00
Tanguy Pruvot
cc05128ae3 api: fix histo thread param 2014-11-14 20:30:42 +01:00
Tanguy Pruvot
124dc6ea57 nvapi: fix mapping of devices 2014-11-14 19:33:24 +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
3d2260acc4 stats: add support for current freq and pstate
windows only via nvapi, if nvml function is not supported
2014-11-14 02:48:27 +01:00
Tanguy Pruvot
e139736a2f api: better compat with telnet + help command
handle "\r\n" and terminate connection if command is not known
2014-11-14 01:32:10 +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
Tanguy Pruvot
49f3c454c2 Add nvml for GPU monitoring (squashed)
Based on mwhite73 <marvin.white@gmail.com> implementation

  Linked to the api system

  Also fix Makefile to support standard c++ files
  This prevent nvcc use without device code

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-13 14:36:18 +01:00