Merge lp:~ivaldi/midori/devpet-backtrace into lp:midori

[André Stösel]

Add backtrace support to DevPet

[André Stösel (ivaldi)]

FYI: there is vala Linux.backtrace wrapper, but it doesn't work so I had to wrap it in sokoke

[Cris Dywan (kalikiana)]

Do you have any test code to see what the issue with Linux.backtrace in Vala was?

It'd be nice to use eg. addr2line or equivalent to make backtraces readable. Maybe even go the extra mile and do a little parsing to collapse duplicates and macros. But those might come in later.

review: Needs Information

[André Stösel (ivaldi)]

// valac bt.vala --pkg linux

void bar() {
    void* buffer[10];
    int num = Linux.backtrace (buffer, 10);
    string[] symbols = Linux.backtrace_symbols (buffer, num);

    if (symbols != null) {
        for (int i = 0; i < num; i++) {
            stdout.printf ("%s\n", symbols[i]);
        }
    } else {
        stdout.printf ("error: symbols is null\n");
    }
}

void foo() {
    bar ();
}

void main () {
    foo ();
}

PS: addr2line would be nice, indeed, but at the moment I have no time for it :/

[Cris Dywan (kalikiana)]

To achieve the equivalent of the C code "unowned" is needed - the problem with string[] in your snippet comes from Vala trying to memory-manage a buffer that is already owned by the stack. Also note that the buffer size is one more, same as the C code.

void* buffer[101];
int num = Linux.backtrace (buffer, 100);
unowned string[] symbols = Linux.backtrace_symbols (buffer, num);

If you change it to not use sokoke I'm happy for it to go in.

review: Needs Fixing

[lp:~ivaldi/midori/devpet-backtrace]

6298. By André Stösel on 2013-08-02

Move backtrace generation from sokoke to DevPet

[André Stösel (ivaldi)]

hm... I guess I overlooked this when I tested the vala part, thanks

[Paweł Forysiuk (tuxator)]

Looks good to me. Not sure what would be equivalent on win32 side yet.

review: Approve

[Cris Dywan (kalikiana)]

Nice!

review: Approve

=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala	2013-07-30 19:43:54 +0000
+++ extensions/devpet.vala	2013-08-02 09:19:25 +0000
@@ -14,10 +14,58 @@
 namespace DevPet {
     enum TreeCells {
         MESSAGE,
+        BACKTRACE,
         STOCK,
         COUNT
     }
 
+    private class DataWindow : Gtk.Window {
+        public string message {get; construct; }
+        public string backtrace {get; construct; }
+
+        private void create_content () {
+            this.title = this.message;
+            this.set_default_size (500, 500);
+
+            Gtk.VBox vbox = new Gtk.VBox (false, 1);
+            this.add (vbox);
+
+            Gtk.TextBuffer message_buffer = new Gtk.TextBuffer (null);
+            message_buffer.set_text (this.message);
+
+            Gtk.TextView message_text_view = new Gtk.TextView.with_buffer (message_buffer);
+            message_text_view.editable = false;
+
+            Gtk.TextBuffer backtrace_buffer = new Gtk.TextBuffer (null);
+            backtrace_buffer.set_text (this.backtrace);
+
+            Gtk.TextView backtrace_text_view = new Gtk.TextView.with_buffer (backtrace_buffer);
+            backtrace_text_view.editable = false;
+
+            Gtk.ScrolledWindow message_scroll = new Gtk.ScrolledWindow (null, null);
+            message_scroll.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            message_scroll.add (message_text_view);
+
+            Gtk.ScrolledWindow backtrace_scroll = new Gtk.ScrolledWindow (null, null);
+            backtrace_scroll.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            backtrace_scroll.add (backtrace_text_view);
+
+            vbox.pack_start (message_scroll, false, false, 0);
+            vbox.pack_end (backtrace_scroll, true, true, 0);
+
+            this.show_all ();
+        }
+
+        internal DataWindow (string message, string backtrace) {
+            GLib.Object (type: Gtk.WindowType.TOPLEVEL,
+                window_position: Gtk.WindowPosition.CENTER,
+                message: message,
+                backtrace: backtrace);
+
+            this.create_content ();
+        }
+    }
+
     private class LogWindow : Gtk.Window {
         private Manager manager;
 
@@ -26,6 +74,20 @@
             this.destroy ();
         }
 
+        private void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (this.manager.list_store.get_iter (out iter, path)) {
+                string message;
+                string backtrace;
+                this.manager.list_store.get(iter,
+                    TreeCells.MESSAGE, out message,
+                    TreeCells.BACKTRACE, out backtrace, -1);
+
+                DataWindow data_window = new DataWindow (message, backtrace);
+                data_window.show ();
+            }
+        }
+
         private void create_content () {
             this.title = "Midori - DevPet";
             this.set_default_size (500, 250);
@@ -34,6 +96,11 @@
             Gtk.VBox vbox = new Gtk.VBox (false, 1);
             this.add (vbox);
 
+            #if !HAVE_WIN32
+            Gtk.Label label = new Gtk.Label (_("Double click for more information"));
+            vbox.pack_start (label, false, false, 0);
+            #endif
+
             Gtk.ScrolledWindow scroll_windows = new Gtk.ScrolledWindow (null, null);
             scroll_windows.set_policy (Gtk.PolicyType.NEVER , Gtk.PolicyType.AUTOMATIC);
             scroll_windows.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
@@ -56,6 +123,10 @@
                 -1, "Message",
                 new Gtk.CellRendererText (), "text", TreeCells.MESSAGE);
 
+            #if !HAVE_WIN32
+            treeview.row_activated.connect (this.row_activated);
+            #endif
+
             this.show_all ();
         }
 
@@ -103,8 +174,26 @@
                 this.trayicon.set_from_stock (stock);
             }
 
+            #if !HAVE_WIN32
+                string bt = "";
+                void* buffer[100];
+                int num = Linux.backtrace (buffer, 100);
+                unowned string[] symbols = Linux.backtrace_symbols (buffer, num);
+                if (symbols != null) {
+                    /* we don't need the first three lines */
+                    for (int i = 3; i < num; i++) {
+                        bt += "\r\n%s".printf(symbols[i]);
+                    }
+                }
+            #endif
+
             this.list_store.append (out iter);
-            this.list_store.set (iter, TreeCells.MESSAGE, message, TreeCells.STOCK, theme.load_icon (stock, 16, 0));
+            this.list_store.set (iter,
+                TreeCells.MESSAGE, message,
+                #if !HAVE_WIN32
+                TreeCells.BACKTRACE, bt,
+                #endif
+                TreeCells.STOCK, theme.load_icon (stock, 16, 0));
 
             this.trayicon.set_visible (true);
         }
@@ -143,7 +232,7 @@
             this.trayicon.set_tooltip_text ("Midori - DevPet");
             this.trayicon.activate.connect(this.show_error_log);
 
-            this.list_store = new Gtk.ListStore (TreeCells.COUNT, typeof(string), typeof (Gdk.Pixbuf));
+            this.list_store = new Gtk.ListStore (TreeCells.COUNT, typeof(string), typeof(string), typeof (Gdk.Pixbuf));
 
             this.activate.connect (this.activated);
             this.deactivate.connect (this.deactivated);

=== modified file 'extensions/wscript_build'
--- extensions/wscript_build	2013-07-31 20:27:52 +0000
+++ extensions/wscript_build	2013-08-02 09:19:25 +0000
@@ -54,6 +54,8 @@
             obj.packages += ' webkitgtk-3.0'
         if bld.env['HAVE_GRANITE']:
             obj.packages += ' granite'
+        if bld.env['platform'] != 'win32':
+            obj.packages += ' linux'
     obj.install_path = '${LIBDIR}/midori'
     # See LINKFLAGS in wscript: w/ o it we get several "undefined reference" errors
     if bld.env['platform'] == 'win32':