Re: Cycles annotation support for perf tools

[Andi Kleen]

> columns are displayed fine, but the current highlighted line disappeared
> and also and standard annotation (without LBR) is broken..

I can't reproduce that. Everything looks fine to me.

Please investigate on your side.

That's the only hunk that's changing colors. It looks equivalent to me:


@@ -110,11 +122,29 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                        percent_max = bdl->percent[i];
        }
 
-       if (dl->offset != -1 && percent_max != 0.0) {
-               for (i = 0; i < ab->nr_events; i++) {
-                       ui_browser__set_percent_color(browser, bdl->percent[i],
-                                                     current_entry);
-                       slsmg_printf("%6.2f ", bdl->percent[i]);
+       if (dl->offset != -1) {
+               if (percent_max != 0.0) {
+                       for (i = 0; i < ab->nr_events; i++) {
+                               ui_browser__set_percent_color(browser,
+                                                             bdl->percent[i],
+                                                             current_entry);
+                               slsmg_printf("%6.2f ", bdl->percent[i]);
+                       }
+               } else {
+                       slsmg_write_nstring(" ", 7 * ab->nr_events);
+               }
+
+               if (ab->have_cycles) {
+                       ui_browser__set_color(browser, HE_COLORSET_NORMAL);
+                       if (dl->ipc)
+                               slsmg_printf("%*.2f ", IPC_WIDTH - 1, dl->ipc);
+                       else
+                               slsmg_write_nstring(" ", IPC_WIDTH);
+                       if (dl->cycles)
+                               slsmg_printf("%*" PRIu64 " ",
+                                               CYCLES_WIDTH - 1, dl->cycles);
+                       else
+                               slsmg_write_nstring(" ", CYCLES_WIDTH);
                }
        } else {
                ui_browser__set_percent_color(browser, 0, current_entry);







-- 
ak@xxxxxxxxxxxxxxx -- Speaking for myself only.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/