Merge lp:~dlancer/ubuntu/quantal/g15stats/lp-749834 into lp:ubuntu/quantal/g15stats

[dlancer]

New upstream version merged (this also fix LP: #749834).
Man page updated, new supported options added.

[Stefano Rivera (stefanor)]

Please forward this to Debian. It'd be nice to get this updated in Debian, and then we can sync it into Ubuntu.

[Dimitri John Ledkov (xnox)]

I agree with Stefano, and I would have even sponsored this into Debian but it's frozen now. So I'd be happy to review this and possibly sponsor this into ubuntu delta.

[Dimitri John Ledkov (xnox)]

- If you are packaging a new upstream release ahead of debian the revision number would generally be -0ubuntu1 as the version number should be bigger than anything in ubuntu, but less than something in debian. The -1 is reserved for debian to package the new upstream release for Debian.

- And you should use just one debian/changelog entry with version 1.9.7-0ubuntu1 instead of two changelog entries.

- Maintainer name is usually in the form of "Name Lastname <email address hidden>"
If you want to keep doing anonymous contributions, it is fine and you will find sponsors who will be willing to upload for you. To become a developer you will need become part of the GPG web-of-trust and connect to Debian/Ubuntu Developers. See http://www.debian.org/devel/join/nm-step2 for further details.

- You have correctly done a 'minimal' / least intrusive update.

In general though it would be nice to modernise packaging and fix these lintian warnings:

I: g15stats source: binary-control-field-duplicates-source field "section" in package g15stats
I: g15stats source: missing-debian-source-format
P: g15stats source: direct-changes-in-diff-but-no-patch-system g15stats.1
W: g15stats source: ancient-standards-version 3.8.2 (current is 3.9.3)
W: g15stats: possible-new-upstream-release-without-new-version
P: g15stats: copyright-with-old-dh-make-debian-copyright
W: g15stats: description-synopsis-starts-with-article
I: g15stats: hyphen-used-as-minus-sign usr/share/man/man1/g15stats.1.gz:32
I: g15stats: hyphen-used-as-minus-sign usr/share/man/man1/g15stats.1.gz:38
I: g15stats: hyphen-used-as-minus-sign usr/share/man/man1/g15stats.1.gz:43
I: g15stats: hyphen-used-as-minus-sign usr/share/man/man1/g15stats.1.gz:51
I: g15stats: hyphen-used-as-minus-sign usr/share/man/man1/g15stats.1.gz:59

I will do a MIA ping of the Debian Maintainer.
In the mean time please at least change the version numbers to -0ubuntu1 or potentially do a bit more on the package:
- use 3.0 (quilt) format
- put your manpage diff into a patch under debian/patches/
- update copyright file to use 1.0 copyright format
- correct debian/control as per lintian

Then I can upload this into ubuntu and/or possibly debian if the maintainer is MIA.

Please set this merge proposal back to 'Needs Review' after you have made an update.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Also your changelog should mention (LP: #749834) to close that bug automatically upon upload.

Unmerged revisions

6. By dlancer <email address hidden> on 2012-06-05

New upstream release.
Man page updated.

=== modified file 'ChangeLog'
--- ChangeLog	2009-08-04 13:15:38 +0000
+++ ChangeLog	2012-06-05 18:03:18 +0000
@@ -60,3 +60,23 @@
 SVN 520 (1.9.2)
 - Disable monitoring CPUs frequencies with the option -df
 - Improve Summary Screen without CPUs frequencies
+SVN 530 (1.9.3)
+- Activate the bottom info bar content rotate with the option -ir
+- Change bottom info bar content to the component default one
+- Activate variable CPUs count with the option -vc
+- Improve Fan bottom info
+SVN 531 (1.9.4)
+- Fix time info
+- Improve Fan / Temperature Screens leading labels position
+- Improve Fan / Temperature Screens height calculation
+- Improve Summary Screen multi bar (temperature and network)
+SVN 532 (1.9.5)
+- Improve Summary Screen multi bar (temperature and network)
+- Fix compilation with the newer version of the glibc
+- Improve refresh interval causing -nan error with the newer kernel on very fast machines due to too often glibtop probing
+- Fix possible -nan error on the fast screens switch
+- Change refresh interval with the option -r seconds (The seconds must be between 1 and 300)
+SVN 534 (1.9.6)
+- Improve Summary Screen with 3 and 6 core CPU
+SVN 538 (1.9.7)
+- Improve Summary Screen Fan / Temperature sensors bar calculation

=== modified file 'Makefile.am'
--- Makefile.am	2011-03-15 08:04:59 +0000
+++ Makefile.am	2012-06-05 18:03:18 +0000
@@ -1,5 +1,5 @@
 
-AM_CFLAGS = -O3 -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir) 
+AM_CFLAGS = -O3 -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
 METASOURCES = AUTO
 bin_PROGRAMS = g15stats
 noinst_HEADERS = g15stats.h
@@ -7,7 +7,7 @@
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = README ChangeLog AUTHORS NEWS COPYING
 
-LIBS = -lg15daemon_client -lg15render -lpthread -lm
+LIBS = -lg15daemon_client -lg15render -lpthread -lm -lrt
 IMCLUDES = -I
 g15stats_LDFLAGS = -avoid-version
 g15stats_SOURCES =  g15stats.c g15stats.h

=== modified file 'README'
--- README	2009-08-04 13:15:38 +0000
+++ README	2012-06-05 18:03:18 +0000
@@ -30,6 +30,7 @@
 -nsa		Scale network graphs against highest speed recorded.  The
 		default is to scale against the highest peak in the current graph.
 -h		Show help
+-r seconds      Set the refresh interval to seconds The seconds must be between 1 and 300. ie -r 15
 -u      Display unicore graphs only on the CPU screen
 -t id   Force to monitor temperature sensor id on start (ie -t 1)
         The id should point to sysfs path /sys/class/hwmon/hwmon[id]/device/temp1_input
@@ -40,6 +41,8 @@
 -gt id  Show temperature [id] in place of the maximal one on the Summary Screen with the option -gt id ie -gt 1
         The id should point to sysfs path /sys/class/hwmon/hwmon../device/temp[id]_input
 -df     Disable monitoring CPUs frequencies.
+-ir     enable the bottom info bar content rotate cycle over all available sensors
+-vc     The cpu cores will be calculated every time (for systems with the cpu hotplug)
 
 Usage:
 $> g15stats

=== modified file 'configure.in'
--- configure.in	2009-08-04 13:15:38 +0000
+++ configure.in	2012-06-05 18:03:18 +0000
@@ -1,7 +1,7 @@
-AC_INIT(g15stats,[1.1], [[e-mail]])
+AC_INIT(g15stats,[1.9.7], [[e-mail]])
 
 PACKAGE=g15stats
-VERSION=1.9.2
+VERSION=1.9.7
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-15 08:04:59 +0000
+++ debian/changelog	2012-06-05 18:03:18 +0000
@@ -1,3 +1,16 @@
+g15stats (1.9.7-1ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * Man page updated.
+
+ -- dlancer <[e-mail]>  Tue, 05 Jun 2012 21:20:17 +0600
+
+g15stats (1.9.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- dlancer <[e-mail]>  Tue, 05 Jun 2012 21:19:30 +0600
+
 g15stats (1.9.2-2) unstable; urgency=low
 
   * Supports binutils-gold linker, writing explicitly our library

=== modified file 'debian/control'
--- debian/control	2011-03-15 08:04:59 +0000
+++ debian/control	2012-06-05 18:03:18 +0000
@@ -1,7 +1,8 @@
 Source: g15stats
 Section: utils
 Priority: extra
-Maintainer: Giacomo Catenazzi <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Giacomo Catenazzi <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev,
  libxtst-dev, libfreetype6-dev, libusb-dev, libgtop2-dev,
  libg15-dev, libg15render-dev (>= 1.2-3), libg15daemon-client-dev,

=== modified file 'g15stats.1'
--- g15stats.1	2008-03-18 08:09:06 +0000
+++ g15stats.1	2012-06-05 18:03:18 +0000
@@ -1,4 +1,4 @@
-.TH "g15stats" "1" "14 Feb 2008" "G15Daemon - g15stats" "G15Daemon User Manual"
+.TH "g15stats" "1" "06 Jun 2012" "G15Daemon - g15stats" "G15Daemon User Manual"
 
 .SH "NAME"
 g15stats \- A CPU/Memory/Swap usage meter for G15Daemon
@@ -23,19 +23,70 @@
 .br
 .P
 .HP
-\-h,--help          show usage information.
-.P
-.HP
-\-d,--daemon        run in background.
-.P
-.HP
-\-i,--interface [interface]  monitor network interface [interface] ie -i eth0.
-.P
-.HP
-\-nsa,--net-scale-absolute   scale net graphs against maximum speed seen.
+\-h,--help      Show usage information.
+.P
+.HP
+\-d,--daemon    Run in background.
+.P
+.HP
+\-i,--interface [interface]  Monitor network interface [interface] ie -i eth0.
+.P
+.HP
+\-nsa,--net-scale-absolute   Scale net graphs against maximum speed seen.
+.P
+.HP
+\-r seconds    Set the refresh interval to seconds, the seconds must be between 1 and 300. ie -r 15
+.P
+.HP
+\-u            Display unicore graphs only on the CPU screen
+.HP
+\-t id         Force to monitor temperature sensor id on start (ie -t 1)
+.br
+The id should point to sysfs path:
+.br
+ /sys/class/hwmon/hwmon[id]/device/temp1_input
+.br
+Default the sensor id is auto-detected.
+.HP 
+\-f id        Force to monitor fan speed sensor id on start (ie -f 1)
+.br
+The id should point to sysfs path:
+.br
+ /sys/class/hwmon/hwmon[id]/device/fan1_input
+.br
+Default the sensor id is auto-detected.
+.HP
+\-gt id      Show temperature [id] in place of the maximal one on the Summary Screen with the option -gt id ie -gt 1
+.br
+The id should point to sysfs path:
+.br
+/sys/class/hwmon/hwmon../device/temp[id]_input
+.P
+.HP
+\-df        Disable monitoring CPUs frequencies.
+.P
+.HP
+\-ir       Enable the bottom info bar content rotate cycle over all available sensors
+.P
+.HP
+\-vc        The cpu cores will be calculated every time (for systems with the cpu hotplug)
+
+.SH "USAGE"
+.P
+Once running, the separate screens can be switched to as follows:
+.br
+L2: Previous Screen
+.br
+L3: Next Screen
+.br
+L4: Alternative Screen (Doesn't work on Swap, Memory and Battery Screen)
+.br
+L5: Bottom Info bar mode
 
 .SH "AUTHOR"
 Mike Lampard
+.br
+dlancer <[e-mail]>
 .SH "SEE ALSO"
 .BR g15daemon (1),
 .BR libg15 (3),

=== modified file 'g15stats.c'
--- g15stats.c	2009-08-04 13:15:38 +0000
+++ g15stats.c	2012-06-05 18:03:18 +0000
@@ -15,9 +15,9 @@
 along with g15daemon; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-(c) 2008-2009 Mike Lampard
+(c) 2008-2010 Mike Lampard
 
-$Revision: 520 $ -  $Date: 2009-07-23 00:24:45 +0200 (Thu, 23 Jul 2009) $ $Author: czarnyckm $
+$Revision: 538 $ -  $Date: 2011-04-27 23:23:15 +0200 (Mi, 27 Apr 2011) $ $Author: czarnyckm $
 
 This daemon listens on localhost port 15550 for client connections,
 and arbitrates LCD display.  Allows for multiple simultaneous clients.
@@ -39,6 +39,7 @@
 #include <libg15render.h>
 #include <sched.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h> 
 #include <time.h>
@@ -62,7 +63,7 @@
 /** Holds the mode type variable of the application running */
 int mode[MAX_SCREENS];
 /** Holds the sub mode type variable of the application running */
-int submode     = 0;
+int submode     = 1;
 
 int info_cycle_timer    = -1;
 
@@ -70,10 +71,14 @@
 int summary_rows    = 4;
 
 int have_freq   = 2;
+
+int wait_seconds = 1;
+
 _Bool have_temp = 1;
 _Bool have_fan  = 1;
 _Bool have_bat  = 1;
 _Bool have_nic  = 0;
+_Bool variable_cpu = 0;
 
 _Bool sensor_type_temp[MAX_SENSOR];
 _Bool sensor_type_fan[MAX_SENSOR];
@@ -305,8 +310,7 @@
 }
 
 void init_cpu_count(void) {
-    // initialize cpu count once
-    if (!ncpu) {
+    if ((variable_cpu) || (!ncpu)) {
         const glibtop_sysinfo *cpuinfo = glibtop_get_sysinfo();
 
         if(cpuinfo->ncpu == 0) {
@@ -548,7 +552,7 @@
     for (core = 0; (core < ncpu) && (core < 6); core++) {
         sprintf(proc, "C%d ", core);
         strcat(tmpstr,proc);
-        if (ncpu < 5) {
+        if (ncpu < 4) {
             strcat(tmpstr, show_hertz(get_cpu_freq_cur(core)));
         } else {
             strcat(tmpstr, show_hertz_short(get_cpu_freq_cur(core)));
@@ -566,6 +570,7 @@
     time(&now);
 
     sprintf(tmpstr,"%s",ctime(&now));
+    tmpstr[(strlen(tmpstr) - 1)] = '\0';
     g15r_renderString (canvas, (unsigned char*)tmpstr, 0, G15_TEXT_SMALL, 80-(strlen(tmpstr)*4)/2, INFO_ROW);
 }
 
@@ -627,19 +632,28 @@
 
     if (count) {
         int j = 0;
-        int rest;
-        int step = (int) (y2 / count);
+        int rest, step;
+        step = y2 / count;
         rest = y2 - (step * count);
         int y = cur_shift + y1;
         int last_y;
         for (j = 0; j < count; j++) {
             last_y = y;
+            if( j ) {
+                last_y++;
+                if (rest > 0) {
+                    if ((j+1) < count) {
+                        y++;
+                        rest--;
+                    } else {
+                        y += rest;
+                        rest = 0;
+                    }
+                }
+            }
             y += step;
-            if (rest > 0) {
-                rest--;
-                y++;
-            }
             drawBar_both(canvas, last_y + move, y + move, sensors[j].cur + 1, tot_max, tot_max - sensors[j].cur, tot_max);
+
         }
         drawLine_both(canvas, cur_shift + y1 + move, y + move);
 
@@ -687,10 +701,9 @@
         y = y2 / 2;
 
         drawLine_both(canvas, cur_shift + y1 + move, cur_shift + y2 + move);
+
         drawBar_both(canvas, cur_shift + y1 + move, cur_shift + y + move, net_cur_in + 1, net_max_in, net_max_in - net_cur_in, net_max_in);
-
-        
-        drawBar_both(canvas, cur_shift + y + move, cur_shift + y2 + move, net_cur_out + 1, net_max_out, net_max_out - net_cur_out, net_max_out);
+        drawBar_both(canvas, cur_shift + y + move + 1, cur_shift + y2 + move, net_cur_out + 1, net_max_out, net_max_out - net_cur_out, net_max_out);
 
         if (net_cur_in > net_cur_out) {
             sprintf(tmpstr, "IN %s", show_bytes_short((int) net_cur_in));
@@ -746,8 +759,8 @@
 /* draw cpu screen.  if drawgraph = 0 then no graph is drawn */
 void draw_cpu_screen_unicore_logic(g15canvas *canvas, glibtop_cpu cpu, char *tmpstr, int drawgraph, int printlabels, int cpuandmemory) {
     int total,user,nice,sys,idle;
-    int b_total,b_user,b_nice,b_sys,b_idle,b_irq,b_iowait;
-    static int last_total,last_user,last_nice,last_sys,last_idle,last_iowait,last_irq;
+    static int last_total,last_user,last_nice,last_sys,last_idle,last_iowait,
+            last_irq,b_total,b_user,b_nice,b_sys,b_idle,b_irq,b_iowait;
 
     g15r_clearScreen (canvas, G15_COLOR_WHITE);
 
@@ -757,21 +770,26 @@
     sys   = ((unsigned long) cpu.sys)   ? ((double) cpu.sys)   : 1.0;
     idle  = ((unsigned long) cpu.idle)  ? ((double) cpu.idle)  : 1.0;
 
-    b_total = total - last_total;
-    b_user  = user  - last_user;
-    b_nice  = nice  - last_nice;
-    b_sys   = sys   - last_sys;
-    b_idle  = idle  - last_idle;
-    b_irq   = cpu.irq - last_irq;
-    b_iowait= cpu.iowait - last_iowait;
+    if ((total - last_total) > 0) {
+        b_total = total - last_total;
+        b_user  = user  - last_user;
+        b_nice  = nice  - last_nice;
+        b_sys   = sys   - last_sys;
+        b_idle  = idle  - last_idle;
+        b_irq   = cpu.irq - last_irq;
+        b_iowait= cpu.iowait - last_iowait;
 
-    last_total  = total;
-    last_user   = user;
-    last_nice   = nice;
-    last_sys    = sys;
-    last_idle   = idle;
-    last_irq    = cpu.irq;
-    last_iowait = cpu.iowait;
+        last_total  = total;
+        last_user   = user;
+        last_nice   = nice;
+        last_sys    = sys;
+        last_idle   = idle;
+        last_irq    = cpu.irq;
+        last_iowait = cpu.iowait;
+    } else if (b_total == 0) {
+        b_total = 100;
+        b_idle  = 100;
+    }
 
     if(printlabels) {
         sprintf(tmpstr,"Usr %2.f%%",((float)b_user/(float)b_total)*100);
@@ -814,10 +832,12 @@
     int divider = 0;
         
     int total,user,nice,sys,idle;
-    int b_total,b_user,b_nice,b_sys,b_idle,b_irq,b_iowait;
     int sub_val;
     static int last_total[GLIBTOP_NCPU],last_user[GLIBTOP_NCPU],last_nice[GLIBTOP_NCPU],
-            last_sys[GLIBTOP_NCPU],last_idle[GLIBTOP_NCPU],last_iowait[GLIBTOP_NCPU],last_irq[GLIBTOP_NCPU];
+            last_sys[GLIBTOP_NCPU],last_idle[GLIBTOP_NCPU],last_iowait[GLIBTOP_NCPU],
+            last_irq[GLIBTOP_NCPU],b_total[GLIBTOP_NCPU],b_user[GLIBTOP_NCPU],
+            b_nice[GLIBTOP_NCPU],b_sys[GLIBTOP_NCPU],b_idle[GLIBTOP_NCPU],
+            b_irq[GLIBTOP_NCPU],b_iowait[GLIBTOP_NCPU];
 
     init_cpu_count();
 
@@ -873,12 +893,15 @@
                 switch (ncpu) {
                     case 1  :
                     case 2  :
-                    case 3  :
                     case 5  :
                     case 7  :
                         move    = 1;
                         height  = 6;
                         break;
+                    case 3  :
+                    case 6  :
+                        height  = 6;
+                        break;
                     default :
                         height  = 8;
                         break;
@@ -891,9 +914,9 @@
                         move    = 1;
                         break;
                 }
-                height  = 8;
-            }
-
+                        height  = 8;
+                }
+                
             shift   = height + 1;
             shift2  = (2 * shift);
             break;
@@ -917,21 +940,26 @@
         sys   = ((unsigned long) cpu.xcpu_sys[core])   ? ((double) cpu.xcpu_sys[core])   : 1.0;
         idle  = ((unsigned long) cpu.xcpu_idle[core])  ? ((double) cpu.xcpu_idle[core])  : 1.0;
 
-        b_total     = total - last_total[core];
-        b_user      = user  - last_user[core];
-        b_nice      = nice  - last_nice[core];
-        b_sys       = sys   - last_sys[core];
-        b_idle      = idle  - last_idle[core];
-        b_irq       = cpu.xcpu_irq[core]    - last_irq[core];
-        b_iowait    = cpu.xcpu_iowait[core] - last_iowait[core];
+        if ((total - last_total[core]) > 0) {
+            b_total[core]   = total - last_total[core];
+            b_user[core]    = user  - last_user[core];
+            b_nice[core]    = nice  - last_nice[core];
+            b_sys[core]     = sys   - last_sys[core];
+            b_idle[core]    = idle  - last_idle[core];
+            b_irq[core]     = cpu.xcpu_irq[core]    - last_irq[core];
+            b_iowait[core]  = cpu.xcpu_iowait[core] - last_iowait[core];
 
-        last_total[core]	= total;
-        last_user[core] 	= user;
-        last_nice[core] 	= nice;
-        last_sys[core] 		= sys;
-        last_idle[core] 	= idle;
-        last_irq[core] 		= cpu.xcpu_irq[core];
-        last_iowait[core] 	= cpu.xcpu_iowait[core];
+            last_total[core]	= total;
+            last_user[core] 	= user;
+            last_nice[core] 	= nice;
+            last_sys[core] 	= sys;
+            last_idle[core] 	= idle;
+            last_irq[core] 	= cpu.xcpu_irq[core];
+            last_iowait[core] 	= cpu.xcpu_iowait[core];
+        } else if (b_total[core] == 0){
+            b_total[core] = 100;
+            b_idle[core]  = 100;
+        }
 
         y1 = (core * height) + (core * spacer);
         y2 = y1 + height - 1;
@@ -941,7 +969,7 @@
                 if ((mode[SCREEN_FREQ]) && (have_freq)) {
                     freq_cur = get_cpu_freq_cur(core);
                     if (core < 6) {
-                        result = ((float) (b_total - b_idle) / (float) b_total)*100;
+                        result = ((float) (b_total[core] - b_idle[core]) / (float) b_total[core])*100;
                         if (result < 100.0) {
                             sprintf(tmpstr, "%2.f%% %s", result, show_hertz_short(freq_cur));
                         } else {
@@ -960,9 +988,9 @@
                     if (core < 6) {
                         if (have_freq) {
                             freq_cur = get_cpu_freq_cur(core);
-                            sprintf(tmpstr, "%s%3.f%%", show_hertz_short(freq_cur), ((float) (b_total - b_idle) / (float) b_total)*100);
+                            sprintf(tmpstr, "%s%3.f%%", show_hertz_short(freq_cur), ((float) (b_total[core] - b_idle[core]) / (float) b_total[core])*100);
                         } else {
-                            sprintf(tmpstr, "CPU%.f%3.f%%", (float) core, ((float) (b_total - b_idle) / (float) b_total)*100);
+                            sprintf(tmpstr, "CPU%.f%3.f%%", (float) core, ((float) (b_total[core] - b_idle[core]) / (float) b_total[core])*100);
                         }
                         if (ncpu < 5) {
                             g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_MED, 1, y1 + 1);
@@ -970,8 +998,8 @@
                             g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_SMALL, 1, core * 6);
                         }
                     }
-                    current_value = b_total - b_idle;
-                    drawBar_both(canvas, y1, y2, current_value, b_total, b_total - current_value, b_total);
+                    current_value = b_total[core] - b_idle[core];
+                    drawBar_both(canvas, y1, y2, current_value, b_total[core], b_total[core] - current_value, b_total[core]);
                     y1 = 0;
                 }
                 break;
@@ -979,29 +1007,29 @@
                 if (mode[SCREEN_CPU]) {
                     divider = 9 / ncpu;
                     sub_val = divider * core;
-                    g15r_drawBar(canvas, BAR_START, sub_val, BAR_END, divider + sub_val, G15_COLOR_BLACK, b_user + 1, b_total, 4);
-                    g15r_drawBar(canvas, BAR_START, shift + sub_val, BAR_END, shift + divider + sub_val, G15_COLOR_BLACK, b_sys + 1, b_total, 4);
+                    g15r_drawBar(canvas, BAR_START, sub_val, BAR_END, divider + sub_val, G15_COLOR_BLACK, b_user[core] + 1, b_total[core], 4);
+                    g15r_drawBar(canvas, BAR_START, shift + sub_val, BAR_END, shift + divider + sub_val, G15_COLOR_BLACK, b_sys[core] + 1, b_total[core], 4);
                     y1 = 0;
                     y2 = shift2 + divider + sub_val;
-                    g15r_drawBar(canvas, BAR_START, shift2 + sub_val, BAR_END, y2, G15_COLOR_BLACK, b_nice + 1, b_total, 4);
+                    g15r_drawBar(canvas, BAR_START, shift2 + sub_val, BAR_END, y2, G15_COLOR_BLACK, b_nice[core] + 1, b_total[core], 4);
 
                     divider = y2 / ncpu;
-                    drawBar_reversed(canvas, BAR_START, sub_val, BAR_END, y2, G15_COLOR_BLACK, b_idle + 1, b_total, 5);
+                    drawBar_reversed(canvas, BAR_START, sub_val, BAR_END, y2, G15_COLOR_BLACK, b_idle[core] + 1, b_total[core], 5);
                 } else {
-                    current_value = b_total - b_idle;
-                    drawBar_both(canvas, y1, y2, current_value, b_total, b_total - current_value, b_total);
+                    current_value = b_total[core] - b_idle[core];
+                    drawBar_both(canvas, y1, y2, current_value, b_total[core], b_total[core] - current_value, b_total[core]);
 
-                    drawBar_both(canvas, shift + y1, shift + y2, b_sys + 1, b_total, b_total - b_sys, b_total);
+                    drawBar_both(canvas, shift + y1, shift + y2, b_sys[core] + 1, b_total[core], b_total[core] - b_sys[core], b_total[core]);
 
                     y2 += shift2;
-                    drawBar_both(canvas, shift2 + y1, y2, b_nice + 1, b_total, b_total - b_nice, b_total);
+                    drawBar_both(canvas, shift2 + y1, y2, b_nice[core] + 1, b_total[core], b_total[core] - b_nice[core], b_total[core]);
 
                     y1 = 0;
                 }
                 break;
             case SCREEN_SUMMARY:
-                current_value = b_total - b_idle;
-                drawBar_both(canvas, y1 + move, y2 + move, current_value, b_total, b_total - current_value, b_total);
+                current_value = b_total[core] - b_idle[core];
+                drawBar_both(canvas, y1 + move, y2 + move, current_value, b_total[core], b_total[core] - current_value, b_total[core]);
 
                 if (have_freq) {
                     freq_cur = get_cpu_freq_cur(core);
@@ -1266,36 +1294,56 @@
 
     int j = 0;
 
-    int shift;
-    shift = 32 / count;
-
-    if (count) {
-        if (all) {
-            g15r_clearScreen(canvas, G15_COLOR_WHITE);
-            print_vert_label(canvas, vert_label);
-
-            for (j = 0; j < count; j++) {
-                register int bar_top = (j * shift) + 1 + j;
-                register int bar_bottom = ((j + 1)*shift) + j;
-                sprintf(tmpstr, format_main, j + 1, probes[j].cur);
-                g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_MED, 1, bar_top + 1);
-                drawBar_both(canvas, bar_top, bar_bottom, probes[j].cur + 1, tot_max, tot_max - probes[j].cur, tot_max);
-            }
-            drawLine_both(canvas, 1, ((j*shift) + j-1));
-        }
-
-        if ((!all) || (info_cycle == screen_type)) {
-            char extension[16];
-            tmpstr[0] = '\0';
-            for (j = 0; j < count; j++) {
-                sprintf(extension, format_bottom, j + 1, probes[j].cur);
-                if (j) {
-                    strcat(tmpstr, "| ");
-                }
-                strcat(tmpstr, extension);
-            }
-            g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_SMALL, 80 - (strlen(tmpstr)*4) / 2, INFO_ROW);
-        }
+    if (all) {
+        int shift;
+        int info_shift;
+
+        shift = BAR_BOTTOM / count;
+
+        switch (count) {
+            case    1:
+                info_shift = 14;
+                shift = 33;
+                break;
+            case    2:
+                info_shift = 5;
+                break;
+            case    3:
+                info_shift = 2;
+                shift = 10;
+                break;
+            default:
+                info_shift = 1;
+                break;
+        }
+
+        g15r_clearScreen(canvas, G15_COLOR_WHITE);
+        print_vert_label(canvas, vert_label);
+
+        int bar_top, bar_bottom;
+        bar_bottom = BAR_BOTTOM;
+        for (j = 0; j < count; j++) {
+            bar_top = (j * shift) + 1 + j;
+            bar_bottom = ((j + 1)*shift) + j;
+
+            sprintf(tmpstr, format_main, j + 1, probes[j].cur);
+            g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_MED, 1, bar_top + info_shift);
+            drawBar_both(canvas, bar_top, bar_bottom, probes[j].cur + 1, tot_max, tot_max - probes[j].cur, tot_max);
+        }
+        drawLine_both(canvas, 1, bar_bottom);
+    }
+
+    if ((!all) || (info_cycle == screen_type)) {
+        char extension[16];
+        tmpstr[0] = '\0';
+        for (j = 0; j < count; j++) {
+            sprintf(extension, format_bottom, j + 1, probes[j].cur);
+            if (j) {
+                strcat(tmpstr, "| ");
+            }
+            strcat(tmpstr, extension);
+        }
+        g15r_renderString(canvas, (unsigned char*) tmpstr, 0, G15_TEXT_SMALL, 80 - (strlen(tmpstr)*4) / 2, INFO_ROW);
     }
 }
 
@@ -1615,18 +1663,24 @@
 /* wait for a max of <seconds> seconds.. if condition &wake_now is received leave immediately */
 void g15stats_wait(int seconds) {
     pthread_mutex_t dummy_mutex;
+    pthread_mutexattr_t   mta;
     struct timespec timeout;
       /* Create a dummy mutex which doesn't unlock for sure while waiting. */
-    pthread_mutex_init(&dummy_mutex, NULL);
+    pthread_mutexattr_init(&mta);
+
+    pthread_mutex_init(&dummy_mutex, &mta);
     pthread_mutex_lock(&dummy_mutex);
 
-    time(&timeout.tv_sec);
+    if (clock_gettime(CLOCK_REALTIME, &timeout) != 0) {
+        perror("clock_gettime");
+    }
+
     timeout.tv_sec += seconds;
-    timeout.tv_nsec = 0L;
 
     pthread_cond_timedwait(&wake_now, &dummy_mutex, &timeout);
     pthread_mutex_unlock(&dummy_mutex);
     pthread_mutex_destroy(&dummy_mutex);
+    pthread_mutexattr_destroy(&mta);
 }
 
 int main(int argc, char *argv[]){
@@ -1656,8 +1710,16 @@
             have_freq=0;
         }
 
+        if(0==strncmp(argv[i],"-rc",3)||0==strncmp(argv[i],"--info-rotate",13)) {
+            submode = 0;
+        }
+
+        if(0==strncmp(argv[i],"-vc",3)||0==strncmp(argv[i],"--variable-cpu",14)) {
+            variable_cpu = 1;
+        }
+
         if(0==strncmp(argv[i],"-h",2)||0==strncmp(argv[i],"--help",6)) {
-            printf("%s %s - (c) 2008-2009 Mike Lampard, Piotr Czarnecki\n",PACKAGE_NAME,VERSION);
+            printf("%s %s - (c) 2008-2010 Mike Lampard, Piotr Czarnecki\n",PACKAGE_NAME,VERSION);
             printf("Usage: %s [Options]\n", PACKAGE_NAME);
             printf("Options:\n");
             printf("--daemon (-d) run in background\n");
@@ -1673,6 +1735,9 @@
                     "\t[id] should point to sysfs path /sys/class/hwmon/hwmon[id]/device/fan1_input\n");
             printf("--net-scale-absolute (-nsa) scale net graphs against maximum speed seen.\n"
                     "\tDefault is to scale fullsize, similar to apps like gkrellm.\n");
+            printf("--info-rotate (-ir) enable the bottom info bar content rotate.\n");
+            printf("--variable-cpu (-vc) the cpu cores will be calculated every time (for systems with the cpu hotplug).\n");
+            printf("--refresh [seconds] (-r) set the refresh interval to [seconds] The seconds must be between 1 and 300. ie -r 15\n");
             printf("--disable-freq (-df) disable monitoring CPUs frequencies.\n\n");
             return 0;
         }
@@ -1709,6 +1774,16 @@
             }
           }
         }
+
+        if(0==strncmp(argv[i],"-r",2)||0==strncmp(argv[i],"--refresh",9)) {
+          if(argv[i+1]!=NULL) {
+            i++;
+            wait_seconds = atoi(argv[i]);
+            if ((wait_seconds < 1) || (wait_seconds > MAX_INTERVAL)) {
+                wait_seconds = 1;
+            }
+          }
+        }
     }        
     if((g15screen_fd = new_g15_screen(G15_G15RBUF))<0){
         printf("Sorry, cant connect to the G15daemon\n");
@@ -1849,7 +1924,7 @@
         canvas->mode_xor = 0;
 
         g15_send(g15screen_fd,(char *)canvas->buffer,G15_BUFFER_LEN);
-        g15stats_wait(1);
+        g15stats_wait(wait_seconds);
     }
     glibtop_close();
 

=== modified file 'g15stats.h'
--- g15stats.h	2009-08-04 13:15:38 +0000
+++ g15stats.h	2012-06-05 18:03:18 +0000
@@ -9,6 +9,8 @@
 #define MAX_MODE        1
 #define MAX_SUB_MODE    1
 
+#define MAX_INTERVAL    300
+
 #define PAUSE           6
 #define RETRY_COUNT     10