toplev: Fix --columns output

Print remark correctly.
Avoid bogus : header
Some other improvements.

Author: Andi Kleen

tl_output.py

@@ -79,10 +79,12 @@ def set_cpus(self, cpus):
             self.titlelen = max(map(len, cpus)) + 1
 
     def print_desc(self, desc, sample):
-        if desc and not self.args.no_desc:
+        if self.args.no_desc:
+            return
+        if desc:
             print >>self.logf, "\t" + desc
-        if desc and sample and not self.args.no_desc:
-            print >>self.logf, "\t" + "Sampling events: ", sample
+            if sample:
+                print >>self.logf, "\t" + "Sampling events: ", sample
 
     def print_timestamp(self, timestamp):
         if timestamp:
@@ -93,7 +95,7 @@ def print_timestamp(self, timestamp):
 
     def print_header(self, area, hdr):
         hdr = "%-14s %s" % (area, hdr)
-        self.logf.write("%-*s " % (self.hdrlen, hdr + ":"))
+        self.logf.write("%-*s " % (self.hdrlen, (hdr + ":") if hdr.strip() else " "))
 
     # timestamp Timestamp in interval mode
     # title     CPU
@@ -182,7 +184,7 @@ def flush(self):
             for cpuname in cpunames:
                 if cpuname in node:
                     cpu = node[cpuname]
-                    uval, desc, sample, remark, bn = cpu
+                    uval, remark, desc, sample, bn = cpu
                     v = uval.format_value()
                     if bn:
                         v += "*"
@@ -194,7 +196,7 @@ def flush(self):
                     write("%*s " % (VALCOL_LEN, ""))
             if remark:
                 cval = combine_uval(vlist)
-                vs = cval.format_uncertainty() + " " + cval.format_mux()
+                vs = "+- " + cval.format_uncertainty() + " " + cval.format_mux()
                 write(" %-*s %s" % (self.unitlen, remark, vs))
             write("\n")
             self.print_desc(desc, sample)

tl_uval.py

@@ -111,7 +111,6 @@ def update(self, other):
         self.value = res.value
         self.stddev = res.stddev
         self.multiplex = UVal._merge_mux(self, other)
-        log.warning("updated {} with {} => {}".format(strbefore, other, self))
 
     ######################
     # operators