binding: manual lock on API call, do not use noconcurrent bit

[staging/windowmanager.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a768347..4c04f74 100644 (file)
--- 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;
@@ -47,8 +51,10 @@ int afb_instance::init() {
    return this->app.init();
 }
 
-int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
+int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
                            void * /*data*/) {
+   ST();
+
    if ((events & EPOLLHUP) != 0) {
       logerror("The compositor hung up, dying now.");
       delete g_afb_instance;
@@ -57,8 +63,16 @@ int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
    }
 
    if ((events & EPOLLIN) != 0u) {
-      if (g_afb_instance->app.dispatch_events() == -1) {
-         goto error;
+      {
+         STN(display_read_events);
+         g_afb_instance->app.display->read_events();
+         g_afb_instance->app.pending_events.store(true, std::memory_order_release);
+      }
+      {
+         STN(winman_ping_api_call);
+         afb_service_call("winman", "ping", json_object_new_object(), [](void *c, int st,  json_object* j) {
+            STN(winman_ping_api_call_return);
+         }, nullptr);
       }
    }
 
@@ -66,6 +80,8 @@ int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
 
 error:
    sd_event_source_unref(evs);
+   if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr)
+      exit(1);
    return -1;
 }
 
@@ -129,10 +145,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");
    }
@@ -140,4 +155,4 @@ void binding_api::send_event(char const *evname, json_object *payload) {
 }
 
 extern "C" const struct afb_binding_v2 afbBindingV2 = {
-   "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 1};
+   "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 0};