Commit 38f912f81263d945e32d6f18520176ef8b121718
2012-12-14T13:36:23
miner.php allow custom page joins for STATS
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
diff --git a/miner.php b/miner.php
index f6250f0..06407b4 100644
--- a/miner.php
+++ b/miner.php
@@ -892,7 +892,7 @@ $singlerigsum = array(
'Hardware Errors' => 1, 'Utility' => 1, 'Total MH' => 1),
'pools' => array('Getworks' => 1, 'Accepted' => 1, 'Rejected' => 1, 'Discarded' => 1,
'Stale' => 1, 'Get Failures' => 1, 'Remote Failures' => 1,
- 'Diff1 Shares' => 1),
+ 'Diff1 Shares' => 1, 'Difficulty Accepted' => 1),
'notify' => array('*' => 1));
#
function showtotal($total, $when, $oldvalues)
@@ -1522,7 +1522,8 @@ $sectionmap = array(
'DEVDETAILS' => 'devdetails',
'STATS' => 'stats',
'CONFIG' => 'config',
- 'COIN' => 'coin');
+ 'COIN' => 'coin',
+ 'USBSTATS' => 'usbstats');
#
function joinfields($section1, $section2, $join, $results)
{
@@ -1584,6 +1585,79 @@ function joinfields($section1, $section2, $join, $results)
return $newres;
}
#
+function joinlr($section1, $section2, $join, $results)
+{
+ global $sectionmap;
+
+ $name1 = $sectionmap[$section1];
+ $name2 = $sectionmap[$section2];
+ $newres = array();
+
+ // foreach rig in section1
+ foreach ($results[$name1] as $rig => $result)
+ {
+ $status = null;
+
+ // foreach answer section in the rig api call
+ foreach ($result as $name1b => $fields1b)
+ {
+ if ($name1b == 'STATUS')
+ {
+ // remember the STATUS from section1
+ $status = $result[$name1b];
+ continue;
+ }
+
+ // Build L string to be matched
+ // : means a string constant otherwise it's a field name
+ $Lval = '';
+ foreach ($join['L'] as $field)
+ {
+ if (substr($field, 0, 1) == ':')
+ $Lval .= substr($field, 1);
+ else
+ $Lval .= $fields1b[$field];
+ }
+
+ // foreach answer section in the rig api call (for the other api command)
+ foreach ($results[$name2][$rig] as $name2b => $fields2b)
+ {
+ if ($name2b == 'STATUS')
+ continue;
+
+ // Build R string and compare
+ // : means a string constant otherwise it's a field name
+ $Rval = '';
+ foreach ($join['R'] as $field)
+ {
+ if (substr($field, 0, 1) == ':')
+ $Rval .= substr($field, 1);
+ else
+ $Rval .= $fields2b[$field];
+ }
+
+ if ($Lval === $Rval)
+ {
+ if ($status != null)
+ {
+ $newres[$rig]['STATUS'] = $status;
+ $status = null;
+ }
+
+ $subsection = $section1.'+'.$section2;
+ $subsection .= preg_replace('/[^0-9]/', '', $name1b.$name2b);
+
+ foreach ($fields1b as $nam => $val)
+ $newres[$rig][$subsection]["$section1.$nam"] = $val;
+ foreach ($fields2b as $nam => $val)
+ $newres[$rig][$subsection]["$section2.$nam"] = $val;
+ }
+ }
+ }
+ }
+ return $newres;
+}
+#
function joinall($section1, $section2, $results)
{
global $sectionmap;
@@ -1628,8 +1702,6 @@ function joinsections($sections, $results, $errors)
{
global $sectionmap;
-#echo "results['pools']=".print_r($results['pools'],true)."<br>";
-
// GPU's don't have Name,ID fields - so create them
foreach ($results as $section => $res)
foreach ($res as $rig => $result)
@@ -1667,14 +1739,33 @@ function joinsections($sections, $results, $errors)
}
break;
case 'DEVS':
- $join = array('Name', 'ID');
switch($both[1])
{
case 'NOTIFY':
case 'DEVDETAILS':
+ case 'USBSTATS':
+ $join = array('Name', 'ID');
$sectionmap[$section] = $section;
$results[$section] = joinfields($both[0], $both[1], $join, $results);
break;
+ case 'STATS':
+ $join = array('L' => array('Name','ID'), 'R' => array('ID'));
+ $sectionmap[$section] = $section;
+ $results[$section] = joinlr($both[0], $both[1], $join, $results);
+ break;
+ default:
+ $errors[] = "Error: Invalid section '$section'";
+ break;
+ }
+ break;
+ case 'POOL':
+ switch($both[1])
+ {
+ case 'STATS':
+ $join = array('L' => array(':POOL','POOL'), 'R' => array('ID'));
+ $sectionmap[$section] = $section;
+ $results[$section] = joinlr($both[0], $both[1], $join, $results);
+ break;
default:
$errors[] = "Error: Invalid section '$section'";
break;
@@ -2099,7 +2190,7 @@ function display()
newtable();
doforeach('version', 'rig summary', array(), array(), true);
- $sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH', 'Work Utility', 'Diff1 Shares', 'Diff1 Work');
+ $sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH', 'Work Utility', 'Diff1 Shares', 'Diff1 Work', 'Difficulty Accepted', 'Difficulty Rejected', 'Difficulty Stale');
doforeach('summary', 'summary information', $sum, array(), false);
endtable();
otherrow('<td><br><br></td>');