snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmmon: Merged patch suggested by Bernard Cafarelli at Gentoo to prevent clobbering environment.

Browse source 
TODO: Still need to fix dependencies.

wmmon.c:
  Updated version string to 1.2b2 (forgot this for 1.2b1).

  Fixed compiler warnings: added error checking for filesystem calls
  and commented out some preprocessor/C code that was apparently used
  to hardcode test cases.

  TODO: remove completely  soon if no ill effect.
This commit is contained in:
B. Kelly (wbk) 2012-04-01 18:58:33 -05:00 committed by Carlos R. Mafra
parent b2ce70a147
commit a5f88e5e59
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wmmon/wmmon/Makefile
View file

@ -6,14 +6,14 @@ OBJS = wmmon.o \
../wmgeneral/list.o ../wmgeneral/list.o
CFLAGS = -O2 CFLAGS = -O2
CC = cc $(CFLAGS) CC = cc
.c.o: .c.o:
$(CC) -c -Wall $< -o $*.o $(CC) $(CFLAGS) -c -Wall $< -o $*.o
wmmon: $(OBJS) wmmon: $(OBJS)
$(CC) -o wmmon $^ $(LIBDIR) $(LIBS) $(CC) $(LDFLAGS) -o wmmon $^ $(LIBDIR) $(LIBS)
debug: CFLAGS = -g3 debug: CFLAGS = -g3
debug: wmmon debug: wmmon

39
wmmon/wmmon/wmmon.c
View file

@ -116,11 +116,17 @@
/* Defines */ /* Defines */
/***********/ /***********/
#define LEFT_ACTION (NULL) /* wbk - see notes below (search on these preprocessor variables).
* TODO: remove if causing no problems. This was probably used to
* hardcode test cases.
*/
/*#define LEFT_ACTION (NULL)
#define RIGHT_ACTION (NULL) #define RIGHT_ACTION (NULL)
#define MIDDLE_ACTION (NULL) #define MIDDLE_ACTION (NULL)*/
#define WMMON_VERSION "1.0.b2" #define WMMON_VERSION "1.2.b2"
#define HISTORY_ENTRIES 55
#define HISTORY_ENTRIES 55 #define HISTORY_ENTRIES 55
@ -280,7 +286,8 @@ void wmmon_routine(int argc, char **argv) {
fp_diskstats = fopen("/proc/diskstats", "r"); fp_diskstats = fopen("/proc/diskstats", "r");
if (fp) { if (fp) {
fscanf(fp, "%ld", &online_time); if (fscanf(fp, "%ld", &online_time) == EOF)
perror("Error! fscanf() of /proc/uptime failed!\n");
ref_time = time(0); ref_time = time(0);
fclose(fp); fclose(fp);
} }
@ -292,9 +299,20 @@ void wmmon_routine(int argc, char **argv) {
stat_device[i].hisaddcnt = 0; stat_device[i].hisaddcnt = 0;
} }
if (LEFT_ACTION) left_action = strdup(LEFT_ACTION); /* wbk - I don't fully understand this. Probably just a means of providing
if (RIGHT_ACTION) right_action = strdup(RIGHT_ACTION); * test cases. ifdef'ing to clear compiler warnings. TODO: remove. */
if (MIDDLE_ACTION) middle_action = strdup(MIDDLE_ACTION); #ifdef LEFT_ACTION
if (LEFT_ACTION)
left_action = strdup(LEFT_ACTION);
#endif
#ifdef RIGHT_ACTION
if (RIGHT_ACTION)
right_action = strdup(RIGHT_ACTION);
#endif
#ifdef MIDDLE_ACTION
if (MIDDLE_ACTION)
middle_action = strdup(MIDDLE_ACTION);
#endif
/* Scan through the .rc files */ /* Scan through the .rc files */
if (asprintf(&conffile, "/etc/wmmonrc") >= 0) { if (asprintf(&conffile, "/etc/wmmonrc") >= 0) {
@ -661,7 +679,9 @@ void update_stat_mem(stat_dev *st, stat_dev *st2) {
unsigned long swapfree; unsigned long swapfree;
unsigned long free, shared, buffers, cached; unsigned long free, shared, buffers, cached;
freopen("/proc/meminfo", "r", fp_meminfo); if (freopen("/proc/meminfo", "r", fp_meminfo) == NULL)
perror("freopen() of /proc/meminfo failed!)\n");
while ((getline(&line, &line_size, fp_meminfo)) > 0) { while ((getline(&line, &line_size, fp_meminfo)) > 0) {
/* The original format for the first two lines of /proc/meminfo was /* The original format for the first two lines of /proc/meminfo was
* Mem: total used free shared buffers cached * Mem: total used free shared buffers cached
@ -777,7 +797,8 @@ void get_statistics(char *devname, long *is, long *ds, long *idle, long *ds2, lo
if ((fp_loadavg = freopen("/proc/loadavg", "r", fp_loadavg)) == NULL) if ((fp_loadavg = freopen("/proc/loadavg", "r", fp_loadavg)) == NULL)
perror("ger_statistics(): freopen(proc/loadavg) failed!\n"); perror("ger_statistics(): freopen(proc/loadavg) failed!\n");
fscanf(fp_loadavg, "%f", &f); if (fscanf(fp_loadavg, "%f", &f) == EOF)
perror("fscanf() failed to read f\n");
*is = (long) (100 * f); *is = (long) (100 * f);
} }