Merge branch 'master' of ssh://git.lttng.org/home/git/lttv

diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c
index 871df9bc95ae571768912fae4094c8f76cc95d2f..bd3f64d6cd08473ece9108b784c4c6add5c815c7 100644 (file)
--- a/lttv/lttv/state.c
+++ b/lttv/lttv/state.c
@@ -227,7 +227,7 @@ static void lttv_trace_states_read_raw(LttvTraceState *tcs, FILE *fp,
                GPtrArray *quarktable);
 
 /* Resource function prototypes */
-static LttvBdevState *get_hashed_bdevstate(LttvTraceState *ts, guint16 devcode);
+static LttvBdevState *get_hashed_bdevstate(LttvTraceState *ts, guint32 devcode);
 static LttvBdevState *bdevstate_new(void);
 static void bdevstate_free(LttvBdevState *);
 static void bdevstate_free_cb(gpointer key, gpointer value, gpointer user_data);
@@ -1491,7 +1491,7 @@ static void lttv_state_free_trap_states(LttvTrapState *states, guint n)
 
 /* bdevstate stuff */
 
-static LttvBdevState *get_hashed_bdevstate(LttvTraceState *ts, guint16 devcode)
+static LttvBdevState *get_hashed_bdevstate(LttvTraceState *ts, guint32 devcode)
 {
        gint devcode_gint = devcode;
        gpointer bdev = g_hash_table_lookup(ts->bdev_states, &devcode_gint);
@@ -2764,7 +2764,7 @@ static gboolean bdev_request_issue(void *hook_data, void *call_data)
                        lttv_trace_get_hook_field(th, 1));
        guint oper = ltt_event_get_long_unsigned(e,
                        lttv_trace_get_hook_field(th, 2));
-       guint16 devcode = MKDEV(major,minor);
+       guint32 devcode = MKDEV(major,minor);
 
        /* have we seen this block device before? */
        gpointer bdev = get_hashed_bdevstate(ts, devcode);
@@ -2790,7 +2790,7 @@ static gboolean bdev_request_complete(void *hook_data, void *call_data)
                        lttv_trace_get_hook_field(th, 1));
        //guint oper = ltt_event_get_long_unsigned(e,
        //              lttv_trace_get_hook_field(th, 2));
-       guint16 devcode = MKDEV(major,minor);
+       guint32 devcode = MKDEV(major,minor);
 
        /* have we seen this block device before? */
        gpointer bdev = get_hashed_bdevstate(ts, devcode);

diff --git a/lttv/lttv/state.h b/lttv/lttv/state.h
index 1e6efb57c88dd05be6f16c342f3c838dd6875f05..0ae7e5c63194ad5beaf8bf699e8800932dd8445f 100644 (file)
--- a/lttv/lttv/state.h
+++ b/lttv/lttv/state.h
@@ -470,6 +470,6 @@ static inline guint lttv_state_get_target_pid(LttvTracefileState *tfs)
 #define MINORMASK      ((1U << MINORBITS) - 1)
 #define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
 #define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
-#define MKDEV(ma,mi)   (((ma) << MINORBITS) | (mi))
+#define MKDEV(ma, mi)  ((((unsigned int) (ma)) << MINORBITS) | (unsigned int) (mi))
 
 #endif // STATE_H

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index d58c3137af64f90a95c9f630df9e8b5612aaf787..122968887e4acd51a328314468085a2d27228f99 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -1845,25 +1845,29 @@ void add_trace(GtkWidget * widget, gpointer user_data)
     tab = ptab->tab;
   }
 
-  //GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
-  GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a trace");
-  gtk_widget_hide( (file_selector)->file_list->parent) ;
-  gtk_file_selection_hide_fileop_buttons(file_selector);
-  gtk_window_set_transient_for(GTK_WINDOW(file_selector),
-      GTK_WINDOW(mw_data->mwindow));
-  
+  /* File open dialog management */
+  GtkFileChooser * file_chooser = 
+         GTK_FILE_CHOOSER(
+                 gtk_file_chooser_dialog_new ("Select a trace",
+                                         GTK_WINDOW(mw_data->mwindow),
+                                         GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                         NULL));
+
+  gtk_file_chooser_set_show_hidden (file_chooser, TRUE);
   if(remember_trace_dir[0] != '\0')
-    gtk_file_selection_set_filename(file_selector, remember_trace_dir);
-  
-  id = gtk_dialog_run(GTK_DIALOG(file_selector));
+         gtk_file_chooser_set_filename(file_chooser, remember_trace_dir);
+
+  id = gtk_dialog_run(GTK_DIALOG(file_chooser));
+
   switch(id){
     case GTK_RESPONSE_ACCEPT:
     case GTK_RESPONSE_OK:
-      dir = gtk_file_selection_get_filename (file_selector);
+      dir = gtk_file_chooser_get_filename (file_chooser);
       strncpy(remember_trace_dir, dir, PATH_MAX);
       strncat(remember_trace_dir, "/", PATH_MAX);
       if(!dir || strlen(dir) == 0){
-       gtk_widget_destroy((GtkWidget*)file_selector);
        break;
       }
       get_absolute_pathname(dir, abs_path);
@@ -1893,7 +1897,6 @@ void add_trace(GtkWidget * widget, gpointer user_data)
         lttvwindow_add_trace(tab, trace_v);
       }
 
-      gtk_widget_destroy((GtkWidget*)file_selector);
       
       //update current tab
       //update_traceset(mw_data);
@@ -1909,9 +1912,10 @@ void add_trace(GtkWidget * widget, gpointer user_data)
     case GTK_RESPONSE_REJECT:
     case GTK_RESPONSE_CANCEL:
     default:
-      gtk_widget_destroy((GtkWidget*)file_selector);
-      break;
+           break;
   }
+  gtk_widget_destroy((GtkWidget*)file_chooser);
+
 }
 
 /* remove_trace removes a trace from the current traceset if all viewers in 

diff --git a/lttv/modules/text/depanalysis.c b/lttv/modules/text/depanalysis.c
index 0c984711b5fd7203417894b00507b99263b9c370..5a4064aefa9b5c949b001e90831777307e135f91 100644 (file)
--- a/lttv/modules/text/depanalysis.c
+++ b/lttv/modules/text/depanalysis.c
@@ -49,6 +49,7 @@ static int depanalysis_range_pid = -1;
 static int depanalysis_range_pid_searching = -1;
 static int depanalysis_use_time=0;
 static int depanalysis_event_limit = -1;
+static int a_print_simple_summary = 0;
 static LttTime depanalysis_time1, depanalysis_time2;
 static char *arg_t1_str,*arg_t2_str;
 static int statedump_finished = 0;
@@ -454,7 +455,7 @@ static int try_pop_blocked_llev_preempted(struct process *p, LttTime t)
                pwstate = g_array_index(p->stack->array, struct sstack_item *, push_idx)->data_val;
 
                if(!(pwstate->state.bstate == LLEV_PREEMPTED && ((struct llev_state_info_preempted *)pwstate->state.private)->prev_state > 0)) {
-                       printf("double try wake up\n");
+                       //printf("double try wake up\n");
                        return 0;
                }
        }
@@ -508,7 +509,7 @@ static gboolean write_traceset_header(void *hook_data, void *call_data)
   g_info("Traceset header");
 
   /* Print the trace set header */
-  fprintf(a_file,"Trace set contains %d traces\n\n",
+  g_info(a_file,"Trace set contains %d traces\n\n",
       lttv_traceset_number(tc->ts));
 
   return FALSE;
@@ -906,6 +907,20 @@ static struct process_state *find_state_ending_after(int pid, LttTime t)
                return g_array_index(p->hlev_history, struct process_state *, result);
 }
 
+static void print_indent(int offset)
+{
+       if (offset > 2) {
+               int i;
+
+               printf("%*s", 8, "");
+               for (i = 3; i < offset; i++) {
+                       printf("|");
+                       printf("%*s", 4, "");
+               }
+       } else
+               printf("%*s", 4*offset, "");
+}
+
 static void print_delay_pid(int pid, LttTime t1, LttTime t2, int offset)
 {
        struct process *p;
@@ -926,8 +941,8 @@ static void print_delay_pid(int pid, LttTime t1, LttTime t2, int offset)
                        state_private_blocked = pstate->private;
                        struct process_state *state_unblocked;
 
-                       printf("%*s", 8*offset, "");
-                       printf("Blocked in ");
+                       print_indent(offset);
+                       printf("--> Blocked in ");
                        print_stack_garray_horizontal(state_private_blocked->llev_state_entry);
 
                        printf("(times: ");
@@ -942,15 +957,15 @@ static void print_delay_pid(int pid, LttTime t1, LttTime t2, int offset)
                                if(state_unblocked->bstate == HLEV_INTERRUPTED_IRQ) {
                                        struct hlev_state_info_interrupted_irq *priv = state_unblocked->private;
                                        /* if in irq or softirq, we don't care what the waking process was doing because they are asynchroneous events */
-                                       printf("%*s", 8*offset, "");
-                                       printf("Woken up by an IRQ: ");
+                                       print_indent(offset);
+                                       printf("--- Woken up by an IRQ: ");
                                        print_irq(priv->irq);
                                        printf("\n");
                                }
                                else if(state_unblocked->bstate == HLEV_INTERRUPTED_SOFTIRQ) {
                                        struct hlev_state_info_interrupted_softirq *priv = state_unblocked->private;
-                                       printf("%*s", 8*offset, "");
-                                       printf("Woken up by a SoftIRQ: ");
+                                       print_indent(offset);
+                                       printf("--- Woken up by a SoftIRQ: ");
                                        print_softirq(priv->softirq);
                                        printf("\n");
                                }
@@ -964,8 +979,8 @@ static void print_delay_pid(int pid, LttTime t1, LttTime t2, int offset)
                                                t2prime = pstate->time_end;
 
                                        print_delay_pid(state_private_blocked->pid_exit, t1prime, t2prime, offset+1);
-                                       printf("%*s", 8*offset, "");
-                                       printf("Woken up in context of ");
+                                       print_indent(offset);
+                                       printf("--- Woken up in context of ");
                                        print_pid(state_private_blocked->pid_exit);
                                        if(state_private_blocked->llev_state_exit) {
                                                print_stack_garray_horizontal(state_private_blocked->llev_state_exit);
@@ -977,7 +992,7 @@ static void print_delay_pid(int pid, LttTime t1, LttTime t2, int offset)
                                }
                        }
                        else {
-                               printf("%*s", 8*offset, "");
+                               print_indent(offset);
                                printf("Weird... cannot find in what state the waker (%d) was\n", state_private_blocked->pid_exit);
                        }
 
@@ -1002,6 +1017,17 @@ static void print_range_critical_path(int process, LttTime t1, LttTime t2)
        print_delay_pid(process, t1, t2, 2);
 }
 
+/*
+ * output legend example:
+ *
+ *           --> Blocked in RUNNING, SYSCALL NNN [syscall_name]
+ *           |      ---> Blocked in RUNNING, SYSCALL NNN [syscall_name]
+ *           |      |        --> Blocked in RUNNING, SYSCALL  [syscall_name]
+ *           |      |        --- Woken up by an IRQ: IRQ 0 [timer]
+ *           |      ---  Woken up in context of PID [appname] in high-level state RUNNING
+ *           --- Woken up in context of PID [appname] in high-level state RUNNING
+ */
+
 static void print_process_critical_path_summary()
 {
        struct process *pinfo;
@@ -1022,6 +1048,8 @@ static void print_process_critical_path_summary()
                struct process_state *hlev_state_cur;
 
                pinfo = (struct process *)pinfos->data;
+               if (depanalysis_range_pid_searching != -1 && pinfo->pid != depanalysis_range_pid_searching)
+                       goto next_iter;
                printf("\tProcess %d [%s]\n", pinfo->pid, g_quark_to_string(pinfo->name));
 
                if(pinfo->hlev_history->len < 1)
@@ -1048,7 +1076,7 @@ gint compare_states_length(gconstpointer a, gconstpointer b)
        return val;
 }
 
-static void print_simple_summary()
+static void print_simple_summary(void)
 {
        struct process *pinfo;
        GList *pinfos;
@@ -1056,6 +1084,9 @@ static void print_simple_summary()
        int i,j;
        int id_for_episodes = 0;
 
+       if (!a_print_simple_summary)
+               return;
+
        /* we save all the nodes here to print the episodes table quickly */
        GArray *all_nodes = g_array_new(FALSE, FALSE, sizeof(struct summary_tree_node *));
 
@@ -1356,7 +1387,7 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data)
 
        g_info("TextDump traceset footer");
 
-       fprintf(a_file,"End trace set\n\n");
+       g_info(a_file,"End trace set\n\n");
 
 //     if(LTTV_IS_TRACESET_STATS(tc)) {
 //             lttv_stats_sum_traceset((LttvTracesetStats *)tc, ltt_time_infinite);
@@ -1372,8 +1403,8 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data)
        /* print the reports */
        print_simple_summary();
        print_process_critical_path_summary();
-       printf("depanalysis_use_time = %d\n", depanalysis_use_time);
        if(depanalysis_use_time == 3) {
+               printf("depanalysis_use_time = %d\n", depanalysis_use_time);
                if(depanalysis_range_pid == -1 && depanalysis_range_pid_searching >= 0)
                        depanalysis_range_pid = depanalysis_range_pid_searching;
 
@@ -1965,6 +1996,10 @@ static void arg_limit(void *hook_data)
 {
 }
 
+static void arg_sum(void *hook_data)
+{
+}
+
 static void init()
 {
   gboolean result;
@@ -1985,6 +2020,8 @@ static void init()
       LTTV_OPT_INT, &depanalysis_range_pid_searching, arg_pid, NULL);
   lttv_option_add("limit-events", 0, "dependency limit event count", "count",
       LTTV_OPT_INT, &depanalysis_event_limit, arg_limit, NULL);
+  lttv_option_add("print-summary", 0, "print simple summary", "sum",
+      LTTV_OPT_INT, &a_print_simple_summary, arg_sum, NULL);
 
   process_hash_table = g_hash_table_new(g_int_hash, g_int_equal);
   syscall_table = g_hash_table_new(g_int_hash, g_int_equal);
@@ -2030,6 +2067,7 @@ static void destroy()
   lttv_option_remove("dep-time-end");
   lttv_option_remove("dep-pid");
   lttv_option_remove("limit-events");
+  lttv_option_remove("print-summary");
 
   g_hash_table_destroy(process_hash_table);
   g_hash_table_destroy(syscall_table);