Update GUI after showing error message.

2005-11-01  Soeren Sandmann  <sandmann@redhat.com>

        * sysprof.c (on_start_toggled): Update GUI after showing error
        message.

        * sysprof.glade: Rename File menu Profiler, move
        Start/Profile/Reset here, delete View menu.

diff --git a/ChangeLog b/ChangeLog
index 414ca87..ca76f43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-01  Soeren Sandmann  <sandmann@redhat.com>
+
+       * sysprof.c (on_start_toggled): Update GUI after showing error
+       message.
+
+       * sysprof.glade: Rename File menu Profiler, move
+       Start/Profile/Reset here, delete View menu.
+
 Mon Oct 31 23:41:33 2005  Soeren Sandmann  <sandmann@redhat.com>
 
        * stackstash.h (struct StackNode): Add "total" field.

diff --git a/TODO b/TODO
index 89ad414..fbdd7e8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -117,7 +117,8 @@ Before 1.2:
 * Send entire stack to user space, then do stackwalking there. That would
   allow us to do more complex algorithms, like dwarf, in userspace. Though
   we'd lose the ability to do non-racy file naming. We could pass a list
-  of the process mappings with each stack though.
+  of the process mappings with each stack though. Doing this would also solve
+  the problem of not being able to get maps of processes running as root.
 
 * If interrupt happens in kernel mode, send both
   kernel stack and user space stack, have userspace stitch them

diff --git a/sysprof.c b/sysprof.c
index 8b915c3..74d3a86 100644 (file)
--- a/sysprof.c
+++ b/sysprof.c
@@ -350,11 +350,11 @@ on_start_toggled (GtkWidget *widget, gpointer data)
               "       modprobe sysprof-module\n"
               "\n"
               "as root.");
-
-       return;
     }
-    
-    app->state = PROFILING;
+    else
+    {
+       app->state = PROFILING;
+    }
 
     update_sensitivity (app);
 }

diff --git a/sysprof.glade b/sysprof.glade
index c68756e..724e5b8 100644 (file)
--- a/sysprof.glade
+++ b/sysprof.glade
@@ -32,24 +32,23 @@
          <child>
            <widget class="GtkMenuItem" id="menuitem1">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_File</property>
+             <property name="label" translatable="yes">_Profiler</property>
              <property name="use_underline">True</property>
 
              <child>
                <widget class="GtkMenu" id="menuitem1_menu">
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="open_item">
+                   <widget class="GtkImageMenuItem" id="start_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Open...</property>
+                     <property name="label" translatable="yes">_Start</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_open_item_activate" last_modification_time="Thu, 04 Nov 2004 21:01:03 GMT"/>
-                     <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                     <signal name="activate" handler="on_start1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image80">
+                       <widget class="GtkImage" id="image98">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-open</property>
+                         <property name="stock">gtk-media-play</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -61,17 +60,16 @@
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="save_as_item">
+                   <widget class="GtkImageMenuItem" id="profile_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Save _As...</property>
+                     <property name="label" translatable="yes">_Profile</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_Save _As..._activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
-                     <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+                     <signal name="activate" handler="on_profile1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image81">
+                       <widget class="GtkImage" id="image99">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-save-as</property>
+                         <property name="stock">gtk-justify-left</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -83,23 +81,16 @@
                  </child>
 
                  <child>
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="quit">
+                   <widget class="GtkImageMenuItem" id="reset_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Quit</property>
+                     <property name="label" translatable="yes">_Reset</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_quit_activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
-                     <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                     <signal name="activate" handler="on_reset_item_activate" last_modification_time="Fri, 05 Nov 2004 15:34:30 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image82">
+                       <widget class="GtkImage" id="image100">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-quit</property>
+                         <property name="stock">gtk-clear</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -109,31 +100,25 @@
                      </child>
                    </widget>
                  </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
 
-         <child>
-           <widget class="GtkMenuItem" id="menuitem3">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_View</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="menuitem3_menu">
+                 <child>
+                   <widget class="GtkSeparatorMenuItem" id="separator1">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="start_item">
+                   <widget class="GtkImageMenuItem" id="open_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Start</property>
+                     <property name="label" translatable="yes">_Open...</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_start1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
+                     <signal name="activate" handler="on_open_item_activate" last_modification_time="Thu, 04 Nov 2004 21:01:03 GMT"/>
+                     <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image83">
+                       <widget class="GtkImage" id="image101">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-media-play</property>
+                         <property name="stock">gtk-open</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -145,16 +130,17 @@
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="profile_item">
+                   <widget class="GtkImageMenuItem" id="save_as_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Profile</property>
+                     <property name="label" translatable="yes">Save _As...</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_profile1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
+                     <signal name="activate" handler="on_Save _As..._activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
+                     <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image84">
+                       <widget class="GtkImage" id="image102">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-justify-left</property>
+                         <property name="stock">gtk-save-as</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -166,16 +152,23 @@
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="reset_item">
+                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Reset</property>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="quit">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">_Quit</property>
                      <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_reset_item_activate" last_modification_time="Fri, 05 Nov 2004 15:34:30 GMT"/>
+                     <signal name="activate" handler="on_quit_activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
+                     <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image85">
+                       <widget class="GtkImage" id="image103">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-clear</property>
+                         <property name="stock">gtk-quit</property>
                          <property name="icon_size">1</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -207,7 +200,7 @@
                      <signal name="activate" handler="on_about_activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image86">
+                       <widget class="GtkImage" id="image104">
                          <property name="visible">True</property>
                          <property name="stock">gtk-about</property>
                          <property name="icon_size">1</property>