tsmall bug fixes - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 272fd660b41d7ec793bc9d8972878510f3b66055
(DIR) parent e18c1340502932dfefda01e309567774e9fce599
(HTM) Author: rsc <devnull@localhost>
Date: Fri, 23 Apr 2004 17:47:02 +0000
small bug fixes
Diffstat:
M src/cmd/auxstats/main.c | 8 ++++----
M src/cmd/draw/stats.c | 28 ++++++++++++++++++++++++----
2 files changed, 28 insertions(+), 8 deletions(-)
---
(DIR) diff --git a/src/cmd/auxstats/main.c b/src/cmd/auxstats/main.c
t@@ -19,7 +19,7 @@ notifyf(void *v, char *msg)
{
USED(v);
- if(strcmp(msg, "child") == 0)
+ if(strstr(msg, "child"))
noted(NCONT);
postnote(PNPROC, pid, msg);
exits(nil);
t@@ -57,14 +57,14 @@ main(int argc, char **argv)
sysfatal("fork: %r");
case 0:
rfork(RFNOTEG);
- execlp("ssh", "ssh", "-C", sys, exe, nil);
- _exit(12);
+ execlp("ssh", "ssh", "-nTC", sys, exe, nil);
+ _exit(97);
default:
if((w = wait()) == nil)
sysfatal("wait: %r");
if(w->pid != pid)
sysfatal("wait got wrong pid");
- if(atoi(w->msg) == 12)
+ if(atoi(w->msg) == 97)
sysfatal("exec ssh failed");
free(w);
fprint(2, "stats: %s hung up; sleeping 60\n", sys);
(DIR) diff --git a/src/cmd/draw/stats.c b/src/cmd/draw/stats.c
t@@ -78,7 +78,7 @@ struct Graph
int ndata;
char *label;
int value;
- void (*update)(Graph*, ulong, ulong);
+ void (*update)(Graph*, long, ulong);
Machine *mach;
int overflow;
Image *overtmp;
t@@ -94,6 +94,8 @@ struct Machine
int absolute[Nvalue];
ulong last[Nvalue];
ulong val[Nvalue][2];
+ ulong load;
+ ulong nload;
};
char *menu2str[Nvalue+1];
t@@ -297,11 +299,13 @@ redraw(Graph *g, int vmax)
}
void
-update1(Graph *g, ulong v, ulong vmax)
+update1(Graph *g, long v, ulong vmax)
{
char buf[32];
int overflow;
+ if(v < 0)
+ v = 0;
if(vmax != g->vmax){
g->vmax = vmax;
changedvmax = 1;
t@@ -423,7 +427,23 @@ newvalue(Machine *m, int i, ulong *v, ulong *vmax)
{
ulong now;
- if(m->absolute[i]){
+ if(m->last[i] == 0)
+ m->last[i] = m->val[i][0];
+
+ if(i == Vload){
+ /*
+ * Invert the ewma to obtain the 5s load statistics.
+ * Ewma is load' = (1884/2048)*load + (164/2048)*last5s, so we do
+ * last5s = (load' - (1884/2048)*load) / (164/2048).
+ */
+ if(++m->nload%5 == 0){
+ now = m->val[i][0];
+ m->load = (now - (((vlong)m->last[i]*1884)/2048)) * 2048 / 164;
+ m->last[i] = now;
+ }
+ *v = m->load;
+ *vmax = m->val[i][1];
+ }else if(m->absolute[i]){
*v = m->val[i][0];
*vmax = m->val[i][1];
}else{
t@@ -769,7 +789,7 @@ threadmain(int argc, char *argv[])
if(initdraw(nil, nil, "stats") < 0)
sysfatal("initdraw: %r");
colinit();
- if((mc = initmouse(nil, nil)) == nil)
+ if((mc = initmouse(nil, screen)) == nil)
sysfatal("initmouse: %r");
if((kc = initkeyboard(nil)) == nil)
sysfatal("initkeyboard: %r");