added per-miner graphs

diff --git a/p2pool/util/graph.py b/p2pool/util/graph.py
index 2070163..66c1f99 100644 (file)
--- a/p2pool/util/graph.py
+++ b/p2pool/util/graph.py
@@ -27,7 +27,7 @@ class DataView(object):
     
     def _add_datum(self, t, value):
         shift = max(0, int(math.ceil((t - self.last_bin_end)/self.desc.bin_width)))
-        self.bins = _shift(self.bins, shift, (0, 0))
+        self.bins = _shift(self.bins, shift, (self.ds_desc.zero_element, 0))
         self.last_bin_end += shift*self.desc.bin_width
         
         bin = int(math.ceil((self.last_bin_end - self.desc.bin_width - t)/self.desc.bin_width))
@@ -36,27 +36,30 @@ class DataView(object):
             return
         
         prev_total, prev_count = self.bins[bin]
-        self.bins[bin] = prev_total + value, prev_count + 1
+        self.bins[bin] = self.ds_desc.add_operator(prev_total, value), prev_count + 1
     
     def get_data(self, t):
         shift = max(0, int(math.ceil((t - self.last_bin_end)/self.desc.bin_width)))
-        bins = _shift(self.bins, shift, (0, 0))
+        bins = _shift(self.bins, shift, (self.ds_desc.zero_element, 0))
         last_bin_end = self.last_bin_end + shift*self.desc.bin_width
         
         assert last_bin_end - self.desc.bin_width <= t <= last_bin_end
         
         return [(
             (min(t, last_bin_end - self.desc.bin_width*i) + (last_bin_end - self.desc.bin_width*(i + 1)))/2, # center time
-            (total/count if count else None) if self.ds_desc.source_is_cumulative
-                else total/(min(t, last_bin_end - self.desc.bin_width*i) - (last_bin_end - self.desc.bin_width*(i + 1))), # value
+            (self.ds_desc.mult_operator(1/count, total) if count else None) if self.ds_desc.source_is_cumulative
+                else self.ds_desc.mult_operator(1/(min(t, last_bin_end - self.desc.bin_width*i) - (last_bin_end - self.desc.bin_width*(i + 1))), total), # value
             min(t, last_bin_end - self.desc.bin_width*i) - (last_bin_end - self.desc.bin_width*(i + 1)), # width
         ) for i, (total, count) in enumerate(bins)]
 
 
 class DataStreamDescription(object):
-    def __init__(self, source_is_cumulative, dataview_descriptions):
+    def __init__(self, source_is_cumulative, dataview_descriptions, zero_element=0, add_operator=lambda x, y: x+y, mult_operator=lambda a, x: a*x):
         self.source_is_cumulative = source_is_cumulative
         self.dataview_descriptions = dataview_descriptions
+        self.zero_element = zero_element
+        self.add_operator = add_operator
+        self.mult_operator = mult_operator
 
 class DataStream(object):
     def __init__(self, desc, dataviews):
@@ -78,7 +81,7 @@ class HistoryDatabase(object):
                     dv_data = ds_data[dv_name]
                     if dv_data['bin_width'] == dv_desc.bin_width and len(dv_data['bins']) == dv_desc.bin_count:
                         return DataView(dv_desc, ds_desc, dv_data['last_bin_end'], dv_data['bins'])
-            return DataView(dv_desc, ds_desc, 0, dv_desc.bin_count*[(0, 0)])
+            return DataView(dv_desc, ds_desc, 0, dv_desc.bin_count*[(ds_desc.zero_element, 0)])
         return cls(dict(
             (ds_name, DataStream(ds_desc, dict(
                 (dv_name, get_dataview(ds_name, ds_desc, dv_name, dv_desc))

diff --git a/p2pool/util/math.py b/p2pool/util/math.py
index a484c04..aa5ea8a 100644 (file)
--- a/p2pool/util/math.py
+++ b/p2pool/util/math.py
@@ -65,6 +65,8 @@ def add_dicts(*dicts):
             res[k] = res.get(k, 0) + v
     return dict((k, v) for k, v in res.iteritems() if v)
 
+mult_dict = lambda c, x: dict((k, c*v) for k, v in x.iteritems())
+
 def format(x):
     prefixes = 'kMGTPEZY'
     count = 0

diff --git a/p2pool/web.py b/p2pool/web.py
index 59c32d7..acc38b3 100644 (file)
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -391,6 +391,8 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
         'current_payout': graph.DataStreamDescription(True, dataview_descriptions),
         'incoming_peers': graph.DataStreamDescription(True, dataview_descriptions),
         'outgoing_peers': graph.DataStreamDescription(True, dataview_descriptions),
+        'miner_hash_rates': graph.DataStreamDescription(False, dataview_descriptions, {}, math.add_dicts, math.mult_dict),
+        'miner_dead_hash_rates': graph.DataStreamDescription(False, dataview_descriptions, {}, math.add_dicts, math.mult_dict),
     }, hd_obj)
     task.LoopingCall(lambda: _atomic_write(hd_path, json.dumps(hd.to_obj()))).start(100)
     @pseudoshare_received.watch
@@ -399,6 +401,10 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
         hd.datastreams['local_hash_rate'].add_datum(t, work)
         if dead:
             hd.datastreams['local_dead_hash_rate'].add_datum(t, work)
+        if user is not None:
+            hd.datastreams['miner_hash_rates'].add_datum(t, {user: work})
+            if dead:
+                hd.datastreams['miner_dead_hash_rates'].add_datum(t, {user: work})
     def add_point():
         if tracker.get_height(current_work.value['best_share_hash']) < 720:
             return

diff --git a/web-static/graphs.html b/web-static/graphs.html
index fe8f548..fd9b25e 100644 (file)
--- a/web-static/graphs.html
+++ b/web-static/graphs.html
@@ -16,14 +16,7 @@
                 shape-rendering: crispEdges;
             }
             
-            .rate {
-                stroke: #0000FF;
-                stroke-width: 1.4;
-                fill: none;
-            }
-            
-            .deadrate {
-                stroke: #FF0000;
+            .plotline {
                 stroke-width: 1.4;
                 fill: none;
             }
@@ -52,6 +45,9 @@
         <h2>Peers - Blue=Incoming, Red=Outgoing</h2>
         <svg id="peers"></svg>
         
+        <h2>Miners - Blue=All, Red=Dead (hash/second)</h2>
+        <div id="miners"></div>
+        
         <script type="text/javascript">
             function compose() {
                 var funcs = arguments;
@@ -65,6 +61,7 @@
             function itemgetter(i) { return function(x) { return x[i]; } }
             function as_date(x) { return new Date(1000*x); }
             function not_null(x) { return x != null; }
+            function identity(x) { return x; }
             
             function getData(url) {
                 var xmlhttp = new XMLHttpRequest();
@@ -73,34 +70,59 @@
                 return JSON.parse(xmlhttp.responseText);
             }
             
-            function plot(g, blue, red) {
-                var data = getData("/web/graph_data/" + blue);
-                if(red)
-                    var dead_data = getData("/web/graph_data/" + red);
-                else
-                    var dead_data = [];
+            function get_avg(data, value_getter) {
+                var top = 0;
+                var bottom = 0;
+                for(var i = 0; i < data.length; i++) {
+                    var value = value_getter(data[i][1]);
+                    if(value == null) continue; // no data for bin
+                    top += value * data[i][2];
+                    bottom += data[i][2];
+                }
+                if(bottom == 0) return null; // no data at all
+                return top/bottom;
+            }
+            
+            function plot(g, lines) {
+                // lines is a list of objects which have attributes data, value_getter, color
                 
                 var w = 640;
                 var h = 300;
                 var margin = 50;
                 var margin_top = 10;
                 
-                var x = d3.time.scale().domain([as_date(d3.min(data, itemgetter(0))), as_date(d3.max(data, itemgetter(0)))]).range([0 + margin * 2, w - margin * 2]);
-                var y = d3.scale.linear().domain([0, d3.max(data.concat(dead_data), itemgetter(1))]).range([h - margin, margin_top]);
+                var x = d3.time.scale().domain([
+                    as_date(d3.min(lines, function(line) { return d3.min(line.data, itemgetter(0)); })),
+                    as_date(d3.max(lines, function(line) { return d3.max(line.data, itemgetter(0)); }))
+                ]).range([0 + margin * 2, w - margin * 2]);
+                var y = d3.scale.linear().domain([
+                    0,
+                    d3.max(lines, function(line) { return d3.max(line.data, compose(line.value_getter, itemgetter(1))); } )
+                ]).range([h - margin, margin_top]);
                 
-                var line = d3.svg.line().x(compose(x, as_date, itemgetter(0))).y(compose(y, itemgetter(1))).defined(compose(not_null, itemgetter(1)));
                 
                 g.attr("width", w).attr("height", h);
                 g.selectAll("*").remove();
                 
-                g.append("svg:path")
-                    .attr("d", line(data))
-                    .attr("class", "rate");
-                
-                g.append("svg:path")
-                    .attr("d", line(dead_data))
-                    .attr("class", "deadrate");
+                for(var i = 0; i < lines.length; ++i) {
+                    var line = lines[i];
+                    var line_type = d3.svg.line().x(compose(x, as_date, itemgetter(0))).y(compose(y, line.value_getter, itemgetter(1))).defined(compose(not_null, line.value_getter, itemgetter(1)));
+                    g.append("svg:path")
+                        .attr("d", line_type(line.data))
+                        .attr("stroke", line.color)
+                        .attr("class", "plotline");
+                    var mean = get_avg(line.data, line.value_getter);
+                    if(mean != null)
+                        g.append("svg:text")
+                            .text("-Mean: " + d3.format(".3s")(mean))
+                            .attr("text-anchor", "start")
+                            .attr("dominant-baseline", "central")
+                            .attr("fill", line.color)
+                            .attr("x", w - 2*margin)
+                            .attr("y", y(mean));
+                }
                 
+                // x axis
                 
                 g.append("svg:line")
                     .attr("x1", margin * 2)
@@ -126,6 +148,7 @@
                     .attr("x2", x)
                     .attr("y2", h - margin + 5);
                 
+                // y axis
                 
                 g.append("svg:line")
                     .attr("x1", margin * 2)
@@ -149,60 +172,50 @@
                     .attr("y", y)
                     .attr("dominant-baseline", "central")
                     .attr("text-anchor", "middle");
-                
-                function get_avg(data) {
-                    var top = 0;
-                    var bottom = 0;
-                    for(var i = 0; i < data.length; i++) {
-                        if(data[i][1] == null) continue; // no data for bin
-                        top += data[i][1] * data[i][2];
-                        bottom += data[i][2];
-                    }
-                    if(bottom == 0) return null; // no data at all
-                    return top/bottom;
-                }
-                
-                var mean = get_avg(data);
-                if(mean != null) {
-                    g.append("svg:text")
-                        .text("-Mean: " + d3.format(".3s")(mean))
-                        .attr("text-anchor", "start")
-                        .attr("dominant-baseline", "central")
-                        .attr("fill", "#0000FF")
-                        .attr("x", w - 2*margin)
-                        .attr("y", y(mean));
-                }
-                
-                var mean2 = get_avg(dead_data);
-                if(mean2 != null) {
-                    g.append("svg:text")
-                        .text("-Mean: " + d3.format(".3s")(mean2))
-                        .attr("text-anchor", "start")
-                        .attr("dominant-baseline", "central")
-                        .attr("fill", "#FF0000")
-                        .attr("x", w - 2*margin)
-                        .attr("y", y(mean2));
-                }
             }
             
-            function attachGraph(e, blue, red) {
-                plot(e, blue, red);
-                //setInterval(function() { plot(e, blue, red); }, 5000);
+            function change_period(period) {
+                d3.select("#period_current").text(period);
+                var lowerperiod = period.toLowerCase();
+                plot(d3.select("#local"), [
+                    {"data": getData("/web/graph_data/local_hash_rate/last_" + lowerperiod), "value_getter": identity, "color": "#0000FF"},
+                    {"data": getData("/web/graph_data/local_dead_hash_rate/last_" + lowerperiod), "value_getter": identity, "color": "#FF0000"}
+                ]);
+                plot(d3.select("#payout"), [
+                    {"data": getData("/web/graph_data/current_payout/last_" + lowerperiod), "value_getter": identity, "color": "#0000FF"}
+                ]);
+                plot(d3.select("#pool"), [
+                    {"data": getData("/web/graph_data/pool_rate/last_" + lowerperiod), "value_getter": identity, "color": "#0000FF"},
+                    {"data": getData("/web/graph_data/pool_stale_rate/last_" + lowerperiod), "value_getter": identity, "color": "#FF0000"}
+                ]);
+                plot(d3.select("#peers"), [
+                    {"data": getData("/web/graph_data/incoming_peers/last_" + lowerperiod), "value_getter": identity, "color": "#0000FF"},
+                    {"data": getData("/web/graph_data/outgoing_peers/last_" + lowerperiod), "value_getter": identity, "color": "#FF0000"}
+                ]);
+                
+                var data = getData("/web/graph_data/miner_hash_rates/last_" + lowerperiod);
+                var dead_data = getData("/web/graph_data/miner_dead_hash_rates/last_" + lowerperiod);
+                var users = {}; for(var i = 0; i < data.length; ++i) for(var u in data[i][1]) users[u] = null; for(var i = 0; i < dead_data.length; ++i) for(var u in dead_data[i][1]) users[u] = null;
+                var userlist = []; for(var u in users) userlist.push(u);
+                d3.select("#miners").selectAll("*").remove();
+                var div = d3.select("#miners").selectAll().data(userlist).enter().append("div");
+                d.append("h3").text(identity);
+                d.append("svg:svg").each(function(u) {
+                    function f(d) {
+                        return u in d ? d[u] : 0;
+                    }
+                    plot(d3.select(this), [
+                        {"data": data, "value_getter": f, "color": "#0000FF"},
+                        {"data": dead_data, "value_getter": f, "color": "#FF0000"}
+                    ]);
+                });
             }
             
             periods = ["Hour", "Day", "Week", "Month", "Year"];
             d3.select("#period_chooser").selectAll().data(periods).enter().append("span")
-                .text(function(x){return x;})
+                .text(identity)
                 .on("click", change_period)
                 .attr("style", function(d, i) { return (i == 0 ? "" : "margin-left:.4em;") + "color:blue;text-decoration:underline;cursor:pointer" });
-            function change_period(period) {
-                var lowerperiod = period.toLowerCase();
-                attachGraph(d3.select("#local"), "local_hash_rate/last_" + lowerperiod, "local_dead_hash_rate/last_" + lowerperiod);
-                attachGraph(d3.select("#payout"), "current_payout/last_" + lowerperiod);
-                attachGraph(d3.select("#pool"), "pool_rate/last_" + lowerperiod, "pool_stale_rate/last_" + lowerperiod);
-                attachGraph(d3.select("#peers"), "incoming_peers/last_" + lowerperiod, "outgoing_peers/last_" + lowerperiod);
-                d3.select("#period_current").text(period);
-            }
             change_period(periods[1]);
         </script>
     </body>