GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #153 from kanoi/master 

Add API support for Icarus and Bitforce + Icarus fixes ++
nfactor-troky
Con Kolivas 13 years ago
parent
e26f0ac131 0699061ade
commit
2beb3500d4
10 changed files with 652 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      AUTHORS
  2. 28
      README
  3. 12
      adl.c
  4. 427
      api.c
  5. 4
      bitforce.c
  6. 34
      cgminer.c
  7. 7
      device-gpu.c
  8. 7
      icarus.c
  9. 34
      miner.h
  10. 183
      miner.php

2
AUTHORS
Unescape View File

@ -1,4 +1,4 @@
Original CPU mining software: Jeff Garzik <jgarzik@pobox.com> Original CPU mining software: Jeff Garzik <jgarzik@pobox.com>
GPU mining and rewrite: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ GPU mining and rewrite: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
BitFORCE FPGA mining and refactor: Luke Dashjr <luke-jr+cgminer@utopios.org> 1NbRmS6a4dniwHHoSS9v3tEYUpP1Z5VVdL BitFORCE FPGA mining and refactor: Luke Dashjr <luke-jr+cgminer@utopios.org> 1NbRmS6a4dniwHHoSS9v3tEYUpP1Z5VVdL
API+: Andrew Smith <kanoi@kano-kun.net> 1Jjk2LmktEQKnv8r2cZ9MvLiZwZ9gxabKm API+: Andrew Smith <kanoi2@kano-kun.net> 1Jjk2LmktEQKnv8r2cZ9MvLiZwZ9gxabKm

28
README
Unescape View File

@ -596,7 +596,7 @@ An example request in both formats to set GPU 0 fan to 80%:
The format of each reply (unless stated otherwise) is a STATUS section The format of each reply (unless stated otherwise) is a STATUS section
followed by an optional detail section followed by an optional detail section
For API version 1.4: For API version 1.4 and later:
The STATUS section is: The STATUS section is:
@ -622,7 +622,7 @@ The STATUS section is:
This defaults to the cgminer version but is the value of --api-description This defaults to the cgminer version but is the value of --api-description
if it was specified at runtime. if it was specified at runtime.
For API version 1.4: For API version 1.6:
The list of requests - a (*) means it requires privileged access - and replies are: The list of requests - a (*) means it requires privileged access - and replies are:
@ -633,12 +633,14 @@ The list of requests - a (*) means it requires privileged access - and replies a
config CONFIG Some miner configuration information: config CONFIG Some miner configuration information:
GPU Count=N, <- the number of GPUs GPU Count=N, <- the number of GPUs
PGA Count=N, <- the number of PGAs
CPU Count=N, <- the number of CPUs CPU Count=N, <- the number of CPUs
Pool Count=N, <- the number of Pools Pool Count=N, <- the number of Pools
ADL=X, <- Y or N if ADL is compiled in the code ADL=X, <- Y or N if ADL is compiled in the code
ADL in use=X, <- Y or N if any GPU has ADL ADL in use=X, <- Y or N if any GPU has ADL
Strategy=Name, <- the current pool strategy Strategy=Name, <- the current pool strategy
Log Interval=N| <- log interval (--log N) Log Interval=N, <- log interval (--log N)
Device Code=GPU ICA | <- spaced list of compiled devices
summary SUMMARY The status summary of the miner summary SUMMARY The status summary of the miner
e.g. Elapsed=NNN,Found Blocks=N,Getworks=N,...| e.g. Elapsed=NNN,Found Blocks=N,Getworks=N,...|
@ -646,16 +648,22 @@ The list of requests - a (*) means it requires privileged access - and replies a
pools POOLS The status of each pool pools POOLS The status of each pool
e.g. Pool=0,URL=http://pool.com:6311,Status=Alive,...| e.g. Pool=0,URL=http://pool.com:6311,Status=Alive,...|
devs DEVS Each available CPU and GPU with their details devs DEVS Each available GPU, PGA and CPU with their details
e.g. GPU=0,Accepted=NN,MHS av=NNN,...,Intensity=D| e.g. GPU=0,Accepted=NN,MHS av=NNN,...,Intensity=D|
Last Share Time=NNN, <- standand long time in seconds Last Share Time=NNN, <- standand long time in seconds
(or 0 if none) of last accepted share (or 0 if none) of last accepted share
Last Share Pool=N, <- pool number (or -1 if none) Last Share Pool=N, <- pool number (or -1 if none)
Will not report PGAs if PGA mining is disabled
Will not report CPUs if CPU mining is disabled Will not report CPUs if CPU mining is disabled
gpu|N GPU The details of a single GPU number N in the same gpu|N GPU The details of a single GPU number N in the same
format and details as for DEVS format and details as for DEVS
pga|N PGA The details of a single PGA number N in the same
format and details as for DEVS
This is only available if PGA mining is enabled
Use 'pgacount' or 'config' first to see if there are any
cpu|N CPU The details of a single CPU number N in the same cpu|N CPU The details of a single CPU number N in the same
format and details as for DEVS format and details as for DEVS
This is only available if CPU mining is enabled This is only available if CPU mining is enabled
@ -663,6 +671,9 @@ The list of requests - a (*) means it requires privileged access - and replies a
gpucount GPUS Count=N| <- the number of GPUs gpucount GPUS Count=N| <- the number of GPUs
pgacount PGAS Count=N| <- the number of PGAs
Always returns 0 if PGA mining is disabled
cpucount CPUS Count=N| <- the number of CPUs cpucount CPUS Count=N| <- the number of CPUs
Always returns 0 if CPU mining is disabled Always returns 0 if CPU mining is disabled
@ -729,6 +740,9 @@ The list of requests - a (*) means it requires privileged access - and replies a
quit (*) none There is no status section but just a single "BYE|" quit (*) none There is no status section but just a single "BYE|"
reply before cgminer quits reply before cgminer quits
notify NOTIFY The last status and history count of each devices problem
e.g. NOTIFY=0,Name=GPU,ID=0,Last Well=1332432290,...|
privileged (*) privileged (*)
none There is no reply section just the STATUS section none There is no reply section just the STATUS section
stating an error if you do not have privileged access stating an error if you do not have privileged access
@ -923,6 +937,12 @@ it fail when php is installed properly but I only get errors about Sockets not
working in the logs? working in the logs?
A: http://us.php.net/manual/en/sockets.installation.php A: http://us.php.net/manual/en/sockets.installation.php
Q: What is a PGA?
A: At the moment, cgminer supports 2 FPGA's: Icarus and BitForce.
They are Field-Programmable Gate Arrays that have been programmed to do Bitcoin
mining. Since the acronym needs to be only 3 characters, the "Field-" part has
been skipped.
--- ---
This code is provided entirely free of charge by the programmer in his spare This code is provided entirely free of charge by the programmer in his spare

12
adl.c
Unescape View File

@ -992,6 +992,10 @@ static bool fan_autotune(int gpu, int temp, int fanpercent, int lasttemp)
if (temp > ga->overtemp && fanpercent < iMax) { if (temp > ga->overtemp && fanpercent < iMax) {
applog(LOG_WARNING, "Overheat detected on GPU %d, increasing fan to 100%", gpu); applog(LOG_WARNING, "Overheat detected on GPU %d, increasing fan to 100%", gpu);
newpercent = iMax; newpercent = iMax;
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_DEV_OVER_HEAT;
cgpu->dev_over_heat_count++;
} else if (temp > ga->targettemp && fanpercent < top && temp >= lasttemp) { } else if (temp > ga->targettemp && fanpercent < top && temp >= lasttemp) {
applog(LOG_DEBUG, "Temperature over target, increasing fanspeed"); applog(LOG_DEBUG, "Temperature over target, increasing fanspeed");
if (temp > ga->targettemp + opt_hysteresis) if (temp > ga->targettemp + opt_hysteresis)
@ -1076,9 +1080,17 @@ void gpu_autotune(int gpu, enum dev_enable *denable)
applog(LOG_WARNING, "Hit thermal cutoff limit on GPU %d, disabling!", gpu); applog(LOG_WARNING, "Hit thermal cutoff limit on GPU %d, disabling!", gpu);
*denable = DEV_RECOVER; *denable = DEV_RECOVER;
newengine = ga->minspeed; newengine = ga->minspeed;
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_DEV_THERMAL_CUTOFF;
cgpu->dev_thermal_cutoff_count++;
} else if (temp > ga->overtemp && engine > ga->minspeed) { } else if (temp > ga->overtemp && engine > ga->minspeed) {
applog(LOG_WARNING, "Overheat detected, decreasing GPU %d clock speed", gpu); applog(LOG_WARNING, "Overheat detected, decreasing GPU %d clock speed", gpu);
newengine = ga->minspeed; newengine = ga->minspeed;
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_DEV_OVER_HEAT;
cgpu->dev_over_heat_count++;
} else if (temp > ga->targettemp + opt_hysteresis && engine > ga->minspeed && fan_optimal) { } else if (temp > ga->targettemp + opt_hysteresis && engine > ga->minspeed && fan_optimal) {
applog(LOG_DEBUG, "Temperature %d degrees over target, decreasing clock speed", opt_hysteresis); applog(LOG_DEBUG, "Temperature %d degrees over target, decreasing clock speed", opt_hysteresis);
newengine = engine - ga->lpOdParameters.sEngineClock.iStep; newengine = engine - ga->lpOdParameters.sEngineClock.iStep;

427
api.c
Unescape View File

@ -6,6 +6,10 @@
* under the terms of the GNU General Public License as published by the Free * under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) * Software Foundation; either version 3 of the License, or (at your option)
* any later version. See COPYING for more details. * any later version. See COPYING for more details.
*
* Note: the code always includes GPU support even if there are no GPUs
* this simplifies handling multiple other device code being included
* depending on compile options
*/ */
#include "config.h" #include "config.h"
@ -134,12 +138,13 @@
#endif #endif
// Big enough for largest API request // Big enough for largest API request
// though a PC with 100s of CPUs may exceed the size ... // though a PC with 100s of PGAs/CPUs may exceed the size ...
// Current code assumes it can socket send this size also // Current code assumes it can socket send this size also
#define MYBUFSIZ 32768 #define MYBUFSIZ 65432 // TODO: intercept before it's exceeded
// Number of requests to queue - normally would be small // Number of requests to queue - normally would be small
#define QUEUE 10 // However lots of PGA's may mean more
#define QUEUE 100
static char *io_buffer = NULL; static char *io_buffer = NULL;
static char *msg_buffer = NULL; static char *msg_buffer = NULL;
@ -152,7 +157,7 @@ static const char *COMMA = ",";
static const char SEPARATOR = '|'; static const char SEPARATOR = '|';
static const char GPUSEP = ','; static const char GPUSEP = ',';
static const char *APIVERSION = "1.4"; static const char *APIVERSION = "1.6";
static const char *DEAD = "Dead"; static const char *DEAD = "Dead";
static const char *SICK = "Sick"; static const char *SICK = "Sick";
static const char *NOSTART = "NoStart"; static const char *NOSTART = "NoStart";
@ -164,20 +169,60 @@ static const char *DYNAMIC = _DYNAMIC;
static const char *YES = "Y"; static const char *YES = "Y";
static const char *NO = "N"; static const char *NO = "N";
static const char *DEVICECODE = ""
#ifdef HAVE_OPENCL
"GPU "
#endif
#ifdef USE_BITFORCE
"BFL "
#endif
#ifdef USE_ICARUS
"ICA "
#endif
#ifdef WANT_CPUMINE
"CPU "
#endif
"";
static const char *OSINFO =
#if defined(__linux)
"Linux";
#else
#if defined(__APPLE__)
"Apple";
#else
#if defined (WIN32)
"Windows";
#else
#if defined(unix)
"Unix";
#else
"Unknown";
#endif
#endif
#endif
#endif
#define _DEVS "DEVS" #define _DEVS "DEVS"
#define _POOLS "POOLS" #define _POOLS "POOLS"
#define _SUMMARY "SUMMARY" #define _SUMMARY "SUMMARY"
#define _STATUS "STATUS" #define _STATUS "STATUS"
#define _VERSION "VERSION" #define _VERSION "VERSION"
#define _MINECON "CONFIG" #define _MINECON "CONFIG"
#define _GPU "GPU"
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
#define _PGA "PGA"
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
#define _CPU "CPU" #define _CPU "CPU"
#endif #endif
#define _GPU "GPU"
#define _CPUS "CPUS"
#define _GPUS "GPUS" #define _GPUS "GPUS"
#define _PGAS "PGAS"
#define _CPUS "CPUS"
#define _NOTIFY "NOTIFY"
#define _BYE "BYE" #define _BYE "BYE"
static const char ISJSON = '{'; static const char ISJSON = '{';
@ -196,12 +241,18 @@ static const char ISJSON = '{';
#define JSON_MINECON JSON1 _MINECON JSON2 #define JSON_MINECON JSON1 _MINECON JSON2
#define JSON_GPU JSON1 _GPU JSON2 #define JSON_GPU JSON1 _GPU JSON2
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
#define JSON_PGA JSON1 _PGA JSON2
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
#define JSON_CPU JSON1 _CPU JSON2 #define JSON_CPU JSON1 _CPU JSON2
#endif #endif
#define JSON_GPUS JSON1 _GPUS JSON2 #define JSON_GPUS JSON1 _GPUS JSON2
#define JSON_PGAS JSON1 _PGAS JSON2
#define JSON_CPUS JSON1 _CPUS JSON2 #define JSON_CPUS JSON1 _CPUS JSON2
#define JSON_NOTIFY JSON1 _NOTIFY JSON2
#define JSON_BYE JSON1 _BYE JSON1 #define JSON_BYE JSON1 _BYE JSON1
#define JSON_CLOSE JSON3 #define JSON_CLOSE JSON3
#define JSON_END JSON4 #define JSON_END JSON4
@ -269,6 +320,15 @@ static const char *JSON_PARAMETER = "parameter";
#define MSG_TOOMANYP 54 #define MSG_TOOMANYP 54
#define MSG_ADDPOOL 55 #define MSG_ADDPOOL 55
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
#define MSG_PGANON 56
#define MSG_PGADEV 57
#define MSG_INVPGA 58
#endif
#define MSG_NUMPGA 59
#define MSG_NOTIFY 60
enum code_severity { enum code_severity {
SEVERITY_ERR, SEVERITY_ERR,
SEVERITY_WARN, SEVERITY_WARN,
@ -279,16 +339,17 @@ enum code_severity {
enum code_parameters { enum code_parameters {
PARAM_GPU, PARAM_GPU,
PARAM_PGA,
PARAM_CPU, PARAM_CPU,
PARAM_GPUMAX, PARAM_GPUMAX,
PARAM_PGAMAX,
PARAM_CPUMAX, PARAM_CPUMAX,
PARAM_PMAX, PARAM_PMAX,
PARAM_POOLMAX, PARAM_POOLMAX,
#ifdef WANT_CPUMINE
PARAM_GCMAX, // Single generic case: have the code resolve it - see below
#else PARAM_DMAX,
PARAM_GMAX,
#endif
PARAM_CMD, PARAM_CMD,
PARAM_POOL, PARAM_POOL,
PARAM_STR, PARAM_STR,
@ -310,25 +371,43 @@ struct CODES {
{ SEVERITY_ERR, MSG_GPUNON, PARAM_NONE, "No GPUs" }, { SEVERITY_ERR, MSG_GPUNON, PARAM_NONE, "No GPUs" },
{ SEVERITY_SUCC, MSG_POOL, PARAM_PMAX, "%d Pool(s)" }, { SEVERITY_SUCC, MSG_POOL, PARAM_PMAX, "%d Pool(s)" },
{ SEVERITY_ERR, MSG_NOPOOL, PARAM_NONE, "No pools" }, { SEVERITY_ERR, MSG_NOPOOL, PARAM_NONE, "No pools" },
{ SEVERITY_SUCC, MSG_DEVS, PARAM_DMAX, "%d GPU(s)"
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
" - %d PGA(s)"
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
{ SEVERITY_SUCC, MSG_DEVS, PARAM_GCMAX, "%d GPU(s) - %d CPU(s)" }, " - %d CPU(s)"
{ SEVERITY_ERR, MSG_NODEVS, PARAM_NONE, "No GPUs/CPUs" }, #endif
#else },
{ SEVERITY_SUCC, MSG_DEVS, PARAM_GMAX, "%d GPU(s)" },
{ SEVERITY_ERR, MSG_NODEVS, PARAM_NONE, "No GPUs" }, { SEVERITY_ERR, MSG_NODEVS, PARAM_NONE, "No GPUs"
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
"/PGAs"
#endif #endif
#ifdef WANT_CPUMINE
"/CPUs"
#endif
},
{ SEVERITY_SUCC, MSG_SUMM, PARAM_NONE, "Summary" }, { SEVERITY_SUCC, MSG_SUMM, PARAM_NONE, "Summary" },
{ SEVERITY_INFO, MSG_GPUDIS, PARAM_GPU, "GPU %d set disable flag" }, { SEVERITY_INFO, MSG_GPUDIS, PARAM_GPU, "GPU %d set disable flag" },
{ SEVERITY_INFO, MSG_GPUREI, PARAM_GPU, "GPU %d restart attempted" }, { SEVERITY_INFO, MSG_GPUREI, PARAM_GPU, "GPU %d restart attempted" },
{ SEVERITY_ERR, MSG_INVCMD, PARAM_NONE, "Invalid command" }, { SEVERITY_ERR, MSG_INVCMD, PARAM_NONE, "Invalid command" },
{ SEVERITY_ERR, MSG_MISID, PARAM_NONE, "Missing device id parameter" }, { SEVERITY_ERR, MSG_MISID, PARAM_NONE, "Missing device id parameter" },
{ SEVERITY_SUCC, MSG_GPUDEV, PARAM_GPU, "GPU%d" }, { SEVERITY_SUCC, MSG_GPUDEV, PARAM_GPU, "GPU%d" },
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
{ SEVERITY_ERR, MSG_PGANON, PARAM_NONE, "No PGAs" },
{ SEVERITY_SUCC, MSG_PGADEV, PARAM_PGA, "PGA%d" },
{ SEVERITY_ERR, MSG_INVPGA, PARAM_PGAMAX, "Invalid PGA id %d - range is 0 - %d" },
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
{ SEVERITY_ERR, MSG_CPUNON, PARAM_NONE, "No CPUs" }, { SEVERITY_ERR, MSG_CPUNON, PARAM_NONE, "No CPUs" },
{ SEVERITY_SUCC, MSG_CPUDEV, PARAM_CPU, "CPU%d" }, { SEVERITY_SUCC, MSG_CPUDEV, PARAM_CPU, "CPU%d" },
{ SEVERITY_ERR, MSG_INVCPU, PARAM_CPUMAX, "Invalid CPU id %d - range is 0 - %d" }, { SEVERITY_ERR, MSG_INVCPU, PARAM_CPUMAX, "Invalid CPU id %d - range is 0 - %d" },
#endif #endif
{ SEVERITY_SUCC, MSG_NUMGPU, PARAM_NONE, "GPU count" }, { SEVERITY_SUCC, MSG_NUMGPU, PARAM_NONE, "GPU count" },
{ SEVERITY_SUCC, MSG_NUMPGA, PARAM_NONE, "PGA count" },
{ SEVERITY_SUCC, MSG_NUMCPU, PARAM_NONE, "CPU count" }, { SEVERITY_SUCC, MSG_NUMCPU, PARAM_NONE, "CPU count" },
{ SEVERITY_SUCC, MSG_VERSION, PARAM_NONE, "CGMiner versions" }, { SEVERITY_SUCC, MSG_VERSION, PARAM_NONE, "CGMiner versions" },
{ SEVERITY_ERR, MSG_INVJSON, PARAM_NONE, "Invalid JSON" }, { SEVERITY_ERR, MSG_INVJSON, PARAM_NONE, "Invalid JSON" },
@ -364,6 +443,7 @@ struct CODES {
{ SEVERITY_ERR, MSG_INVPDP, PARAM_STR, "Invalid addpool details '%s'" }, { SEVERITY_ERR, MSG_INVPDP, PARAM_STR, "Invalid addpool details '%s'" },
{ SEVERITY_ERR, MSG_TOOMANYP,PARAM_NONE, "Reached maximum number of pools (%d)" }, { SEVERITY_ERR, MSG_TOOMANYP,PARAM_NONE, "Reached maximum number of pools (%d)" },
{ SEVERITY_SUCC, MSG_ADDPOOL, PARAM_STR, "Added pool '%s'" }, { SEVERITY_SUCC, MSG_ADDPOOL, PARAM_STR, "Added pool '%s'" },
{ SEVERITY_SUCC, MSG_NOTIFY, PARAM_NONE, "Notify" },
{ SEVERITY_FAIL, 0, 0, NULL } { SEVERITY_FAIL, 0, 0, NULL }
}; };
@ -382,6 +462,54 @@ struct IP4ACCESS {
static struct IP4ACCESS *ipaccess = NULL; static struct IP4ACCESS *ipaccess = NULL;
static int ips = 0; static int ips = 0;
#ifdef USE_BITFORCE
extern struct device_api bitforce_api;
#endif
#ifdef USE_ICARUS
extern struct device_api icarus_api;
#endif
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
static int numpgas()
{
int count = 0;
int i;
for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE
if (devices[i]->api == &bitforce_api)
count++;
#endif
#ifdef USE_ICARUS
if (devices[i]->api == &icarus_api)
count++;
#endif
}
return count;
}
static int pgadevice(int pgaid)
{
int count = 0;
int i;
for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE
if (devices[i]->api == &bitforce_api)
count++;
#endif
#ifdef USE_ICARUS
if (devices[i]->api == &icarus_api)
count++;
#endif
if (count == (pgaid + 1))
return i;
}
return -1;
}
#endif
// All replies (except BYE) start with a message // All replies (except BYE) start with a message
// thus for JSON, message() inserts JSON_START at the front // thus for JSON, message() inserts JSON_START at the front
// and send_result() adds JSON_END at the end // and send_result() adds JSON_END at the end
@ -389,6 +517,9 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
{ {
char severity; char severity;
char *ptr; char *ptr;
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
int pga;
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
int cpu; int cpu;
#endif #endif
@ -421,6 +552,7 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
switch(codes[i].params) { switch(codes[i].params) {
case PARAM_GPU: case PARAM_GPU:
case PARAM_PGA:
case PARAM_CPU: case PARAM_CPU:
sprintf(ptr, codes[i].description, paramid); sprintf(ptr, codes[i].description, paramid);
break; break;
@ -430,26 +562,47 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
case PARAM_GPUMAX: case PARAM_GPUMAX:
sprintf(ptr, codes[i].description, paramid, nDevs - 1); sprintf(ptr, codes[i].description, paramid, nDevs - 1);
break; break;
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
case PARAM_PGAMAX:
pga = numpgas();
sprintf(ptr, codes[i].description, paramid, pga - 1);
break;
#endif
#ifdef WANT_CPUMINE
case PARAM_CPUMAX:
if (opt_n_threads > 0)
cpu = num_processors;
else
cpu = 0;
sprintf(ptr, codes[i].description, paramid, cpu - 1);
break;
#endif
case PARAM_PMAX: case PARAM_PMAX:
sprintf(ptr, codes[i].description, total_pools); sprintf(ptr, codes[i].description, total_pools);
break; break;
case PARAM_POOLMAX: case PARAM_POOLMAX:
sprintf(ptr, codes[i].description, paramid, total_pools - 1); sprintf(ptr, codes[i].description, paramid, total_pools - 1);
break; break;
case PARAM_DMAX:
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
pga = numpgas();
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
case PARAM_GCMAX:
if (opt_n_threads > 0) if (opt_n_threads > 0)
cpu = num_processors; cpu = num_processors;
else else
cpu = 0; cpu = 0;
#endif
sprintf(ptr, codes[i].description, nDevs, cpu); sprintf(ptr, codes[i].description, nDevs
break; #if defined(USE_BITFORCE) || defined(USE_ICARUS)
#else , pga
case PARAM_GMAX:
sprintf(ptr, codes[i].description, nDevs);
break;
#endif #endif
#ifdef WANT_CPUMINE
, cpu
#endif
);
break;
case PARAM_CMD: case PARAM_CMD:
sprintf(ptr, codes[i].description, JSON_COMMAND); sprintf(ptr, codes[i].description, JSON_COMMAND);
break; break;
@ -500,6 +653,7 @@ static void apiversion(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson) static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
int pgacount = 0;
int cpucount = 0; int cpucount = 0;
char *adlinuse = (char *)NO; char *adlinuse = (char *)NO;
#ifdef HAVE_ADL #ifdef HAVE_ADL
@ -516,6 +670,10 @@ static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
const char *adl = NO; const char *adl = NO;
#endif #endif
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
pgacount = numpgas();
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
cpucount = opt_n_threads > 0 ? num_processors : 0; cpucount = opt_n_threads > 0 ? num_processors : 0;
#endif #endif
@ -523,9 +681,9 @@ static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
strcpy(io_buffer, message(MSG_MINECON, 0, NULL, isjson)); strcpy(io_buffer, message(MSG_MINECON, 0, NULL, isjson));
if (isjson) if (isjson)
sprintf(buf, "," JSON_MINECON "{\"GPU Count\":%d,\"CPU Count\":%d,\"Pool Count\":%d,\"ADL\":\"%s\",\"ADL in use\":\"%s\",\"Strategy\":\"%s\",\"Log Interval\":\"%d\"}" JSON_CLOSE, nDevs, cpucount, total_pools, adl, adlinuse, strategies[pool_strategy].s, opt_log_interval); sprintf(buf, "," JSON_MINECON "{\"GPU Count\":%d,\"PGA Count\":%d,\"CPU Count\":%d,\"Pool Count\":%d,\"ADL\":\"%s\",\"ADL in use\":\"%s\",\"Strategy\":\"%s\",\"Log Interval\":%d,\"Device Code\":\"%s\",\"OS\":\"%s\"}" JSON_CLOSE, nDevs, pgacount, cpucount, total_pools, adl, adlinuse, strategies[pool_strategy].s, opt_log_interval, DEVICECODE, OSINFO);
else else
sprintf(buf, _MINECON ",GPU Count=%d,CPU Count=%d,Pool Count=%d,ADL=%s,ADL in use=%s,Strategy=%s,Log Interval=%d%c", nDevs, cpucount, total_pools, adl, adlinuse, strategies[pool_strategy].s, opt_log_interval, SEPARATOR); sprintf(buf, _MINECON ",GPU Count=%d,PGA Count=%d,CPU Count=%d,Pool Count=%d,ADL=%s,ADL in use=%s,Strategy=%s,Log Interval=%d,Device Code=%s,OS=%s%c", nDevs, pgacount, cpucount, total_pools, adl, adlinuse, strategies[pool_strategy].s, opt_log_interval, DEVICECODE, OSINFO, SEPARATOR);
strcat(io_buffer, buf); strcat(io_buffer, buf);
} }
@ -589,6 +747,59 @@ static void gpustatus(int gpu, bool isjson)
} }
} }
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
static void pgastatus(int pga, bool isjson)
{
char buf[BUFSIZ];
char *enabled;
char *status;
int numpga = numpgas();
if (numpga > 0 && pga >= 0 && pga < numpga) {
int dev = pgadevice(pga);
if (dev < 0) // Should never happen
return;
struct cgpu_info *cgpu = devices[dev];
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
if (cgpu->deven != DEV_DISABLED)
enabled = (char *)YES;
else
enabled = (char *)NO;
if (cgpu->status == LIFE_DEAD)
status = (char *)DEAD;
else if (cgpu->status == LIFE_SICK)
status = (char *)SICK;
else if (cgpu->status == LIFE_NOSTART)
status = (char *)NOSTART;
else
status = (char *)ALIVE;
if (isjson)
sprintf(buf, "{\"PGA\":%d,\"Name\":\"%s\",\"ID\":%d,\"Enabled\":\"%s\",\"Status\":\"%s\",\"Temperature\":%.2f,\"MHS av\":%.2f,\"MHS %ds\":%.2f,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Last Share Pool\":%d,\"Last Share Time\":%lu,\"Total MH\":%.4f}",
pga, cgpu->api->name, cgpu->device_id,
enabled, status, cgpu->temp,
cgpu->total_mhashes / total_secs, opt_log_interval, cgpu->rolling,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->utility,
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes);
else
sprintf(buf, "PGA=%d,Name=%s,ID=%d,Enabled=%s,Status=%s,Temperature=%.2f,MHS av=%.2f,MHS %ds=%.2f,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Last Share Pool=%d,Last Share Time=%lu,Total MH=%.4f%c",
pga, cgpu->api->name, cgpu->device_id,
enabled, status, cgpu->temp,
cgpu->total_mhashes / total_secs, opt_log_interval, cgpu->rolling,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->utility,
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes, SEPARATOR);
strcat(io_buffer, buf);
}
}
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
static void cpustatus(int cpu, bool isjson) static void cpustatus(int cpu, bool isjson)
{ {
@ -623,6 +834,7 @@ static void cpustatus(int cpu, bool isjson)
static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson) static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{ {
int devcount = 0;
int i; int i;
if (nDevs == 0 && opt_n_threads == 0) { if (nDevs == 0 && opt_n_threads == 0) {
@ -638,19 +850,37 @@ static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, b
} }
for (i = 0; i < nDevs; i++) { for (i = 0; i < nDevs; i++) {
if (isjson && i > 0) if (isjson && devcount > 0)
strcat(io_buffer, COMMA); strcat(io_buffer, COMMA);
gpustatus(i, isjson); gpustatus(i, isjson);
devcount++;
} }
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
int numpga = numpgas();
if (numpga > 0)
for (i = 0; i < numpga; i++) {
if (isjson && devcount > 0)
strcat(io_buffer, COMMA);
pgastatus(i, isjson);
devcount++;
}
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
if (opt_n_threads > 0) if (opt_n_threads > 0)
for (i = 0; i < num_processors; i++) { for (i = 0; i < num_processors; i++) {
if (isjson && (i > 0 || nDevs > 0)) if (isjson && devcount > 0)
strcat(io_buffer, COMMA); strcat(io_buffer, COMMA);
cpustatus(i, isjson); cpustatus(i, isjson);
devcount++;
} }
#endif #endif
@ -691,6 +921,42 @@ static void gpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
strcat(io_buffer, JSON_CLOSE); strcat(io_buffer, JSON_CLOSE);
} }
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
static void pgadev(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int numpga = numpgas();
int id;
if (numpga == 0) {
strcpy(io_buffer, message(MSG_PGANON, 0, NULL, isjson));
return;
}
if (param == NULL || *param == '\0') {
strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
return;
}
id = atoi(param);
if (id < 0 || id >= numpga) {
strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
return;
}
strcpy(io_buffer, message(MSG_PGADEV, id, NULL, isjson));
if (isjson) {
strcat(io_buffer, COMMA);
strcat(io_buffer, JSON_PGA);
}
pgastatus(id, isjson);
if (isjson)
strcat(io_buffer, JSON_CLOSE);
}
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
static void cpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson) static void cpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{ {
@ -949,6 +1215,25 @@ static void gpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bo
strcat(io_buffer, buf); strcat(io_buffer, buf);
} }
static void pgacount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
char buf[BUFSIZ];
int count = 0;
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
count = numpgas();
#endif
strcpy(io_buffer, message(MSG_NUMPGA, 0, NULL, isjson));
if (isjson)
sprintf(buf, "," JSON_PGAS "{\"Count\":%d}" JSON_CLOSE, count);
else
sprintf(buf, _PGAS ",Count=%d%c", count, SEPARATOR);
strcat(io_buffer, buf);
}
static void cpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson) static void cpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -1315,6 +1600,89 @@ void privileged(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool is
strcpy(io_buffer, message(MSG_ACCOK, 0, NULL, isjson)); strcpy(io_buffer, message(MSG_ACCOK, 0, NULL, isjson));
} }
void notifystatus(int device, struct cgpu_info *cgpu, bool isjson)
{
char buf[BUFSIZ];
char *reason;
if (cgpu->device_last_not_well == 0)
reason = REASON_NONE;
else
switch(cgpu->device_not_well_reason) {
case REASON_THREAD_FAIL_INIT:
reason = REASON_THREAD_FAIL_INIT_STR;
break;
case REASON_THREAD_ZERO_HASH:
reason = REASON_THREAD_ZERO_HASH_STR;
break;
case REASON_THREAD_FAIL_QUEUE:
reason = REASON_THREAD_FAIL_QUEUE_STR;
break;
case REASON_DEV_SICK_IDLE_60:
reason = REASON_DEV_SICK_IDLE_60_STR;
break;
case REASON_DEV_DEAD_IDLE_600:
reason = REASON_DEV_DEAD_IDLE_600_STR;
break;
case REASON_DEV_NOSTART:
reason = REASON_DEV_NOSTART_STR;
break;
case REASON_DEV_OVER_HEAT:
reason = REASON_DEV_OVER_HEAT_STR;
break;
case REASON_DEV_THERMAL_CUTOFF:
reason = REASON_DEV_THERMAL_CUTOFF_STR;
break;
default:
reason = REASON_UNKNOWN_STR;
break;
}
// ALL counters (and only counters) must start the name with a '*'
// Simplifies future external support for adding new counters
if (isjson)
sprintf(buf, "%s{\"NOTIFY\":%d,\"Name\":\"%s\",\"ID\":%d,\"Last Well\":%lu,\"Last Not Well\":%lu,\"Reason Not Well\":\"%s\",\"*Thread Fail Init\":%d,\"*Thread Zero Hash\":%d,\"*Thread Fail Queue\":%d,\"*Dev Sick Idle 60s\":%d,\"*Dev Dead Idle 600s\":%d,\"*Dev Nostart\":%d,\"*Dev Over Heat\":%d,\"*Dev Thermal Cutoff\":%d}" JSON_CLOSE,
device > 0 ? "," : "", device, cgpu->api->name, cgpu->device_id,
cgpu->device_last_well, cgpu->device_last_not_well, reason,
cgpu->thread_fail_init_count, cgpu->thread_zero_hash_count,
cgpu->thread_fail_queue_count, cgpu->dev_sick_idle_60_count,
cgpu->dev_dead_idle_600_count, cgpu->dev_nostart_count,
cgpu->dev_over_heat_count, cgpu->dev_thermal_cutoff_count);
else
sprintf(buf, "NOTIFY=%d,Name=%s,ID=%d,Last Well=%lu,Last Not Well=%lu,Reason Not Well=%s,*Thread Fail Init=%d,*Thread Zero Hash=%d,*Thread Fail Queue=%d,*Dev Sick Idle 60s=%d,*Dev Dead Idle 600s=%d,*Dev Nostart=%d,*Dev Over Heat=%d,*Dev Thermal Cutoff=%d%c",
device, cgpu->api->name, cgpu->device_id,
cgpu->device_last_well, cgpu->device_last_not_well, reason,
cgpu->thread_fail_init_count, cgpu->thread_zero_hash_count,
cgpu->thread_fail_queue_count, cgpu->dev_sick_idle_60_count,
cgpu->dev_dead_idle_600_count, cgpu->dev_nostart_count,
cgpu->dev_over_heat_count, cgpu->dev_thermal_cutoff_count, SEPARATOR);
strcat(io_buffer, buf);
}
static void notify(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
int i;
if (total_devices == 0) {
strcpy(io_buffer, message(MSG_NODEVS, 0, NULL, isjson));
return;
}
strcpy(io_buffer, message(MSG_NOTIFY, 0, NULL, isjson));
if (isjson) {
strcat(io_buffer, COMMA);
strcat(io_buffer, JSON_NOTIFY);
}
for (i = 0; i < total_devices; i++)
notifystatus(i, devices[i], isjson);
if (isjson)
strcat(io_buffer, JSON_CLOSE);
}
void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson) void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{ {
FILE *fcfg; FILE *fcfg;
@ -1350,10 +1718,14 @@ struct CMDS {
{ "gpudisable", gpudisable, true }, { "gpudisable", gpudisable, true },
{ "gpurestart", gpurestart, true }, { "gpurestart", gpurestart, true },
{ "gpu", gpudev, false }, { "gpu", gpudev, false },
#if defined(USE_BITFORCE) || defined(USE_ICARUS)
{ "pga", pgadev, false },
#endif
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
{ "cpu", cpudev, false }, { "cpu", cpudev, false },
#endif #endif
{ "gpucount", gpucount, false }, { "gpucount", gpucount, false },
{ "pgacount", pgacount, false },
{ "cpucount", cpucount, false }, { "cpucount", cpucount, false },
{ "switchpool", switchpool, true }, { "switchpool", switchpool, true },
{ "addpool", addpool, true }, { "addpool", addpool, true },
@ -1367,6 +1739,7 @@ struct CMDS {
{ "save", dosave, true }, { "save", dosave, true },
{ "quit", doquit, true }, { "quit", doquit, true },
{ "privileged", privileged, true }, { "privileged", privileged, true },
{ "notify", notify, false },
{ NULL, NULL, false } { NULL, NULL, false }
}; };

4
bitforce.c
Unescape View File

@ -309,6 +309,10 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6
if (temp > bitforce->cutofftemp) { if (temp > bitforce->cutofftemp) {
applog(LOG_WARNING, "Hit thermal cutoff limit on %s %d, disabling!", bitforce->api->name, bitforce->device_id); applog(LOG_WARNING, "Hit thermal cutoff limit on %s %d, disabling!", bitforce->api->name, bitforce->device_id);
bitforce->deven = DEV_RECOVER; bitforce->deven = DEV_RECOVER;
bitforce->device_last_not_well = time(NULL);
bitforce->device_not_well_reason = REASON_DEV_THERMAL_CUTOFF;
bitforce->dev_thermal_cutoff_count++;
} }
} }
} }

34
cgminer.c
Unescape View File

@ -2889,6 +2889,7 @@ void thread_reportin(struct thr_info *thr)
gettimeofday(&thr->last, NULL); gettimeofday(&thr->last, NULL);
thr->cgpu->status = LIFE_WELL; thr->cgpu->status = LIFE_WELL;
thr->getwork = false; thr->getwork = false;
thr->cgpu->device_last_well = time(NULL);
} }
static inline void thread_reportout(struct thr_info *thr) static inline void thread_reportout(struct thr_info *thr)
@ -2909,8 +2910,10 @@ static void hashmeter(int thr_id, struct timeval *diff,
bool showlog = false; bool showlog = false;
/* Update the last time this thread reported in */ /* Update the last time this thread reported in */
if (thr_id >= 0) if (thr_id >= 0) {
gettimeofday(&thr_info[thr_id].last, NULL); gettimeofday(&thr_info[thr_id].last, NULL);
thr_info[thr_id].cgpu->device_last_well = time(NULL);
}
/* Don't bother calculating anything if we're not displaying it */ /* Don't bother calculating anything if we're not displaying it */
if (opt_realquiet || !opt_log_interval) if (opt_realquiet || !opt_log_interval)
@ -3426,8 +3429,13 @@ void *miner_thread(void *userdata)
bool requested = false; bool requested = false;
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
if (api->thread_init && !api->thread_init(mythr)) if (api->thread_init && !api->thread_init(mythr)) {
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_THREAD_FAIL_INIT;
cgpu->thread_fail_init_count++;
goto out; goto out;
}
thread_reportout(mythr); thread_reportout(mythr);
applog(LOG_DEBUG, "Popping ping in miner thread"); applog(LOG_DEBUG, "Popping ping in miner thread");
@ -3476,8 +3484,14 @@ void *miner_thread(void *userdata)
break; break;
} }
if (unlikely(!hashes)) if (unlikely(!hashes)) {
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_THREAD_ZERO_HASH;
cgpu->thread_zero_hash_count++;
goto out; goto out;
}
hashes_done += hashes; hashes_done += hashes;
if (hashes > cgpu->max_hashes) if (hashes > cgpu->max_hashes)
cgpu->max_hashes = hashes; cgpu->max_hashes = hashes;
@ -3497,6 +3511,11 @@ void *miner_thread(void *userdata)
thread_reportout(mythr); thread_reportout(mythr);
if (unlikely(!queue_request(mythr, false))) { if (unlikely(!queue_request(mythr, false))) {
applog(LOG_ERR, "Failed to queue_request in miner_thread %d", thr_id); applog(LOG_ERR, "Failed to queue_request in miner_thread %d", thr_id);
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_THREAD_FAIL_QUEUE;
cgpu->thread_fail_queue_count++;
goto out; goto out;
} }
thread_reportin(mythr); thread_reportin(mythr);
@ -3882,11 +3901,16 @@ static void *watchdog_thread(void __maybe_unused *userdata)
if (gpus[gpu].status != LIFE_WELL && now.tv_sec - thr->last.tv_sec < 60) { if (gpus[gpu].status != LIFE_WELL && now.tv_sec - thr->last.tv_sec < 60) {
applog(LOG_ERR, "Device %d recovered, GPU %d declared WELL!", i, gpu); applog(LOG_ERR, "Device %d recovered, GPU %d declared WELL!", i, gpu);
gpus[gpu].status = LIFE_WELL; gpus[gpu].status = LIFE_WELL;
gpus[gpu].device_last_well = time(NULL);
} else if (now.tv_sec - thr->last.tv_sec > 60 && gpus[gpu].status == LIFE_WELL) { } else if (now.tv_sec - thr->last.tv_sec > 60 && gpus[gpu].status == LIFE_WELL) {
thr->rolling = thr->cgpu->rolling = 0; thr->rolling = thr->cgpu->rolling = 0;
gpus[gpu].status = LIFE_SICK; gpus[gpu].status = LIFE_SICK;
applog(LOG_ERR, "Device %d idle for more than 60 seconds, GPU %d declared SICK!", i, gpu); applog(LOG_ERR, "Device %d idle for more than 60 seconds, GPU %d declared SICK!", i, gpu);
gettimeofday(&thr->sick, NULL); gettimeofday(&thr->sick, NULL);
gpus[gpu].device_last_not_well = time(NULL);
gpus[gpu].device_not_well_reason = REASON_DEV_SICK_IDLE_60;
gpus[gpu].dev_sick_idle_60_count++;
#ifdef HAVE_ADL #ifdef HAVE_ADL
if (adl_active && gpus[gpu].has_adl && gpu_activity(gpu) > 50) { if (adl_active && gpus[gpu].has_adl && gpu_activity(gpu) > 50) {
applog(LOG_ERR, "GPU still showing activity suggesting a hard hang."); applog(LOG_ERR, "GPU still showing activity suggesting a hard hang.");
@ -3901,6 +3925,10 @@ static void *watchdog_thread(void __maybe_unused *userdata)
gpus[gpu].status = LIFE_DEAD; gpus[gpu].status = LIFE_DEAD;
applog(LOG_ERR, "Device %d not responding for more than 10 minutes, GPU %d declared DEAD!", i, gpu); applog(LOG_ERR, "Device %d not responding for more than 10 minutes, GPU %d declared DEAD!", i, gpu);
gettimeofday(&thr->sick, NULL); gettimeofday(&thr->sick, NULL);
gpus[gpu].device_last_not_well = time(NULL);
gpus[gpu].device_not_well_reason = REASON_DEV_DEAD_IDLE_600;
gpus[gpu].dev_dead_idle_600_count++;
} else if (now.tv_sec - thr->sick.tv_sec > 60 && } else if (now.tv_sec - thr->sick.tv_sec > 60 &&
(gpus[i].status == LIFE_SICK || gpus[i].status == LIFE_DEAD)) { (gpus[i].status == LIFE_SICK || gpus[i].status == LIFE_DEAD)) {
/* Attempt to restart a GPU that's sick or dead once every minute */ /* Attempt to restart a GPU that's sick or dead once every minute */

7
device-gpu.c
Unescape View File

@ -1191,6 +1191,11 @@ static bool opencl_thread_prepare(struct thr_info *thr)
} }
cgpu->deven = DEV_DISABLED; cgpu->deven = DEV_DISABLED;
cgpu->status = LIFE_NOSTART; cgpu->status = LIFE_NOSTART;
cgpu->device_last_not_well = time(NULL);
cgpu->device_not_well_reason = REASON_DEV_NOSTART;
cgpu->dev_nostart_count++;
return false; return false;
} }
applog(LOG_INFO, "initCl() finished. Found %s", name); applog(LOG_INFO, "initCl() finished. Found %s", name);
@ -1250,6 +1255,8 @@ static bool opencl_thread_init(struct thr_info *thr)
gpu->status = LIFE_WELL; gpu->status = LIFE_WELL;
gpu->device_last_well = time(NULL);
return true; return true;
} }

7
icarus.c
Unescape View File

@ -100,7 +100,10 @@ static int icarus_open(const char *devpath)
NULL, OPEN_EXISTING, 0, NULL); NULL, OPEN_EXISTING, 0, NULL);
if (unlikely(hSerial == INVALID_HANDLE_VALUE)) if (unlikely(hSerial == INVALID_HANDLE_VALUE))
return -1; return -1;
/* TODO: Needs setup read block time. just like VTIME = 10 */
COMMTIMEOUTS cto = {1000, 0, 1000, 0, 1000};
SetCommTimeouts(hSerial, &cto);
return _open_osfhandle((LONG)hSerial, 0); return _open_osfhandle((LONG)hSerial, 0);
#endif #endif
} }
@ -120,7 +123,7 @@ static int icarus_gets(unsigned char *buf, size_t bufLen, int fd)
rc++; rc++;
if (rc == ICARUS_READ_FAULT_COUNT) { if (rc == ICARUS_READ_FAULT_COUNT) {
applog(LOG_WARNING, applog(LOG_DEBUG,
"Icarus Read: No data in %d seconds", rc); "Icarus Read: No data in %d seconds", rc);
return 1; return 1;
} }

34
miner.h
Unescape View File

@ -221,6 +221,28 @@ enum cl_kernels {
KL_DIABLO, KL_DIABLO,
}; };
enum dev_reason {
REASON_THREAD_FAIL_INIT,
REASON_THREAD_ZERO_HASH,
REASON_THREAD_FAIL_QUEUE,
REASON_DEV_SICK_IDLE_60,
REASON_DEV_DEAD_IDLE_600,
REASON_DEV_NOSTART,
REASON_DEV_OVER_HEAT,
REASON_DEV_THERMAL_CUTOFF,
};
#define REASON_NONE "None"
#define REASON_THREAD_FAIL_INIT_STR "Thread failed to init"
#define REASON_THREAD_ZERO_HASH_STR "Thread got zero hashes"
#define REASON_THREAD_FAIL_QUEUE_STR "Thread failed to queue work"
#define REASON_DEV_SICK_IDLE_60_STR "Device idle for 60s"
#define REASON_DEV_DEAD_IDLE_600_STR "Device dead - idle for 600s"
#define REASON_DEV_NOSTART_STR "Device failed to start"
#define REASON_DEV_OVER_HEAT_STR "Device over heated"
#define REASON_DEV_THERMAL_CUTOFF_STR "Device reached thermal cutoff"
#define REASON_UNKNOWN_STR "Unknown reason - code bug"
struct cgpu_info { struct cgpu_info {
int cgminer_id; int cgminer_id;
struct device_api *api; struct device_api *api;
@ -272,6 +294,18 @@ struct cgpu_info {
#endif #endif
int last_share_pool; int last_share_pool;
time_t last_share_pool_time; time_t last_share_pool_time;
time_t device_last_well;
time_t device_last_not_well;
enum dev_reason device_not_well_reason;
int thread_fail_init_count;
int thread_zero_hash_count;
int thread_fail_queue_count;
int dev_sick_idle_60_count;
int dev_dead_idle_600_count;
int dev_nostart_count;
int dev_over_heat_count; // It's a warning but worth knowing
int dev_thermal_cutoff_count;
}; };
struct thread_q { struct thread_q {

183
miner.php
Unescape View File

@ -1,30 +1,61 @@
<?php <?php
session_start(); session_start();
# #
global $miner, $port; global $miner, $port, $readonly, $notify;
$miner = '127.0.0.1'; # hostname or IP address $miner = '127.0.0.1'; # hostname or IP address
$port = 4028; $port = 4028;
# #
# Set $readonly to true to force miner.php to be readonly
# Set $readonly to false then it will check cgminer 'privileged'
$readonly = false;
#
# Set $notify to false to NOT attempt to display the notify command
# Set $notify to true to attempt to display the notify command
# If your older version of cgminer returns an 'Invalid command'
# coz it doesn't have notify - it just shows the error status table
$notify = true;
#
$here = $_SERVER['PHP_SELF']; $here = $_SERVER['PHP_SELF'];
# #
function htmlhead()
{
global $error, $readonly, $here;
if ($readonly === false)
{
$access = api('privileged');
if ($error != null
|| !isset($access['STATUS']['STATUS'])
|| $access['STATUS']['STATUS'] != 'S')
$readonly = true;
}
?> ?>
<html><head><title>Mine</title> <html><head><title>Mine</title>
<style type='text/css'> <style type='text/css'>
td { color:blue; font-family:verdana,arial,sans; font-size:13pt; } td { color:blue; font-family:verdana,arial,sans; font-size:13pt; }
td.h { color:blue; font-family:verdana,arial,sans; font-size:13pt; background:#d0ffff } td.h { color:blue; font-family:verdana,arial,sans; font-size:13pt; background:#d0ffff }
td.err { color:black; font-family:verdana,arial,sans; font-size:13pt; background:#ff3050 }
td.warn { color:black; font-family:verdana,arial,sans; font-size:13pt; background:#ffb050 }
td.sta { color:green; font-family:verdana,arial,sans; font-size:13pt; } td.sta { color:green; font-family:verdana,arial,sans; font-size:13pt; }
</style> </style>
</head><body bgcolor=#ecffff> </head><body bgcolor=#ecffff>
<script type='text/javascript'> <script type='text/javascript'>
function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location="<?php echo $here ?>"+a} function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location="<?php echo $here ?>"+a}
<?php
if ($readonly === false)
{
?>
function prc(a,m){pr('?arg='+a,m)} function prc(a,m){pr('?arg='+a,m)}
function prs(a){var c=a.substr(3);var z=c.split('|',2);var m=z[0].substr(0,1).toUpperCase()+z[0].substr(1)+' GPU '+z[1];prc(a,m)} function prs(a){var c=a.substr(3);var z=c.split('|',2);var m=z[0].substr(0,1).toUpperCase()+z[0].substr(1)+' GPU '+z[1];prc(a,m)}
function prs2(a,n){var v=document.getElementById('gi'+n).value;var c=a.substr(3);var z=c.split('|',2);var m='Set GPU '+z[1]+' '+z[0].substr(0,1).toUpperCase()+z[0].substr(1)+' to '+v;prc(a+','+v,m)} function prs2(a,n){var v=document.getElementById('gi'+n).value;var c=a.substr(3);var z=c.split('|',2);var m='Set GPU '+z[1]+' '+z[0].substr(0,1).toUpperCase()+z[0].substr(1)+' to '+v;prc(a+','+v,m)}
<?php
}
?>
</script> </script>
<table width=100% height=100% border=0 cellpadding=0 cellspacing=0 summary='Mine'> <table width=100% height=100% border=0 cellpadding=0 cellspacing=0 summary='Mine'>
<tr><td align=center valign=top> <tr><td align=center valign=top>
<table border=0 cellpadding=4 cellspacing=0 summary='Mine'> <table border=0 cellpadding=4 cellspacing=0 summary='Mine'>
<?php <?php
}
# #
global $error; global $error;
$error = null; $error = null;
@ -154,56 +185,114 @@ function getparam($name, $both = false)
# #
function fmt($section, $name, $value) function fmt($section, $name, $value)
{ {
$errorclass = ' class=err';
$warnclass = ' class=warn';
$b = '&nbsp;'; $b = '&nbsp;';
$ret = $value;
$class = '';
switch ($section.'.'.$name) switch ($section.'.'.$name)
{ {
case 'GPU0.Last Share Time': case 'GPU.Last Share Time':
return date('H:i:s', $value); case 'PGA.Last Share Time':
$ret = date('H:i:s', $value);
break; break;
case 'SUMMARY.Elapsed': case 'SUMMARY.Elapsed':
$s = $value % 60; $s = $value % 60;
$value -= $s; $value -= $s;
$value /= 60; $value /= 60;
if ($value == 0) if ($value == 0)
{ $ret = $s.'s';
return $s.'s';
}
else else
{ {
$m = $value % 60; $m = $value % 60;
$value -= $m; $value -= $m;
$value /= 60; $value /= 60;
if ($value == 0) if ($value == 0)
{ $ret = sprintf("%dm$b%02ds", $m, $s);
return sprintf("%dm$b%02ds", $m, $s);
}
else else
{ {
$h = $value % 24; $h = $value % 24;
$value -= $h; $value -= $h;
$value /= 24; $value /= 24;
if ($value == 0) if ($value == 0)
return sprintf("%dh$b%02dm$b%02ds", $h, $m, $s); $ret = sprintf("%dh$b%02dm$b%02ds", $h, $m, $s);
else else
return sprintf("%ddays$b%02dh$b%02dm$b%02ds", $value, $h, $m, $s); $ret = sprintf("%ddays$b%02dh$b%02dm$b%02ds", $value, $h, $m, $s);
} }
} }
break; break;
case 'GPU0.Utility': case 'NOTIFY.Last Well':
if ($value == '0')
{
$ret = 'Never';
$class = $warnclass;
}
else
$ret = date('H:i:s', $value);
break;
case 'NOTIFY.Last Not Well':
if ($value == '0')
$ret = 'Never';
else
{
$ret = date('H:i:s', $value);
$class = $errorclass;
}
break;
case 'NOTIFY.Reason Not Well':
if ($value != 'None')
$class = $errorclass;
break;
case 'GPU.Utility':
case 'PGA.Utility':
case 'SUMMARY.Utility': case 'SUMMARY.Utility':
return $value.'/m'; $ret = $value.'/m';
break; break;
case 'GPU0.Temperature': case 'GPU.Temperature':
return $value.'&deg;C'; case 'PGA.Temperature':
$ret = $value.'&deg;C';
break; break;
} }
return $value; if ($section == 'NOTIFY' && substr($name, 0, 1) == '*' && $value != '0')
$class = $errorclass;
return array($ret, $class);
}
#
global $poolcmd;
$poolcmd = array( 'Switch to' => 'switchpool',
'Enable' => 'enablepool',
'Disable' => 'disablepool' );
#
function showhead($cmd, $item, $values)
{
global $poolcmd, $readonly;
echo '<tr>';
foreach ($values as $name => $value)
{
if ($name == '0')
$name = '&nbsp;';
echo "<td valign=bottom class=h>$name</td>";
}
if ($cmd == 'pools' && $readonly === false)
foreach ($poolcmd as $name => $pcmd)
echo "<td valign=bottom class=h>$name</td>";
echo '</tr>';
} }
# #
function details($cmd, $list) function details($cmd, $list)
{ {
global $poolcmd, $readonly;
$dfmt = 'H:i:s j-M-Y \U\T\CP';
$stas = array('S' => 'Success', 'W' => 'Warning', 'I' => 'Informational', 'E' => 'Error', 'F' => 'Fatal'); $stas = array('S' => 'Success', 'W' => 'Warning', 'I' => 'Informational', 'E' => 'Error', 'F' => 'Fatal');
$tb = '<tr><td><table border=1 cellpadding=5 cellspacing=0>'; $tb = '<tr><td><table border=1 cellpadding=5 cellspacing=0>';
@ -211,7 +300,7 @@ function details($cmd, $list)
echo $tb; echo $tb;
echo '<tr><td class=sta>Date: '.date('H:i:s j-M-Y \U\T\CP').'</td></tr>'; echo '<tr><td class=sta>Date: '.date($dfmt).'</td></tr>';
echo $te.$tb; echo $te.$tb;
@ -219,56 +308,40 @@ function details($cmd, $list)
{ {
echo '<tr>'; echo '<tr>';
echo '<td>Computer: '.$list['STATUS']['Description'].'</td>'; echo '<td>Computer: '.$list['STATUS']['Description'].'</td>';
if (isset($list['STATUS']['When']))
echo '<td>When: '.date($dfmt, $list['STATUS']['When']).'</td>';
$sta = $list['STATUS']['STATUS']; $sta = $list['STATUS']['STATUS'];
echo '<td>Status: '.$stas[$sta].'</td>'; echo '<td>Status: '.$stas[$sta].'</td>';
echo '<td>Message: '.$list['STATUS']['Msg'].'</td>'; echo '<td>Message: '.$list['STATUS']['Msg'].'</td>';
echo '</tr>'; echo '</tr>';
} }
echo $te.$tb;
$section = ''; $section = '';
$poolcmd = array( 'Switch to' => 'switchpool',
'Enable' => 'enablepool',
'Disable' => 'disablepool' );
foreach ($list as $item => $values) foreach ($list as $item => $values)
{ {
if ($item != 'STATUS') if ($item == 'STATUS')
{ continue;
$section = $item;
echo '<tr>'; $sectionname = preg_replace('/\d/', '', $item);
foreach ($values as $name => $value) if ($sectionname != $section)
{ {
if ($name == '0') echo $te.$tb;
$name = '&nbsp;'; showhead($cmd, $item, $values);
echo "<td valign=bottom class=h>$name</td>"; $section = $sectionname;
}
if ($cmd == 'pools')
foreach ($poolcmd as $name => $pcmd)
echo "<td valign=bottom class=h>$name</td>";
echo '</tr>';
break;
}
} }
foreach ($list as $item => $values)
{
if ($item == 'STATUS')
continue;
echo '<tr>'; echo '<tr>';
foreach ($values as $name => $value) foreach ($values as $name => $value)
echo '<td>'.fmt($section, $name, $value).'</td>'; {
list($showvalue, $class) = fmt($section, $name, $value);
echo "<td$class>$showvalue</td>";
}
if ($cmd == 'pools') if ($cmd == 'pools' && $readonly === false)
{ {
reset($values); reset($values);
$pool = current($values); $pool = current($values);
@ -294,7 +367,7 @@ function details($cmd, $list)
global $devs; global $devs;
$devs = null; $devs = null;
# #
function gpubuttons($count, $info) function gpubuttons($count)
{ {
global $devs; global $devs;
@ -408,7 +481,7 @@ function process($cmds, $rd, $ro)
# #
function display() function display()
{ {
global $error; global $error, $readonly, $notify;
$error = null; $error = null;
@ -418,6 +491,7 @@ function display()
echo "<tr><td><table cellpadding=0 cellspacing=0 border=0><tr><td>"; echo "<tr><td><table cellpadding=0 cellspacing=0 border=0><tr><td>";
echo "<input type=button value='Refresh' onclick='pr(\"\",null)'>"; echo "<input type=button value='Refresh' onclick='pr(\"\",null)'>";
echo "</td><td width=100%>&nbsp;</td><td>"; echo "</td><td width=100%>&nbsp;</td><td>";
if ($readonly === false)
echo "<input type=button value='Quit' onclick='prc(\"quit\",\"Quit CGMiner\")'>"; echo "<input type=button value='Quit' onclick='prc(\"quit\",\"Quit CGMiner\")'>";
echo "</td></tr></table></td></tr>"; echo "</td></tr></table></td></tr>";
@ -427,15 +501,20 @@ function display()
$cmds = array( 'devs' => 'device list', $cmds = array( 'devs' => 'device list',
'summary' => 'summary information', 'summary' => 'summary information',
'pools' => 'pool list', 'pools' => 'pool list');
'config' => 'cgminer config');
if ($notify)
$cmds['notify'] = 'device status';
$cmds['config'] = 'cgminer config';
process($cmds, $rd, $ro); process($cmds, $rd, $ro);
if ($error == null) if ($error == null && $readonly === false)
processgpus($rd, $ro); processgpus($rd, $ro);
} }
# #
htmlhead();
display(); display();
# #
?> ?>

Write Preview
Loading…
Cancel
Save