wmmon I/O monitor bug fixes:
wmmon/CHANGES:
Updated for 1.2b1.
wmmon/Makefile:
Added debug build with -g3; default build with -O3. Note:
This makefile isn't perfect. You must "make clean" when switching
between "make" and "make debug" otherwise objects won't compile.
I'm sure it's a simple dependency issue, but I am not an expert with
Makefiles. I intend to fix this, but it's a low priority.
wmmon/wmmon/wmmon.c:
Updated changelog. Added #define HISTORY_ENTRIES to replace hardcoded
values.
DrawStats_io():
Removed static variable global_io_scale. Replaced with a local
variable. This should improve graphing - scale was growing, but
never shrinking, meaning as time passed, graphed values were
downscaled and not displayed.
Fixed rounding errors caused by use of integer types which were
causing very small values not to appear on graph. Added code to
round very low values up, so they will appear on meter and graph.
We are making a reasonable compromise between readability and
accuracy. Side effect is that small peaks (greater than 0 but less
than our rounded-up tiny values) will actually appear as dips
instead of peaks. I feel this is acceptable, since it still conveys
an impression of "jitter" to the user. Fixing this would have
involved further modifying the data before we graph it, which would
defeat the purpose of improving accuracy.
Tweaked load bar scaling algorithm for reabality and sensitivity.
update_stat_io():
Added a "stale" timeout for static long maxdiskio (determines
scaling of load bar). New behaviour is that every couple of minutes
we discard our saved peak value and resample. This prevents an
anomalously huge I/O spike from making more typical values fail to
trigger the load bar for the rest of the app's lifetime. Side
effect will be that every couple of minutes, we will get an
anomalous spike in the load bar as it recalibrates. This anomaly
only affects the bar, not the graph.
getWidth():
Fixed integer rounding issue similar to that in DrawStats_io().
Added similar rounding code to round up very small values so we
don't have the illusion of an idle system following a huge spike.
This commit is contained in:
Barry Kelly
Carlos R. Mafra
parent
eff65410df
commit
e2363d30fc
|
|
@ -2,6 +2,29 @@ WMMon changes.
|
|||
|
||||
Version Description
|
||||
--------------------------------------------------------------
|
||||
1.2b1 - Released 20120325
|
||||
- I/O monitor - updated to use /proc/diskstats instead
|
||||
of obsolete /proc/stat interface, which is no longer
|
||||
present in post 2.6 kernels. TODO: The non-/proc based
|
||||
solutions used in the various BSD ports trees should
|
||||
be incorporated into mainline version.
|
||||
- I/O monitor - Fixed scaling issues with graph caused
|
||||
by improper use of static data. The graph would
|
||||
continually scale up, making smaller values invisible.
|
||||
Eventually the system would appear to be idle, only
|
||||
graphing the biggest spikes. A similar issue affecting
|
||||
the upper-right meter is also fixed. Meter scaling is
|
||||
recalibrated every couple of minutes to avoid losing
|
||||
meter funtionality after anomalously large peaks.
|
||||
- I/O Monitor - Fixed rounding errors caused by use of
|
||||
integer types, which were causing relatively small
|
||||
values not to appear on graph or meter. Added code to
|
||||
round very low values up, so they will appear on meter
|
||||
and graph.
|
||||
- ONGOING: Style edits to improve readability and
|
||||
maintainability (removing hardcoded values, adding
|
||||
newlines to "if" conditions, etc).
|
||||
|
||||
1.0b2 - Released 980520
|
||||
- Vastly reduced CPU usage in CPU & IO mode,
|
||||
MEM/SWAP/UPTIME (i.e. SysInfo) only updated
|
||||
|
|
|
|||
|
|
@ -5,12 +5,18 @@ OBJS = wmmon.o \
|
|||
../wmgeneral/misc.o \
|
||||
../wmgeneral/list.o
|
||||
|
||||
CFLAGS = -O3
|
||||
CC = cc $(CFLAGS)
|
||||
|
||||
|
||||
.c.o:
|
||||
cc -c -O2 -Wall $< -o $*.o
|
||||
$(CC) -c -Wall $< -o $*.o
|
||||
|
||||
wmmon: $(OBJS)
|
||||
cc -o wmmon $^ $(LIBDIR) $(LIBS)
|
||||
$(CC) -o wmmon $^ $(LIBDIR) $(LIBS)
|
||||
|
||||
debug: CFLAGS = -g3
|
||||
debug: wmmon
|
||||
|
||||
clean::
|
||||
for i in $(OBJS) ; do \
|
||||
|
|
|
|||
|
|
@ -28,6 +28,23 @@
|
|||
Changes:
|
||||
----
|
||||
|
||||
13/3/2012 (Barry Kelly (wbk), <coydog@devio.us>)
|
||||
* Fixed get_statistics() I/O features to work with newer
|
||||
/proc/diskstats instead of the old /proc/stat.
|
||||
* Fixes to graph/meter scaling for I/O. Original code let
|
||||
the scaling grow out of control due to inappropriate static
|
||||
data.
|
||||
* Eliminated rounding down relatively low stats in getWidth()
|
||||
and DrawStats_io() by using double and float types instead
|
||||
of ints. We now round up tiny values to prevent the system
|
||||
appearing idle when it's not.
|
||||
* Style/readbility edits.
|
||||
* TODO: Merge in Gentoo and possibly BSD local patches. This
|
||||
should aid in fixing I/O monitoring on non-Linux systems.
|
||||
* TODO: Color swapping. User supplies color values in .rc, and
|
||||
app modifies pixmap in memory on startup. Should be simple.
|
||||
* TODO: address compiler warnings (GCC has gotten pickier over
|
||||
the years).
|
||||
17/10/2009 (Romuald Delavergne, romuald.delavergne@free.fr)
|
||||
* Support SMP processors in realtime CPU stress meter
|
||||
15/05/2004 (Simon Law, sfllaw@debian.org)
|
||||
|
|
@ -105,6 +122,8 @@
|
|||
|
||||
#define WMMON_VERSION "1.0.b2"
|
||||
|
||||
#define HISTORY_ENTRIES 55
|
||||
|
||||
/********************/
|
||||
/* Global Variables */
|
||||
/********************/
|
||||
|
|
@ -115,6 +134,7 @@ int cpu_avg_max = 0; /* CPU stress meter with average and max for SMP */
|
|||
FILE *fp_meminfo;
|
||||
FILE *fp_stat;
|
||||
FILE *fp_loadavg;
|
||||
FILE *fp_diskstats; /* wbk new io stats API */
|
||||
|
||||
/* functions */
|
||||
void usage(char*);
|
||||
|
|
@ -184,7 +204,7 @@ int main(int argc, char *argv[]) {
|
|||
typedef struct {
|
||||
|
||||
char name[5]; /* "cpu0..cpuz", eventually.. :) */
|
||||
int his[55];
|
||||
int his[HISTORY_ENTRIES];
|
||||
int hisaddcnt;
|
||||
long rt_stat;
|
||||
long statlast;
|
||||
|
|
@ -257,6 +277,7 @@ void wmmon_routine(int argc, char **argv) {
|
|||
fp_meminfo = fopen("/proc/meminfo", "r");
|
||||
fp_loadavg = fopen("/proc/loadavg", "r");
|
||||
fp_stat = fopen("/proc/stat", "r");
|
||||
fp_diskstats = fopen("/proc/diskstats", "r");
|
||||
|
||||
if (fp) {
|
||||
fscanf(fp, "%ld", &online_time);
|
||||
|
|
@ -265,7 +286,7 @@ void wmmon_routine(int argc, char **argv) {
|
|||
}
|
||||
|
||||
for (i = 0; i < MAX_STAT_DEVICES; i++) {
|
||||
for (j=0; j<55; j++) {
|
||||
for (j = 0; j < HISTORY_ENTRIES; j++) {
|
||||
stat_device[i].his[j] = 0;
|
||||
}
|
||||
stat_device[i].hisaddcnt = 0;
|
||||
|
|
@ -298,7 +319,10 @@ void wmmon_routine(int argc, char **argv) {
|
|||
stat_device[0].cpu_last = calloc(nb_cpu, sizeof(long));
|
||||
stat_device[0].idle_stat = calloc(nb_cpu, sizeof(long));
|
||||
stat_device[0].idle_last = calloc(nb_cpu, sizeof(long));
|
||||
if (!stat_device[0].cpu_stat || !stat_device[0].cpu_last || !stat_device[0].idle_stat || !stat_device[0].idle_last) {
|
||||
if (!stat_device[0].cpu_stat
|
||||
|| !stat_device[0].cpu_last
|
||||
|| !stat_device[0].idle_stat
|
||||
|| !stat_device[0].idle_last) {
|
||||
fprintf(stderr, "%s: Unable to alloc memory !\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
|
@ -309,7 +333,8 @@ void wmmon_routine(int argc, char **argv) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
openXwindow(argc, argv, wmmon_master_xpm, wmmon_mask_bits, wmmon_mask_width, wmmon_mask_height);
|
||||
openXwindow(argc, argv, wmmon_master_xpm, wmmon_mask_bits,
|
||||
wmmon_mask_width, wmmon_mask_height);
|
||||
|
||||
/* add mouse region */
|
||||
AddMouseRegion(0, 12, 13, 58, 57);
|
||||
|
|
@ -347,10 +372,14 @@ void wmmon_routine(int argc, char **argv) {
|
|||
}
|
||||
|
||||
/* Draw statistics */
|
||||
if (stat_current == 0)
|
||||
DrawStats(stat_device[stat_current].his, 54, 40, 5, 58);
|
||||
if (stat_current == 1)
|
||||
DrawStats_io(stat_device[stat_current].his, 54, 40, 5, 58);
|
||||
if (stat_current == 0) {
|
||||
DrawStats(stat_device[stat_current].his,
|
||||
HISTORY_ENTRIES-1, 40, 5, 58);
|
||||
}
|
||||
else if (stat_current == 1) {
|
||||
DrawStats_io(stat_device[stat_current].his,
|
||||
HISTORY_ENTRIES, 40, 5, 58);
|
||||
}
|
||||
DrawActive(stat_device[stat_current].name);
|
||||
|
||||
while (1) {
|
||||
|
|
@ -364,7 +393,7 @@ void wmmon_routine(int argc, char **argv) {
|
|||
|
||||
if(stat_current == 2) {
|
||||
update_stat_mem(&stat_device[2], &stat_device[3]);
|
||||
// update_stat_swp(&stat_device[3]);
|
||||
/* update_stat_swp(&stat_device[3]);*/
|
||||
}
|
||||
|
||||
if (stat_current < 2) {
|
||||
|
|
@ -379,13 +408,17 @@ void wmmon_routine(int argc, char **argv) {
|
|||
j = getWidth(stat_device[i].rt_stat, stat_device[i].rt_idle);
|
||||
copyXPMArea(32, 64, j, 6, 28, 4);
|
||||
/* Show max CPU */
|
||||
j = getWidth(stat_device[i].cpu_stat[cpu_max], stat_device[i].idle_stat[cpu_max]);
|
||||
j = getWidth(stat_device[i].cpu_stat[cpu_max],
|
||||
stat_device[i].idle_stat[cpu_max]);
|
||||
copyXPMArea(32, 70, j, 6, 28, 10);
|
||||
} else {
|
||||
int cpu;
|
||||
for (cpu = 0; cpu < nb_cpu; cpu++) {
|
||||
j = getWidth(stat_device[i].cpu_stat[cpu], stat_device[i].idle_stat[cpu]);
|
||||
copyXPMArea(32, 65, j, MAX_CPU/nb_cpu, 28, 5+(MAX_CPU/nb_cpu)*cpu);
|
||||
j = getWidth(stat_device[i].cpu_stat[cpu],
|
||||
stat_device[i].idle_stat[cpu]);
|
||||
copyXPMArea(32, 65, j,
|
||||
MAX_CPU / nb_cpu, 28,
|
||||
5 + (MAX_CPU / nb_cpu) * cpu);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -460,19 +493,22 @@ void wmmon_routine(int argc, char **argv) {
|
|||
nexttime = curtime;
|
||||
|
||||
for (i=0; i<stat_online; i++) {
|
||||
if (stat_device[i].his[54])
|
||||
stat_device[i].his[54] /= stat_device[i].hisaddcnt;
|
||||
stat_dev *sd = stat_device + i;
|
||||
if (sd->his[HISTORY_ENTRIES-1])
|
||||
sd->his[HISTORY_ENTRIES-1] /= sd->hisaddcnt;
|
||||
|
||||
for (j=1; j<55; j++) {
|
||||
stat_device[i].his[j-1] = stat_device[i].his[j];
|
||||
for (j = 1; j < HISTORY_ENTRIES; j++) {
|
||||
sd->his[j-1] = sd->his[j];
|
||||
}
|
||||
|
||||
if (i == stat_current) {
|
||||
if (i == 0) DrawStats(stat_device[i].his, 54, 40, 5, 58);
|
||||
if (i == 1) DrawStats_io(stat_device[i].his, 54, 40, 5, 58);
|
||||
if (i == 0)
|
||||
DrawStats(sd->his, HISTORY_ENTRIES-1, 40, 5, 58);
|
||||
else if (i == 1)
|
||||
DrawStats_io(sd->his, HISTORY_ENTRIES-1, 40, 5, 58);
|
||||
}
|
||||
stat_device[i].his[54] = 0;
|
||||
stat_device[i].hisaddcnt = 0;
|
||||
sd->his[HISTORY_ENTRIES-1] = 0;
|
||||
sd->hisaddcnt = 0;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -516,9 +552,13 @@ void wmmon_routine(int argc, char **argv) {
|
|||
stat_current = 0;
|
||||
|
||||
DrawActive(stat_device[stat_current].name);
|
||||
if (stat_current == 0) DrawStats(stat_device[stat_current].his, 54, 40, 5, 58);
|
||||
if (stat_current == 0) {
|
||||
DrawStats(stat_device[stat_current].his,
|
||||
HISTORY_ENTRIES-1, 40, 5, 58);
|
||||
}
|
||||
if (stat_current == 1) {
|
||||
DrawStats_io(stat_device[stat_current].his, 54, 40, 5, 58);
|
||||
DrawStats_io(stat_device[stat_current].his,
|
||||
HISTORY_ENTRIES-1, 40, 5, 58);
|
||||
}
|
||||
if (stat_current == 2) {
|
||||
xpm_X = 64;
|
||||
|
|
@ -570,14 +610,22 @@ void update_stat_cpu(stat_dev *st, long *istat2, long *idle2) {
|
|||
}
|
||||
}
|
||||
|
||||
st->his[54] += k;
|
||||
st->his[HISTORY_ENTRIES-1] += k;
|
||||
st->hisaddcnt += 1;
|
||||
}
|
||||
|
||||
void update_stat_io(stat_dev *st) {
|
||||
|
||||
long j, k, istat, idle;
|
||||
|
||||
/* Periodically re-sample. Sometimes we get anomalously high readings;
|
||||
* this discards them. */
|
||||
static int stalemax = 300;
|
||||
static long maxdiskio = 0;
|
||||
if (--stalemax <= 0) {
|
||||
maxdiskio = 0;
|
||||
stalemax = 300;
|
||||
}
|
||||
|
||||
get_statistics(st->name, &k, &istat, &idle, NULL, NULL);
|
||||
|
||||
|
|
@ -587,13 +635,21 @@ void update_stat_io(stat_dev *st) {
|
|||
st->rt_stat = istat - st->statlast;
|
||||
st->statlast = istat;
|
||||
|
||||
/* remember peak for scaling of upper-right meter. */
|
||||
j = st->rt_stat;
|
||||
if (maxdiskio < j) {
|
||||
maxdiskio = j;
|
||||
}
|
||||
st->rt_idle = maxdiskio - j;
|
||||
/* Calculate scaling factor for upper-right meter. "/ 5" will clip
|
||||
* the highest peaks, but makes moderate values more visible. We are
|
||||
* compensating for wild fluctuations which are probably caused by
|
||||
* kernel I/O buffering.
|
||||
*/
|
||||
st->rt_idle = (maxdiskio - j) / 5;
|
||||
if (j > 0 && st->rt_idle < 1)
|
||||
st->rt_idle = 1; /* scale up tiny values so they are visible */
|
||||
|
||||
st->his[54] += st->rt_stat;
|
||||
st->his[HISTORY_ENTRIES-1] += st->rt_stat;
|
||||
st->hisaddcnt += 1;
|
||||
}
|
||||
|
||||
|
|
@ -679,8 +735,8 @@ void update_stat_swp(stat_dev *st) {
|
|||
|* get_statistics *|
|
||||
\*******************************************************************************/
|
||||
|
||||
void get_statistics(char *devname, long *is, long *ds, long *idle, long *ds2, long *idle2) {
|
||||
|
||||
void get_statistics(char *devname, long *is, long *ds, long *idle, long *ds2, long *idle2)
|
||||
{
|
||||
int i;
|
||||
static char *line = NULL;
|
||||
static size_t line_size = 0;
|
||||
|
|
@ -718,61 +774,98 @@ void get_statistics(char *devname, long *is, long *ds, long *idle, long *ds2, lo
|
|||
idle2[cpu] = atol(p);
|
||||
}
|
||||
}
|
||||
fp_loadavg = freopen("/proc/loadavg", "r", fp_loadavg);
|
||||
if ((fp_loadavg = freopen("/proc/loadavg", "r", fp_loadavg)) == NULL)
|
||||
perror("ger_statistics(): freopen(proc/loadavg) failed!\n");
|
||||
|
||||
fscanf(fp_loadavg, "%f", &f);
|
||||
*is = (long) (100 * f);
|
||||
}
|
||||
|
||||
if (!strncmp(devname, "i/o", 3)) {
|
||||
if (fseek(fp_diskstats, 0, SEEK_SET) == -1)
|
||||
perror("get_statistics() seek failed\n");
|
||||
|
||||
fseek(fp_stat, 0, SEEK_SET);
|
||||
while ((getline(&line, &line_size, fp_stat)) > 0) {
|
||||
if (strstr(line, "disk_rio") || strstr(line, "disk_wio")) {
|
||||
/* wbk 20120308 These are no longer in /proc/stat. /proc/diskstats
|
||||
* seems to be the closest replacement. Under modern BSD's, /proc is
|
||||
* now deprecated, so iostat() might be the answer.
|
||||
* http://www.gossamer-threads.com/lists/linux/kernel/314618
|
||||
* has good info on this being removed from kernel. Also see
|
||||
* kernel sources Documentation/iostats.txt
|
||||
*
|
||||
* TODO: We will end up with doubled values. We are adding the
|
||||
* aggregate to the individual partition, due to device selection
|
||||
* logic. Either grab devices' stats with numbers, or without (sda
|
||||
* OR sda[1..10]. Could use strstr() return plus offset, but would
|
||||
* have to be careful with bounds checking since we're in a
|
||||
* limited buffer. Or just divide by 2 (inefficient). Shouldn't
|
||||
* matter for graphing (we care about proportions, not numbers). */
|
||||
while ((getline(&line, &line_size, fp_diskstats)) > 0) {
|
||||
if (strstr(line, "sd") || strstr(line, "sr")) {
|
||||
p = strtok(line, tokens);
|
||||
/* 1..4 */
|
||||
for (i=0; i<4; i++) {
|
||||
/* skip 3 tokens, then use fields from
|
||||
`* linux/Documentation/iostats.txt */
|
||||
for (i = 1; i <= 6; i++)
|
||||
p = strtok(NULL, tokens);
|
||||
|
||||
*ds += atol(p);
|
||||
for (i = 7; i <= 10; i++)
|
||||
p = strtok(NULL, tokens);
|
||||
|
||||
*ds += atol(p);
|
||||
/* Field 11 looks tailor made for a simple load monitor. In
|
||||
* practice, it doesn't show much unless the system is
|
||||
* hammered. Feel free to uncomment as a command line option. */
|
||||
/*for (i=1; i<14; i++)
|
||||
p = strtok(NULL, tokens);
|
||||
ds += atol(p);*/
|
||||
}
|
||||
}
|
||||
else if (strstr(line, "disk_io")) {
|
||||
|
||||
/* wbk 20120308 as far as I know, this code would only work with
|
||||
* very old kernels (early 2.4.x). If the above change does not
|
||||
* work on your system, we will need to add logic to check
|
||||
* /proc/stat OR /proc/diskstats. (This was a Debian patch) */
|
||||
/*else if (strstr(line, "disk_io")) {
|
||||
int val;
|
||||
unsigned int a, b, c, d, e, h, g;
|
||||
|
||||
p = strtok(line, tokens);
|
||||
|
||||
while ((p = strtok(NULL, tokens))) {
|
||||
val = sscanf (p,
|
||||
"(%d,%d):(%d,%d,%d,%d,%d)",
|
||||
val = sscanf (p, "(%d,%d):(%d,%d,%d,%d,%d)",
|
||||
&a, &b, &c, &d, &e, &h,
|
||||
&g);
|
||||
|
||||
if (val != 7)
|
||||
continue;
|
||||
|
||||
*ds += d;
|
||||
*ds += h;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
} /* end while */
|
||||
} /* end if i/o */
|
||||
}
|
||||
|
||||
/*******************************************************************************\
|
||||
|* getWidth
|
||||
|* getWidth *|
|
||||
\*******************************************************************************/
|
||||
|
||||
unsigned long getWidth(long actif, long idle) {
|
||||
unsigned long j;
|
||||
/* wbk - work with a decimal value so we don't round < 1 down to zero. */
|
||||
double j = 0;
|
||||
unsigned long r = 0;
|
||||
|
||||
j = (actif + idle);
|
||||
if (j != 0) {
|
||||
j = (actif * 100) / j;
|
||||
}
|
||||
j = j * 0.32;
|
||||
if (j > 32) j = 32;
|
||||
|
||||
return j;
|
||||
/* round up very low positive values so they are visible. */
|
||||
if (actif > 0 && j < 2)
|
||||
j = 2;
|
||||
if (j > 32)
|
||||
j = 32;
|
||||
|
||||
r = (unsigned long)j;
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -886,31 +979,46 @@ void DrawStats_io(int *his, int num, int size, int x_left, int y_bottom) {
|
|||
float pixels_per_byte;
|
||||
int j,k;
|
||||
int *p;
|
||||
int d;
|
||||
/* wbk - Use a double to avoid rounding values of d < 1 to zero. */
|
||||
double d = 0;
|
||||
int border = 3;
|
||||
|
||||
static int global_io_scale = 1;
|
||||
/* wbk - this should not be static. No need to track the scale, since
|
||||
* we always calculate it on the fly anyway. This static variable did
|
||||
* not get re-initialized when we entered this function, so the scale
|
||||
* would always grow and never shrink.
|
||||
*/
|
||||
/*static int global_io_scale = 1;*/
|
||||
int io_scale = 1;
|
||||
|
||||
p = his;
|
||||
for (j=0; j<num; j++) {
|
||||
if (p[j] > global_io_scale) global_io_scale = p[j];
|
||||
if (p[j] > io_scale) io_scale = p[j];
|
||||
}
|
||||
|
||||
pixels_per_byte = 1.0 * global_io_scale / size;
|
||||
pixels_per_byte = 1.0 * io_scale / size;
|
||||
if (pixels_per_byte == 0) pixels_per_byte = 1;
|
||||
|
||||
for (k=0; k<num; k++) {
|
||||
d = (1.0 * p[0] / pixels_per_byte);
|
||||
|
||||
for (j=0; j<size; j++) {
|
||||
/* graph values too low for graph resolution */
|
||||
if (d > 0 && d < 1) {
|
||||
d = 3;
|
||||
border = 2;
|
||||
} else {
|
||||
border = 3;
|
||||
}
|
||||
|
||||
if (j < d - 3)
|
||||
for (j=0; j<size; j++) {
|
||||
if (j < d - border)
|
||||
copyXPMArea(2, 88, 1, 1, k+x_left, y_bottom-j);
|
||||
else if (j < d )
|
||||
copyXPMArea(2, 89, 1, 1, k+x_left, y_bottom-j);
|
||||
else
|
||||
copyXPMArea(2, 90, 1, 1, k+x_left, y_bottom-j);
|
||||
}
|
||||
p += 1;
|
||||
p += 1; /* beware... */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue