kernelshark: Fix bug with Plot CPU filtering

From: Vaibhav Nagarnaik <[email protected]>

The button "All CPUs" in CPU filter dialog allows setting of all CPUs but doesn't clear CPUs when it is unchecked. Make sure that when the "All CPUs" button is unchecked, all the CPUs get unchecked.

Tested: In kernelshark, go to Filter->list CPUs and uncheck "All CPUs" button. All the CPUs should be unchecked at that point.

Signed-off-by Vaibhav Nagarnaik <[email protected]>

Signed-off-by David Sharp <[email protected]>

---
 trace-filter.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

trace-filter.c +4 -6

index c657a18..89cf032 100644
@@ -1723,12 +1723,10 @@ void cpu_toggle(gpointer data, GtkWidget *widget)
 
 	if (strcmp(label, CPU_ALL_CPUS_STR) == 0) {
 		cpu_helper->allcpus = active;
-		if (active) {
-			/* enable all toggles */
-			for (cpu = 0; cpu < cpu_helper->cpus; cpu++)
-				gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_helper->buttons[cpu]),
-							     TRUE);
-		}
+		/* enable/disable all toggles */
+		for (cpu = 0; cpu < cpu_helper->cpus; cpu++)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_helper->buttons[cpu]),
+						     active ? TRUE : FALSE);
 		return;
 	}
 

"width" and "height" were swapped, causing the vertical marker and cursor lines to be drawn with the wrong height.

Signed-off-by David Sharp <[email protected]>

---
 trace-graph.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

trace-graph.c +4 -4

index 6f72350..60e5241 100644
@@ -380,7 +380,7 @@ static void draw_cursor(struct graph_info *ginfo)
 	x = convert_time_to_x(ginfo, ginfo->cursor);
 
 	gdk_draw_line(ginfo->draw->window, ginfo->draw->style->mid_gc[3],
-		      x, 0, x, ginfo->draw->allocation.width);
+		      x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void draw_marka(struct graph_info *ginfo)

@@ -392,7 +392,7 @@ static void draw_marka(struct graph_info *ginfo)
 
 	x = convert_time_to_x(ginfo, ginfo->marka_time);
 	gdk_draw_line(ginfo->draw->window, green,
-		      x, 0, x, ginfo->draw->allocation.width);
+		      x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void draw_markb(struct graph_info *ginfo)

@@ -404,7 +404,7 @@ static void draw_markb(struct graph_info *ginfo)
 
 	x = convert_time_to_x(ginfo, ginfo->markb_time);
 	gdk_draw_line(ginfo->draw->window, red,
-		      x, 0, x, ginfo->draw->allocation.width);
+		      x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void update_with_backend(struct graph_info *ginfo,

@@ -434,7 +434,7 @@ static void
 draw_line(GtkWidget *widget, gdouble x, struct graph_info *ginfo)
 {
 	gdk_draw_line(widget->window, widget->style->black_gc,
-		      x, 0, x, widget->allocation.width);
+		      x, 0, x, widget->allocation.height);
 }
 
 static void clear_line(struct graph_info *ginfo, gint x)

Quoted 2 lines · David Sharp

"width" and "height" were swapped, causing the vertical marker and cursor lines to be drawn with the wrong height.

Is this the fix to the strange "mark bottom stays around" bug? It's been on my TODO list for a long time to fix that. ;-)

-- Steve

Quoted 46 lines

Signed-off-by David Sharp <[email protected]>

---
 trace-graph.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

trace-graph.c +4 -4

index 6f72350..60e5241 100644
@@ -380,7 +380,7 @@ static void draw_cursor(struct graph_info *ginfo)
      x = convert_time_to_x(ginfo, ginfo->cursor);
 
      gdk_draw_line(ginfo->draw->window, ginfo->draw->style->mid_gc[3],
-                   x, 0, x, ginfo->draw->allocation.width);
+                   x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void draw_marka(struct graph_info *ginfo)

@@ -392,7 +392,7 @@ static void draw_marka(struct graph_info *ginfo)
 
      x = convert_time_to_x(ginfo, ginfo->marka_time);
      gdk_draw_line(ginfo->draw->window, green,
-                   x, 0, x, ginfo->draw->allocation.width);
+                   x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void draw_markb(struct graph_info *ginfo)

@@ -404,7 +404,7 @@ static void draw_markb(struct graph_info *ginfo)
 
      x = convert_time_to_x(ginfo, ginfo->markb_time);
      gdk_draw_line(ginfo->draw->window, red,
-                   x, 0, x, ginfo->draw->allocation.width);
+                   x, 0, x, ginfo->draw->allocation.height);
 }
 
 static void update_with_backend(struct graph_info *ginfo,

@@ -434,7 +434,7 @@ static void
 draw_line(GtkWidget *widget, gdouble x, struct graph_info *ginfo)
 {
      gdk_draw_line(widget->window, widget->style->black_gc,
-                   x, 0, x, widget->allocation.width);
+                   x, 0, x, widget->allocation.height);
 }
 
 static void clear_line(struct graph_info *ginfo, gint x)

From: Venkatesh Pallipadi <[email protected]>

Plot CPU filtering in kernelshark has the following bug:
1) Deselect CPU A from Plot CPU list
2) Plot gets updated with no CPU A
3) Deselect CPU B
4) Plot continues to have CPU B

This is due to a bug in graph_plot_cpus_update_callback(), which seems to be checking old_all_cpus != new_all_cpus before doing any update. This condition is true on 1, but false on 2. Removing that check fixes the problem.

Tested:
Above sequence now does expected filtering.

Google-bug-id: 4258610

Signed-off-by Venkatesh Pallipadi <[email protected]>

Signed-off-by David Sharp <[email protected]>

sorry for the dups... typoed Steve's domain.