Merge lp:~mhr3/unity/ubus-rewrite into lp:unity

[Michal Hruby]

Rewrite UBus

Remove last bit of good old GObject code and replace it with C++ version of UBus, the only additional feature atm is the ability to specify priority when sending UBus messages. Besides that change the API stayed pretty much the same (with the exception of using glib::Variant instead of raw GVariant*).

The default priority of messages was also bumped to DEFAULT (instead of DEFAULT_IDLE), to try to prevent issues like lp:1064256 (arguably it might be good idea to lower the prio once unity isn't running in the same thread as compiz, but for now this will be better default).

[Brandon Schaefer (brandontschaefer)]

Overall it looks good. I haven't had the time to do much testing, but I tried to fix that launcher showing to slowly and there seems to be another bug located in that...

Ill spend some more time running tests and playing around with this some more :)

Thanks!

[Andrea Azzarone (azzar1)]

966 +UBusServer::~UBusServer()
967 +{
968 +}

Remove it please. It should not be required.

5 + for (auto it = interests_.begin(); it != interests_.end(); ++it)
986 + {
987 + if ((*it).second->id == connection_id)
988 + {
989 + interests_.erase(it);
990 + return;
991 + }
992 + }

Can you use the range-based for loop of std::erase + std::remove_if?

995 +void UBusServer::SendMessage(std::string const& message_name,
996 + glib::Variant const& args)
997 +{
998 + SendMessageFull(message_name, args, glib::Source::Priority::DEFAULT_IDLE);
999 +}
1000 +
1001 +void UBusServer::SendMessageFull(std::string const& message_name,
1002 + glib::Variant const& args,
1003 + glib::Source::Priority prio)
1004 +{

What about default value here?

+ msg_queue_.insert(std::pair<int, std::pair<std::string, glib::Variant>>(prio, std::pair<std::string, glib::Variant>(message_name, args)));

ouch :) std::make_pair will make this line shorter :)

1009 + auto src_nick = boost::lexical_cast<std::string>(static_cast<int>(prio));

std::to_string should be good :)

1088 +#include <vector>
1089 +#include <boost/utility.hpp>

I think these are not needed.

1221 + // we don't want to modify a container while iterating it
1222 + std::set<unsigned> ids_copy(connection_ids_);
1223 + for (auto it = ids_copy.begin(); it != ids_copy.end(); ++it)
1224 + {
1225 + UnregisterInterest(*it);
1226 + }

IIRC std::set::erase does not invalidate all the iterators of the container, but just the iterator of the erased element. So you can avoid std::set<unsigned> ids_copy(connection_ids_); doing somethign like this:

for (...) {
  auto to_delete = it;
  it++; // don't do this above too :)
  UnregisterInterest(*to_delete);
}

But i'm not really sure about this :)

1274 +#include <map>

Should not be necessary.

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

1006 + msg_queue_.insert(std::pair<int, std::pair<std::string, glib::Variant>>(prio, std::pair<std::string, glib::Variant>(message_name, args)));

It can be just std::make_pair(prio, std::make_pair(message_name, args))

1009 + auto src_nick = boost::lexical_cast<std::string>(static_cast<int>(prio));

No need for it with C++11, just use std::to_string(prio); also use auto const& when possible.

985 + for (auto it = interests_.begin(); it != interests_.end(); ++it)

Not tried, but I guess that also the multimaps, would handle nicely a for (auto const& : interests_) foreach loop.

983 +void UBusServer::UnregisterInterest(unsigned connection_id)

I know this is safer, but what's the reason why not to add also UBusServer::UnregisterInterest(std::string const& name) as it used to be?
[NVM, I've noticed that now there's only just one static UBusServer: +1].

1034 + for (unsigned i = 0; i < dispatched_msgs.size(); i++)

Use ++i or just a foreach loop.

1221 + // we don't want to modify a container while iterating it
1222 + std::set<unsigned> ids_copy(connection_ids_);
1223 + for (auto it = ids_copy.begin(); it != ids_copy.end(); ++it)
1224 + {
1225 + UnregisterInterest(*it);
1226 + }

this is also safe:
for (auto it = ids_copy.begin(); it != ids_copy.end();)
{
  UnregisterInterest(*(it++));
}

1317 + static std::unique_ptr<UBusServer> server;

You can just use an stack allocated server here, just remember to add this to the .cpp file:
// initialize the global static server
UBusServer UBusManager::server;

PS: add yourself to to authors, so people will bother you when on troubles ;-D

[Michal Hruby (mhr3)]

> Remove it please. It should not be required.

Done

> Can you use the range-based for loop of std::erase + std::remove_if?

remove_if traverses the entire collection, I know there's just one item with the given id, so used find_if + erase instead.

> What about default value here?

It's *Full because the default param-variant is SendMessage().

> ouch :) std::make_pair will make this line shorter :)

Fixed.

> std::to_string should be good :)

Fixed.

> I think these are not needed.

Removed.

> IIRC std::set::erase does not invalidate all the iterators of the container,
> but just the iterator of the erased element. So you can avoid
> std::set<unsigned> ids_copy(connection_ids_); doing somethign like this:
> ...

The Unregister calls can lead to more Unregister calls (destroying a signal handler can lead to destruction of another object that will call Unregister in its own destructor), it's safer to try to call Unregister with already unregistered id, than to use invalid iterator.

>
> 1274 +#include <map>
>
> Should not be necessary.

Removed.

[Michal Hruby (mhr3)]

> 1034 + for (unsigned i = 0; i < dispatched_msgs.size(); i++)
>
> Use ++i or just a foreach loop.

It's 2012, compilers do that these days ;) (plus it's simple type, so there's no ambiguity)

>
> 1221 + // we don't want to modify a container while iterating it
> 1222 + std::set<unsigned> ids_copy(connection_ids_);
> 1223 + for (auto it = ids_copy.begin(); it != ids_copy.end(); ++it)
> 1224 + {
> 1225 + UnregisterInterest(*it);
> 1226 + }
>
> this is also safe:
> for (auto it = ids_copy.begin(); it != ids_copy.end();)
> {
> UnregisterInterest(*(it++));
> }

True, but it looks weird :P

>
> 1317 + static std::unique_ptr<UBusServer> server;
>
> You can just use an stack allocated server here, just remember to add this to
> the .cpp file:
> // initialize the global static server
> UBusServer UBusManager::server;

I'd rather keep it this way, it allows lazy initialization (even though not used now).

> PS: add yourself to to authors, so people will bother you when on troubles ;-D

Done.

[Andrea Azzarone (azzar1)]

> 966 +UBusServer::~UBusServer()
> 967 +{
> 968 +}
>
> Remove it please. It should not be required.
>
> 5 + for (auto it = interests_.begin(); it != interests_.end(); ++it)
> 986 + {
> 987 + if ((*it).second->id == connection_id)
> 988 + {
> 989 + interests_.erase(it);
> 990 + return;
> 991 + }
> 992 + }
>
> Can you use the range-based for loop of std::erase + std::remove_if?
>
> 995 +void UBusServer::SendMessage(std::string const& message_name,
> 996 + glib::Variant const& args)
> 997 +{
> 998 + SendMessageFull(message_name, args,
> glib::Source::Priority::DEFAULT_IDLE);
> 999 +}
> 1000 +
> 1001 +void UBusServer::SendMessageFull(std::string const& message_name,
> 1002 + glib::Variant const& args,
> 1003 + glib::Source::Priority prio)
> 1004 +{

I mean you ca do:

class UbusServer {
...
   void SendMessage(std::string const& message_name, glib::Variant const& args, glib::Source::Priority prio = DEFAULT_IDLE)
...
}

So you don't need two functions. But this is not blocking.

>
> What about default value here?
>
> + msg_queue_.insert(std::pair<int, std::pair<std::string,
> glib::Variant>>(prio, std::pair<std::string, glib::Variant>(message_name,
> args)));
>
> ouch :) std::make_pair will make this line shorter :)
>
> 1009 + auto src_nick =
> boost::lexical_cast<std::string>(static_cast<int>(prio));
>
> std::to_string should be good :)
>
> 1088 +#include <vector>
> 1089 +#include <boost/utility.hpp>
>
> I think these are not needed.
>
> 1221 + // we don't want to modify a container while iterating it
> 1222 + std::set<unsigned> ids_copy(connection_ids_);
> 1223 + for (auto it = ids_copy.begin(); it != ids_copy.end(); ++it)
> 1224 + {
> 1225 + UnregisterInterest(*it);
> 1226 + }
>
> IIRC std::set::erase does not invalidate all the iterators of the container,
> but just the iterator of the erased element. So you can avoid
> std::set<unsigned> ids_copy(connection_ids_); doing somethign like this:
>
> for (...) {
> auto to_delete = it;
> it++; // don't do this above too :)
> UnregisterInterest(*to_delete);
> }
>
> But i'm not really sure about this :)
>
> 1274 +#include <map>
>
> Should not be necessary.

review: Approve

[Michal Hruby (mhr3)]

> void SendMessage(std::string const& message_name, glib::Variant const&
> args, glib::Source::Priority prio = DEFAULT_IDLE)
> ...
> }
>
> So you don't need two functions. But this is not blocking.

Right, fwiw UBusManager is doing that, and noone should be using the server directly.

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

Looks nice now, thanks

review: Approve

=== modified file 'UnityCore/Variant.cpp'
--- UnityCore/Variant.cpp	2012-08-22 15:02:29 +0000
+++ UnityCore/Variant.cpp	2012-10-12 08:42:18 +0000
@@ -31,7 +31,7 @@
 Variant::Variant(GVariant* variant)
   : variant_(variant)
 {
-  g_variant_ref_sink(variant_);
+  if (variant) g_variant_ref_sink(variant_);
 }
 
 Variant::Variant(GVariant* variant, StealRef const& ref)
@@ -95,6 +95,11 @@
   return true;
 }
 
+void Variant::swap(Variant& other)
+{
+  std::swap(this->variant_, other.variant_);
+}
+
 Variant& Variant::operator=(GVariant* val)
 {
   if (variant_) g_variant_unref(variant_);
@@ -103,6 +108,13 @@
   return *this;
 }
 
+Variant& Variant::operator=(Variant other)
+{
+  swap(other);
+
+  return *this;
+}
+
 Variant::operator GVariant* () const
 {
   return variant_;

=== modified file 'UnityCore/Variant.h'
--- UnityCore/Variant.h	2012-08-22 15:02:29 +0000
+++ UnityCore/Variant.h	2012-10-12 08:42:18 +0000
@@ -53,7 +53,9 @@
 
   bool ASVToHints(HintsMap& hints) const;
 
+  void swap(Variant&);
   Variant& operator=(GVariant*);
+  Variant& operator=(Variant);
   operator GVariant*() const;
   operator bool() const;
 

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-10-04 07:10:39 +0000
+++ dash/DashController.cpp	2012-10-12 08:42:18 +0000
@@ -137,7 +137,7 @@
 
   window_->UpdateInputWindowGeometry();
 
-  ubus_manager_.UnregisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST);
+  ubus_manager_.UnregisterInterest(place_entry_request_id_);
 }
 
 void Controller::RegisterUBusInterests()
@@ -146,8 +146,9 @@
                                  sigc::mem_fun(this, &Controller::OnExternalShowDash));
   ubus_manager_.RegisterInterest(UBUS_PLACE_VIEW_CLOSE_REQUEST,
                                  sigc::mem_fun(this, &Controller::OnExternalHideDash));
-  ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
-                                 sigc::mem_fun(this, &Controller::OnActivateRequest));
+  place_entry_request_id_ =
+    ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                                   sigc::mem_fun(this, &Controller::OnActivateRequest));
   ubus_manager_.RegisterInterest(UBUS_DASH_ABOUT_TO_SHOW,
                                  [&] (GVariant*) { EnsureDash(); });
   ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, [&] (GVariant *data)

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2012-09-18 17:39:36 +0000
+++ dash/DashController.h	2012-10-12 08:42:18 +0000
@@ -108,6 +108,7 @@
   Animator timeline_animator_;
   UBusManager ubus_manager_;
   unsigned int dbus_owner_;
+  unsigned place_entry_request_id_;
   glib::Object<GCancellable> dbus_connect_cancellable_;
   static GDBusInterfaceVTable interface_vtable;
 };

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-10-05 12:51:56 +0000
+++ dash/DashView.cpp	2012-10-12 08:42:18 +0000
@@ -829,7 +829,8 @@
   }
   else if (/* visible_ && */ handled_type == NOT_HANDLED)
   {
-    ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+    ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST, NULL,
+                              glib::Source::Priority::HIGH);
   }
   else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
   {

=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-10-08 06:36:17 +0000
+++ dash/PlacesGroup.cpp	2012-10-12 08:42:18 +0000
@@ -31,7 +31,7 @@
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
 

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-10-03 11:09:27 +0000
+++ dash/ResultViewGrid.cpp	2012-10-12 08:42:18 +0000
@@ -31,7 +31,7 @@
 #include <UnityCore/Variant.h>
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/Timer.h"
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include "ResultViewGrid.h"
 #include "math.h"

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-10-04 08:00:29 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-10-12 08:42:18 +0000
@@ -33,7 +33,6 @@
 #include "Launcher.h"
 #include "MultiMonitor.h"
 #include "unity-shared/UBusMessages.h"
-#include "unity-shared/ubus-server.h"
 
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-10-10 16:38:42 +0000
+++ launcher/LauncherController.cpp	2012-10-12 08:42:18 +0000
@@ -951,7 +951,8 @@
 
 void Controller::Impl::SendHomeActivationRequest()
 {
-  ubus.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", dash::NOT_HANDLED, ""));
+  ubus.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                   g_variant_new("(sus)", "home.lens", dash::NOT_HANDLED, ""));
 }
 
 Controller::Controller()

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-10-04 07:10:39 +0000
+++ launcher/LauncherIcon.cpp	2012-10-12 08:42:18 +0000
@@ -44,7 +44,7 @@
 
 #include "MultiMonitor.h"
 
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
@@ -865,8 +865,7 @@
       Present(0.5f, 1500);
     }
 
-    UBusServer* ubus = ubus_server_get_default();
-    ubus_server_send_message(ubus, UBUS_LAUNCHER_ICON_URGENT_CHANGED, g_variant_new_boolean(value));
+    UBusManager::SendMessage(UBUS_LAUNCHER_ICON_URGENT_CHANGED, g_variant_new_boolean(value));
   }
 
   if (quirk == Quirk::VISIBLE)

=== modified file 'launcher/QuicklistManager.cpp'
--- launcher/QuicklistManager.cpp	2012-05-07 19:52:54 +0000
+++ launcher/QuicklistManager.cpp	2012-10-12 08:42:18 +0000
@@ -25,7 +25,7 @@
 #include "QuicklistView.h"
 #include "QuicklistManager.h"
 
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
 namespace unity
@@ -109,8 +109,7 @@
   _current_quicklist = quicklist;
 
   quicklist_opened.emit(quicklist);
-  UBusServer* ubus = ubus_server_get_default();
-  ubus_server_send_message(ubus, UBUS_QUICKLIST_SHOWN, NULL);
+  UBusManager::SendMessage(UBUS_QUICKLIST_SHOWN);
 }
 
 void QuicklistManager::RecvHideQuicklist(nux::BaseWindow* window)

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2012-09-27 11:47:36 +0000
+++ launcher/QuicklistView.cpp	2012-10-12 08:42:18 +0000
@@ -42,7 +42,7 @@
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/UnitySettings.h"
 
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/DashStyle.h"
 
@@ -281,18 +281,14 @@
     case NUX_KP_LEFT:
       Hide();
       // inform Launcher we switch back to Launcher key-nav
-      ubus_server_send_message(ubus_server_get_default(),
-                               UBUS_QUICKLIST_END_KEY_NAV,
-                               NULL);
+      UBusManager::SendMessage(UBUS_QUICKLIST_END_KEY_NAV);
       break;
 
       // esc (close quicklist, exit key-nav)
     case NUX_VK_ESCAPE:
       Hide();
       // inform UnityScreen we leave key-nav completely
-      ubus_server_send_message(ubus_server_get_default(),
-                               UBUS_LAUNCHER_END_KEY_NAV,
-                               NULL);
+      UBusManager::SendMessage(UBUS_LAUNCHER_END_KEY_NAV);
       break;
 
       // <SPACE>, <RETURN> (activate selected menu-item)

=== modified file 'launcher/SimpleLauncherIcon.cpp'
--- launcher/SimpleLauncherIcon.cpp	2012-10-04 07:10:39 +0000
+++ launcher/SimpleLauncherIcon.cpp	2012-10-12 08:42:18 +0000
@@ -27,7 +27,7 @@
 
 #include "SimpleLauncherIcon.h"
 
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
 namespace unity
@@ -92,8 +92,7 @@
 void SimpleLauncherIcon::ActivateLauncherIcon(ActionArg arg)
 {
   activate.emit();
-  ubus_server_send_message(ubus_server_get_default(),
-                           UBUS_PLACE_VIEW_CLOSE_REQUEST,
+  UBusManager::SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST,
                            g_variant_new_boolean(FALSE));
 }
 

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2012-09-25 17:02:59 +0000
+++ launcher/Tooltip.cpp	2012-10-12 08:42:18 +0000
@@ -24,7 +24,7 @@
 #include <UnityCore/Variant.h>
 
 #include "unity-shared/CairoTexture.h"
-#include "unity-shared/ubus-server.h"
+#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include <unity-shared/UnitySettings.h>
 
@@ -103,8 +103,7 @@
   PushToFront();
 
   ShowWindow(true);
-  UBusServer* ubus = ubus_server_get_default();
-  ubus_server_send_message(ubus, UBUS_TOOLTIP_SHOWN, NULL);
+  UBusManager::SendMessage(UBUS_TOOLTIP_SHOWN);
 }
 
 void Tooltip::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)

=== modified file 'plugins/unityshell/src/UnityGestureTarget.cpp'
--- plugins/unityshell/src/UnityGestureTarget.cpp	2012-07-27 20:24:01 +0000
+++ plugins/unityshell/src/UnityGestureTarget.cpp	2012-10-12 08:42:18 +0000
@@ -27,7 +27,7 @@
 #include "Launcher.h"
 
 #include "UBusMessages.h"
-#include "ubus-server.h"
+#include "UBusWrapper.h"
 
 using namespace nux;
 
@@ -46,9 +46,7 @@
   else if (event.GetGestureClasses() == TAP_GESTURE
       && event.type == EVENT_GESTURE_END)
   {
-    ubus_server_send_message(ubus_server_get_default(),
-                             UBUS_DASH_EXTERNAL_ACTIVATION,
-                             NULL);
+    UBusManager::SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION);
   }
 
   return GestureDeliveryRequest::NONE;

=== modified file 'plugins/unityshell/src/unity-root-accessible.cpp'
--- plugins/unityshell/src/unity-root-accessible.cpp	2012-10-11 16:17:09 +0000
+++ plugins/unityshell/src/unity-root-accessible.cpp	2012-10-12 08:42:18 +0000
@@ -30,6 +30,8 @@
 #include "nux-base-window-accessible.h"
 #include "unitya11y.h"
 
+#include <UnityCore/Variant.h>
+
 #include "UBusWrapper.h"
 #include "UBusMessages.h"
 
@@ -352,7 +354,7 @@
 }
 
 static void
-ubus_launcher_register_interest_cb(GVariant* variant,
+ubus_launcher_register_interest_cb(unity::glib::Variant const& variant,
                                    UnityRootAccessible* self)
 {
   //launcher window is the same during all the life of Unity

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-10 18:10:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-12 08:42:18 +0000
@@ -59,6 +59,7 @@
 #include "unitya11y.h"
 
 #include "UBusMessages.h"
+#include "UBusWrapper.h"
 #include "UScreen.h"
 
 #include "config.h"

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-10-09 09:48:07 +0000
+++ tests/CMakeLists.txt	2012-10-12 08:42:18 +0000
@@ -63,14 +63,12 @@
 add_executable (test-unit
                 unit/TestMain.cpp
                 unit/TestPanelService.cpp
-                unit/TestUBus.cpp
                 unit/TestStaticCairoText.cpp
                 ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
                 ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
                 ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
                 ../services/panel-service.c
                 ${CMAKE_CURRENT_BINARY_DIR}/panel-marshal.c
-                ${CMAKE_SOURCE_DIR}/unity-shared/ubus-server.cpp
                 )
 target_link_libraries (test-unit unity-shared ${LIBS})
 add_dependencies (test-unit unity-core-${UNITY_API_VERSION})
@@ -149,6 +147,7 @@
                  test_shortcut_model.cpp
                  test_shortcut_private.cpp
                  test_showdesktop_handler.cpp
+                 test_ubus.cpp
                  test_unityshell_private.cpp
                  ${CMAKE_CURRENT_BINARY_DIR}/test_glib_signals_utils_marshal.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
@@ -168,6 +167,8 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/UBusServer.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/UBusWrapper.cpp
                  ${UNITY_SRC}/UnityshellPrivate.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/StandaloneWindowManager.cpp
@@ -356,6 +357,7 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/TextureThumbnailProvider.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/ThumbnailGenerator.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/UBusServer.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UBusWrapper.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UScreen.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UnitySettings.cpp
@@ -364,7 +366,6 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/UserThumbnailProvider.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/XKeyboardUtil.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/ubus-server.cpp
                  ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
                 )
   target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS})

=== added file 'tests/test_ubus.cpp'
--- tests/test_ubus.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_ubus.cpp	2012-10-12 08:42:18 +0000
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Michal Hruby <[e-mail]>
+ *
+ */
+
+#include <gtest/gtest.h>
+#include <time.h>
+#include "TimeUtil.h"
+#include "test_utils.h"
+
+#include <UnityCore/Variant.h>
+#include <UnityCore/GLibSource.h>
+#include "UBusServer.h"
+#include "UBusWrapper.h"
+
+#define MESSAGE1 "TEST MESSAGE ONE"
+#define MESSAGE2 "ՄᕅᏆⲤꙨႧΈ Ϊટ ಗשׁຣ໐ɱË‼‼❢"
+
+using namespace unity;
+
+namespace
+{
+
+struct TestUBusServer : public testing::Test
+{
+  UBusServer ubus_server;
+  bool callback_called;
+  unsigned callback_call_count;
+  glib::Variant last_msg_variant;
+
+  virtual void SetUp()
+  {
+    callback_called = false;
+    callback_call_count = 0;
+  }
+
+  void Callback(glib::Variant const& message)
+  {
+    callback_called = true;
+    callback_call_count++;
+
+    last_msg_variant = message;
+  }
+
+  void ProcessMessages()
+  {
+    bool expired = false;
+    glib::Idle idle([&] { expired = true; return false; },
+                    glib::Source::Priority::LOW);
+    Utils::WaitUntil(expired);
+  }
+};
+
+struct TestUBusManager : public testing::Test
+{
+  UBusManager ubus_manager;
+  bool callback_called;
+  unsigned callback_call_count;
+  glib::Variant last_msg_variant;
+
+  virtual void SetUp()
+  {
+    callback_called = false;
+    callback_call_count = 0;
+  }
+
+  void Callback(glib::Variant const& message)
+  {
+    callback_called = true;
+    callback_call_count++;
+
+    last_msg_variant = message;
+  }
+
+  void ProcessMessages()
+  {
+    bool expired = false;
+    glib::Idle idle([&] { expired = true; return false; },
+                    glib::Source::Priority::LOW);
+    Utils::WaitUntil(expired);
+  }
+};
+
+// UBus tests
+
+TEST_F(TestUBusServer, Contruct)
+{
+  EXPECT_FALSE(callback_called);
+}
+
+TEST_F(TestUBusServer, SingleDispatch)
+{
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.SendMessage(MESSAGE1);
+
+  ProcessMessages();
+
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 1);
+}
+
+TEST_F(TestUBusServer, SingleDispatchWithData)
+{
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.SendMessage(MESSAGE1, g_variant_new_string("UserData"));
+
+  ProcessMessages();
+
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(last_msg_variant.GetString(), "UserData");
+}
+
+TEST_F(TestUBusServer, SingleDispatchUnicode)
+{
+  ubus_server.RegisterInterest(MESSAGE2, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.SendMessage(MESSAGE2);
+
+  ProcessMessages();
+
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 1);
+}
+
+TEST_F(TestUBusServer, SendUnregisteredMessage)
+{
+  ubus_server.SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_FALSE(callback_called);
+}
+
+TEST_F(TestUBusServer, SendUninterestedMessage)
+{
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.SendMessage(MESSAGE2);
+
+  ProcessMessages();
+  EXPECT_FALSE(callback_called);
+}
+
+TEST_F(TestUBusServer, MultipleDispatches)
+{
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusServer::Callback));
+  ubus_server.SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 3);
+}
+
+TEST_F(TestUBusServer, MultipleDispatchesWithData)
+{
+  int cb_count = 0;
+  ubus_server.RegisterInterest(MESSAGE1, [&cb_count] (glib::Variant const& data)
+  {
+    cb_count++;
+    EXPECT_EQ(data.GetString(), "foo");
+  });
+  ubus_server.RegisterInterest(MESSAGE1, [&cb_count] (glib::Variant const& data)
+  {
+    cb_count++;
+    EXPECT_EQ(data.GetString(), "foo");
+  });
+  ubus_server.SendMessage(MESSAGE2);
+  ubus_server.SendMessage(MESSAGE1, g_variant_new_string("foo"));
+
+  ProcessMessages();
+  EXPECT_EQ(cb_count, 2);
+}
+
+TEST_F(TestUBusServer, DispatchesInOrder)
+{
+  std::string order;
+
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "1"; });
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "2"; });
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "3"; });
+  ubus_server.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "4"; });
+
+  ubus_server.SendMessage(MESSAGE1);
+  ubus_server.SendMessage(MESSAGE2);
+
+  ProcessMessages();
+  EXPECT_EQ(order, "1234");
+
+  // prepare for second round of dispatches
+  order = "";
+
+  ubus_server.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "5"; });
+
+  // swap order of the messages
+  ubus_server.SendMessage(MESSAGE2);
+  ubus_server.SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_EQ(order, "45123");
+}
+
+TEST_F(TestUBusServer, DispatchesWithPriority)
+{
+  std::string order;
+
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "1"; });
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "2"; });
+  ubus_server.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "3"; });
+  ubus_server.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "4"; });
+  ubus_server.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "5"; });
+
+  glib::Variant data;
+  ubus_server.SendMessage(MESSAGE1, data);
+  ubus_server.SendMessageFull(MESSAGE2, data, glib::Source::Priority::HIGH);
+
+  ProcessMessages();
+  EXPECT_EQ(order, "45123");
+}
+
+TEST_F(TestUBusManager, RegisterAndSend)
+{
+  ubus_manager.RegisterInterest(MESSAGE1, sigc::mem_fun(this, &TestUBusManager::Callback));
+
+  UBusManager::SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 1);
+}
+
+TEST_F(TestUBusManager, Unregister)
+{
+  auto interest_id = ubus_manager.RegisterInterest(MESSAGE1, 
+      sigc::mem_fun(this, &TestUBusManager::Callback));
+
+  UBusManager::SendMessage(MESSAGE1);
+
+  ubus_manager.UnregisterInterest(interest_id);
+
+  ProcessMessages();
+  EXPECT_FALSE(callback_called);
+}
+
+TEST_F(TestUBusManager, AutoUnregister)
+{
+  if (true)
+  {
+    // want this to go out of scope
+    UBusManager manager;
+
+    manager.RegisterInterest(MESSAGE1,
+                             sigc::mem_fun(this, &TestUBusManager::Callback));
+  }
+
+  UBusManager::SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_FALSE(callback_called);
+}
+
+TEST_F(TestUBusManager, UnregisterInsideCallback)
+{
+  unsigned interest_id;
+  interest_id = ubus_manager.RegisterInterest(MESSAGE1, [&] (glib::Variant const& data)
+  {
+    callback_called = true;
+    callback_call_count++;
+    ubus_manager.UnregisterInterest(interest_id);
+  });
+
+  UBusManager::SendMessage(MESSAGE1);
+  UBusManager::SendMessage(MESSAGE1);
+
+  ProcessMessages();
+  EXPECT_TRUE(callback_called);
+  EXPECT_EQ(callback_call_count, 1);
+}
+
+TEST_F(TestUBusManager, DispatchWithPriority)
+{
+  std::string order;
+
+  ubus_manager.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "1"; });
+  ubus_manager.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "2"; });
+  ubus_manager.RegisterInterest(MESSAGE1, [&order] (glib::Variant const&)
+      { order += "3"; });
+  ubus_manager.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "4"; });
+  ubus_manager.RegisterInterest(MESSAGE2, [&order] (glib::Variant const&)
+      { order += "5"; });
+
+  glib::Variant data;
+  UBusManager::SendMessage(MESSAGE1, data);
+  UBusManager::SendMessage(MESSAGE2, data, glib::Source::Priority::HIGH);
+
+  ProcessMessages();
+  EXPECT_EQ(order, "45123");
+}
+
+}

=== modified file 'tests/unit/TestMain.cpp'
--- tests/unit/TestMain.cpp	2012-08-15 02:51:33 +0000
+++ tests/unit/TestMain.cpp	2012-10-12 08:42:18 +0000
@@ -26,7 +26,6 @@
 #include "Nux/WindowThread.h"
 
 void TestPanelServiceCreateSuite();
-void TestUBusCreateSuite();
 void TestStaticCairoTextCreateSuite();
 
 nux::WindowThread*
@@ -71,7 +70,6 @@
   //Keep alphabetical please
   TestPanelServiceCreateSuite();
   TestStaticCairoTextCreateSuite();
-  TestUBusCreateSuite();
 
   nux::WindowThread* thread = createThread();
 

=== removed file 'tests/unit/TestUBus.cpp'
--- tests/unit/TestUBus.cpp	2011-07-21 14:59:25 +0000
+++ tests/unit/TestUBus.cpp	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Gordon Allott <[e-mail]>
- *
- */
-
-
-#include "config.h"
-#include "ubus-server.h"
-
-#define MESSAGE1 "TEST MESSAGE ONE"
-#define MESSAGE2 "ՄᕅᏆⲤꙨႧΈ Ϊટ ಗשׁຣ໐ɱË‼‼❢"
-
-static void TestAllocation(void);
-static void TestMainLoop(void);
-static void TestPropagation(void);
-
-void
-TestUBusCreateSuite()
-{
-#define _DOMAIN "/Unit/UBus"
-  g_test_add_func(_DOMAIN"/Allocation", TestAllocation);
-  g_test_add_func(_DOMAIN"/Propagation", TestPropagation);
-  g_test_add_func(_DOMAIN"/MainLoop", TestMainLoop);
-}
-
-static void
-TestAllocation()
-{
-  UBusServer* serv_1 = ubus_server_get_default();
-  UBusServer* serv_2 = ubus_server_get_default();
-
-  g_assert(serv_1 != NULL);
-  g_assert(serv_2 != NULL);
-
-  // i used a different way of making a singleton than i am used to
-  // so i'm not 100% confident in it yet
-  g_assert(serv_1 == serv_2);
-}
-
-void
-test_handler_inc_counter(GVariant* data, gpointer val)
-{
-  // inc a counter when we get called
-  gint* counter = (gint*)val;
-  *counter = *counter + 1;
-}
-
-void
-test_handler_inc_counter_2(GVariant* data, gpointer val)
-{
-  // inc a counter by two when called
-  gint* counter = (gint*)val;
-  *counter = *counter + 2;
-}
-
-static void
-TestPropagation()
-{
-  UBusServer* ubus;
-  gint        counter, i;
-  guint       handler1, handler2;
-
-  ubus = ubus_server_get_default();
-  handler1 = ubus_server_register_interest(ubus, MESSAGE1,
-                                           test_handler_inc_counter,
-                                           &counter);
-
-  handler2 = ubus_server_register_interest(ubus, MESSAGE2,  // tests UNICODE
-                                           test_handler_inc_counter_2,
-                                           &counter);
-
-  counter = 0;
-  for (i = 0; i < 1000; i++)
-  {
-    ubus_server_send_message(ubus, MESSAGE1, NULL);
-  }
-
-  ubus_server_force_message_pump(ubus);
-
-  counter = 0;
-  for (i = 0; i < 1000; i++)
-  {
-    ubus_server_send_message(ubus, MESSAGE1, NULL);
-    ubus_server_send_message(ubus, MESSAGE2, NULL);
-  }
-  ubus_server_force_message_pump(ubus);
-
-  g_assert(counter == 3000);
-
-  ubus_server_unregister_interest(ubus, handler1);
-  ubus_server_unregister_interest(ubus, handler2);
-
-  counter = 0;
-  ubus_server_send_message(ubus, MESSAGE1, NULL);
-  ubus_server_send_message(ubus, MESSAGE2, NULL);
-
-  ubus_server_force_message_pump(ubus);
-
-  g_assert(counter == 0);
-}
-
-gboolean
-main_loop_bailout(gpointer data)
-{
-  GMainLoop* mainloop = (GMainLoop*)data;
-  g_main_quit(mainloop);
-  return FALSE;
-}
-
-void
-test_handler_mainloop(GVariant* data, gpointer val)
-{
-  // inc a counter when we get called
-  gint* counter = (gint*)val;
-  *counter = *counter + 1;
-
-}
-
-static void
-TestMainLoop()
-{
-  GMainLoop*  mainloop;
-  UBusServer* ubus;
-  gint        counter = 0;
-
-  ubus = ubus_server_get_default();
-  mainloop = g_main_loop_new(NULL, TRUE);
-
-  g_timeout_add_seconds(1, main_loop_bailout, mainloop);
-
-  ubus_server_register_interest(ubus, MESSAGE1,
-                                test_handler_mainloop,
-                                &counter);
-
-  ubus_server_send_message(ubus, MESSAGE1, NULL);
-  g_main_loop_run(mainloop);
-
-  g_assert(counter == 1);
-
-}
-
-

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-10-04 07:36:35 +0000
+++ unity-shared/CMakeLists.txt	2012-10-12 08:42:18 +0000
@@ -56,6 +56,7 @@
      TextureThumbnailProvider.cpp
      ThumbnailGenerator.cpp
      Timer.cpp
+     UBusServer.cpp
      UBusWrapper.cpp
      UScreen.cpp
      UnitySettings.cpp
@@ -65,7 +66,6 @@
      WindowManager.cpp
      XKeyboardUtil.cpp
      XWindowManager.cpp
-     ubus-server.cpp
 )
 
 add_library (unity-shared STATIC ${UNITY_SHARED_SOURCES})

=== added file 'unity-shared/UBusServer.cpp'
--- unity-shared/UBusServer.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/UBusServer.cpp	2012-10-12 08:42:18 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michal Hruby <[e-mail]>
+ */
+
+#include <NuxCore/Logger.h>
+
+#include "UBusServer.h"
+
+namespace unity
+{
+
+namespace
+{
+nux::logging::Logger logger("unity.ubus");
+}
+
+UBusServer::UBusServer()
+  : last_id_(0)
+{}
+
+unsigned UBusServer::RegisterInterest(std::string const& interest_name,
+                                      UBusCallback const& slot)
+{
+  if (!slot || interest_name.empty())
+    return 0;
+
+  unsigned connection_id = ++last_id_;
+  auto connection = std::make_shared<UBusConnection>(slot, connection_id);
+  interests_.insert(std::pair<std::string, UBusConnection::Ptr>(interest_name, connection));
+
+  return connection_id;
+}
+
+void UBusServer::UnregisterInterest(unsigned connection_id)
+{
+  auto it = std::find_if(interests_.begin(), interests_.end(),
+                         [&] (std::pair<std::string, UBusConnection::Ptr> const& p)
+                         { return p.second->id == connection_id; });
+  if (it != interests_.end()) interests_.erase(it);
+}
+
+void UBusServer::SendMessage(std::string const& message_name,
+                              glib::Variant const& args)
+{
+  SendMessageFull(message_name, args, glib::Source::Priority::DEFAULT_IDLE);
+}
+
+void UBusServer::SendMessageFull(std::string const& message_name,
+                                  glib::Variant const& args,
+                                  glib::Source::Priority prio)
+{
+  // queue the message
+  msg_queue_.insert(std::pair<int, std::pair<std::string, glib::Variant>>(prio, std::make_pair(message_name, args)));
+
+  // start the source (if not already running)
+  auto src_nick = std::to_string(static_cast<int>(prio));
+  auto src_ptr = source_manager_.GetSource(src_nick);
+  if (!src_ptr)
+  {
+    source_manager_.Add(new glib::Idle([this, prio] ()
+    {
+      return DispatchMessages(prio);
+    }, prio));
+  }
+}
+
+bool UBusServer::DispatchMessages(glib::Source::Priority prio)
+{
+  // copy messages we are about to dispatch to a separate container
+  std::vector<std::pair<std::string, glib::Variant> > dispatched_msgs;
+
+  auto iterators = msg_queue_.equal_range(prio);
+  for (auto it = iterators.first; it != iterators.second; ++it)
+  {
+    dispatched_msgs.push_back((*it).second);
+  }
+
+  // remove the messages from the queue
+  msg_queue_.erase(prio);
+
+  for (unsigned i = 0; i < dispatched_msgs.size(); i++)
+  {
+    // invoke callbacks for this message_name
+    std::string const& message_name = dispatched_msgs[i].first;
+    glib::Variant const& msg_args = dispatched_msgs[i].second;
+    auto interest_it = interests_.find(message_name);
+    while (interest_it != interests_.end())
+    {
+      // add a reference to make sure we don't crash if the slot unregisters itself
+      UBusConnection::Ptr connection((*interest_it).second);
+      interest_it++;
+      // invoke the slot
+      // FIXME: what if this slot unregisters the next? We should mark the interests map dirty in UnregisterInterest
+      connection->slot(msg_args);
+
+      if (interest_it == interests_.end() || 
+          (*interest_it).first != message_name)
+        break;
+    }
+  }
+
+  // return true if there are new queued messages with this prio
+  return msg_queue_.find(prio) != msg_queue_.end();
+}
+
+}

=== added file 'unity-shared/UBusServer.h'
--- unity-shared/UBusServer.h	1970-01-01 00:00:00 +0000
+++ unity-shared/UBusServer.h	2012-10-12 08:42:18 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ *              Michal Hruby <[e-mail]>
+ */
+
+#ifndef UNITY_UBUS_SERVER_H
+#define UNITY_UBUS_SERVER_H
+
+#include <memory>
+#include <string>
+#include <map>
+
+#include <UnityCore/Variant.h>
+#include <UnityCore/GLibSource.h>
+
+namespace unity
+{
+
+typedef std::function<void(glib::Variant const&)> UBusCallback;
+
+class UBusServer : public boost::noncopyable
+{
+public:
+  UBusServer();
+
+  unsigned RegisterInterest(std::string const& interest_name,
+                            UBusCallback const& slot);
+  void UnregisterInterest(unsigned connection_id);
+  void SendMessage(std::string const& message_name,
+                   glib::Variant const& args = glib::Variant());
+  void SendMessageFull(std::string const& message_name,
+                       glib::Variant const& args,
+                       glib::Source::Priority prio);
+
+private:
+  struct UBusConnection
+  {
+    typedef std::shared_ptr<UBusConnection> Ptr;
+
+    UBusCallback slot;
+    unsigned id;
+
+    UBusConnection(UBusCallback const& cb, unsigned connection_id)
+      : slot(cb), id(connection_id) {}
+  };
+
+  bool DispatchMessages(glib::Source::Priority);
+
+  unsigned last_id_;
+  std::multimap<std::string, UBusConnection::Ptr> interests_;
+  std::multimap<int, std::pair<std::string, glib::Variant> > msg_queue_;
+  glib::SourceManager source_manager_;
+};
+
+}
+
+#endif

=== modified file 'unity-shared/UBusWrapper.cpp'
--- unity-shared/UBusWrapper.cpp	2012-07-16 11:03:32 +0000
+++ unity-shared/UBusWrapper.cpp	2012-10-12 08:42:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,65 +13,58 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Neil Jagdish Patel <[e-mail]>
+ * Authored by: Michal Hruby <[e-mail]>
  */
 
+#include <NuxCore/Logger.h>
+
 #include "UBusWrapper.h"
 
 namespace unity
 {
 
+// initialize the global static ptr
+std::unique_ptr<UBusServer> UBusManager::server(new UBusServer());
+
 UBusManager::UBusManager()
-  : server_(ubus_server_get_default())
-{}
+{
+}
 
 UBusManager::~UBusManager()
 {
-  for (auto connection: connections_)
-  {
-    ubus_server_unregister_interest(server_, connection->id);
-  }
-}
-
-void UBusManager::RegisterInterest(std::string const& interest_name,
-                                   UBusManagerCallback slot)
-{
-  if (!slot || interest_name.empty())
-    return;
-
-  auto connection = std::make_shared<UBusConnection>();
-  connection->name = interest_name;
-  connection->slot = slot;
-  connection->id = ubus_server_register_interest(server_,
-                                                 interest_name.c_str(),
-                                                 UBusManager::OnCallback,
-                                                 connection.get());
-  connections_.push_back(connection);
-}
-
-void UBusManager::UnregisterInterest(std::string const& interest_name)
-{
-  for (auto it = connections_.begin(); it != connections_.end(); ++it)
-  {
-    if ((*it)->name == interest_name)
-    {
-      ubus_server_unregister_interest(server_, (*it)->id);
-      connections_.erase(it);
-      break;
-    }
-  }
-}
-
-void UBusManager::OnCallback(GVariant* args, gpointer user_data)
-{
-  UBusConnection* connection = static_cast<UBusConnection*>(user_data);
-
-  connection->slot(args);
-}
-
-void UBusManager::SendMessage(std::string const& message_name, GVariant* args)
-{
-  ubus_server_send_message(server_, message_name.c_str(), args);
+  // we don't want to modify a container while iterating it
+  std::set<unsigned> ids_copy(connection_ids_);
+  for (auto it = ids_copy.begin(); it != ids_copy.end(); ++it)
+  {
+    UnregisterInterest(*it);
+  }
+}
+
+unsigned UBusManager::RegisterInterest(std::string const& interest_name,
+                                       UBusCallback const& slot)
+{
+  unsigned c_id = server->RegisterInterest(interest_name, slot);
+
+  if (c_id != 0) connection_ids_.insert(c_id);
+
+  return c_id;
+}
+
+void UBusManager::UnregisterInterest(unsigned connection_id)
+{
+  auto it = connection_ids_.find(connection_id);
+  if (it != connection_ids_.end())
+  {
+    server->UnregisterInterest(connection_id);
+    connection_ids_.erase(it);
+  }
+}
+
+void UBusManager::SendMessage(std::string const& message_name,
+                              glib::Variant const& args,
+                              glib::Source::Priority prio)
+{
+  server->SendMessageFull(message_name, args, prio);
 }
 
 }

=== modified file 'unity-shared/UBusWrapper.h'
--- unity-shared/UBusWrapper.h	2012-07-16 11:03:32 +0000
+++ unity-shared/UBusWrapper.h	2012-10-12 08:42:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
+ *              Michal Hruby <[e-mail]>
  */
 
 #ifndef UNITY_UBUS_WRAPPER_H
@@ -21,10 +22,12 @@
 
 #include <memory>
 #include <string>
-#include <vector>
-#include <boost/utility.hpp>
-
-#include "ubus-server.h"
+#include <set>
+
+#include <UnityCore/Variant.h>
+#include <UnityCore/GLibSource.h>
+
+#include "UBusServer.h"
 
 namespace unity
 {
@@ -32,29 +35,19 @@
 class UBusManager : public boost::noncopyable
 {
 public:
-  typedef std::function<void(GVariant*)> UBusManagerCallback;
-
   UBusManager();
   ~UBusManager();
 
-  void RegisterInterest(std::string const& interest_name, UBusManagerCallback slot);
-  void UnregisterInterest(std::string const& interest_name);
-  void SendMessage(std::string const& message_name, GVariant* args = NULL);
+  unsigned RegisterInterest(std::string const& interest_name,
+                            UBusCallback const& slot);
+  void UnregisterInterest(unsigned connection_id);
+  static void SendMessage(std::string const& message_name,
+                          glib::Variant const& args = glib::Variant(),
+                          glib::Source::Priority prio = glib::Source::Priority::DEFAULT);
 
 private:
-  struct UBusConnection
-  {
-    typedef std::shared_ptr<UBusConnection> Ptr;
-
-    std::string name;
-    UBusManagerCallback slot;
-    guint id;
-  };
-
-  static void OnCallback(GVariant* args, gpointer user_data);
-
-  UBusServer* server_;
-  std::vector<UBusConnection::Ptr> connections_;
+  static std::unique_ptr<UBusServer> server;
+  std::set<unsigned> connection_ids_;
 };
 
 }

=== removed file 'unity-shared/ubus-server.cpp'
--- unity-shared/ubus-server.cpp	2012-05-06 23:48:38 +0000
+++ unity-shared/ubus-server.cpp	1970-01-01 00:00:00 +0000
@@ -1,397 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * u-bus-server.c
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Gordon Allott <[e-mail]>
- */
-
-#include "ubus-server.h"
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-
-#define UBUS_SERVER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),\
-  UBUS_TYPE_SERVER, \
-  UBusServerPrivate))
-
-struct _UBusServerPrivate
-{
-  GHashTable*   message_interest_table;
-  GHashTable*   dispatch_table;
-
-  GQueue*       message_queue;
-  GStringChunk* message_names;
-
-  guint         id_sequencial_number;
-  gboolean      message_pump_queued;
-};
-
-
-G_DEFINE_TYPE(UBusServer, ubus_server, G_TYPE_INITIALLY_UNOWNED);
-
-struct _UBusDispatchInfo
-{
-  guint         id;
-  UBusCallback  callback;
-  gchar*        message;
-  gpointer      user_data;
-};
-typedef struct _UBusDispatchInfo UBusDispatchInfo;
-
-UBusDispatchInfo*
-ubus_dispatch_info_new(UBusServer*   server,
-                       const gchar*  message,
-                       UBusCallback  callback,
-                       gpointer      user_data)
-{
-  g_return_val_if_fail(UBUS_IS_SERVER(server), NULL);
-  UBusServerPrivate* priv = server->priv;
-  UBusDispatchInfo* info;
-
-  if (priv->id_sequencial_number < 1)
-  {
-    g_critical(G_STRLOC ": ID's are overflowing");
-  }
-
-  info = g_slice_new(UBusDispatchInfo);
-  info->id = priv->id_sequencial_number++;
-  info->callback = callback;
-  info->message = g_string_chunk_insert_const(priv->message_names, message);
-  info->user_data = user_data;
-
-  return info;
-}
-
-void
-ubus_dispatch_info_free(UBusDispatchInfo* info)
-{
-  g_slice_free(UBusDispatchInfo, info);
-}
-
-struct _UBusMessageInfo
-{
-  gchar*     message;
-  GVariant*  data;
-};
-
-typedef struct _UBusMessageInfo UBusMessageInfo;
-
-/*
- * If @data is floating the constructed message info will
- * assume ownership of the ref.
- *
- * The message member of the UBusMessageInfo struct is managed
- * by the UBusServer owning the message. This is done to have
- * "interned" strings representing the message names.
- *
- * Technically the interning is done with g_string_chunk_insert_const().
- * This not only gives us imporved memory management, but also allows
- * us to compare message names with direct pointer comparison.
- */
-static UBusMessageInfo*
-ubus_message_info_new(GVariant* data)
-{
-  UBusMessageInfo* info;
-
-  info = g_slice_new0(UBusMessageInfo);
-  info->data = data;
-
-  if (data != NULL)
-    g_variant_ref_sink(data);
-
-  return info;
-}
-
-static void
-ubus_message_info_free(UBusMessageInfo* info)
-{
-  if (info->data != NULL)
-  {
-    g_variant_unref(info->data);
-    info->data = NULL;
-  }
-
-  g_slice_free(UBusMessageInfo, info);
-}
-
-static void
-ubus_server_init(UBusServer* server)
-{
-  UBusServerPrivate* priv;
-
-  priv = server->priv = UBUS_SERVER_GET_PRIVATE(server);
-
-  /* message_interest_table holds the message/DispatchInfo relationship
-   * We can use g_direct_* hash functions because we are interning all
-   * message names in our GStringChunk
-   */
-  priv->message_interest_table = g_hash_table_new_full(g_direct_hash,
-                                                       g_direct_equal,
-                                                       NULL,
-                                                       (GDestroyNotify) g_sequence_free);
-  // dispatch_table holds the individial id/DispatchInfo pairs
-  priv->dispatch_table = g_hash_table_new_full(g_direct_hash,
-                                               g_direct_equal,
-                                               NULL,
-                                               (GDestroyNotify) ubus_dispatch_info_free);
-
-  // for anyone thats wondering (hi kamstrup!), there are two hash tables so
-  // that lookups are fast when sending messages and removing handlers
-
-  priv->message_queue = g_queue_new();
-  priv->message_names = g_string_chunk_new(512);
-  priv->id_sequencial_number = 1;
-}
-
-static void
-ubus_server_finalize(GObject* object)
-{
-  UBusServer*        server;
-  UBusServerPrivate* priv;
-
-  server = UBUS_SERVER(object);
-  priv = server->priv;
-
-  g_hash_table_destroy(priv->message_interest_table);
-  g_hash_table_destroy(priv->dispatch_table);
-
-  UBusMessageInfo* info = (UBusMessageInfo*)g_queue_pop_tail(priv->message_queue);
-  for (; info != NULL; info = (UBusMessageInfo*)g_queue_pop_tail(priv->message_queue))
-  {
-    ubus_message_info_free(info);
-  }
-
-  g_queue_free(priv->message_queue);
-  g_string_chunk_free(priv->message_names);
-
-  G_OBJECT_CLASS(ubus_server_parent_class)->finalize(object);
-}
-
-static void
-ubus_server_class_init(UBusServerClass* klass)
-{
-  GObjectClass* object_class = G_OBJECT_CLASS(klass);
-  g_type_class_add_private(klass, sizeof(UBusServerPrivate));
-  object_class->finalize = ubus_server_finalize;
-}
-
-UBusServer*
-ubus_server_get_default()
-{
-  UBusServer* server;
-  static gsize singleton;
-
-  // Ensure GType has been initialized
-  g_type_init();
-
-  if (g_once_init_enter(&singleton))
-  {
-    server = (UBusServer*)g_object_new(UBUS_TYPE_SERVER, NULL);
-    g_object_ref_sink(server);
-    g_once_init_leave(&singleton, (gsize) server);
-  }
-
-  // we actually just want to hold our own reference and not let anything
-  // else reference us, because we never want to lose that reference, we are
-  // only allowed to initalise once
-  return (UBusServer*)singleton;
-}
-
-guint
-ubus_server_register_interest(UBusServer*   server,
-                              const gchar*  message,
-                              UBusCallback  callback,
-                              gpointer      user_data)
-{
-  UBusServerPrivate* priv;
-  GSequence*         dispatch_list;
-  gchar*             interned_message;
-  UBusDispatchInfo*  info;
-
-  g_return_val_if_fail(UBUS_IS_SERVER(server), 0);
-  g_return_val_if_fail(message != NULL, 0);
-
-  priv = server->priv;
-  interned_message = g_string_chunk_insert_const(priv->message_names, message);
-  dispatch_list = (GSequence*)g_hash_table_lookup(priv->message_interest_table,
-                                                  interned_message);
-
-  if (dispatch_list == NULL)
-  {
-    // not had this message before so add a new entry to the message_interest table
-    dispatch_list = g_sequence_new(NULL);  // we use a sequence because its a stable pointer
-    g_hash_table_insert(priv->message_interest_table,
-                        interned_message,
-                        dispatch_list);
-  }
-
-  // add the callback to the dispatch table
-  info = ubus_dispatch_info_new(server, message, callback, user_data);
-  g_hash_table_insert(priv->dispatch_table, GUINT_TO_POINTER(info->id), info);
-
-  // add the dispatch info to the dispatch list in the message interest table
-  g_sequence_append(dispatch_list, info);
-
-  return info->id;
-}
-
-static gboolean
-ubus_server_pump_message_queue(UBusServer* server)
-{
-  g_return_val_if_fail(UBUS_IS_SERVER(server), FALSE);
-  UBusServerPrivate* priv = server->priv;
-  UBusMessageInfo* info;
-
-  priv->message_pump_queued = FALSE;
-
-  // loop through each message queued and call the dispatch functions associated
-  // with it. something in the back of my mind says it would be quicker in some
-  // situations to sort the queue first so that duplicate messages can re-use
-  // the same dispatch_list lookups.. but thats a specific case.
-
-  info = (UBusMessageInfo*)g_queue_pop_tail(priv->message_queue);
-  for (; info != NULL; info = (UBusMessageInfo*)g_queue_pop_tail(priv->message_queue))
-  {
-    GSequence* dispatch_list;
-    dispatch_list = (GSequence*)g_hash_table_lookup(priv->message_interest_table,
-                                                    info->message);
-
-    if (dispatch_list == NULL)
-    {
-      ubus_message_info_free(info);
-      continue; // no handlers for this message
-    }
-
-    GSequenceIter* iter = g_sequence_get_begin_iter(dispatch_list);
-    GSequenceIter* end = g_sequence_get_end_iter(dispatch_list);
-
-    while (iter != end)
-    {
-      GSequenceIter* next = g_sequence_iter_next(iter);
-      UBusDispatchInfo* dispatch_info = (UBusDispatchInfo*)g_sequence_get(iter);
-      UBusCallback callback = dispatch_info->callback;
-
-      (*callback)(info->data, dispatch_info->user_data);
-
-      iter = next;
-    }
-
-    ubus_message_info_free(info);
-  }
-
-  return FALSE;
-}
-
-static void
-ubus_server_queue_message_pump(UBusServer* server)
-{
-  UBusServerPrivate* priv;
-
-  g_return_if_fail(UBUS_IS_SERVER(server));
-
-  priv = server->priv;
-  if (priv->message_pump_queued)
-    return;
-
-  g_idle_add((GSourceFunc)ubus_server_pump_message_queue, server);
-  priv->message_pump_queued = TRUE;
-}
-
-void
-ubus_server_send_message(UBusServer*  server,
-                         const gchar* message,
-                         GVariant*    data)
-{
-  UBusServerPrivate* priv;
-  UBusMessageInfo*   message_info;
-
-  g_return_if_fail(UBUS_IS_SERVER(server));
-  g_return_if_fail(message != NULL);
-
-  priv = server->priv;
-  message_info = ubus_message_info_new(data);
-  message_info->message = g_string_chunk_insert_const(priv->message_names,
-                                                      message);
-
-  g_queue_push_head(priv->message_queue, message_info);
-  ubus_server_queue_message_pump(server);
-}
-
-void
-ubus_server_unregister_interest(UBusServer* server, guint handle)
-{
-  UBusServerPrivate* priv;
-  GSequence*         dispatch_list;
-  UBusDispatchInfo*  info;
-
-  g_return_if_fail(UBUS_IS_SERVER(server));
-  g_return_if_fail(handle > 0);
-
-  priv = server->priv;
-  info = (UBusDispatchInfo*)g_hash_table_lookup(priv->dispatch_table, GUINT_TO_POINTER(handle));
-
-  if (info == NULL)
-  {
-    g_warning(G_STRLOC ": Handle %u does not exist", handle);
-    return;
-  }
-
-  // now the slightly sucky bit, we have to remove from our message-interest
-  // table, but we can only find it by itterating through a sequence
-  // but this is not so bad because we know *which* sequence its in
-
-  dispatch_list = (GSequence*)g_hash_table_lookup(priv->message_interest_table,
-                                                  info->message);
-
-  if (dispatch_list == NULL)
-  {
-    g_critical(G_STRLOC ": Handle exists but not dispatch list, ubus has "\
-               "become unstable");
-    return;
-  }
-
-  GSequenceIter* iter = g_sequence_get_begin_iter(dispatch_list);
-  GSequenceIter* end = g_sequence_get_end_iter(dispatch_list);
-  while (iter != end)
-  {
-    GSequenceIter* next = g_sequence_iter_next(iter);
-    UBusDispatchInfo* info_test = (UBusDispatchInfo*)g_sequence_get(iter);
-
-    if (info_test->id == handle)
-    {
-      g_sequence_remove(iter);
-    }
-
-    iter = next;
-  }
-
-  if (g_sequence_get_length(dispatch_list) == 0)
-  {
-    // free the key/value pair
-    g_hash_table_remove(priv->message_interest_table, info->message);
-  }
-
-  // finally remove the dispatch_table hash table.
-  g_hash_table_remove(priv->dispatch_table, &handle);
-
-}
-
-void
-ubus_server_force_message_pump(UBusServer* server)
-{
-  ubus_server_pump_message_queue(server);
-}

=== removed file 'unity-shared/ubus-server.h'
--- unity-shared/ubus-server.h	2012-05-06 23:48:38 +0000
+++ unity-shared/ubus-server.h	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * u-bus-server.h
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Gordon Allott <[e-mail]>
- */
-
-#ifndef _U_BUS_SERVER_H_
-#define _U_BUS_SERVER_H_
-
-#include <glib-object.h>
-#include <glib.h>
-G_BEGIN_DECLS
-
-#define UBUS_TYPE_SERVER             (ubus_server_get_type ())
-#define UBUS_SERVER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), UBUS_TYPE_SERVER, UBusServer))
-#define UBUS_SERVER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), UBUS_TYPE_SERVER, UBusServerClass))
-#define UBUS_IS_SERVER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UBUS_TYPE_SERVER))
-#define UBUS_IS_SERVER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), UBUS_TYPE_SERVER))
-#define UBUS_SERVER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), UBUS_TYPE_SERVER, UBusServerClass))
-
-typedef struct _UBusServerClass UBusServerClass;
-typedef struct _UBusServer UBusServer;
-typedef struct _UBusServerPrivate  UBusServerPrivate;
-
-struct _UBusServerClass
-{
-  GObjectClass parent_class;
-
-  /* padding */
-  void (*_unity_padding1)(void);
-  void (*_unity_padding2)(void);
-  void (*_unity_padding3)(void);
-  void (*_unity_padding4)(void);
-  void (*_unity_padding5)(void);
-  void (*_unity_padding6)(void);
-};
-
-struct _UBusServer
-{
-  GObject parent_instance;
-
-  UBusServerPrivate* priv;
-};
-
-typedef void (*UBusCallback)(GVariant*     data,
-                             gpointer      user_data);
-
-GType        ubus_server_get_type(void) G_GNUC_CONST;
-UBusServer*  ubus_server_get_default();
-void         ubus_server_prime_context(UBusServer*   server,
-                                       GMainContext* context);
-guint        ubus_server_register_interest(UBusServer*   server,
-                                           const gchar*  message,
-                                           UBusCallback  callback,
-                                           gpointer      user_data);
-void         ubus_server_send_message(UBusServer*   server,
-                                      const gchar*  message,
-                                      GVariant*     data);
-void         ubus_server_unregister_interest(UBusServer*   server,
-                                             guint handle);
-void         ubus_server_force_message_pump(UBusServer*   server);
-
-G_END_DECLS
-
-#endif /* _U_BUS_SERVER_H_ */