succbone/succd/http.go

@@ -70,9 +70,6 @@ type apiData struct {
 		// HighReached is true when the system has reached a high vacuum stage.
 		HighReached bool
 	}
-	// LoopLoad is a percentage expressing how busy the processing loop is; 100
-	// is full utilization; >100 is lag.
-	LoopLoad int64
 	// System junk.
 	System struct {
 		// Load of the system.
@@ -117,7 +114,6 @@ func (s *webServer) apiData(skipSystem bool) *apiData {
 	ad.Pumps.DPOn = state.dpOn
 	ad.Feedback.RoughReached = rough
 	ad.Feedback.HighReached = high
-	ad.LoopLoad = s.d.loopLoad()
 	ad.System.Load = load
 	ad.System.Hostname = hostname
 	return &ad

succbone/succd/index.html

@@ -100,29 +100,27 @@ td > span {
         <tr>
             <th rowspan="3">Control</th>
             <th>RP</th>
-            <td colspan="3">
+            <td>
                 <button id="rpon">On</button>
                 <button id="rpoff">Off</button>
             </td>
         </tr>
         <tr>
             <th>DP</th>
-            <td colspan="3">
+            <td>
                 <button id="dpon">On</button>
                 <button id="dpoff">Off</button>
             </td>
         </tr>
         <tr>
-            <td colspan="3">
+            <td colspan="2">
                 <button id="pd">Pump Down</button>
                 <button id="vent">Vent</button>
             </td>
         </tr>
         <tr>
             <th>Status</th>
-            <td id="status" colspan="1">OK</td>
+            <td id="status" colspan="4">OK</td>
-            <th>Load</th>
-            <td id="load" colspan="1">...</td>
         </tr>
     </table>
 </p>
@@ -277,7 +275,6 @@ window.addEventListener("load", (_) => {
     let ping = document.querySelector("#ping");
     let trough = document.querySelector("#trough");
     let thigh = document.querySelector("#thigh");
-    let load = document.querySelector("#load");
 
     // Buttons
     let pd = document.querySelector("#pd");
@@ -357,7 +354,6 @@ window.addEventListener("load", (_) => {
                 thigh.innerHTML = "NOK";
                 thigh.style = "background-color: #f06060";
             }
-            load.innerHTML = data.LoopLoad.toString() + "%";
             historicalPush(data.Pirani.MbarFloat);
             ping.innerHTML = Date.now();
         });

succbone/succd/process.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"k8s.io/klog"
@@ -24,8 +23,6 @@ type daemon struct {
 	gpioBelowRough    gpio
 	gpioBelowHigh     gpio
 
-	load atomic.Int64
-
 	// mu guards the state below.
 	mu sync.RWMutex
 	daemonState
@@ -65,22 +62,11 @@ func (d *daemonState) vacuumStatus() (rough, high bool) {
 
 // process runs the pain acquisition and control loop of succd.
 func (d *daemon) process(ctx context.Context) {
-	var lastRun time.Time
+	ticker := time.NewTicker(time.Millisecond * 100)
-	hz := 100
-	period := time.Second / time.Duration(hz)
-	// Extra grace period for GC pauses and other non-realtime system jitter.
-	periodGrace := period + time.Millisecond*5
-
-	ticker := time.NewTicker(period)
 	defer ticker.Stop()
 	for {
 		select {
 		case <-ticker.C:
-			now := time.Now()
-			if elapsed := now.Sub(lastRun); !lastRun.IsZero() && elapsed > periodGrace {
-				klog.Warningf("Processing loop lag: took %s, want %s", elapsed, period)
-			}
-			lastRun = now
 			if err := d.processOnce(ctx); err != nil {
 				if errors.Is(err, ctx.Err()) {
 					return
@@ -89,9 +75,6 @@ func (d *daemon) process(ctx context.Context) {
 					time.Sleep(time.Second * 10)
 				}
 			}
-			runtime := time.Since(lastRun)
-			load := int64(100 * runtime / period)
-			d.load.Store(load)
 		case <-ctx.Done():
 			return
 		}
@@ -121,8 +104,8 @@ func (d *daemon) processOnce(_ context.Context) error {
 		mbar := d.piraniMbar3.mbar
 		if !d.safety.failsafe && mbar < 4e-6 {
 			// Unrealistic result, Pirani probe probably disconnected. Failsafe mode.
-			d.safety.failsafe = true
+      d.safety.failsafe = true
-			klog.Errorf("SAFETY: Pirani probe seems disconnected; enabling failsafe mode")
+      klog.Errorf("SAFETY: Pirani probe seems disconnected; enabling failsafe mode")
 		}
 		if d.safety.failsafe && mbar > 1e2 {
 			d.safety.failsafe = false

succbone/succd/process_controller.go

@@ -7,7 +7,6 @@ import "k8s.io/klog"
 //
 // This is a subset of daemon functions limited to a safe, explicit subset.
 type daemonController interface {
-	loopLoad() int64
 	// snapshot returns an internally consistent copy of the daemon state.
 	snapshot() *daemonState
 	// rpSet enables/disables the roughing pump.
@@ -20,10 +19,6 @@ type daemonController interface {
 	ventPress()
 }
 
-func (d *daemon) loopLoad() int64 {
-	return d.load.Load()
-}
-
 func (d *daemon) snapshot() *daemonState {
 	d.mu.RLock()
 	ds := d.daemonState