light9 Changeset - a745bee5c419

Changeset - a745bee5c419

Parent rev.

Child rev.

[Not reviewed]

default

0 8 1

Drew Perttula - 6 years ago 2019-06-06 09:31:36
drewp@bigasterisk.com

new process stats visualizers
Ignore-this: 8e47516baad0bfb9cd02a712571c5a5f

9 files changed with 117 insertions and 2 deletions:

bin/ascoltami2

bin/collector

bin/effecteval

bin/vidref

light9/effect/sequencer.py

light9/web/index.html

light9/web/stats-line.js

light9/web/stats-process.js

requirements.txt

0 comments (0 inline, 0 general)

bin/ascoltami2

➞

Show inline comments

@@ @@ -11,9 +11,11 @@ from light9.ascoltami.player import Play @@
 from light9.ascoltami.playlist import Playlist, NoSuchSong
 from light9.ascoltami.webapp import makeWebApp, songUri, songLocation
 from light9 import networking, showconfig
 from standardservice.scalessetup import gatherProcessStats
 from gi.repository import GObject, Gst
 gatherProcessStats()
 class App(object):

bin/collector

➞

Show inline comments

@@ @@ -25,6 +25,7 @@ from greplin.scales.cyclonehandler impor @@
 from light9.namespaces import L9
 from light9.zmqtransport import parseJsonMessage, startZmq
 from rdfdb.syncedgraph import SyncedGraph
 from standardservice.scalessetup import gatherProcessStats
 from light9.collector.output import Udmx, DummyOutput  # noqa
@@ @@ -42,6 +43,7 @@ class Updates(cyclone.websocket.WebSocke @@
         json.loads(message)
 gatherProcessStats()
 stats = scales.collection(
     '/webServer',
     scales.PmfStat('setAttr', recalcPeriod=1),

bin/effecteval

➞

Show inline comments

@@ @@ -16,10 +16,12 @@ from light9.namespaces import L9 @@
 from rdfdb.patch import Patch
 from rdfdb.syncedgraph import SyncedGraph
 from greplin import scales
 from standardservice.scalessetup import gatherProcessStats
 from cycloneerr import PrettyErrorHandler
 from light9.coffee import StaticCoffee
 gatherProcessStats()
 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):

bin/vidref

➞

Show inline comments

@@ @@ -30,6 +30,7 @@ from light9 import networking, showconfi @@
 from light9.newtypes import Song
 from light9.vidref import videorecorder
 from rdfdb.syncedgraph import SyncedGraph
 from standardservice.scalessetup import gatherProcessStats
 parser = optparse.OptionParser()
 parser.add_option("-v", "--verbose", action="store_true", help="logging.DEBUG")
@@ @@ -37,6 +38,7 @@ parser.add_option("-v", "--verbose", act @@
 log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
 gatherProcessStats()
 stats = scales.collection(
     '/webServer',
     scales.RecentFpsStat('liveWebsocketFrameFps'),

light9/effect/sequencer.py

➞

Show inline comments

@@ @@ -20,12 +20,14 @@ from light9.effect.simple_outputs import @@
 from light9.namespaces import L9, RDF
 from light9.newtypes import DeviceUri, DeviceAttr, NoteUri, Curve, Song
 from rdfdb.syncedgraph import SyncedGraph
 from standardservice.scalessetup import gatherProcessStats
 from greplin import scales
 import imp
 log = logging.getLogger('sequencer')
 gatherProcessStats()
 updateStats = scales.collection(
     '/update/',
     scales.PmfStat('s0_getMusic', recalcPeriod=1),

light9/web/index.html

➞

Show inline comments

@@ @@ -9,6 +9,7 @@ @@
   </head>
   <body>
       <script type="module"  src="stats-line.js"></script>
       <script type="module"  src="stats-process.js"></script>

light9/web/stats-line.js

➞

Show inline comments

@@ @@ -21,7 +21,6 @@ class StatsLine extends LitElement { @@
                     fetch(this.name + '/stats/?format=json').then((resp) => {
                         if (resp.ok) {
                     resp.json().then((msg) => {
                         this.stats = msg;
                     setTimeout(reload, 1000);
                     });
@@ @@ -78,10 +77,21 @@ class StatsLine extends LitElement { @@
+    }
     render() {
         const now = Date.now() / 1000;
         const table = (d, path) => {
-            const cols = Object.keys(d);
+            let cols = Object.keys(d);
             cols.sort();
             if (path.length == 0) {
                 ['webServer', 'process'].forEach((earlyKey) => {
                     let i = cols.indexOf(earlyKey);
                     if (i != -1) {
                         cols = [earlyKey].concat(cols.slice(0, i), cols.slice(i + 1));
+                    }
                 });
+            }
             const th = (col) =>  {
                 return html`<th>${col}</th>`;
             };
@@ @@ -131,6 +141,13 @@ class StatsLine extends LitElement { @@
             }, path));
         };
         const drawLevel = (d, path) => {
             if (path.length == 1 && path[0] === 'process') {
                  const elem = this.shadowRoot.querySelector('#proc');
                 if (elem) {
                     elem.data = d;
+                }
                 return html`<stats-process id="proc"></stats-process>`;
+            }
             if (typeof d === 'object') {
                 if (d instanceof TemplateResult) {
                     return html`<td class="val">${d}</td>`;

light9/web/stats-process.js

➞

Show inline comments

@@ new file 100644 @@
 import { LitElement, TemplateResult, html, css } from '/node_modules/lit-element/lit-element.js';
 import debug from '/lib/debug/debug-build-es6.js';
 import { rounding }  from '/node_modules/significant-rounding/index.js';
 const log = debug('process');
 const remap = (x, lo, hi, outLo, outHi) => {
     return outLo + (outHi - outLo) * Math.max(0, Math.min(1, (x - lo) / (hi - lo)));
 };
 class StatsProcess extends LitElement {
     static get properties() {
         return {
             data: { type: Object },
         };
+    }
     firstUpdated() {
         // inspired by https://codepen.io/qiruiyin/pen/qOopQx
         var context = this.shadowRoot.firstElementChild,
 	    ctx = context.getContext('2d'),
 	    w = 64,
 	    h = 64,
 	    revs = 0;
 	context.width = w;
 	context.height = h;
         let prev = Date.now() / 1000;
         var animate = () => {
 	    requestAnimationFrame( animate );
             const now = Date.now() / 1000;
             ctx.beginPath();
             // wrong type of fade- never goes to 0
             ctx.fillStyle = '#00000003';
             ctx.fillRect(0, 0, w, h);
             if (this.data.time < now - 2) {
                 return;
+            }
             const dt = now - prev;
             prev = now;
             const size = remap(this.data.memMb, /*in*/ 20, 600, /*out*/ 3, 30);
 	    revs += dt * remap(this.data.cpuPercent, /*in*/ 0, 100, /*out*/ 4, 120);
             const rad  = remap(size, /*in*/ 3, 30, /*out*/ 14, 5);
 	    var x = w/2 + rad * Math.cos(revs / 6.28),
 		y = h/2 + rad * Math.sin(revs / 6.28);
 	    ctx.save();
 	    ctx.beginPath();
 	    ctx.fillStyle = "hsl(194, 100%, 42%)";
 	    ctx.arc(x, y, size, 0, 2*Math.PI);
 	    ctx.fill();
 	    ctx.restore();
         };
         animate();
+    }
     updated(changedProperties) {
         if (changedProperties.has('data')) {
             this.shadowRoot.firstElementChild.setAttribute('title', `cpu ${this.data.cpuPercent}% mem ${this.data.memMb}MB`);
+        }
+    }
     static get styles() {
         return css`
         :host {
            display: inline-block;
            width: 64px;
            height: 64px;
+        }
         `;
+    }
     render() {
         return html`<canvas></canvas>`;
+    }
+}
 customElements.define('stats-process', StatsProcess);

requirements.txt

➞

Show inline comments

@@ @@ -45,3 +45,4 @@ https://github.com/drewp/cyclone/archive @@
 cycloneerr==0.3.0
 rdfdb==0.19.0
 standardservice==0.6.0

0 comments (0 inline, 0 general)