Make a description of ${cpu} variable not so confusing.

[monky] / src / common.c

diff --git a/src/common.c b/src/common.c
index 1012b47..73a269c 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -27,7 +27,7 @@ double get_time()
 {
        struct timeval tv;
        gettimeofday(&tv, 0);
-       return tv.tv_sec + tv.tv_usec / 1000000.0;
+       return tv.tv_sec + (tv.tv_usec / 1000000.0);
 }
 
 FILE *open_file(const char *file, int *reported)
@@ -167,7 +167,7 @@ void update_stuff()
                need_mask |= 1 << INFO_BUFFERS;
 
        /* clear speeds and up status in case device was removed and doesn't get
-        * updated */
+          updated */
 
        for (i = 0; i < 16; i++) {
                if (netstats[i].dev) {
@@ -206,6 +206,7 @@ void update_stuff()
                update_mail_count();
 
 
+
 #if defined(__linux__)
        if (NEED(INFO_I8K))
                update_i8k();
@@ -226,15 +227,30 @@ void update_stuff()
                update_mpd();
 #endif
 
+#ifdef XMMS2
+       if (NEED(INFO_XMMS2))
+               update_xmms2();
+#endif
+
+#if defined(XMMS) || defined(BMP) || defined(AUDACIOUS) || defined(INFOPIPE)
+       if (NEED(INFO_XMMS))
+               update_xmms();
+#endif
+#ifdef BMPX
+       if (NEED(INFO_BMPX))
+                update_bmpx();
+#endif
+
        if (NEED(INFO_LOADAVG))
                update_load_average();
 
 
-       if ((NEED(INFO_MEM) || NEED(INFO_BUFFERS)) &&
+       if ((NEED(INFO_MEM) || NEED(INFO_BUFFERS) || NEED(INFO_TOP)) &&
            current_update_time - last_meminfo_update > 6.9) {
                update_meminfo();
-               if (no_buffers)
+               if (no_buffers) {
                        info.mem -= info.bufmem;
+               }
                last_meminfo_update = current_update_time;
        }