cleanup exit path

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

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index c8ac5db55f93c8a990adcbd699f29d6dd3c5396e..02764dd19976996f13fb1f11a580531aa3285b60 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -75,11 +75,13 @@ void reset_ncurses()
        curs_set(1);
        endwin();
        quit = 1;
        curs_set(1);
        endwin();
        quit = 1;

+       sem_post(&pause_sem);
+       sem_post(&timer);
+       sem_post(&goodtodisplay);

 }
 
 static void handle_sigterm(int signal)
 {
 }
 
 static void handle_sigterm(int signal)
 {

-       fprintf(stderr, "caugh signal\n");

        pthread_cancel(keyboard_thread);
        reset_ncurses();
 }
        pthread_cancel(keyboard_thread);
        reset_ncurses();
 }


@@ -1507,6 +1509,7 @@ void *handle_keyboard(void *p)
                        } else {
                                resume_display();
                        }
                        } else {
                                resume_display();
                        }

+                       break;

                case 'r':
                        toggle_pref_panel();
                        break;
                case 'r':
                        toggle_pref_panel();
                        break;

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 8a3416c8dd6bf41659b695a458d2bd52c0c50993..26faf1de7d0344db0717e371f82b5bcd152fb1a4 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -124,11 +124,12 @@ void *ncurses_display(void *p)
                sem_wait(&pause_sem);
 
                if (quit) {
                sem_wait(&pause_sem);
 
                if (quit) {

+                       sem_post(&pause_sem);
+                       sem_post(&timer);

                        reset_ncurses();
                        pthread_exit(0);
                }
 
                        reset_ncurses();
                        pthread_exit(0);
                }
 

-

                copy = g_ptr_array_index(copies, current_display_index);
                assert(copy);
                display(current_display_index++);
                copy = g_ptr_array_index(copies, current_display_index);
                assert(copy);
                display(current_display_index++);