Merge lp:~brandontschaefer/unity/possible-crash--fixes into lp:unity

[Brandon Schaefer]

UnityScreen: destroy the controllers before the window thread

Fixes crashes enabling/disabling plugins in CCSM

=== Problem ===
Lots of crashes in unity with ccsm and plugin

=== Fix ===
Make sure the smart ptr gets reset before the window thread is deleted.

[Brandon Schaefer (brandontschaefer)]

So im tracking down the crash that wasn't fixed by this branch. Here are the only 2 crashes now from UnityPlugin and Wobbly Windows:

Caused when enabling/disabling Unity Plugin in ccsm
bamf_matcher_on_view_opened:

normal backtrace
http://paste.ubuntu.com/943691/

full backtrace
http://paste.ubuntu.com/943693/

Caused when enabling/disabling Wobbly Windows in ccsm
bamf_matcher_on_view_closed:

normal backtrace
http://paste.ubuntu.com/943698/

full backtrace
http://paste.ubuntu.com/943697/

What happens is either OpenView is emited twice on the same window or the CloseView is called twice on the same window. It was always the same window for open, or the same for close (if you cause the crash multiple times).

[Marco Trevisan (Treviño) (3v1n0)]

> So im tracking down the crash that wasn't fixed by this branch. Here are the
> only 2 crashes now from UnityPlugin and Wobbly Windows:
>
> Caused when enabling/disabling Unity Plugin in ccsm
> bamf_matcher_on_view_opened:
>
> normal backtrace
> http://paste.ubuntu.com/943691/
>
> full backtrace
> http://paste.ubuntu.com/943693/
>
> Caused when enabling/disabling Wobbly Windows in ccsm
> bamf_matcher_on_view_closed:
>
> normal backtrace
> http://paste.ubuntu.com/943698/
>
> full backtrace
> http://paste.ubuntu.com/943697/
>
>
> What happens is either OpenView is emited twice on the same window or the
> CloseView is called twice on the same window. It was always the same window
> for open, or the same for close (if you cause the crash multiple times).

This should be due to libbamf, that doesn't disconnect these signals on dispose, I'll look to that.

The unity side looks good to me.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Brandon, please check if the crashes are fixed using this libbamf version: http://go.3v1n0.net/IBB74t

[Brandon Schaefer (brandontschaefer)]

Sweeet that fixed the problem! Now I don't get any crashes when enabling and disabling unity plugin.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-22 19:09:53 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-24 06:32:22 +0000
@@ -402,8 +402,14 @@
 
   ::unity::ui::IconRenderer::DestroyTextures();
   QuicklistManager::Destroy();
-  // We need to delete the launchers before the window thread.
+  // We need to delete the controllers before the window thread.
   launcher_controller_.reset();
+  hud_controller_.reset();
+  dash_controller_.reset();
+  panel_controller_.reset();
+  switcher_controller_.reset();
+  shortcut_controller_.reset();
+
   delete wt;
   reset_glib_logging();
 }