X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=e7b3c22cf16f24574037de9c8c9bf663670247f8;hb=a0aeb123e0163301a5498c148ef1882d48a8d179;hp=a768347fff413a583fa3330ce163329c4b2dbe19;hpb=38da977e18f4b9e9a295119b8bac194a8a87a498;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index a768347..e7b3c22 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,8 @@
 #include "wayland.hpp"
 
 #include <algorithm>
+#include <mutex>
+
 #include <json.h>
 
 extern "C" {
@@ -28,6 +30,8 @@ extern "C" {
 }
 
 namespace {
+std::mutex binding_m;
+
 struct afb_instance {
    std::unique_ptr<wl::display> display;
    wm::App app;
@@ -49,6 +53,8 @@ int afb_instance::init() {
 
 int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
                            void * /*data*/) {
+   std::lock_guard<std::mutex> guard(binding_m);
+
    if ((events & EPOLLHUP) != 0) {
       logerror("The compositor hung up, dying now.");
       delete g_afb_instance;
@@ -66,6 +72,7 @@ int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
 
 error:
    sd_event_source_unref(evs);
+   exit(1);
    return -1;
 }
 
@@ -129,10 +136,9 @@ int binding_init() noexcept {
 
 // XXX implement send_event right here...
 namespace wm {
-void binding_api::send_event(char const *evname, json_object *payload) {
-   logdebug("%s: %s(%s)", __func__, evname, json_object_to_json_string(payload));
-   afb_event ev = afb_daemon_make_event(evname);
-   int ret = afb_event_broadcast(ev, payload);
+void binding_api::send_event(char const *evname, char const *label) {
+   logdebug("%s: %s(%s)", __func__, evname, label);
+   int ret = afb_daemon_broadcast_event(evname, json_object_new_string(label));
    if (ret != 0) {
       logdebug("afb_event_broadcast failed: %m");
    }