summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-12 11:29:27 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-12 11:29:27 +0200
commit01058af8b919e1c58207008ea9609f2e7b23efac (patch)
tree211ec08189a8d454ded98bd5d716f91b127e1187 /src/main.cpp
parent793166f301c058503c37553204c4d4c2b106ff23 (diff)
binding: manual lock on API call, do not use noconcurrent bit
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 4bb53b3..4c04f74 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,7 @@ extern "C" {
}
namespace {
-//std::mutex binding_m;
+std::mutex binding_m;
struct afb_instance {
std::unique_ptr<wl::display> display;
@@ -54,7 +54,6 @@ int afb_instance::init() {
int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
void * /*data*/) {
ST();
- // std::lock_guard<std::mutex> guard(binding_m);
if ((events & EPOLLHUP) != 0) {
logerror("The compositor hung up, dying now.");
@@ -156,4 +155,4 @@ void binding_api::send_event(char const *evname, char const *label) {
}
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};