time bar fixes
[lttv.git] / ltt / branches / poly / lttv / modules / gui / lttvwindow / lttvwindow / callbacks.c
index c7d1cc17a5e907d9cb7a1c865c176c4b79e082fc..7a7d19c96484766437ad90ff4675c91340284ed9 100644 (file)
@@ -238,31 +238,44 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor)
 
 int SetTraceset(Tab * tab, LttvTraceset *traceset)
 {
-  LttvHooks * tmp;
-  LttvAttributeValue value;
-  gint retval = 0;
+  LttvTracesetContext *tsc =
+        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  TimeWindow new_time_window;
+  LttTime new_current_time;
 
-  g_assert( lttv_iattribute_find_by_path(tab->attributes,
-     "hooks/updatetraceset", LTTV_POINTER, &value));
+  /* Set the tab's time window and current time if
+   * out of bounds */
+  if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0
+     || ltt_time_compare(  ltt_time_add(tab->time_window.start_time,
+                                        tab->time_window.time_width),
+                           time_span.end_time) > 0) {
+    new_time_window.start_time = time_span.start_time;
+    
+    new_current_time = time_span.start_time;
+    
+    LttTime tmp_time;
 
-  tmp = (LttvHooks*)*(value.v_pointer);
-  if(tmp == NULL) retval = 1;
-  else lttv_hooks_call(tmp,traceset);
+    if(DEFAULT_TIME_WIDTH_S < time_span.end_time.tv_sec)
+      tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
+    else
+      tmp_time.tv_sec = time_span.end_time.tv_sec;
+    tmp_time.tv_nsec = 0;
+    new_time_window.time_width = tmp_time ;
+  }
+  time_change_manager(tab, new_time_window);
+  current_time_change_manager(tab, new_current_time);
 
+#if 0
   /* Set scrollbar */
-  LttvTracesetContext *tsc =
-        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
-  TimeInterval time_span = tsc->time_span;
   GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
+  LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time);
       
   g_object_set(G_OBJECT(adjustment),
                "lower",
-               ltt_time_to_double(time_span.start_time) 
-                 * NANOSECONDS_PER_SECOND, /* lower */
+                 0.0, /* lower */
                "upper",
-               ltt_time_to_double(time_span.end_time
+               ltt_time_to_double(upper
                  * NANOSECONDS_PER_SECOND, /* upper */
                "step_increment",
                ltt_time_to_double(tab->time_window.time_width)
@@ -279,11 +292,43 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset)
 
   g_object_set(G_OBJECT(adjustment),
                "value",
-               ltt_time_to_double(tab->time_window.start_time) 
-                 * NANOSECONDS_PER_SECOND, /* value */
+               ltt_time_to_double(
+                ltt_time_sub(tab->time_window.start_time, time_span.start_time))
+                   * NANOSECONDS_PER_SECOND, /* value */
                NULL);
   gtk_adjustment_value_changed(adjustment);
+
+  /* set the time bar. The value callbacks will change their nsec themself */
+  /* start seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry1),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+
+  /* end seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry3),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+
+   /* current seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry5),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+#endif //0
   
+  /* Finally, call the update hooks of the viewers */
+  LttvHooks * tmp;
+  LttvAttributeValue value;
+  gint retval = 0;
+
+  g_assert( lttv_iattribute_find_by_path(tab->attributes,
+     "hooks/updatetraceset", LTTV_POINTER, &value));
+
+  tmp = (LttvHooks*)*(value.v_pointer);
+  if(tmp == NULL) retval = 1;
+  else lttv_hooks_call(tmp,traceset);
+
   return retval;
 }
 
@@ -740,10 +785,13 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
   
   /* Events processing algorithm implementation */
+  /* Warning : the gtk_events_pending takes a LOT of cpu time. So what we do
+   * instead is to leave the control to GTK and take it back.
+   */
   /* A. Servicing loop */
-  while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
-     /*    && !gtk_events_pending() )  */
-
+  //while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
+  if((g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
+    /* Servicing */
     /* 1. If list_in is empty (need a seek) */
     if( g_slist_length(list_in) ==  0 ) {
 
@@ -1011,7 +1059,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                              events_request->event,
                                              events_request->event_by_id);
           }
+
           /* Go to next */
           if(remove)
           {
@@ -1113,8 +1161,11 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position);
 
       tfc = lttv_traceset_context_get_current_tfc(tsc);
-      g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
+      if(tfc != NULL)
+        g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
                                                         tfc->timestamp.tv_nsec);
+      else
+        g_debug("End of trace reached after middle.");
 
     }
     {
@@ -1231,9 +1282,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
         }
       }
     }
-
-    if(gtk_events_pending()) break;
   }
+  /* End of removed servicing loop : leave control to GTK instead. */
+  //  if(gtk_events_pending()) break;
+  //}
 
   /* B. When interrupted between chunks */
 
@@ -1254,8 +1306,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       lttv_traceset_context_position_save(tsc, events_request->start_position);
 
       /* 1.2. Remove start time */
-      events_request->start_time.tv_sec = G_MAXUINT;
-      events_request->start_time.tv_nsec = G_MAXUINT;
+      events_request->start_time = ltt_time_infinite;
       
       /* 1.3. Move from list_in to list_out */
       remove = TRUE;
@@ -1384,9 +1435,10 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
 {
   LttvTraceset *traceset = tab->traceset_info->traceset;
   guint i;
+  guint num_traces = lttv_traceset_number(traceset);
 
  //Verify if trace is already present.
-  for(i=0; i<lttv_traceset_number(traceset); i++)
+  for(i=0; i<num_traces; i++)
   {
     LttvTrace * trace = lttv_traceset_get(traceset, i);
     if(trace == trace_v)
@@ -1419,36 +1471,7 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
                                       traceset_context),
             traceset); 
 
-  /* Set the tab's time window and current time if
-   * out of bounds */
-  TimeInterval time_span = 
-    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->time_span;
-  if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0
-     || ltt_time_compare(  ltt_time_add(tab->time_window.start_time,
-                                        tab->time_window.time_width),
-                           time_span.end_time) > 0) {
-    tab->time_window.start_time = 
-        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                               time_span.start_time;
-    tab->current_time = 
-       LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                             time_span.start_time;
-    
-    LttTime tmp_time;
 
-    if(DEFAULT_TIME_WIDTH_S <
-            LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                           time_span.end_time.tv_sec)
-      tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
-    else
-      tmp_time.tv_sec =
-              LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                           time_span.end_time.tv_sec;
-    tmp_time.tv_nsec = 0;
-    tab->time_window.time_width = tmp_time ;
-    
-  }
   //add state update hooks
   lttv_state_add_event_hooks(
   (LttvTracesetState*)tab->traceset_info->traceset_context);
@@ -1633,17 +1656,18 @@ void remove_trace(GtkWidget *widget, gpointer user_data)
 
     trace_v = lttv_traceset_get(traceset, index);
 
-    if(lttv_trace_get_ref_number(trace_v) <= 2) {
-      /* ref 2 : traceset, local */
-      lttvwindowtraces_remove_trace(trace_v);
-      ltt_trace_close(lttv_trace(trace_v));
-    }
-    
     lttv_traceset_remove(traceset, index);
     lttv_trace_unref(trace_v);  // Remove local reference
 
-    if(!lttv_trace_get_ref_number(trace_v))
-       lttv_trace_destroy(trace_v);
+    if(lttv_trace_get_ref_number(trace_v) <= 1) {
+      /* ref 1 : lttvwindowtraces only*/
+      ltt_trace_close(lttv_trace(trace_v));
+      /* lttvwindowtraces_remove_trace takes care of destroying
+       * the traceset linked with the trace_v and also of destroying
+       * the trace_v at the same time.
+       */
+      lttvwindowtraces_remove_trace(trace_v);
+    }
     
     tab->traceset_info->traceset_context =
       g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
@@ -1987,15 +2011,15 @@ void zoom(GtkWidget * widget, double size)
   //
   //
 
+ LttTime rel_time =
+       ltt_time_sub(new_time_window.start_time, time_span.start_time); 
  if(   ltt_time_to_double(new_time_window.time_width)
                              * NANOSECONDS_PER_SECOND
                              / SCROLL_STEP_PER_PAGE/* step increment */
        +
-       ltt_time_to_double(new_time_window.start_time)
-                             * NANOSECONDS_PER_SECOND /* page size */
+       ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */
                     == 
-       ltt_time_to_double(new_time_window.start_time)
-                             * NANOSECONDS_PER_SECOND /* page size */
+       ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */
        ) {
     g_warning("Can not zoom that far due to scrollbar precision");
  } else if(
@@ -2007,6 +2031,8 @@ void zoom(GtkWidget * widget, double size)
      == 0 ) {
     g_warning("Can not zoom that far due to time nanosecond precision");
  } else {
+   time_change_manager(tab, new_time_window);
+#if 0
     /* Set scrollbar */
     GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
         
@@ -2015,10 +2041,10 @@ void zoom(GtkWidget * widget, double size)
                  //ltt_time_to_double(new_time_window.start_time) 
                  //  * NANOSECONDS_PER_SECOND, /* value */
                  "lower",
-                 ltt_time_to_double(time_span.start_time) 
-                   * NANOSECONDS_PER_SECOND, /* lower */
+                   0.0, /* lower */
                  "upper",
-                 ltt_time_to_double(time_span.end_time) 
+                 ltt_time_to_double(
+                   ltt_time_sub(time_span.end_time, time_span.start_time))
                    * NANOSECONDS_PER_SECOND, /* upper */
                  "step_increment",
                  ltt_time_to_double(new_time_window.time_width)
@@ -2036,7 +2062,8 @@ void zoom(GtkWidget * widget, double size)
     //gtk_adjustment_value_changed(adjustment);
     g_object_set(G_OBJECT(adjustment),
                  "value",
-                 ltt_time_to_double(new_time_window.start_time) 
+                 ltt_time_to_double(
+                   ltt_time_sub(new_time_window.start_time, time_span.start_time))
                    * NANOSECONDS_PER_SECOND, /* value */
                  NULL);
     gtk_adjustment_value_changed(adjustment);
@@ -2052,6 +2079,7 @@ void zoom(GtkWidget * widget, double size)
     //gtk_adjustment_set_value(adjustment,
     //                         ltt_time_to_double(new_time_window.start_time)
     //                         * NANOSECONDS_PER_SECOND);
+#endif //0
   }
 }
 
@@ -2072,7 +2100,7 @@ void zoom_extended(GtkWidget * widget, gpointer user_data)
 
 void go_to_time(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Go to time\n");
+  g_printf("Go to time\n");  
 }
 
 void show_time_frame(GtkWidget * widget, gpointer user_data)
@@ -2720,9 +2748,9 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
     GPtrArray *name;
     guint nb,i;
     gchar *module_name;
+    nb = lttv_library_module_number(library);
     LttvModuleInfo *module_info = g_new(LttvModuleInfo,nb);
     name = g_ptr_array_new();
-    nb = lttv_library_module_number(library);
     /* ask for the module name */
 
     for(i=0;i<nb;i++){
@@ -2749,10 +2777,11 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
     if(module_name == NULL) return;
   }
   
-  lttv_module_release(module);
   LttvModuleInfo module_info;
   lttv_module_info(module, &module_info);
   g_printf("Release module: %s\n", module_info.name);
+  lttv_module_release(module);
 }
 
 
@@ -2853,11 +2882,90 @@ on_content_activate                    (GtkMenuItem     *menuitem,
 }
 
 
+static void 
+on_about_close_activate                (GtkButton       *button,
+                                        gpointer         user_data)
+{
+  GtkWidget *about_widget = GTK_WIDGET(user_data);
+
+  gtk_widget_destroy(about_widget);
+}
+
 void
 on_about_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("About...\n");
+  MainWindow *main_window = get_window_data_struct(GTK_WIDGET(menuitem));
+  GtkWidget *window_widget = main_window->mwindow;
+  GtkWidget *about_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  GtkWindow *about_window = GTK_WINDOW(about_widget);
+  gint window_width, window_height;
+  
+  gtk_window_set_title(about_window, "About Linux Trace Toolkit");
+
+  gtk_window_set_resizable(about_window, FALSE);
+  gtk_window_set_transient_for(GTK_WINDOW(window_widget), about_window);
+  gtk_window_set_destroy_with_parent(about_window, TRUE);
+  gtk_window_set_modal(about_window, FALSE);
+
+  /* Put the about window at the center of the screen */
+  gtk_window_get_size(about_window, &window_width, &window_height);
+  gtk_window_move (about_window,
+                   (gdk_screen_width() - window_width)/2,
+                   (gdk_screen_height() - window_height)/2);
+  GtkWidget *vbox = gtk_vbox_new(FALSE, 1);
+
+  gtk_container_add(GTK_CONTAINER(about_widget), vbox);
+
+    
+  /* Text to show */
+  GtkWidget *label1 = gtk_label_new("");
+  gtk_misc_set_padding(GTK_MISC(label1), 10, 20);
+  gtk_label_set_markup(GTK_LABEL(label1), "\
+<big>Linux Trace Toolkit</big>");
+  gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_CENTER);
+  
+  GtkWidget *label2 = gtk_label_new("");
+  gtk_misc_set_padding(GTK_MISC(label2), 10, 20);
+  gtk_label_set_markup(GTK_LABEL(label2), "\
+Project author: Karim Yaghmour\n\
+\n\
+Contributors :\n\
+\n\
+Michel Dagenais (New trace format, lttv main)\n\
+Mathieu Desnoyers (Directory structure, build with automake/conf,\n\
+                   lttv gui, control flow view, gui green threads\n\
+                   with interruptible foreground and background computation,\n\
+                   detailed event list)\n\
+Benoit Des Ligneris (Cluster adaptation)\n\
+Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\
+               detailed event list and statistics view)\n\
+Tom Zanussi (RelayFS)");
+
+  GtkWidget *label3 = gtk_label_new("");
+  gtk_label_set_markup(GTK_LABEL(label3), "\
+Linux Trace Toolkit, Copyright (C) 2004  Karim Yaghmour\n\
+Linux Trace Toolkit comes with ABSOLUTELY NO WARRANTY.\n\
+This is free software, and you are welcome to redistribute it\n\
+under certain conditions. See COPYING for details.");
+  gtk_misc_set_padding(GTK_MISC(label3), 10, 20);
+
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label1);
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label2);
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label3);
+
+  GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  GtkWidget *close_button = gtk_button_new_with_mnemonic("_Close");
+  gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(close_button), 20);
+
+  g_signal_connect(G_OBJECT(close_button), "clicked",
+      G_CALLBACK(on_about_close_activate),
+      (gpointer)about_widget);
+  
+  gtk_widget_show_all(about_widget);
 }
 
 
@@ -3075,31 +3183,407 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
 }
 
 
+void time_change_manager               (Tab *tab,
+                                        TimeWindow new_time_window)
+{
+  /* Only one source of time change */
+  if(tab->time_manager_lock == TRUE) return;
+
+  tab->time_manager_lock = TRUE;
+
+  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  LttTime start_time = new_time_window.start_time;
+  LttTime end_time = ltt_time_add(new_time_window.start_time,
+                                  new_time_window.time_width);
+
+  /* Set scrollbar */
+  GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
+  LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time);
+#if 0  
+  gtk_range_set_increments(GTK_RANGE(tab->scrollbar),
+               ltt_time_to_double(new_time_window.time_width)
+                             / SCROLL_STEP_PER_PAGE
+                             * NANOSECONDS_PER_SECOND, /* step increment */
+               ltt_time_to_double(new_time_window.time_width) 
+                 * NANOSECONDS_PER_SECOND); /* page increment */
+  gtk_range_set_range(GTK_RANGE(tab->scrollbar),
+                 0.0, /* lower */
+               ltt_time_to_double(upper) 
+                 * NANOSECONDS_PER_SECOND); /* upper */
+#endif //0
+  g_object_set(G_OBJECT(adjustment),
+               "lower",
+                 0.0, /* lower */
+               "upper",
+               ltt_time_to_double(upper) 
+                 * NANOSECONDS_PER_SECOND, /* upper */
+               "step_increment",
+               ltt_time_to_double(new_time_window.time_width)
+                             / SCROLL_STEP_PER_PAGE
+                             * NANOSECONDS_PER_SECOND, /* step increment */
+               "page_increment",
+               ltt_time_to_double(new_time_window.time_width) 
+                 * NANOSECONDS_PER_SECOND, /* page increment */
+               "page_size",
+               ltt_time_to_double(new_time_window.time_width) 
+                 * NANOSECONDS_PER_SECOND, /* page size */
+               NULL);
+  gtk_adjustment_changed(adjustment);
+
+ // g_object_set(G_OBJECT(adjustment),
+ //              "value",
+ //              ltt_time_to_double(
+ //               ltt_time_sub(start_time, time_span.start_time))
+ //                  * NANOSECONDS_PER_SECOND, /* value */
+ //              NULL);
+  //gtk_adjustment_value_changed(adjustment);
+  gtk_range_set_value(GTK_RANGE(tab->scrollbar),
+               ltt_time_to_double(
+                ltt_time_sub(start_time, time_span.start_time))
+                   * NANOSECONDS_PER_SECOND /* value */);
+
+  /* set the time bar. */
+  /* start seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry1),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry1),
+                            (double)start_time.tv_sec);
+
+  /* start nanoseconds */
+  if(start_time.tv_sec == time_span.start_time.tv_sec) {
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2),
+                              (double)time_span.start_time.tv_nsec,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  }
+  else if(start_time.tv_sec == time_span.end_time.tv_sec) {
+    /* If we are at the end, max nsec to end..  -1 (not zero length) */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2),
+                              0.0,
+                              (double)time_span.end_time.tv_nsec-1);
+  }
+  else /* anywhere else */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2),
+                              0.0,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2),
+                            (double)start_time.tv_nsec);
+
+  /* end seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry3),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry3),
+                            (double)end_time.tv_sec);
+
+  /* end nanoseconds */
+  if(end_time.tv_sec == time_span.start_time.tv_sec) {
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4),
+                              (double)time_span.start_time.tv_nsec+1,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  }
+  else if(end_time.tv_sec == time_span.end_time.tv_sec) {
+    /* If we are at the end, max nsec to end.. */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4),
+                              0.0,
+                              (double)time_span.end_time.tv_nsec);
+  }
+  else /* anywhere else */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4),
+                              0.0,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4),
+                            (double)end_time.tv_nsec);
+
+  /* call viewer hooks for new time window */
+  set_time_window(tab, &new_time_window);
+
+  tab->time_manager_lock = FALSE;
+}
+
+
+/* value changed for frame start s
+ *
+ * Check time span : if ns is out of range, clip it the nearest good value.
+ */
+void
+on_MEntry1_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab =(Tab *)user_data;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+
+  TimeWindow new_time_window = tab->time_window;
+  LttTime end_time = ltt_time_add(new_time_window.start_time,
+                                  new_time_window.time_width);
+
+  new_time_window.start_time.tv_sec = value;
+
+  /* start nanoseconds */
+  if(new_time_window.start_time.tv_sec == time_span.start_time.tv_sec) {
+    if(new_time_window.start_time.tv_nsec < time_span.start_time.tv_nsec)
+      new_time_window.start_time.tv_nsec = time_span.start_time.tv_nsec;
+  }
+  else if(new_time_window.start_time.tv_sec == time_span.end_time.tv_sec) {
+    if(new_time_window.start_time.tv_nsec > time_span.end_time.tv_nsec)
+      new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1;
+  }
+
+  /* check if end time selected is below or equal */
+  if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
+    /* Then, we must push back end time : keep the same time width
+     * if possible, else end traceset time */
+    end_time = LTT_TIME_MIN(time_span.end_time,
+                                  ltt_time_add(new_time_window.start_time,
+                                               new_time_window.time_width)
+                                 );
+  }
+
+  /* Fix the time width to fit start time and end time */
+  new_time_window.time_width = ltt_time_sub(end_time,
+                                            new_time_window.start_time);
+
+  time_change_manager(tab, new_time_window);
+
+}
+
+void
+on_MEntry2_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab =(Tab *)user_data;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+
+  TimeWindow new_time_window = tab->time_window;
+  LttTime end_time = ltt_time_add(new_time_window.start_time,
+                                  new_time_window.time_width);
+
+  new_time_window.start_time.tv_nsec = value;
+
+  /* check if end time selected is below or equal */
+  if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
+    /* Then, we must push back end time : keep the same time width
+     * if possible, else end traceset time */
+    end_time = LTT_TIME_MIN(time_span.end_time,
+                                  ltt_time_add(new_time_window.start_time,
+                                               new_time_window.time_width)
+                                 );
+  }
+
+  /* Fix the time width to fit start time and end time */
+  new_time_window.time_width = ltt_time_sub(end_time,
+                                            new_time_window.start_time);
+
+  time_change_manager(tab, new_time_window);
+
+}
+
+void
+on_MEntry3_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab =(Tab *)user_data;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+
+  TimeWindow new_time_window = tab->time_window;
+  LttTime end_time = ltt_time_add(new_time_window.start_time,
+                                  new_time_window.time_width);
+  end_time.tv_sec = value;
+
+  /* end nanoseconds */
+  if(end_time.tv_sec == time_span.start_time.tv_sec) {
+    if(end_time.tv_nsec < time_span.start_time.tv_nsec)
+      end_time.tv_nsec = time_span.start_time.tv_nsec+1;
+  }
+  else if(end_time.tv_sec == time_span.end_time.tv_sec) {
+    if(end_time.tv_nsec > time_span.end_time.tv_nsec)
+      end_time.tv_nsec = time_span.end_time.tv_nsec;
+  }
+
+  /* check if end time selected is below or equal */
+  if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
+    /* Then, we must push front start time : keep the same time width
+     * if possible, else end traceset time */
+    new_time_window.start_time = LTT_TIME_MAX(time_span.start_time,
+                                        ltt_time_sub(end_time,
+                                                     new_time_window.time_width)
+                                             );
+  }
+
+  /* Fix the time width to fit start time and end time */
+  new_time_window.time_width = ltt_time_sub(end_time,
+                                            new_time_window.start_time);
+
+  time_change_manager(tab, new_time_window);
+
+}
+
+void
+on_MEntry4_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab =(Tab *)user_data;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+
+  TimeWindow new_time_window = tab->time_window;
+  LttTime end_time = ltt_time_add(new_time_window.start_time,
+                                  new_time_window.time_width);
+  end_time.tv_nsec = value;
+
+  /* check if end time selected is below or equal */
+  if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) {
+    /* Then, we must push front start time : keep the same time width
+     * if possible, else end traceset time */
+    new_time_window.start_time = LTT_TIME_MAX(time_span.start_time,
+                                        ltt_time_sub(end_time,
+                                                     new_time_window.time_width)
+                                             );
+  }
+
+  /* Fix the time width to fit start time and end time */
+  new_time_window.time_width = ltt_time_sub(end_time,
+                                            new_time_window.start_time);
+
+  time_change_manager(tab, new_time_window);
+
+}
+
+
+void current_time_change_manager       (Tab *tab,
+                                        LttTime new_current_time)
+{
+  /* Only one source of time change */
+  if(tab->current_time_manager_lock == TRUE) return;
+
+  tab->current_time_manager_lock = TRUE;
+
+  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+
+  /* current seconds */
+  gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry5),
+                            (double)time_span.start_time.tv_sec,
+                            (double)time_span.end_time.tv_sec);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry5),
+                            (double)new_current_time.tv_sec);
+  /* start nanoseconds */
+  if(new_current_time.tv_sec == time_span.start_time.tv_sec) {
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6),
+                              (double)time_span.start_time.tv_nsec,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  }
+  else if(new_current_time.tv_sec == time_span.end_time.tv_sec) {
+    /* If we are at the end, max nsec to end.. */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6),
+                              0.0,
+                              (double)time_span.end_time.tv_nsec);
+  }
+  else /* anywhere else */
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6),
+                              0.0,
+                              (double)NANOSECONDS_PER_SECOND-1);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry6),
+                            (double)new_current_time.tv_nsec);
+
+  set_current_time(tab, &new_current_time);
+
+  tab->current_time_manager_lock = FALSE;
+}
+
+void
+on_MEntry5_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab = (Tab*)user_data;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+  LttTime new_current_time = tab->current_time;
+  new_current_time.tv_sec = value;
+
+  /* current nanoseconds */
+  if(new_current_time.tv_sec == time_span.start_time.tv_sec) {
+    if(new_current_time.tv_nsec < time_span.start_time.tv_nsec)
+      new_current_time.tv_nsec = time_span.start_time.tv_nsec;
+  }
+  else if(new_current_time.tv_sec == time_span.end_time.tv_sec) {
+    if(new_current_time.tv_nsec > time_span.end_time.tv_nsec)
+      new_current_time.tv_nsec = time_span.end_time.tv_nsec;
+  }
+
+  current_time_change_manager(tab, new_current_time);
+}
+
+void
+on_MEntry6_value_changed               (GtkSpinButton *spinbutton,
+                                        gpointer user_data)
+{
+  Tab *tab = (Tab*)user_data;
+  gint value = gtk_spin_button_get_value_as_int(spinbutton);
+  LttTime new_current_time = tab->current_time;
+  new_current_time.tv_nsec = value;
+
+  current_time_change_manager(tab, new_current_time);
+}
+
+
 void scroll_value_changed_cb(GtkWidget *scrollbar,
                              gpointer user_data)
 {
   Tab *tab = (Tab *)user_data;
-  TimeWindow time_window;
-  TimeInterval *time_span;
+  TimeWindow new_time_window;
   LttTime time;
   GtkAdjustment *adjust = gtk_range_get_adjustment(GTK_RANGE(scrollbar));
   gdouble value = gtk_adjustment_get_value(adjust);
-  gdouble upper, lower, ratio, page_size;
+ // gdouble upper, lower, ratio, page_size;
+  gdouble page_size;
   LttvTracesetContext * tsc = 
     LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+
+  time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND),
+                      time_span.start_time);
+
+  new_time_window.start_time = time;
+  
+  page_size = adjust->page_size;
+
+  new_time_window.time_width = 
+    ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND);
+
 
+  time_change_manager(tab, new_time_window);
+#if 0
   //time_window = tab->time_window;
 
-  time_span = &tsc->time_span ;
   lower = adjust->lower;
   upper = adjust->upper;
   ratio = (value - lower) / (upper - lower);
-  g_critical("lower %lu, upper %lu, value %lu, ratio %lu", lower, upper, value, ratio);
+  g_info("lower %lu, upper %lu, value %lu, ratio %lu", lower, upper, value, ratio);
   
   //time = ltt_time_sub(time_span->end_time, time_span->start_time);
   //time = ltt_time_mul(time, (float)ratio);
   //time = ltt_time_add(time_span->start_time, time);
-  time = ltt_time_from_double(value/NANOSECONDS_PER_SECOND);
+  time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND),
+                      time_span.start_time);
 
   time_window.start_time = time;
   
@@ -3107,14 +3591,14 @@ void scroll_value_changed_cb(GtkWidget *scrollbar,
 
   time_window.time_width = 
     ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND);
-  //time = ltt_time_sub(time_span->end_time, time);
+  //time = ltt_time_sub(time_span.end_time, time);
   //if(ltt_time_compare(time,time_window.time_width) < 0){
   //  time_window.time_width = time;
   //}
 
   /* call viewer hooks for new time window */
   set_time_window(tab, &time_window);
-
+#endif //0
 }
 
 
@@ -3580,7 +4064,6 @@ void construct_main_window(MainWindow * parent)
   // Add the object's information to the module's array 
   g_main_window_list = g_slist_append(g_main_window_list, new_m_window);
 
-
   new_window  = create_MWindow();
   gtk_widget_show (new_window);
     
@@ -3607,7 +4090,7 @@ void construct_main_window(MainWindow * parent)
     g_printf("Notebook does not exist\n");
     return;
   }
-  gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook));
+  //gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook));
   //for now there is no name field in LttvTraceset structure
   //Use "Traceset" as the label for the default tab
   if(parent) {
@@ -3624,10 +4107,14 @@ void construct_main_window(MainWindow * parent)
     new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset");
   } else {
     new_tab = create_tab(new_m_window, NULL, notebook, "Traceset");
+    /* First window, use command line trace */
     if(g_init_trace != NULL){
       lttvwindow_add_trace(new_tab,
                            g_init_trace);
+
     }
+    LttvTraceset *traceset = new_tab->traceset_info->traceset;
+    SetTraceset(new_tab, traceset);
   }
 
   g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
@@ -3702,13 +4189,16 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
     tab->traceset_info->traceset = lttv_traceset_new();
   }
 
-//FIXME : this is g_debug level
+#ifdef DEBUG
   lttv_attribute_write_xml(
       lttv_traceset_attribute(tab->traceset_info->traceset),
       stdout,
       0, 4);
   fflush(stdout);
+#endif //DEBUG
 
+  tab->time_manager_lock = FALSE;
+  tab->current_time_manager_lock = FALSE;
 
   //FIXME copy not implemented in lower level
   tab->traceset_info->traceset_context =
@@ -3722,6 +4212,7 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
        (LttvTracesetState*)tab->traceset_info->traceset_context);
   
   //determine the current_time and time_window of the tab
+#if 0
   if(copy_tab != NULL){
     tab->time_window      = copy_tab->time_window;
     tab->current_time     = copy_tab->current_time;
@@ -3746,11 +4237,12 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
                              time_span.start_time.tv_nsec;
   }
+#endif //0
   tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
  
-  tab->vbox = gtk_vbox_new(FALSE, 0);
-  tab->viewer_container = gtk_vbox_new(TRUE, 0);
+  tab->vbox = gtk_vbox_new(FALSE, 2);
+  tab->viewer_container = gtk_vbox_new(TRUE, 2);
   tab->scrollbar = gtk_hscrollbar_new(NULL);
   //tab->multivpaned = gtk_multi_vpaned_new();
   
@@ -3759,13 +4251,94 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
                      TRUE, /* expand */
                      TRUE, /* Give the extra space to the child */
                      0);    /* No padding */
+
+  /* Create the timebar */
+  {
+    tab->MTimebar = gtk_hbox_new(FALSE, 2);
+    gtk_widget_show(tab->MTimebar);
+
+    tab->MText1 = gtk_label_new("Time Frame  start: ");
+    gtk_widget_show(tab->MText1);
+    tab->MText2 = gtk_label_new("s");
+    gtk_widget_show(tab->MText2);
+    tab->MText3a = gtk_label_new("ns");
+    gtk_widget_show(tab->MText3a);
+    tab->MText3b = gtk_label_new("end:");
+    gtk_widget_show(tab->MText3b);
+    tab->MText4 = gtk_label_new("s");
+    gtk_widget_show(tab->MText4);
+    tab->MText5a = gtk_label_new("ns");
+    gtk_widget_show(tab->MText5a);
+    tab->MText5b = gtk_label_new("Current Time:");
+    gtk_widget_show(tab->MText5b);
+    tab->MText6 = gtk_label_new("s");
+    gtk_widget_show(tab->MText6);
+    tab->MText7 = gtk_label_new("ns");
+    gtk_widget_show(tab->MText7);
+
+    tab->MEntry1 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry1),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry1),TRUE);
+    gtk_widget_show(tab->MEntry1);
+    tab->MEntry2 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry2),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry2),TRUE);
+    gtk_widget_show(tab->MEntry2);
+    tab->MEntry3 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry3),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry3),TRUE);
+    gtk_widget_show(tab->MEntry3);
+    tab->MEntry4 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry4),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry4),TRUE);
+    gtk_widget_show(tab->MEntry4);
+    tab->MEntry5 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry5),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry5),TRUE);
+    gtk_widget_show(tab->MEntry5);
+    tab->MEntry6 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0);
+    gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry6),0);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry6),TRUE);
+    gtk_widget_show(tab->MEntry6);
+
+    
+    GtkWidget *temp_widget;
+    
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText1, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry1, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText2, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry2, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText3a, FALSE, FALSE, 0);
+    temp_widget = gtk_vseparator_new();
+    gtk_widget_show(temp_widget);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText3b, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry3, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText4, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry4, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText5a, FALSE, FALSE, 0);
+    temp_widget = gtk_vseparator_new();
+    gtk_widget_show(temp_widget);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText7, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry6, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText6, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry5, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText5b, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0);
+  }
+
   gtk_box_pack_end(GTK_BOX(tab->vbox),
                    tab->scrollbar,
                    FALSE, /* Do not expand */
                    FALSE, /* Fill has no effect here  (expand false) */
                    0);    /* No padding */
+  
+  gtk_box_pack_end(GTK_BOX(tab->vbox),
+                   tab->MTimebar,
+                   FALSE, /* Do not expand */
+                   FALSE, /* Fill has no effect here  (expand false) */
+                   0);    /* No padding */
+
   g_object_set_data(G_OBJECT(tab->viewer_container), "focused_viewer", NULL);
 
 
@@ -3822,6 +4395,26 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
 
   g_signal_connect(G_OBJECT(tab->scrollbar), "value-changed",
       G_CALLBACK(scroll_value_changed_cb), tab);
+
+  g_signal_connect ((gpointer) tab->MEntry1, "value-changed",
+                    G_CALLBACK (on_MEntry1_value_changed),
+                    tab);
+  g_signal_connect ((gpointer) tab->MEntry2, "value-changed",
+                    G_CALLBACK (on_MEntry2_value_changed),
+                    tab);
+  g_signal_connect ((gpointer) tab->MEntry3, "value-changed",
+                    G_CALLBACK (on_MEntry3_value_changed),
+                    tab);
+  g_signal_connect ((gpointer) tab->MEntry4, "value-changed",
+                    G_CALLBACK (on_MEntry4_value_changed),
+                    tab);
+  g_signal_connect ((gpointer) tab->MEntry5, "value-changed",
+                    G_CALLBACK (on_MEntry5_value_changed),
+                    tab);
+  g_signal_connect ((gpointer) tab->MEntry6, "value-changed",
+                    G_CALLBACK (on_MEntry6_value_changed),
+                    tab);
+
   //g_signal_connect(G_OBJECT(tab->scrollbar), "changed",
   //    G_CALLBACK(scroll_value_changed_cb), tab);
 
This page took 0.034742 seconds and 4 git commands to generate.