mirror of
https://github.com/GOSTSec/sgminer
synced 2025-01-11 07:17:58 +00:00
Merge pull request #137 from kanoi/master
Add enable/disablepool to miner.php example and reduce font size 1pt
This commit is contained in:
Con Kolivas
commit
3ab48f9d1e
12
README
12
README
@ -660,6 +660,13 @@ The list of requests - a (*) means it requires privileged access - and replies a
|
||||
stating the results of enabling pool N
|
||||
The Msg includes the pool URL
|
||||
|
||||
addpool|URL,USR,PASS (*)
|
||||
none There is no reply section just the STATUS section
|
||||
stating the results of attempting to add pool N
|
||||
The Msg includes the pool URL
|
||||
Use '\\' to get a '\' and '\,' to include a comma
|
||||
inside URL, USR or PASS
|
||||
|
||||
disablepool|N (*)
|
||||
none There is no reply section just the STATUS section
|
||||
stating the results of disabling pool N
|
||||
@ -894,6 +901,11 @@ Q: Are kernels from other mining software useable in cgminer?
|
||||
A: No, the APIs are slightly different between the different software and they
|
||||
will not work.
|
||||
|
||||
Q: I run PHP on windows to access the API with the example miner.php. Why does
|
||||
it fail when php is installed properly but I only get errors about Sockets not
|
||||
working in the logs?
|
||||
A: http://us.php.net/manual/en/sockets.installation.php
|
||||
|
||||
---
|
||||
|
||||
This code is provided entirely free of charge by the programmer in his spare
|
||||
|
||||
119
api.c
119
api.c
@ -152,7 +152,7 @@ static const char *COMMA = ",";
|
||||
static const char SEPARATOR = '|';
|
||||
static const char GPUSEP = ',';
|
||||
|
||||
static const char *APIVERSION = "1.2";
|
||||
static const char *APIVERSION = "1.3";
|
||||
static const char *DEAD = "Dead";
|
||||
static const char *SICK = "Sick";
|
||||
static const char *NOSTART = "NoStart";
|
||||
@ -264,6 +264,10 @@ static const char *JSON_PARAMETER = "parameter";
|
||||
#define MSG_ALRENAP 49
|
||||
#define MSG_ALRDISP 50
|
||||
#define MSG_DISLASTP 51
|
||||
#define MSG_MISPDP 52
|
||||
#define MSG_INVPDP 53
|
||||
#define MSG_TOOMANYP 54
|
||||
#define MSG_ADDPOOL 55
|
||||
|
||||
enum code_severity {
|
||||
SEVERITY_ERR,
|
||||
@ -356,6 +360,10 @@ struct CODES {
|
||||
{ SEVERITY_INFO, MSG_ALRENAP, PARAM_POOL, "Pool %d:'%s' already enabled" },
|
||||
{ SEVERITY_INFO, MSG_ALRDISP, PARAM_POOL, "Pool %d:'%s' already disabled" },
|
||||
{ SEVERITY_ERR, MSG_DISLASTP,PARAM_POOL, "Cannot disable last active pool %d:'%s'" },
|
||||
{ SEVERITY_ERR, MSG_MISPDP, PARAM_NONE, "Missing addpool details" },
|
||||
{ SEVERITY_ERR, MSG_INVPDP, PARAM_STR, "Invalid addpool details '%s'" },
|
||||
{ SEVERITY_ERR, MSG_TOOMANYP,PARAM_NONE, "Reached maximum number of pools (%d)" },
|
||||
{ SEVERITY_SUCC, MSG_ADDPOOL, PARAM_STR, "Added pool '%s'" },
|
||||
{ SEVERITY_FAIL, 0, 0, NULL }
|
||||
};
|
||||
|
||||
@ -559,21 +567,21 @@ static void gpustatus(int gpu, bool isjson)
|
||||
sprintf(intensity, "%d", cgpu->intensity);
|
||||
|
||||
if (isjson)
|
||||
sprintf(buf, "{\"GPU\":%d,\"Enabled\":\"%s\",\"Status\":\"%s\",\"Temperature\":%.2f,\"Fan Speed\":%d,\"Fan Percent\":%d,\"GPU Clock\":%d,\"Memory Clock\":%d,\"GPU Voltage\":%.3f,\"GPU Activity\":%d,\"Powertune\":%d,\"MHS av\":%.2f,\"MHS %ds\":%.2f,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Intensity\":\"%s\",\"Last Share Pool\":%d,\"Last Share Time\":%lu}",
|
||||
sprintf(buf, "{\"GPU\":%d,\"Enabled\":\"%s\",\"Status\":\"%s\",\"Temperature\":%.2f,\"Fan Speed\":%d,\"Fan Percent\":%d,\"GPU Clock\":%d,\"Memory Clock\":%d,\"GPU Voltage\":%.3f,\"GPU Activity\":%d,\"Powertune\":%d,\"MHS av\":%.2f,\"MHS %ds\":%.2f,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Intensity\":\"%s\",\"Last Share Pool\":%d,\"Last Share Time\":%lu,\"Total MH\":%.4f}",
|
||||
gpu, enabled, status, gt, gf, gp, gc, gm, gv, ga, pt,
|
||||
cgpu->total_mhashes / total_secs, opt_log_interval, cgpu->rolling,
|
||||
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
|
||||
cgpu->utility, intensity,
|
||||
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
|
||||
(unsigned long)(cgpu->last_share_pool_time));
|
||||
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes);
|
||||
else
|
||||
sprintf(buf, "GPU=%d,Enabled=%s,Status=%s,Temperature=%.2f,Fan Speed=%d,Fan Percent=%d,GPU Clock=%d,Memory Clock=%d,GPU Voltage=%.3f,GPU Activity=%d,Powertune=%d,MHS av=%.2f,MHS %ds=%.2f,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Intensity=%s,Last Share Pool=%d,Last Share Time=%lu%c",
|
||||
sprintf(buf, "GPU=%d,Enabled=%s,Status=%s,Temperature=%.2f,Fan Speed=%d,Fan Percent=%d,GPU Clock=%d,Memory Clock=%d,GPU Voltage=%.3f,GPU Activity=%d,Powertune=%d,MHS av=%.2f,MHS %ds=%.2f,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Intensity=%s,Last Share Pool=%d,Last Share Time=%lu,Total MH=%.4f%c",
|
||||
gpu, enabled, status, gt, gf, gp, gc, gm, gv, ga, pt,
|
||||
cgpu->total_mhashes / total_secs, opt_log_interval, cgpu->rolling,
|
||||
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
|
||||
cgpu->utility, intensity,
|
||||
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
|
||||
(unsigned long)(cgpu->last_share_pool_time), SEPARATOR);
|
||||
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes, SEPARATOR);
|
||||
|
||||
strcat(io_buffer, buf);
|
||||
}
|
||||
@ -590,21 +598,21 @@ static void cpustatus(int cpu, bool isjson)
|
||||
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
|
||||
|
||||
if (isjson)
|
||||
sprintf(buf, "{\"CPU\":%d,\"MHS av\":%.2f,\"MHS %ds\":%.2f,\"Accepted\":%d,\"Rejected\":%d,\"Utility\":%.2f,\"Last Share Pool\":%d,\"Last Share Time\":%lu}",
|
||||
sprintf(buf, "{\"CPU\":%d,\"MHS av\":%.2f,\"MHS %ds\":%.2f,\"Accepted\":%d,\"Rejected\":%d,\"Utility\":%.2f,\"Last Share Pool\":%d,\"Last Share Time\":%lu,\"Total MH\":%.4f}",
|
||||
cpu, cgpu->total_mhashes / total_secs,
|
||||
opt_log_interval, cgpu->rolling,
|
||||
cgpu->accepted, cgpu->rejected,
|
||||
cgpu->utility,
|
||||
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
|
||||
(unsigned long)(cgpu->last_share_pool_time));
|
||||
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes);
|
||||
else
|
||||
sprintf(buf, "CPU=%d,MHS av=%.2f,MHS %ds=%.2f,Accepted=%d,Rejected=%d,Utility=%.2f,Last Share Pool=%d,Last Share Time=%lu%c",
|
||||
sprintf(buf, "CPU=%d,MHS av=%.2f,MHS %ds=%.2f,Accepted=%d,Rejected=%d,Utility=%.2f,Last Share Pool=%d,Last Share Time=%lu,Total MH=%.4f%c",
|
||||
cpu, cgpu->total_mhashes / total_secs,
|
||||
opt_log_interval, cgpu->rolling,
|
||||
cgpu->accepted, cgpu->rejected,
|
||||
cgpu->utility,
|
||||
((unsigned long)(cgpu->last_share_pool_time) > 0) ? cgpu->last_share_pool : -1,
|
||||
(unsigned long)(cgpu->last_share_pool_time), SEPARATOR);
|
||||
(unsigned long)(cgpu->last_share_pool_time), cgpu->total_mhashes, SEPARATOR);
|
||||
|
||||
strcat(io_buffer, buf);
|
||||
}
|
||||
@ -793,34 +801,34 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
|
||||
|
||||
#ifdef WANT_CPUMINE
|
||||
if (isjson)
|
||||
sprintf(io_buffer, "%s," JSON_SUMMARY "{\"Elapsed\":%.0f,\"Algorithm\":\"%s\",\"MHS av\":%.2f,\"Found Blocks\":%d,\"Getworks\":%d,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Discarded\":%d,\"Stale\":%d,\"Get Failures\":%d,\"Local Work\":%u,\"Remote Failures\":%u,\"Network Blocks\":%u}" JSON_CLOSE,
|
||||
sprintf(io_buffer, "%s," JSON_SUMMARY "{\"Elapsed\":%.0f,\"Algorithm\":\"%s\",\"MHS av\":%.2f,\"Found Blocks\":%d,\"Getworks\":%d,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Discarded\":%d,\"Stale\":%d,\"Get Failures\":%d,\"Local Work\":%u,\"Remote Failures\":%u,\"Network Blocks\":%u,\"Total MH\":%.4f}" JSON_CLOSE,
|
||||
message(MSG_SUMM, 0, NULL, isjson),
|
||||
total_secs, algo, mhs, found_blocks,
|
||||
total_getworks, total_accepted, total_rejected,
|
||||
hw_errors, utility, total_discarded, total_stale,
|
||||
total_go, local_work, total_ro, new_blocks);
|
||||
total_go, local_work, total_ro, new_blocks, total_mhashes_done);
|
||||
else
|
||||
sprintf(io_buffer, "%s" _SUMMARY ",Elapsed=%.0f,Algorithm=%s,MHS av=%.2f,Found Blocks=%d,Getworks=%d,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Discarded=%d,Stale=%d,Get Failures=%d,Local Work=%u,Remote Failures=%u,Network Blocks=%u%c",
|
||||
sprintf(io_buffer, "%s" _SUMMARY ",Elapsed=%.0f,Algorithm=%s,MHS av=%.2f,Found Blocks=%d,Getworks=%d,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Discarded=%d,Stale=%d,Get Failures=%d,Local Work=%u,Remote Failures=%u,Network Blocks=%u,Total MH=%.4f%c",
|
||||
message(MSG_SUMM, 0, NULL, isjson),
|
||||
total_secs, algo, mhs, found_blocks,
|
||||
total_getworks, total_accepted, total_rejected,
|
||||
hw_errors, utility, total_discarded, total_stale,
|
||||
total_go, local_work, total_ro, new_blocks, SEPARATOR);
|
||||
total_go, local_work, total_ro, new_blocks, total_mhashes_done, SEPARATOR);
|
||||
#else
|
||||
if (isjson)
|
||||
sprintf(io_buffer, "%s," JSON_SUMMARY "{\"Elapsed\":%.0f,\"MHS av\":%.2f,\"Found Blocks\":%d,\"Getworks\":%d,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Discarded\":%d,\"Stale\":%d,\"Get Failures\":%d,\"Local Work\":%u,\"Remote Failures\":%u,\"Network Blocks\":%u}" JSON_CLOSE,
|
||||
sprintf(io_buffer, "%s," JSON_SUMMARY "{\"Elapsed\":%.0f,\"MHS av\":%.2f,\"Found Blocks\":%d,\"Getworks\":%d,\"Accepted\":%d,\"Rejected\":%d,\"Hardware Errors\":%d,\"Utility\":%.2f,\"Discarded\":%d,\"Stale\":%d,\"Get Failures\":%d,\"Local Work\":%u,\"Remote Failures\":%u,\"Network Blocks\":%u,\"Total MH\":%.4f}" JSON_CLOSE,
|
||||
message(MSG_SUMM, 0, NULL, isjson),
|
||||
total_secs, mhs, found_blocks,
|
||||
total_getworks, total_accepted, total_rejected,
|
||||
hw_errors, utility, total_discarded, total_stale,
|
||||
total_go, local_work, total_ro, new_blocks);
|
||||
total_go, local_work, total_ro, new_blocks, total_mhashes_done);
|
||||
else
|
||||
sprintf(io_buffer, "%s" _SUMMARY ",Elapsed=%.0f,MHS av=%.2f,Found Blocks=%d,Getworks=%d,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Discarded=%d,Stale=%d,Get Failures=%d,Local Work=%u,Remote Failures=%u,Network Blocks=%u%c",
|
||||
sprintf(io_buffer, "%s" _SUMMARY ",Elapsed=%.0f,MHS av=%.2f,Found Blocks=%d,Getworks=%d,Accepted=%d,Rejected=%d,Hardware Errors=%d,Utility=%.2f,Discarded=%d,Stale=%d,Get Failures=%d,Local Work=%u,Remote Failures=%u,Network Blocks=%u,Total MH=%.4f%c",
|
||||
message(MSG_SUMM, 0, NULL, isjson),
|
||||
total_secs, mhs, found_blocks,
|
||||
total_getworks, total_accepted, total_rejected,
|
||||
hw_errors, utility, total_discarded, total_stale,
|
||||
total_go, local_work, total_ro, new_blocks, SEPARATOR);
|
||||
total_go, local_work, total_ro, new_blocks, total_mhashes_done, SEPARATOR);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -986,6 +994,81 @@ static void switchpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
|
||||
strcpy(io_buffer, message(MSG_SWITCHP, id, NULL, isjson));
|
||||
}
|
||||
|
||||
static void copyadvanceafter(char ch, char **param, char **buf)
|
||||
{
|
||||
#define src_p (*param)
|
||||
#define dst_b (*buf)
|
||||
|
||||
while (*src_p && *src_p != ch) {
|
||||
if (*src_p == '\\' && *(src_p+1) != '\0')
|
||||
src_p++;
|
||||
|
||||
*(dst_b++) = *(src_p++);
|
||||
}
|
||||
if (*src_p)
|
||||
src_p++;
|
||||
|
||||
*(dst_b++) = '\0';
|
||||
}
|
||||
|
||||
static bool pooldetails(char *param, char **url, char **user, char **pass)
|
||||
{
|
||||
char *ptr, *buf;
|
||||
|
||||
ptr = buf = malloc(strlen(param)+1);
|
||||
if (unlikely(!buf))
|
||||
quit(1, "Failed to malloc pooldetails buf");
|
||||
|
||||
*url = buf;
|
||||
|
||||
// copy url
|
||||
copyadvanceafter(',', ¶m, &buf);
|
||||
|
||||
if (!(*param)) // missing user
|
||||
goto exitsama;
|
||||
|
||||
*user = buf;
|
||||
|
||||
// copy user
|
||||
copyadvanceafter(',', ¶m, &buf);
|
||||
|
||||
if (!*param) // missing pass
|
||||
goto exitsama;
|
||||
|
||||
*pass = buf;
|
||||
|
||||
// copy pass
|
||||
copyadvanceafter(',', ¶m, &buf);
|
||||
|
||||
return true;
|
||||
|
||||
exitsama:
|
||||
free(ptr);
|
||||
return false;
|
||||
}
|
||||
|
||||
static void addpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
|
||||
{
|
||||
char *url, *user, *pass;
|
||||
|
||||
if (param == NULL || *param == '\0') {
|
||||
strcpy(io_buffer, message(MSG_MISPDP, 0, NULL, isjson));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!pooldetails(param, &url, &user, &pass)) {
|
||||
strcpy(io_buffer, message(MSG_INVPDP, 0, param, isjson));
|
||||
return;
|
||||
}
|
||||
|
||||
if (add_pool_details(true, url, user, pass) == ADD_POOL_MAXIMUM) {
|
||||
strcpy(io_buffer, message(MSG_TOOMANYP, MAX_POOLS, NULL, isjson));
|
||||
return;
|
||||
}
|
||||
|
||||
strcpy(io_buffer, message(MSG_ADDPOOL, 0, url, isjson));
|
||||
}
|
||||
|
||||
static void enablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
|
||||
{
|
||||
struct pool *pool;
|
||||
@ -1271,7 +1354,7 @@ struct CMDS {
|
||||
{ "gpucount", gpucount, false },
|
||||
{ "cpucount", cpucount, false },
|
||||
{ "switchpool", switchpool, true },
|
||||
// { "addpool", addpool, true }, Not yet ...
|
||||
{ "addpool", addpool, true },
|
||||
{ "enablepool", enablepool, true },
|
||||
{ "disablepool", disablepool, true },
|
||||
{ "gpuintensity", gpuintensity, true },
|
||||
|
||||
38
miner.php
38
miner.php
@ -10,13 +10,13 @@ $here = $_SERVER['PHP_SELF'];
|
||||
?>
|
||||
<html><head><title>Mine</title>
|
||||
<style type='text/css'>
|
||||
td { color:blue; font-family:verdana,arial,sans; font-size:14pt; }
|
||||
td.h { color:blue; font-family:verdana,arial,sans; font-size:14pt; background:#d0ffff }
|
||||
td.sta { color:green; font-family:verdana,arial,sans; font-size:14pt; }
|
||||
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.sta { color:green; font-family:verdana,arial,sans; font-size:13pt; }
|
||||
</style>
|
||||
</head><body bgcolor=#ecffff>
|
||||
<script type='text/javascript'>
|
||||
function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location="<? echo $here ?>"+a}
|
||||
function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location="<?php echo $here ?>"+a}
|
||||
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 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)}
|
||||
@ -24,7 +24,7 @@ function prs2(a,n){var v=document.getElementById('gi'+n).value;var c=a.substr(3)
|
||||
<table width=100% height=100% border=0 cellpadding=0 cellspacing=0 summary='Mine'>
|
||||
<tr><td align=center valign=top>
|
||||
<table border=0 cellpadding=4 cellspacing=0 summary='Mine'>
|
||||
<?
|
||||
<?php
|
||||
#
|
||||
global $error;
|
||||
$error = null;
|
||||
@ -229,6 +229,10 @@ function details($cmd, $list)
|
||||
|
||||
$section = '';
|
||||
|
||||
$poolcmd = array( 'Switch to' => 'switchpool',
|
||||
'Enable' => 'enablepool',
|
||||
'Disable' => 'disablepool' );
|
||||
|
||||
foreach ($list as $item => $values)
|
||||
{
|
||||
if ($item != 'STATUS')
|
||||
@ -245,7 +249,8 @@ function details($cmd, $list)
|
||||
}
|
||||
|
||||
if ($cmd == 'pools')
|
||||
echo "<td valign=bottom class=h>Switch</td>";
|
||||
foreach ($poolcmd as $name => $pcmd)
|
||||
echo "<td valign=bottom class=h>$name</td>";
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
@ -258,24 +263,27 @@ function details($cmd, $list)
|
||||
if ($item == 'STATUS')
|
||||
continue;
|
||||
|
||||
echo '<tr>';
|
||||
|
||||
foreach ($values as $name => $value)
|
||||
echo '<td>'.fmt($section, $name, $value).'</td>';
|
||||
|
||||
if ($cmd == 'pools')
|
||||
{
|
||||
echo '<td>';
|
||||
|
||||
reset($values);
|
||||
$pool = current($values);
|
||||
if ($pool === false)
|
||||
echo ' ';
|
||||
else
|
||||
foreach ($poolcmd as $name => $pcmd)
|
||||
{
|
||||
echo "<input type=button value='Pool $pool'";
|
||||
echo " onclick='prc(\"switchpool|$pool\",\"Switch to Pool $pool\")'>";
|
||||
echo '<td>';
|
||||
if ($pool === false)
|
||||
echo ' ';
|
||||
else
|
||||
{
|
||||
echo "<input type=button value='Pool $pool'";
|
||||
echo " onclick='prc(\"$pcmd|$pool\",\"$name Pool $pool\")'>";
|
||||
}
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user