Pref panel introduction + perf list rewrite

Now the list of perf counters seen during the trace is global and not
copied at each refresh. It makes less allocations and especially behaves
far better to keep settings while moving in time.

Also, the perf preference panel, is now becoming a real preference panel
specific for each view. Right now it behaves weirdly on view others than
perf, but I'm working on it now.

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>

diff --git a/src/common.c b/src/common.c
index 3051f7e3b62b0ab7ac0d5c8cf6d74d291bfc48fa..5bbbf992d0adc34279e6ed7ea16eec2bc86e60f8 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -360,11 +360,9 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
        dst->process_table = g_ptr_array_new();
        dst->files_table = g_ptr_array_new();
        dst->cpu_table = g_ptr_array_new();
        dst->process_table = g_ptr_array_new();
        dst->files_table = g_ptr_array_new();
        dst->cpu_table = g_ptr_array_new();

-       dst->perf_list = g_hash_table_new(g_str_hash, g_str_equal);

 
        rotate_cputime(end);
 
 
        rotate_cputime(end);
 

-       g_hash_table_foreach(lttngtop.perf_list, copy_perf_counter, dst->perf_list);

        for (i = 0; i < lttngtop.process_table->len; i++) {
                tmp = g_ptr_array_index(lttngtop.process_table, i);
                new = g_new0(struct processtop, 1);
        for (i = 0; i < lttngtop.process_table->len; i++) {
                tmp = g_ptr_array_index(lttngtop.process_table, i);
                new = g_new0(struct processtop, 1);

diff --git a/src/common.h b/src/common.h
index 0903413a157e43bf42547f3f137160b50d42f70f..087b8ec1c1dc61c6199ed46fd93dfd8dfda2cd22 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -29,7 +29,7 @@
 sem_t goodtodisplay, goodtoupdate, timer, pause_sem, end_trace_sem, bootstrap;
 
 GPtrArray *copies; /* struct lttngtop */
 sem_t goodtodisplay, goodtoupdate, timer, pause_sem, end_trace_sem, bootstrap;
 
 GPtrArray *copies; /* struct lttngtop */

-pthread_mutex_t perf_list_mutex;
+GHashTable *global_perf_liszt;

 
 struct lttngtop *data;
 
 
 struct lttngtop *data;
 

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index b9429db70708bfaa4e30382f4206fbac9b3bb9c1..2c6ee4e0243f21702c93fa69c995d63acaead16e 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -38,10 +38,10 @@ sem_t update_display_sem;
 
 char *termtype;
 WINDOW *footer, *header, *center, *status;
 
 char *termtype;
 WINDOW *footer, *header, *center, *status;

-WINDOW *perf_panel_window = NULL;
-PANEL *perf_panel, *main_panel;
+WINDOW *pref_panel_window = NULL;
+PANEL *pref_panel, *main_panel;

 
 

-int perf_panel_visible = 0;
+int pref_panel_visible = 0;

 int perf_line_selected = 0;
 
 int last_display_index, currently_displayed_index;
 int perf_line_selected = 0;
 
 int last_display_index, currently_displayed_index;


@@ -574,7 +574,7 @@ void update_perf()
        mvwprintw(center, 1, 22, "NAME");
 
        perf_row = 40;
        mvwprintw(center, 1, 22, "NAME");
 
        perf_row = 40;

-       g_hash_table_iter_init(&iter, data->perf_list);
+       g_hash_table_iter_init(&iter, global_perf_liszt);

        while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
                if (perfn1->visible) {
                        /* + 5 to strip the "perf_" prefix */
        while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
                if (perfn1->visible) {
                        /* + 5 to strip the "perf_" prefix */


@@ -609,7 +609,7 @@ void update_perf()
                mvwprintw(center, current_line + header_offset, 11, "%d", tmp->tid);
                mvwprintw(center, current_line + header_offset, 22, "%s", tmp->comm);
 
                mvwprintw(center, current_line + header_offset, 11, "%d", tmp->tid);
                mvwprintw(center, current_line + header_offset, 22, "%s", tmp->comm);
 

-               g_hash_table_iter_init(&iter, data->perf_list);
+               g_hash_table_iter_init(&iter, global_perf_liszt);

 
                perf_row = 40;
                while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
 
                perf_row = 40;
                while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {


@@ -743,20 +743,20 @@ void update_current_view()
        sem_post(&update_display_sem);
 }
 
        sem_post(&update_display_sem);
 }
 

-void setup_perf_panel()
+void setup_pref_panel()

 {
        int size;
        if (!data)
                return;
 {
        int size;
        if (!data)
                return;

-       if (perf_panel_window) {
-               del_panel(perf_panel);
-               delwin(perf_panel_window);
+       if (pref_panel_window) {
+               del_panel(pref_panel);
+               delwin(pref_panel_window);

        }
        }

-       size = g_hash_table_size(data->perf_list);
-       perf_panel_window = create_window(size + 2, 30, 10, 10);
-       perf_panel = new_panel(perf_panel_window);
-       perf_panel_visible = 0;
-       hide_panel(perf_panel);
+       size = g_hash_table_size(global_perf_liszt);
+       pref_panel_window = create_window(size + 2, 30, 10, 10);
+       pref_panel = new_panel(pref_panel_window);
+       pref_panel_visible = 0;
+       hide_panel(pref_panel);

 }
 
 void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
 }
 
 void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)


@@ -768,19 +768,19 @@ void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
        if (!data)
                return;
 
        if (!data)
                return;
 

-       werase(perf_panel_window);
-       box(perf_panel_window, 0 , 0);
-       set_window_title(perf_panel_window, "Perf Preferences ");
-       wattron(perf_panel_window, A_BOLD);
-       mvwprintw(perf_panel_window, g_hash_table_size(data->perf_list) + 1, 1,
+       werase(pref_panel_window);
+       box(pref_panel_window, 0 , 0);
+       set_window_title(pref_panel_window, "Perf Preferences ");
+       wattron(pref_panel_window, A_BOLD);
+       mvwprintw(pref_panel_window, g_hash_table_size(global_perf_liszt) + 1, 1,

                        " 's' to sort");
                        " 's' to sort");

-       wattroff(perf_panel_window, A_BOLD);
+       wattroff(pref_panel_window, A_BOLD);

 
        if (toggle_sort == 1) {
                i = 0;
 
        if (toggle_sort == 1) {
                i = 0;

-               perflist = g_list_first(g_hash_table_get_keys(data->perf_list));
+               perflist = g_list_first(g_hash_table_get_keys(global_perf_liszt));

                while (perflist) {
                while (perflist) {

-                       perf = g_hash_table_lookup(data->perf_list, perflist->data);
+                       perf = g_hash_table_lookup(global_perf_liszt, perflist->data);

                        if (i != line_selected)
                                perf->sort = 0;
                        else
                        if (i != line_selected)
                                perf->sort = 0;
                        else


@@ -792,24 +792,24 @@ void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
        }
 
        i = 0;
        }
 
        i = 0;

-       perflist = g_list_first(g_hash_table_get_keys(data->perf_list));
+       perflist = g_list_first(g_hash_table_get_keys(global_perf_liszt));

        while (perflist) {
        while (perflist) {

-               perf = g_hash_table_lookup(data->perf_list, perflist->data);
+               perf = g_hash_table_lookup(global_perf_liszt, perflist->data);

                if (i == line_selected && toggle_view == 1) {
                        perf->visible = perf->visible == 1 ? 0:1;
                        update_current_view();
                }
                if (i == line_selected) {
                if (i == line_selected && toggle_view == 1) {
                        perf->visible = perf->visible == 1 ? 0:1;
                        update_current_view();
                }
                if (i == line_selected) {

-                       wattron(perf_panel_window, COLOR_PAIR(5));
-                       mvwhline(perf_panel_window, i + 1, 1, ' ', 30 - 2);
+                       wattron(pref_panel_window, COLOR_PAIR(5));
+                       mvwhline(pref_panel_window, i + 1, 1, ' ', 30 - 2);

                }
                if (perf->sort == 1)
                }
                if (perf->sort == 1)

-                       wattron(perf_panel_window, A_BOLD);
-               mvwprintw(perf_panel_window, i + 1, 1, "[%c] %s",
+                       wattron(pref_panel_window, A_BOLD);
+               mvwprintw(pref_panel_window, i + 1, 1, "[%c] %s",

                                perf->visible == 1 ? 'x' : ' ',
                                (char *) perflist->data + 5);
                                perf->visible == 1 ? 'x' : ' ',
                                (char *) perflist->data + 5);

-               wattroff(perf_panel_window, A_BOLD);
-               wattroff(perf_panel_window, COLOR_PAIR(5));
+               wattroff(pref_panel_window, A_BOLD);
+               wattroff(pref_panel_window, COLOR_PAIR(5));

                i++;
                perflist = g_list_next(perflist);
        }
                i++;
                perflist = g_list_next(perflist);
        }


@@ -817,16 +817,27 @@ void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
        doupdate();
 }
 
        doupdate();
 }
 

-void toggle_perf_panel(void)
+void update_preference_panel(int line_selected, int toggle_view, int toggle_sort)

 {
 {

-       if (perf_panel_visible) {
-               hide_panel(perf_panel);
-               perf_panel_visible = 0;
+       switch(current_view) {
+               case perf:
+                       update_perf_panel(line_selected, toggle_view, toggle_sort);
+                       break;
+               default:
+                       break;
+       }
+}
+
+void toggle_pref_panel(void)
+{
+       if (pref_panel_visible) {
+               hide_panel(pref_panel);
+               pref_panel_visible = 0;

        } else {
        } else {

-               setup_perf_panel();
-               update_perf_panel(perf_line_selected, 0, 0);
-               show_panel(perf_panel);
-               perf_panel_visible = 1;
+               setup_pref_panel();
+               update_preference_panel(perf_line_selected, 0, 0);
+               show_panel(pref_panel);
+               pref_panel_visible = 1;

        }
        update_panels();
        doupdate();
        }
        update_panels();
        doupdate();


@@ -867,10 +878,10 @@ void *handle_keyboard(void *p)
                switch(ch) {
                /* Move the cursor and scroll */
                case KEY_DOWN:
                switch(ch) {
                /* Move the cursor and scroll */
                case KEY_DOWN:

-                       if (perf_panel_visible) {
-                               if (perf_line_selected < g_hash_table_size(data->perf_list) - 1)
+                       if (pref_panel_visible) {
+                               if (perf_line_selected < g_hash_table_size(global_perf_liszt) - 1)

                                        perf_line_selected++;
                                        perf_line_selected++;

-                               update_perf_panel(perf_line_selected, 0, 0);
+                               update_preference_panel(perf_line_selected, 0, 0);

                        } else {
                                if (selected_line < (max_center_lines - 1) &&
                                                selected_line < max_elements - 1) {
                        } else {
                                if (selected_line < (max_center_lines - 1) &&
                                                selected_line < max_elements - 1) {


@@ -887,10 +898,10 @@ void *handle_keyboard(void *p)
                case KEY_NPAGE:
                        break;
                case KEY_UP:
                case KEY_NPAGE:
                        break;
                case KEY_UP:

-                       if (perf_panel_visible) {
+                       if (pref_panel_visible) {

                                if (perf_line_selected > 0)
                                        perf_line_selected--;
                                if (perf_line_selected > 0)
                                        perf_line_selected--;

-                               update_perf_panel(perf_line_selected, 0, 0);
+                               update_preference_panel(perf_line_selected, 0, 0);

                        } else {
                                if (selected_line > 0) {
                                        selected_line--;
                        } else {
                                if (selected_line > 0) {
                                        selected_line--;


@@ -941,16 +952,16 @@ void *handle_keyboard(void *p)
 
                        break;
                case ' ':
 
                        break;
                case ' ':

-                       if (perf_panel_visible) {
-                               update_perf_panel(perf_line_selected, 1, 0);
+                       if (pref_panel_visible) {
+                               update_preference_panel(perf_line_selected, 1, 0);

                        } else {
                                update_selected_processes();
                                update_current_view();
                        }
                        break;
                case 's':
                        } else {
                                update_selected_processes();
                                update_current_view();
                        }
                        break;
                case 's':

-                       if (perf_panel_visible)
-                               update_perf_panel(perf_line_selected, 0, 1);
+                       if (pref_panel_visible)
+                               update_preference_panel(perf_line_selected, 0, 1);

                        break;
 
                case 13: /* FIXME : KEY_ENTER ?? */
                        break;
 
                case 13: /* FIXME : KEY_ENTER ?? */


@@ -1000,7 +1011,7 @@ void *handle_keyboard(void *p)
                        }
                        break;
                case 'P':
                        }
                        break;
                case 'P':

-                       toggle_perf_panel();
+                       toggle_pref_panel();

                        break;
                default:
                        if (data)
                        break;
                default:
                        if (data)


@@ -1026,7 +1037,7 @@ void init_ncurses()
        print_log("Starting display");
 
        main_panel = new_panel(center);
        print_log("Starting display");
 
        main_panel = new_panel(center);

-       setup_perf_panel();
+       setup_pref_panel();

 
        current_view = cpu;
 
 
        current_view = cpu;
 


@@ -1035,4 +1046,3 @@ void init_ncurses()
 
        pthread_create(&keyboard_thread, NULL, handle_keyboard, (void *)NULL);
 }
 
        pthread_create(&keyboard_thread, NULL, handle_keyboard, (void *)NULL);
 }

-

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 092ebdf99d17e1bd9af2ff31c57bf6e3414bb741..b3368315ac0d6fb27f13c31c19176c6ddfc3b81d 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -165,14 +165,14 @@ struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
        ret->visible = 1;
        g_hash_table_insert(table, (gpointer) strdup(name), ret);
 
        ret->visible = 1;
        g_hash_table_insert(table, (gpointer) strdup(name), ret);
 

-       global = g_hash_table_lookup(lttngtop.perf_list, (gpointer) name);
+       global = g_hash_table_lookup(global_perf_liszt, (gpointer) name);

        if (!global) {
                global = g_new0(struct perfcounter, 1);
                memcpy(global, ret, sizeof(struct perfcounter));
                /* by default, sort on the first perf context */
        if (!global) {
                global = g_new0(struct perfcounter, 1);
                memcpy(global, ret, sizeof(struct perfcounter));
                /* by default, sort on the first perf context */

-               if (g_hash_table_size(lttngtop.perf_list) == 0)
+               if (g_hash_table_size(global_perf_liszt) == 0)

                        global->sort = 1;
                        global->sort = 1;

-               g_hash_table_insert(lttngtop.perf_list, (gpointer) strdup(name), global);
+               g_hash_table_insert(global_perf_liszt, (gpointer) strdup(name), global);

        }
 
 end:
        }
 
 end:


@@ -307,7 +307,7 @@ error:
 void init_lttngtop()
 {
        copies = g_ptr_array_new();
 void init_lttngtop()
 {
        copies = g_ptr_array_new();

-       lttngtop.perf_list = g_hash_table_new(g_str_hash, g_str_equal);
+       global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);

 
        sem_init(&goodtodisplay, 0, 0);
        sem_init(&goodtoupdate, 0, 1);
 
        sem_init(&goodtodisplay, 0, 0);
        sem_init(&goodtoupdate, 0, 1);

diff --git a/src/lttngtoptypes.h b/src/lttngtoptypes.h
index d228f277c0b0c442eecc5d7d9207c809518b6177..711b975f1adc4a47b4979641145fb9b0020698ae 100644 (file)
--- a/src/lttngtoptypes.h
+++ b/src/lttngtoptypes.h
@@ -24,7 +24,6 @@ struct lttngtop {
        GPtrArray *process_table;       /* struct processtop */
        GPtrArray *files_table;         /* struct files */
        GPtrArray *cpu_table;           /* struct cputime */
        GPtrArray *process_table;       /* struct processtop */
        GPtrArray *files_table;         /* struct files */
        GPtrArray *cpu_table;           /* struct cputime */

-       GHashTable *perf_list;          /* struct perfcounter */

        unsigned long start;
        unsigned long end;
        unsigned int nbproc;
        unsigned long start;
        unsigned long end;
        unsigned int nbproc;