show line numbers in dtracy type errors

[plan9front.git] / sys / src / cmd / stats.c

diff --git a/sys/src/cmd/stats.c b/sys/src/cmd/stats.c
index 8a9f926a6c3538a0c5cf91f0aa330c966fd0486d..ac5f9b448cce02a1b8b34d6af03b05d85a375bd1 100644 (file)
--- a/sys/src/cmd/stats.c
+++ b/sys/src/cmd/stats.c
@@ -876,43 +876,35 @@ inintrval(Machine *m, uvlong *v, uvlong *vmax, int)
 }
 
 void
-etherval(Machine *m, uvlong *v, uvlong *vmax, int init)
+etherval(Machine *m, uvlong *v, uvlong *vmax, int)
 {
        *v = m->netetherstats[In]-m->prevetherstats[In] + m->netetherstats[Out]-m->prevetherstats[Out];
-       *vmax = sleeptime*m->nproc;
-       if(init)
-               *vmax = sleeptime;
+       *vmax = sleeptime;
 }
 
 void
-etherinval(Machine *m, uvlong *v, uvlong *vmax, int init)
+etherinval(Machine *m, uvlong *v, uvlong *vmax, int)
 {
        *v = m->netetherstats[In]-m->prevetherstats[In];
-       *vmax = sleeptime*m->nproc;
-       if(init)
-               *vmax = sleeptime;
+       *vmax = sleeptime;
 }
 
 void
-etheroutval(Machine *m, uvlong *v, uvlong *vmax, int init)
+etheroutval(Machine *m, uvlong *v, uvlong *vmax, int)
 {
        *v = m->netetherstats[Out]-m->prevetherstats[Out];
-       *vmax = sleeptime*m->nproc;
-       if(init)
-               *vmax = sleeptime;
+       *vmax = sleeptime;
 }
 
 void
-ethererrval(Machine *m, uvlong *v, uvlong *vmax, int init)
+ethererrval(Machine *m, uvlong *v, uvlong *vmax, int)
 {
        int i;
 
        *v = 0;
        for(i=Err0; i<nelem(m->netetherstats); i++)
-               *v += m->netetherstats[i];
-       *vmax = (sleeptime/1000)*10*m->nproc;
-       if(init)
-               *vmax = (sleeptime/1000)*10;
+               *v += m->netetherstats[i]-m->prevetherstats[i];
+       *vmax = (sleeptime/1000)*10;
 }
 
 void
@@ -1131,7 +1123,7 @@ resize(void)
        /* label right, if requested */
        if(ylabels && dy>Nlab*(font->height+1)){
                wid = labelwidth();
-               if(wid < (maxx-startx)-30){
+               if(wid < dx-10){
                        /* else there's not enough room */
                        maxx -= 1+Lx+wid;
                        draw(screen, Rect(maxx, starty, maxx+1, screen->r.max.y), display->black, nil, ZP);
@@ -1156,9 +1148,9 @@ resize(void)
 
        /* create graphs */
        for(i=0; i<nmach; i++){
-               machr = Rect(startx+i*dx, starty, maxx, screen->r.max.y);
-               if(i < nmach-1)
-                       machr.max.x = startx+(i+1)*dx - 1;
+               machr = Rect(startx+i*dx, starty, startx+(i+1)*dx - 1, screen->r.max.y);
+               if(i == nmach-1)
+                       machr.max.x = maxx;
                y = starty;
                for(j=0; j<ngraph; j++, y+=dy){
                        g = &graph[i*ngraph+j];
@@ -1184,6 +1176,8 @@ resize(void)
                        if(r.max.x <= g->r.max.x)
                                g->overtmp = allocimage(display, r, screen->chan, 0, -1);
                        g->newvalue(g->mach, &v, &vmax, 0);
+                       if(vmax == 0)
+                               vmax = 1;
                        redraw(g, vmax);
                }
        }
@@ -1412,6 +1406,8 @@ main(int argc, char *argv[])
                parity = 1-parity;
                for(i=0; i<nmach*ngraph; i++){
                        graph[i].newvalue(graph[i].mach, &v, &vmax, 0);
+                       if(vmax == 0)
+                               vmax = 1;
                        graph[i].update(&graph[i], v, vmax);
                }
                flushimage(display, 1);